fixing session id stuff and running async queries

Signed-off-by: Sean Li <[email protected]>
opensearch-project · Aug 1, 2024 · ffcfd8a · ffcfd8a
1 parent 55ec24f
commit ffcfd8a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
@@ -446,9 +446,6 @@ export {
   // for BWC, keeping the old name
   IUiStart as DataPublicPluginStartUi,
   DataSetNavigator,
-  setAsyncSessionId,
-  getAsyncSessionId,
-  setAsyncSessionIdByObj,
 } from './ui';
 
 /**

diff --git a/src/plugins/data/public/ui/dataset_navigator/index.tsx b/src/plugins/data/public/ui/dataset_navigator/index.tsx
@@ -5,4 +5,3 @@
 
 export { DataSetNavigator, DataSetNavigatorProps } from './dataset_navigator';
 export { createDataSetNavigator } from './create_dataset_navigator';
-export { setAsyncSessionId, getAsyncSessionId, setAsyncSessionIdByObj } from './lib';
diff --git a/src/plugins/data/public/ui/index.ts b/src/plugins/data/public/ui/index.ts
@@ -49,9 +49,4 @@ export {
 } from './query_editor';
 export { SearchBar, SearchBarProps, StatefulSearchBarProps } from './search_bar';
 export { SuggestionsComponent } from './typeahead';
-export {
-  DataSetNavigator,
-  setAsyncSessionId,
-  getAsyncSessionId,
-  setAsyncSessionIdByObj,
-} from './dataset_navigator';
+export { DataSetNavigator } from './dataset_navigator';
diff --git a/src/plugins/query_enhancements/public/search/sql_search_interceptor.ts b/src/plugins/query_enhancements/public/search/sql_search_interceptor.ts
@@ -20,8 +20,6 @@ import {
   ISearchOptions,
   SearchInterceptor,
   SearchInterceptorDeps,
-  getAsyncSessionId,
-  setAsyncSessionId,
 } from '../../../data/public';
 import {
   API,
@@ -36,13 +34,15 @@ import { QueryEnhancementsPluginStartDependencies } from '../types';
 export class SQLSearchInterceptor extends SearchInterceptor {
   protected queryService!: DataPublicPluginStart['query'];
   protected aggsService!: DataPublicPluginStart['search']['aggs'];
+  protected uiService!: DataPublicPluginStart['ui'];
 
   constructor(deps: SearchInterceptorDeps) {
     super(deps);
 
     deps.startServices.then(([coreStart, depsStart]) => {
       this.queryService = (depsStart as QueryEnhancementsPluginStartDependencies).data.query;
       this.aggsService = (depsStart as QueryEnhancementsPluginStartDependencies).data.search.aggs;
+      this.uiService = (depsStart as QueryEnhancementsPluginStartDependencies).data.ui;
     });
   }
 
@@ -122,7 +122,9 @@ export class SQLSearchInterceptor extends SearchInterceptor {
         ...dataFrame.meta.queryConfig,
         ...dataSourceRef,
       },
-      sessionId: dataSourceRef ? getAsyncSessionId(dataSourceRef.dataSourceName!) : {},
+      sessionId: dataSourceRef
+        ? this.uiService.Settings.getUserQuerySessionId(dataSourceRef.dataSourceName!)
+        : {},
     };
 
     const onPollingSuccess = (pollingResult: any) => {
@@ -162,7 +164,10 @@ export class SQLSearchInterceptor extends SearchInterceptor {
       concatMap((jobResponse) => {
         const df = jobResponse.body;
         if (dataSourceRef?.dataSourceName && df?.meta?.sessionId) {
-          setAsyncSessionId(dataSourceRef.dataSourceName, df?.meta?.sessionId);
+          this.uiService.Settings.setUserQuerySessionId(
+            dataSourceRef.dataSourceName,
+            df?.meta?.sessionId
+          );
         }
         const dataFramePolling = new DataFramePolling<any, any>(
           () => fetchDataFramePolling(dfContext, df),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@

		export { DataSetNavigator, DataSetNavigatorProps } from './dataset_navigator';
		export { createDataSetNavigator } from './create_dataset_navigator';
		export { setAsyncSessionId, getAsyncSessionId, setAsyncSessionIdByObj } from './lib';