Saved object datasource backward compatibility fixes (#1208) (#1209)

* remove unused files * missing snapshots * remove unused files * move dispatch to within batch * backward compatibility for existing saved object * update snapshots --------- (cherry picked from commit eb2721f) Signed-off-by: Eric Wei <menwe@amazon.com> Signed-off-by: Eric <menwe@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Oct 30, 2023 · 6da42db · 6da42db
1 parent 0884408
commit 6da42db
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/public/components/common/search/sql_search.tsx b/public/components/common/search/sql_search.tsx
@@ -190,8 +190,8 @@ export const DirectSearch = (props: any) => {
       dispatch(
         changeQuery({ tabId, query: { [RAW_QUERY]: tempQuery.replaceAll(PPL_NEWLINE_REGEX, '') } })
       );
+      dispatch(updateSearchMetaData({ tabId, data: { isPolling: true, lang } }));
     });
-    dispatch(updateSearchMetaData({ tabId, data: { isPolling: true, lang } }));
     const sessionId = getAsyncSessionId();
     const requestPayload = {
       lang: lang.toLowerCase(),

diff --git a/public/services/saved_objects/saved_object_loaders/explorer_saved_object_loader.ts b/public/services/saved_objects/saved_object_loaders/explorer_saved_object_loader.ts
@@ -46,7 +46,11 @@ import { coreRefs } from '../../../framework/core_refs';
 import { UsePolling } from '../../../components/hooks/use_polling';
 import { getAsyncSessionId, setAsyncSessionId } from '../../../../common/utils/query_session_utils';
 import { get as getObjValue } from '../../../../common/utils/shared';
-import { ASYNC_POLLING_INTERVAL } from '../../../../common/constants/data_sources';
+import {
+  ASYNC_POLLING_INTERVAL,
+  DEFAULT_DATA_SOURCE_NAME,
+  DEFAULT_DATA_SOURCE_TYPE,
+} from '../../../../common/constants/data_sources';
 
 enum DIRECT_DATA_SOURCE_TYPES {
   DEFAULT_INDEX_PATTERNS = 'DEFAULT_INDEX_PATTERNS',
@@ -318,6 +322,31 @@ export class ExplorerSavedObjectLoader extends SavedObjectLoaderBase implements
     return true;
   };
 
+  loadWODataSource = ({ tabId }: { tabId: string }) => {
+    const { dispatch, batch } = this.dispatchers;
+    const { fetchData } = this.loadContext;
+
+    // default datasource
+    batch(() => {
+      dispatch(
+        updateSearchMetaData({
+          tabId,
+          data: {
+            datasources: [
+              {
+                name: DEFAULT_DATA_SOURCE_NAME,
+                type: DEFAULT_DATA_SOURCE_TYPE,
+                label: DEFAULT_DATA_SOURCE_NAME,
+                value: DEFAULT_DATA_SOURCE_NAME,
+              },
+            ],
+          },
+        })
+      );
+      fetchData();
+    });
+  };
+
   loadDefaultIndexPattern = () => {
     const { fetchData } = this.loadContext;
     fetchData();
@@ -380,7 +409,15 @@ export class ExplorerSavedObjectLoader extends SavedObjectLoaderBase implements
 
   async loadDataFromSavedObject(objectData, tabId: string) {
     const dataSources = parseStringDataSource(objectData.data_sources, this.notifications);
-    if (dataSources.length > 0 && dataSources[0].type) {
+
+    // backward compatibility for saved object that doesn't contain datasource
+    if (dataSources.length === 0) {
+      this.loadWODataSource({ tabId });
+      return;
+    }
+
+    // saved object contains data source information
+    if (dataSources[0].type) {
       switch (dataSources[0].type) {
         case DIRECT_DATA_SOURCE_TYPES.DEFAULT_INDEX_PATTERNS:
           this.loadDefaultIndexPattern();