added fix for runAsync query without mds id (opensearch-project#323)

* added fix for runAsync query without mds id Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * linter fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * fixed linter issue Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * fixed linter issue Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added change for linting issue Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * linter issues Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * linter issues Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * linting fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * more linting issues Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added linting fixes Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * refactored flyout code with interface Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added fix for import of interface Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added linter fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added linter fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * added linter fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * addressed pr comments Signed-off-by: sumukhswamy <sumukhhs@amazon.com> * linter fix Signed-off-by: sumukhswamy <sumukhhs@amazon.com> --------- Signed-off-by: sumukhswamy <sumukhhs@amazon.com>
sumukhswamy · May 23, 2024 · 4ae9a53 · 4ae9a53
1 parent 888a8fe
commit 4ae9a53
Show file tree

Hide file tree

Showing 6 changed files with 144 additions and 87 deletions.
diff --git a/public/components/SQLPage/SQLPage.tsx b/public/components/SQLPage/SQLPage.tsx
@@ -34,7 +34,7 @@ interface SQLPageProps {
   onClear: () => void;
   updateSQLQueries: (query: string) => void;
   sqlQuery: string;
-  sqlTranslations: ResponseDetail<TranslateResult>[];
+  sqlTranslations: Array<ResponseDetail<TranslateResult>>;
   selectedDatasource: EuiComboBoxOptionOption[];
   asyncLoading: boolean;
   openAccelerationFlyout: boolean;
@@ -68,7 +68,10 @@ export class SQLPage extends React.Component<SQLPageProps, SQLPageState> {
   }
 
   setAccelerationFlyout = () => {
-    this.renderCreateAccelerationFlyout(this.props.selectedDatasource[0].label,this.props.dataSourceMDSId);
+    this.renderCreateAccelerationFlyout({
+      dataSource: this.props.selectedDatasource[0].label,
+      dataSourceMDSId: this.props.dataSourceMDSId,
+    });
   };
 
   componentDidUpdate(prevProps: SQLPageProps) {
@@ -214,7 +217,10 @@ export class SQLPage extends React.Component<SQLPageProps, SQLPageState> {
                   <EuiButton
                     className="sql-accelerate-button"
                     onClick={() =>
-                      this.renderCreateAccelerationFlyout(this.props.selectedDatasource[0].label,this.props.dataSourceMDSId)
+                      this.renderCreateAccelerationFlyout({
+                        dataSource: this.props.selectedDatasource[0].label,
+                        dataSourceMDSId: this.props.dataSourceMDSId,
+                      })
                     }
                     isDisabled={this.props.asyncLoading}
                   >

diff --git a/public/dependencies/register_observability_dependencies.tsx b/public/dependencies/register_observability_dependencies.tsx
@@ -5,8 +5,7 @@
 
 import { createGetterSetter } from '../../../../src/plugins/opensearch_dashboards_utils/public';
 import { catalogCacheRefs } from '../framework/catalog_cache_refs';
-import { ObservabilityStart } from '../types';
-
+import { ObservabilityStart, RenderAccelerationFlyoutParams } from '../types';
 export const [
   getRenderAccelerationDetailsFlyout,
   setRenderAccelerationDetailsFlyout,
@@ -20,7 +19,9 @@ export const [
 export const [
   getRenderCreateAccelerationFlyout,
   setRenderCreateAccelerationFlyout,
-] = createGetterSetter<(dataSource: string, dataSourceMDSId?: string) => void>('renderCreateAccelerationFlyout');
+] = createGetterSetter<({ dataSource, dataSourceMDSId }: RenderAccelerationFlyoutParams) => void>(
+  'renderCreateAccelerationFlyout'
+);
 
 export const registerObservabilityDependencies = (start?: ObservabilityStart) => {
   if (!start) {

diff --git a/public/types.ts b/public/types.ts
@@ -7,11 +7,11 @@ import { DataSourcePluginStart } from '../../../src/plugins/data_source/public/t
 import { NavigationPublicPluginStart } from '../../../src/plugins/navigation/public';
 import { ObservabilityStart } from './types';
 
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface WorkbenchPluginSetup {}
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface WorkbenchPluginStart {
-}
+export interface WorkbenchPluginStart {}
 
 export interface AppPluginStartDependencies {
   navigation: NavigationPublicPluginStart;
@@ -20,3 +20,5 @@ export interface AppPluginStartDependencies {
 }
 
 export type { ObservabilityStart } from '../../dashboards-observability/public';
+
+export type { RenderAccelerationFlyoutParams } from '../../dashboards-observability/common/types/data_connections';
diff --git a/server/plugin.ts b/server/plugin.ts
@@ -3,20 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-import {
-  CoreSetup,
-  CoreStart,
-  ILegacyClusterClient,
-  Logger,
-  Plugin,
-  PluginInitializerContext,
-} from '../../../src/core/server';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from '../../../src/core/server';
 
 import { DataSourcePluginSetup } from '../../../src/plugins/data_source/server/types';
 import { DataSourceManagementPlugin } from '../../../src/plugins/data_source_management/public/plugin';
 import sqlPlugin from './clusters/sql/sqlPlugin';
-import defineRoutes from './routes';
+import { defineRoutes } from './routes';
 import { WorkbenchPluginSetup, WorkbenchPluginStart } from './types';
 
 export interface WorkbenchPluginSetupDependencies {
@@ -31,22 +23,17 @@ export class WorkbenchPlugin implements Plugin<WorkbenchPluginSetup, WorkbenchPl
     this.logger = initializerContext.logger.get();
   }
 
-  public setup(core: CoreSetup, {dataSource} : WorkbenchPluginSetupDependencies) {
+  public setup(core: CoreSetup, { dataSource }: WorkbenchPluginSetupDependencies) {
     this.logger.debug('queryWorkbenchDashboards: Setup');
     const router = core.http.createRouter();
 
     const dataSourceEnabled = !!dataSource;
 
-    let client: ILegacyClusterClient | undefined = undefined;
-
-    client = core.opensearch.legacy.createClient(
-      'query_workbench',
-      {
-        plugins: [sqlPlugin]
-      }
-    )
+    const client = core.opensearch.legacy.createClient('query_workbench', {
+      plugins: [sqlPlugin],
+    });
     if (dataSourceEnabled) {
-      dataSource.registerCustomApiSchema(sqlPlugin)
+      dataSource.registerCustomApiSchema(sqlPlugin);
     }
 
     // Register server side APIs
@@ -55,7 +42,7 @@ export class WorkbenchPlugin implements Plugin<WorkbenchPluginSetup, WorkbenchPl
     return {};
   }
 
-  public start(core: CoreStart) {
+  public start() {
     this.logger.debug('queryWorkbenchDashboards: Started');
     return {};
   }

diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -3,18 +3,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-import { ILegacyClusterClient, IRouter, Logger, OpenSearchServiceSetup } from '../../../../src/core/server';
+import {
+  ILegacyClusterClient,
+  IRouter,
+  Logger,
+  OpenSearchServiceSetup,
+} from '../../../../src/core/server';
 import QueryService from '../services/QueryService';
 import TranslateService from '../services/TranslateService';
-import registerQueryRoute from './query';
+import { registerQueryRoute } from './query';
 import registerTranslateRoute from './translate';
 
-
-export default function (router: IRouter, client: ILegacyClusterClient | undefined, openSearchServiceSetup: OpenSearchServiceSetup, dataSourceEnabled: boolean, logger: Logger) {
+export function defineRoutes(
+  router: IRouter,
+  client: ILegacyClusterClient | undefined,
+  openSearchServiceSetup: OpenSearchServiceSetup,
+  dataSourceEnabled: boolean,
+  logger: Logger
+) {
   const translateService = new TranslateService(client, dataSourceEnabled, logger);
   registerTranslateRoute(router, translateService, openSearchServiceSetup);
 
   const queryService = new QueryService(client, dataSourceEnabled, logger);
-  registerQueryRoute(router, queryService, openSearchServiceSetup);
+  registerQueryRoute(router, queryService);
 }