Merge branch 'main' into dev-tool-md-refactor

opensearch-project · Apr 17, 2024 · c4e81dd · c4e81dd
2 parents c238e2f + bd0ea35
commit c4e81dd
Show file tree

Hide file tree

Showing 16 changed files with 2,438 additions and 1,019 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -101,6 +101,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [MD] Add dropdown header to data source single selector ([#6431](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6431))
 - [Workspace] Add permission tab to workspace create update page ([#6378](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6378))
 - [Workspace] Hide datasource and advanced settings menu in dashboard management when in workspace. ([#6455](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6455))
+- [Multiple Datasource] Modify selectable picker to remove group label and close popover after selection ([#6515](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6515))
 - [Workspace] Add workspaces filter to saved objects page. ([#6458](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6458))
 
 ### 🐛 Bug Fixes

diff --git a/examples/multiple_data_source_examples/public/application.tsx b/examples/multiple_data_source_examples/public/application.tsx
@@ -11,7 +11,7 @@ import { CoreStart, AppMountParameters } from '../../../src/core/public';
 import { Home } from './components/home';
 
 export const renderApp = (
-  { notifications, http, savedObjects, application }: CoreStart,
+  { notifications, http, savedObjects, application, uiSettings }: CoreStart,
   dataSource: DataSourcePluginSetup,
   dataSourceManagement: DataSourceManagementPluginSetup,
   { appBasePath, element, setHeaderActionMenu }: AppMountParameters,
@@ -28,6 +28,7 @@ export const renderApp = (
       dataSourceManagement={dataSourceManagement}
       navigateToApp={application.navigateToApp}
       navigation={navigation}
+      uiSettings={uiSettings}
     />,
     element
   );

diff --git a/examples/multiple_data_source_examples/public/components/data_source_list_active_example.tsx b/examples/multiple_data_source_examples/public/components/data_source_list_active_example.tsx
@@ -28,6 +28,7 @@ interface DataSourceListActiveExampleProps {
   notifications: CoreStart['notifications'];
   setActionMenu?: (menuMount: MountPoint | undefined) => void;
   dataSourceManagement: DataSourceManagementPluginSetup;
+  uiSettings: CoreStart['uiSettings'];
 }
 
 export const DataSourceListActiveExample = ({
@@ -36,6 +37,7 @@ export const DataSourceListActiveExample = ({
   notifications,
   setActionMenu,
   dataSourceManagement,
+  uiSettings,
 }: DataSourceListActiveExampleProps) => {
   const DataSourceMenu = dataSourceManagement.ui.getDataSourceMenu<
     DataSourceAggregatedViewConfig
@@ -106,7 +108,10 @@ export const DataSourceListActiveExample = ({
               fullWidth: false,
               savedObjects: savedObjects.client,
               notifications,
-              displayAllCompatibleDataSources: true,
+              displayAllCompatibleDataSources: false,
+              // To see selected options, obtain the datasource id and paste it here. Note that this needs to be defined when displayAllCompatibleDataSources is false
+              activeDataSourceIds: [],
+              uiSettings,
             }}
           />
         )}

diff --git a/examples/multiple_data_source_examples/public/components/data_source_list_all_example.tsx b/examples/multiple_data_source_examples/public/components/data_source_list_all_example.tsx
@@ -28,6 +28,7 @@ interface DataSourceListAllExampleProps {
   notifications: CoreStart['notifications'];
   setActionMenu?: (menuMount: MountPoint | undefined) => void;
   dataSourceManagement: DataSourceManagementPluginSetup;
+  uiSettings: CoreStart['uiSettings'];
 }
 
 export const DataSourceListAllExample = ({
@@ -36,6 +37,7 @@ export const DataSourceListAllExample = ({
   notifications,
   setActionMenu,
   dataSourceManagement,
+  uiSettings,
 }: DataSourceListAllExampleProps) => {
   const DataSourceMenu = dataSourceManagement.ui.getDataSourceMenu<
     DataSourceAggregatedViewConfig
@@ -100,6 +102,7 @@ export const DataSourceListAllExample = ({
               savedObjects: savedObjects.client,
               notifications,
               displayAllCompatibleDataSources: true,
+              uiSettings,
             }}
           />
         )}

diff --git a/examples/multiple_data_source_examples/public/components/home.tsx b/examples/multiple_data_source_examples/public/components/home.tsx
@@ -22,6 +22,7 @@ export interface HomeProps {
   notifications: CoreStart['notifications'];
   http: CoreStart['http'];
   savedObjects: CoreStart['savedObjects'];
+  uiSettings: CoreStart['uiSettings'];
   dataSourceEnabled: boolean;
   dataSourceManagement: DataSourceManagementPluginSetup;
   navigateToApp: CoreStart['application']['navigateToApp'];
@@ -65,6 +66,7 @@ export const Home = ({
   basename,
   notifications,
   savedObjects,
+  uiSettings,
   dataSourceEnabled,
   setActionMenu,
   dataSourceManagement,
@@ -133,6 +135,7 @@ export const Home = ({
           dataSourceEnabled={dataSourceEnabled}
           setActionMenu={setActionMenu}
           dataSourceManagement={dataSourceManagement}
+          uiSettings={uiSettings}
         />
       ),
     },
@@ -146,6 +149,7 @@ export const Home = ({
           dataSourceEnabled={dataSourceEnabled}
           setActionMenu={setActionMenu}
           dataSourceManagement={dataSourceManagement}
+          uiSettings={uiSettings}
         />
       ),
     },