diff --git a/CHANGELOG.md b/CHANGELOG.md index bbcc7f0a9c9..a586aec975f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,6 +113,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] Fix for checkForFunctionProperty so that order does not matter ([#6248](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6248)) diff --git a/src/plugins/data_source_management/public/components/data_source_option.test.tsx b/src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx similarity index 74% rename from src/plugins/data_source_management/public/components/data_source_option.test.tsx rename to src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx index 7d6375f47d2..8cb736f2fb6 100644 --- a/src/plugins/data_source_management/public/components/data_source_option.test.tsx +++ b/src/plugins/data_source_management/public/components/data_source_item/data_source_item.test.tsx @@ -6,12 +6,12 @@ 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, @@ -19,7 +19,7 @@ describe('Test on ShowDataSourceOption', () => { const defaultDataSource = null; const component = shallow( - + ); expect(component.find(EuiFlexGroup)).toHaveLength(1); @@ -36,7 +36,7 @@ describe('Test on ShowDataSourceOption', () => { const defaultDataSource = '1'; const component = shallow( - + ); expect(component.find(EuiFlexGroup)).toHaveLength(1); diff --git a/src/plugins/data_source_management/public/components/data_source_item/data_source_item.tsx b/src/plugins/data_source_management/public/components/data_source_item/data_source_item.tsx new file mode 100644 index 00000000000..06064ccd183 --- /dev/null +++ b/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 ( + + + {option.label || ''} + + {option.id === defaultDataSource && ( + + Default + + )} + + ); +}; diff --git a/src/plugins/data_source_management/public/components/data_source_item/index.ts b/src/plugins/data_source_management/public/components/data_source_item/index.ts new file mode 100644 index 00000000000..92148b4ce5b --- /dev/null +++ b/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'; diff --git a/src/plugins/data_source_management/public/components/data_source_menu/types.ts b/src/plugins/data_source_management/public/components/data_source_menu/types.ts index 17aa35d8b8d..7c32cd3cd3d 100644 --- a/src/plugins/data_source_management/public/components/data_source_menu/types.ts +++ b/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 { diff --git a/src/plugins/data_source_management/public/components/data_source_multi_selectable/__snapshots__/data_source_filter_group.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_multi_selectable/__snapshots__/data_source_filter_group.test.tsx.snap index fe89b140951..6dd69391386 100644 --- a/src/plugins/data_source_management/public/components/data_source_multi_selectable/__snapshots__/data_source_filter_group.test.tsx.snap +++ b/src/plugins/data_source_management/public/components/data_source_multi_selectable/__snapshots__/data_source_filter_group.test.tsx.snap @@ -43,13 +43,7 @@ exports[`DataSourceFilterGroup should render normally 1`] = ` />
-