testing default ds switch changes (#1199) (#1201)

(cherry picked from commit 5d3801a) Signed-off-by: Riya Saxena <[email protected]> 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 28, 2024 · 1ddfde7 · 1ddfde7
1 parent eb2279c
commit 1ddfde7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
@@ -156,10 +156,6 @@ export default class Main extends Component<MainProps, MainState> {
       };
       dataSourceId = parsedDataSourceId;
       dataSourceLabel = parsedDataSourceLabel || '';
-
-      if (dataSourceId) {
-        dataSourceObservable.next({ id: dataSourceId, label: dataSourceLabel });
-      }
     }
 
     this.state = {
@@ -275,17 +271,17 @@ export default class Main extends Component<MainProps, MainState> {
       this.setState({
         selectedDataSource: { ...sources[0] },
       });
-      DataStore.logTypes.getLogTypes();
+      dataSourceObservable.next(
+        dataSourceInfo.activeDataSource
+      );
     }
-    dataSourceObservable.next({
-      id: this.state.selectedDataSource.id,
-      label: this.state.selectedDataSource.label,
-    });
+
     if (dataSourceLoading) {
       this.setState({ dataSourceLoading: false });
     }
   };
 
+
   setDataSourceMenuReadOnly = (readOnly: boolean) => {
     this.setState({ dataSourceMenuReadOnly: readOnly });
   };

diff --git a/public/plugin.ts b/public/plugin.ts
@@ -75,10 +75,19 @@ export class SecurityAnalyticsPlugin
   ) {}
 
   private updateDefaultRouteOfManagementApplications: AppUpdater = () => {
-    const hash = `#/?dataSourceId=${dataSourceObservable.value?.id || ''}`;
+    const dataSourceValue = dataSourceObservable.value?.id;
+    let hash = `#/`;
+    /***
+     When data source value is undefined,
+     it means the data source picker has not determined which data source to use(local or default data source)
+     so we should not append any data source id into hash to avoid impacting the data source picker.
+     **/
+    if (dataSourceValue !== undefined) {
+      hash = `#/?dataSourceId=${dataSourceValue}`;
+    }
     return {
-      defaultPath: hash,
-    };
+      defaultPath: hash
+    }
   };
 
   private appStateUpdater = new BehaviorSubject<AppUpdater>(

diff --git a/public/utils/constants.ts b/public/utils/constants.ts
@@ -316,6 +316,9 @@ const LocalCluster: DataSourceOption = {
   id: '',
 };
 
-export const dataSourceObservable = new BehaviorSubject<DataSourceOption>(LocalCluster);
+// We should use empty object for default value as local cluster may be disabled
+export const dataSourceObservable = new BehaviorSubject<DataSourceOption>({});
 
 export const DATA_SOURCE_NOT_SET_ERROR = 'Data source is not set';
+
+