Multi datasource support (#311)

* added mds changes Signed-off-by: sumukhswamy <[email protected]> * added mds changes Signed-off-by: sumukhswamy <[email protected]> * added more changes Signed-off-by: sumukhswamy <[email protected]> * upadted the group buttons and calls with mds Signed-off-by: sumukhswamy <[email protected]> * added changes for and cache management Signed-off-by: sumukhswamy <[email protected]> * added changes for PPL page, changes for fetching queries Signed-off-by: sumukhswamy <[email protected]> * main test added Signed-off-by: sumukhswamy <[email protected]> * added datsource dependency Signed-off-by: sumukhswamy <[email protected]> * updated the tests for workbench with snapshots Signed-off-by: sumukhswamy <[email protected]> * Update common/utils/fetch_datasources.ts Co-authored-by: Joshua Li <[email protected]> Signed-off-by: Sumukh Swamy <[email protected]> * updated lint checker in async workbench Signed-off-by: sumukhswamy <[email protected]> * updated with new comments Signed-off-by: sumukhswamy <[email protected]> * added UX changes Signed-off-by: sumukhswamy <[email protected]> * added changed for pr comments Signed-off-by: sumukhswamy <[email protected]> * added changes for linter Signed-off-by: sumukhswamy <[email protected]> * added changes for snapshop Signed-off-by: sumukhswamy <[email protected]> * added snapshot for main Signed-off-by: sumukhswamy <[email protected]> * updated tests for main Signed-off-by: sumukhswamy <[email protected]> --------- Signed-off-by: sumukhswamy <[email protected]> Signed-off-by: Sumukh Swamy <[email protected]> Co-authored-by: Joshua Li <[email protected]>
opensearch-project · May 1, 2024 · bb6116d · bb6116d
1 parent e08d5e6
commit bb6116d
Show file tree

Hide file tree

Showing 33 changed files with 2,089 additions and 4,519 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/common/utils/async_query_helpers.ts b/common/utils/async_query_helpers.ts
@@ -27,6 +27,7 @@ export const executeAsyncQuery = (
   currentDataSource: string,
   query: {},
   pollingCallback: PollingCallback,
+  dataSourceMDSId?: string,
   onErrorCallback?: (errorMessage: string) => void
 ) => {
   let jobId: string | undefined;
@@ -41,6 +42,7 @@ export const executeAsyncQuery = (
           ...query,
           sessionId: getAsyncSessionId(currentDataSource) ?? undefined,
         }),
+        query: { dataSourceMDSId },
       })
       .then((res) => {
         const responseData = res.data.resp;
@@ -76,7 +78,7 @@ export const executeAsyncQuery = (
   const pollQueryStatus = (id: string, callback: PollingCallback) => {
     !isQueryCancelled &&
       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 ?? '';

diff --git a/common/utils/fetch_datasources.ts b/common/utils/fetch_datasources.ts
@@ -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) {
+              urlSourceFound = true;
+            }
+          }
+        });
+
+        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);
+      });
+  };
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
@@ -5,5 +5,5 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "opensearchDashboardsReact", "opensearchDashboardsUtils"],
-  "optionalPlugins": ["observabilityDashboards"]
-}
+  "optionalPlugins": ["observabilityDashboards", "dataSource", "dataSourceManagement"]
+}
diff --git a/public/application.tsx b/public/application.tsx
@@ -7,13 +7,15 @@
 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
 ) => {
   ReactDOM.render(
     <WorkbenchApp
@@ -22,6 +24,10 @@ export const renderApp = (
       http={http}
       navigation={navigation}
       chrome={chrome}
+      savedObjects={savedObjects}
+      dataSourceEnabled={!!dataSource}
+      dataSourceManagement={dataSourceManagement}
+      setActionMenu={setHeaderActionMenu}
     />,
     element
   );