Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi datasource support #311

Merged
merged 19 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ The OpenSearch Dashboards Query Workbench enables you to query your OpenSearch d
[cypress-test-badge]: https://img.shields.io/badge/Cypress%20tests-in%20progress-yellow
[cypress-test-link]: https://github.com/opensearch-project/opensearch-build/issues/1124
[cypress-code-badge]: https://img.shields.io/badge/Cypress%20code-blue
[cypress-code-link]: https://github.com/opensearch-project/sql/tree/main/workbench/.cypress/integration
[cypress-code-link]: https://github.com/opensearch-project/dashboards-query-workbench/tree/main/.cypress/integration

## Documentation

Please see our technical [documentation](https://opensearch.org/docs/latest/search-plugins/sql/workbench/) to learn more about its features.
Please see our technical [documentation](https://opensearch.org/docs/latest/search-plugins/sql/workbench/) to learn more about its features.


## Contributing
Expand Down
6 changes: 5 additions & 1 deletion common/utils/async_query_helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
currentDataSource: string,
query: {},
pollingCallback: PollingCallback,
dataSourceMDSId?: string,
onErrorCallback?: (errorMessage: string) => void
) => {
let jobId: string | undefined;
Expand All @@ -41,6 +42,9 @@
...query,
sessionId: getAsyncSessionId(currentDataSource) ?? undefined,
}),
query: {
dataSourceMDSId: dataSourceMDSId,

Check failure on line 46 in common/utils/async_query_helpers.ts

View workflow job for this annotation

GitHub Actions / Lint

Expected property shorthand
sumukhswamy marked this conversation as resolved.
Show resolved Hide resolved
},
})
.then((res) => {
const responseData = res.data.resp;
Expand Down Expand Up @@ -74,9 +78,9 @@
};

const pollQueryStatus = (id: string, callback: PollingCallback) => {
!isQueryCancelled &&

Check failure on line 81 in common/utils/async_query_helpers.ts

View workflow job for this annotation

GitHub Actions / Lint

Expected an assignment or function call and instead saw an expression
http
.get(ASYNC_QUERY_JOB_ENDPOINT + id)
.get(ASYNC_QUERY_JOB_ENDPOINT + id + `/` + dataSourceMDSId)
.then((res: AsyncApiResponse) => {
const status = res.data.resp.status.toLowerCase();
const errorDetailsMessage = res.data.resp.error ?? '';
Expand Down
53 changes: 53 additions & 0 deletions common/utils/fetch_datasources.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/


import { CoreStart } from "../../../../src/core/public";

export const fetchDataSources = (http: CoreStart['http'], dataSourceMDSId: string, urlDataSource: string, onSuccess, onError) => {
let dataOptions: { label: string; options?: Array<{ label: string }>; }[] = [];
let urlSourceFound = false;
if(!dataSourceMDSId){
dataSourceMDSId = ''
}

http.get(`/api/get_datasources/${dataSourceMDSId}`)
.then((res) => {
const data = res.data.resp;
const connectorGroups = {};

data.forEach((item) => {
const { connector, name } = item

if (connector === 'S3GLUE') {
if (!connectorGroups[connector]) {
connectorGroups[connector] = [];
}

connectorGroups[connector].push(name);
if (name === urlDataSource) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is urlDataSource? Can we give a better name?

urlSourceFound = true;
}
}
});
sumukhswamy marked this conversation as resolved.
Show resolved Hide resolved

for (const connector in connectorGroups) {
if (connectorGroups.hasOwnProperty(connector)) {
const connectorNames = connectorGroups[connector];

dataOptions.push({
label: connector,
options: connectorNames.map((name) => ({ label: name })),
});
}
}

onSuccess(dataOptions, urlSourceFound);
})
.catch((err) => {
console.error(err);
onError(err);
});
};
4 changes: 2 additions & 2 deletions opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"server": true,
"ui": true,
"requiredPlugins": ["navigation", "opensearchDashboardsReact", "opensearchDashboardsUtils"],
"optionalPlugins": ["observabilityDashboards"]
}
"optionalPlugins": ["observabilityDashboards", "dataSource", "dataSourceManagement"]
}
15 changes: 11 additions & 4 deletions public/application.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,28 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { AppMountParameters, CoreStart } from '../../../src/core/public';
import { AppPluginStartDependencies } from './types';
import { DataSourceManagementPluginSetup } from '../../../src/plugins/data_source_management/public';
import { WorkbenchApp } from './components/app';
import { AppPluginStartDependencies } from './types';

export const renderApp = (
{ notifications, http, chrome }: CoreStart,
{ navigation }: AppPluginStartDependencies,
{ appBasePath, element }: AppMountParameters
{ notifications, http, chrome, savedObjects }: CoreStart,
{ navigation, dataSource }: AppPluginStartDependencies,
{ appBasePath, element, setHeaderActionMenu }: AppMountParameters,
dataSourceManagement: DataSourceManagementPluginSetup
) => {
console.log(dataSource)
sumukhswamy marked this conversation as resolved.
Show resolved Hide resolved
ReactDOM.render(
<WorkbenchApp
basename={appBasePath}
notifications={notifications}
http={http}
navigation={navigation}
chrome={chrome}
savedObjects={savedObjects}
dataSourceEnabled={!!dataSource}
dataSourceManagement={dataSourceManagement}
setActionMenu={setHeaderActionMenu}
/>,
element
);
Expand Down
Loading
Loading