Merge branch 'main' into errorcomponent

Signed-off-by: Lu Yu <nluyu@amazon.com>

CHANGELOG.md

@@ -115,6 +115,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Workspace] Add base path when parse url in http service ([#6233](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6233))
 - [Multiple Datasource] Fix sslConfig for multiple datasource to handle when certificateAuthorities is unset ([#6282](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6282))
 - [BUG][Multiple Datasource]Fix bug in data source aggregated view to change it to depend on displayAllCompatibleDataSources property to show the badge value ([#6291](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6291))
+- [BUG][Multiple Datasource] Fix style of data source option inside popover for data source selector, selectable, multi select components ([#6438](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6438))
 - [BUG][Multiple Datasource]Read hideLocalCluster setting from yml and set in data source selector and data source menu ([#6361](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6361))
 - [BUG][Multiple Datasource] Refactor read-only component to cover more edge cases ([#6416](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6416))
 - [BUG] Fix for checkForFunctionProperty so that order does not matter ([#6248](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6248))

src/plugins/data_source_management/public/components/data_source_option.test.tsx → src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx

@@ -6,20 +6,20 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 import { EuiBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { DataSourceOptionItem } from './data_source_option';
-import { SelectedDataSourceOption } from './data_source_multi_selectable/data_source_filter_group';
+import { DataSourceItem } from '.';
+import { DataSourceOption } from '../data_source_menu/types';
 
 describe('Test on ShowDataSourceOption', () => {
   it('should render the component with label', () => {
-    const item: SelectedDataSourceOption = {
+    const item: DataSourceOption = {
       id: '1',
       label: 'DataSource 1',
       visible: true,
     };
     const defaultDataSource = null;
 
     const component = shallow(
-      <DataSourceOptionItem item={item} defaultDataSource={defaultDataSource} />
+      <DataSourceItem option={item} defaultDataSource={defaultDataSource} />
     );
 
     expect(component.find(EuiFlexGroup)).toHaveLength(1);
@@ -36,7 +36,7 @@ describe('Test on ShowDataSourceOption', () => {
     const defaultDataSource = '1';
 
     const component = shallow(
-      <DataSourceOptionItem item={item} defaultDataSource={defaultDataSource} />
+      <DataSourceItem option={item} defaultDataSource={defaultDataSource} />
     );
 
     expect(component.find(EuiFlexGroup)).toHaveLength(1);

src/plugins/data_source_management/public/components/data_source_item/data_source_item.tsx

@@ -0,0 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import React from 'react';
+import { EuiBadge, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+import { DataSourceOption } from '../data_source_menu/types';
+
+interface DataSourceItemProps {
+  className: string;
+  option: DataSourceOption[];
+  defaultDataSource: string | null;
+}
+
+export const DataSourceItem = ({ className, option, defaultDataSource }: DataSourceItemProps) => {
+  return (
+    <EuiFlexGroup justifyContent="spaceBetween" className={`${className}OuiFlexGroup`}>
+      <EuiFlexItem className={`${className}OuiFlexItem`} grow={false}>
+        {option.label || ''}
+      </EuiFlexItem>
+      {option.id === defaultDataSource && (
+        <EuiFlexItem grow={false}>
+          <EuiBadge iconSide="left">Default</EuiBadge>
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+};

src/plugins/data_source_management/public/components/data_source_item/index.ts

@@ -0,0 +1,6 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { DataSourceItem } from './data_source_item';

src/plugins/data_source_management/public/components/data_source_menu/types.ts

@@ -14,6 +14,7 @@ import { DataSourceAttributes } from '../../types';
 export interface DataSourceOption {
   id: string;
   label?: string;
+  checked?: string;
 }
 
 export interface DataSourceGroupLabelOption extends DataSourceOption {

src/plugins/data_source_management/public/components/data_source_multi_selectable/data_source_filter_group.scss

@@ -0,0 +1,13 @@
+.dataSourceFilterGroupItems {
+  overflow: scroll;
+  max-width: 300px;
+
+  .dataSourceFilterGroupOuiFlexGroup {
+    .dataSourceFilterGroupOuiFlexItem {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      display: inline-block;
+    }
+  }
+}

src/plugins/data_source_management/public/components/data_source_multi_selectable/data_source_filter_group.tsx

@@ -15,8 +15,9 @@ import {
   EuiButtonGroup,
   EuiButtonEmpty,
 } from '@elastic/eui';
-import { DataSourceOption } from '../data_source_selector/data_source_selector';
-import { DataSourceOptionItem } from '../data_source_option';
+import { DataSourceOption } from '../data_source_menu/types';
+import { DataSourceItem } from '../data_source_item';
+import './data_source_filter_group.scss';
 
 export interface SelectedDataSourceOption extends DataSourceOption {
   label: string;
@@ -138,7 +139,7 @@ export const DataSourceFilterGroup: React.FC<DataSourceFilterGroupProps> = ({
           data-test-subj="dataSourceMultiSelectFieldSearch"
         />
       </EuiPopoverTitle>
-      <div className="ouiFilterSelect__items" style={{ maxHeight: 400, overflow: 'scroll' }}>
+      <div className="dataSourceFilterGroupItems">
         {selectedOptions.map((item, index) => {
           const itemStyle: any = {};
           itemStyle.display = !item.visible ? 'none' : itemStyle.display;
@@ -151,7 +152,11 @@ export const DataSourceFilterGroup: React.FC<DataSourceFilterGroupProps> = ({
               showIcons={true}
               style={itemStyle}
             >
-              <DataSourceOptionItem item={item} defaultDataSource={defaultDataSource} />
+              <DataSourceItem
+                option={item}
+                defaultDataSource={defaultDataSource}
+                className={'dataSourceFilterGroup'}
+              />
             </EuiFilterSelectItem>
           );
         })}

src/plugins/data_source_management/public/components/data_source_selectable/data_source_selectable.scss

@@ -0,0 +1,12 @@
+.dataSourceSelectableOuiPanel {
+  width: 300px;
+
+  .dataSourceSelectableOuiFlexGroup {
+    .dataSourceSelectableOuiFlexItem {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      display: inline-block;
+    }
+  }
+}