Fix edge case and test

Signed-off-by: Derek Ho <[email protected]>
derek-ho · Apr 10, 2024 · 6ab449b · 6ab449b
1 parent 5cd84aa
commit 6ab449b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/public/apps/configuration/test/top-nav-menu.test.tsx b/public/apps/configuration/test/top-nav-menu.test.tsx
@@ -46,6 +46,7 @@ describe('SecurityPluginTopNavMenu', () => {
         depsStart={securityPluginStartDepsMock}
         dataSourcePickerReadOnly={false}
         dataSourceManagement={dataSourceManagementMock}
+        selectedDataSource={{}}
         params={{}}
       />
     );

diff --git a/public/apps/configuration/top-nav-menu.tsx b/public/apps/configuration/top-nav-menu.tsx
@@ -42,9 +42,11 @@ export const SecurityPluginTopNavMenu = React.memo(
     const dataSourceEnabled = !!depsStart.dataSource?.dataSourceEnabled;
 
     const wrapSetDataSourceWithUpdateUrl = (dataSources: DataSourceOption[]) => {
+      console.log(dataSources);
       setDataSourceInUrl(dataSources[0]);
       setDataSource(dataSources[0]);
     };
+    console.log(selectedDataSource);
 
     return dataSourceEnabled ? (
       <DataSourceMenu
@@ -53,7 +55,8 @@ export const SecurityPluginTopNavMenu = React.memo(
         componentConfig={{
           savedObjects: coreStart.savedObjects.client,
           notifications: coreStart.notifications,
-          activeOption: [selectedDataSource],
+          activeOption:
+            selectedDataSource.id || selectedDataSource.label ? [selectedDataSource] : undefined,
           onSelectedDataSources: wrapSetDataSourceWithUpdateUrl,
           fullWidth: true,
         }}