From 883925692ee65bd6b1a1c1453a6beda14c5b3ef4 Mon Sep 17 00:00:00 2001
From: Lu Yu <nluyu@amazon.com>
Date: Wed, 6 Mar 2024 11:28:47 -0800
Subject: [PATCH] [MD] Change cluster selector component name to data source
 selector (#6042)

* change component name

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

* add change log

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

---------

Signed-off-by: Lu Yu <nluyu@amazon.com>
---
 CHANGELOG.md                                  |  1 +
 .../create_cluster_selector.tsx               | 11 ------
 ...create_data_source_selector.test.tsx.snap} |  6 +--
 .../data_source_selector.test.tsx.snap}       | 12 +++---
 .../create_data_source_selector.test.tsx}     |  6 +--
 .../create_data_source_selector.tsx           | 11 ++++++
 .../data_source_selector.test.tsx}            | 12 +++---
 .../data_source_selector.tsx}                 | 39 ++++++++++---------
 .../index.ts                                  |  2 +-
 .../data_source_management/public/index.ts    |  2 +-
 .../data_source_management/public/plugin.ts   |  8 ++--
 src/plugins/dev_tools/public/application.tsx  |  6 +--
 src/plugins/dev_tools/public/index.scss       |  2 +-
 .../components/tutorial_directory.js          |  6 +--
 .../__snapshots__/flyout.test.tsx.snap        |  4 +-
 .../objects_table/components/flyout.tsx       |  4 +-
 16 files changed, 68 insertions(+), 64 deletions(-)
 delete mode 100644 src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.tsx
 rename src/plugins/data_source_management/public/components/{cluster_selector/__snapshots__/create_cluster_selector.test.tsx.snap => data_source_selector/__snapshots__/create_data_source_selector.test.tsx.snap} (97%)
 rename src/plugins/data_source_management/public/components/{cluster_selector/__snapshots__/cluster_selector.test.tsx.snap => data_source_selector/__snapshots__/data_source_selector.test.tsx.snap} (79%)
 rename src/plugins/data_source_management/public/components/{cluster_selector/create_cluster_selector.test.tsx => data_source_selector/create_data_source_selector.test.tsx} (85%)
 create mode 100644 src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.tsx
 rename src/plugins/data_source_management/public/components/{cluster_selector/cluster_selector.test.tsx => data_source_selector/data_source_selector.test.tsx} (91%)
 rename src/plugins/data_source_management/public/components/{cluster_selector/cluster_selector.tsx => data_source_selector/data_source_selector.tsx} (67%)
 rename src/plugins/data_source_management/public/components/{cluster_selector => data_source_selector}/index.ts (57%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b22b5556ac33..0addb1e6d221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### 🛡 Security
 
 ### 📈 Features/Enhancements
+- [MD]Change cluster selector component name to data source selector ([#6042](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6042)) 
 
 ### 🐛 Bug Fixes
 
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.tsx b/src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.tsx
deleted file mode 100644
index 02696e8747f9..000000000000
--- a/src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import React from 'react';
-import { ClusterSelector, ClusterSelectorProps } from './cluster_selector';
-
-export function createClusterSelector() {
-  return (props: ClusterSelectorProps) => <ClusterSelector {...props} />;
-}
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/create_cluster_selector.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/create_data_source_selector.test.tsx.snap
similarity index 97%
rename from src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/create_cluster_selector.test.tsx.snap
rename to src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/create_data_source_selector.test.tsx.snap
index 68698f7adabe..4ce6e1bc30ab 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/create_cluster_selector.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/create_data_source_selector.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`create cluster selector should render normally 1`] = `
+exports[`create data source selector should render normally 1`] = `
 Object {
   "asFragment": [Function],
   "baseElement": <body>
@@ -10,7 +10,7 @@ Object {
         aria-haspopup="listbox"
         aria-label="Select a data source"
         class="euiComboBox euiComboBox--compressed"
-        data-test-subj="clusterSelectorComboBox"
+        data-test-subj="dataSourceSelectorComboBox"
         role="combobox"
       >
         <div
@@ -89,7 +89,7 @@ Object {
       aria-haspopup="listbox"
       aria-label="Select a data source"
       class="euiComboBox euiComboBox--compressed"
-      data-test-subj="clusterSelectorComboBox"
+      data-test-subj="dataSourceSelectorComboBox"
       role="combobox"
     >
       <div
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/cluster_selector.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/data_source_selector.test.tsx.snap
similarity index 79%
rename from src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/cluster_selector.test.tsx.snap
rename to src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/data_source_selector.test.tsx.snap
index 34c1df89f050..c921d0e10d1b 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/__snapshots__/cluster_selector.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_selector/__snapshots__/data_source_selector.test.tsx.snap
@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ClusterSelector should render normally with local cluster is hidden 1`] = `
+exports[`DataSourceSelector should render normally with local cluster is hidden 1`] = `
 <EuiComboBox
   aria-label="Select a data source"
   async={false}
   compressed={true}
-  data-test-subj="clusterSelectorComboBox"
+  data-test-subj="dataSourceSelectorComboBox"
   fullWidth={false}
   isClearable={true}
   isDisabled={false}
@@ -23,12 +23,12 @@ exports[`ClusterSelector should render normally with local cluster is hidden 1`]
 />
 `;
 
-exports[`ClusterSelector should render normally with local cluster not hidden 1`] = `
+exports[`DataSourceSelector should render normally with local cluster not hidden 1`] = `
 <EuiComboBox
   aria-label="Select a data source"
   async={false}
   compressed={true}
-  data-test-subj="clusterSelectorComboBox"
+  data-test-subj="dataSourceSelectorComboBox"
   fullWidth={false}
   isClearable={true}
   isDisabled={false}
@@ -60,12 +60,12 @@ exports[`ClusterSelector should render normally with local cluster not hidden 1`
 />
 `;
 
-exports[`ClusterSelector: check dataSource options should always place local cluster option as the first option when local cluster not hidden 1`] = `
+exports[`DataSourceSelector: check dataSource options should always place local cluster option as the first option when local cluster not hidden 1`] = `
 <EuiComboBox
   aria-label="Select a data source"
   async={false}
   compressed={true}
-  data-test-subj="clusterSelectorComboBox"
+  data-test-subj="dataSourceSelectorComboBox"
   fullWidth={false}
   isClearable={true}
   isDisabled={false}
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.test.tsx b/src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.test.tsx
similarity index 85%
rename from src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.test.tsx
rename to src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.test.tsx
index 9a5673d75af9..07080e8fa492 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/create_cluster_selector.test.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.test.tsx
@@ -2,13 +2,13 @@
  * Copyright OpenSearch Contributors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createClusterSelector } from './create_cluster_selector';
+import { createDataSourceSelector } from './create_data_source_selector';
 import { SavedObjectsClientContract } from '../../../../../core/public';
 import { notificationServiceMock } from '../../../../../core/public/mocks';
 import React from 'react';
 import { render } from '@testing-library/react';
 
-describe('create cluster selector', () => {
+describe('create data source selector', () => {
   let client: SavedObjectsClientContract;
   const { toasts } = notificationServiceMock.createStartContract();
 
@@ -27,7 +27,7 @@ describe('create cluster selector', () => {
       hideLocalCluster: false,
       fullWidth: false,
     };
-    const TestComponent = createClusterSelector();
+    const TestComponent = createDataSourceSelector();
     const component = render(<TestComponent {...props} />);
     expect(component).toMatchSnapshot();
     expect(client.find).toBeCalledWith({
diff --git a/src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.tsx b/src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.tsx
new file mode 100644
index 000000000000..ff6b7503a0bb
--- /dev/null
+++ b/src/plugins/data_source_management/public/components/data_source_selector/create_data_source_selector.tsx
@@ -0,0 +1,11 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { DataSourceSelector, DataSourceSelectorProps } from './data_source_selector';
+
+export function createDataSourceSelector() {
+  return (props: DataSourceSelectorProps) => <DataSourceSelector {...props} />;
+}
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.test.tsx b/src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.test.tsx
similarity index 91%
rename from src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.test.tsx
rename to src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.test.tsx
index 6a4448874ab9..d74f74160b22 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.test.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.test.tsx
@@ -4,13 +4,13 @@
  */
 
 import { ShallowWrapper, shallow } from 'enzyme';
-import { ClusterSelector } from './cluster_selector';
+import { DataSourceSelector } from './data_source_selector';
 import { SavedObjectsClientContract } from '../../../../../core/public';
 import { notificationServiceMock } from '../../../../../core/public/mocks';
 import React from 'react';
 import { getDataSourcesResponse, mockResponseForSavedObjectsCalls } from '../../mocks';
 
-describe('ClusterSelector', () => {
+describe('DataSourceSelector', () => {
   let component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>;
 
   let client: SavedObjectsClientContract;
@@ -24,7 +24,7 @@ describe('ClusterSelector', () => {
 
   it('should render normally with local cluster not hidden', () => {
     component = shallow(
-      <ClusterSelector
+      <DataSourceSelector
         savedObjectsClient={client}
         notifications={toasts}
         onSelectedDataSource={jest.fn()}
@@ -44,7 +44,7 @@ describe('ClusterSelector', () => {
 
   it('should render normally with local cluster is hidden', () => {
     component = shallow(
-      <ClusterSelector
+      <DataSourceSelector
         savedObjectsClient={client}
         notifications={toasts}
         onSelectedDataSource={jest.fn()}
@@ -63,7 +63,7 @@ describe('ClusterSelector', () => {
   });
 });
 
-describe('ClusterSelector: check dataSource options', () => {
+describe('DataSourceSelector: check dataSource options', () => {
   let component: ShallowWrapper<any, Readonly<{}>, React.Component<{}, {}, any>>;
   let client: SavedObjectsClientContract;
   const { toasts } = notificationServiceMock.createStartContract();
@@ -79,7 +79,7 @@ describe('ClusterSelector: check dataSource options', () => {
 
   it('should always place local cluster option as the first option when local cluster not hidden', async () => {
     component = shallow(
-      <ClusterSelector
+      <DataSourceSelector
         savedObjectsClient={client}
         notifications={toasts}
         onSelectedDataSource={jest.fn()}
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.tsx b/src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx
similarity index 67%
rename from src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.tsx
rename to src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx
index 36edb19c8053..8f9c1dc4a884 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/cluster_selector.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_selector/data_source_selector.tsx
@@ -9,40 +9,43 @@ import { EuiComboBox } from '@elastic/eui';
 import { SavedObjectsClientContract, ToastsStart } from 'opensearch-dashboards/public';
 import { getDataSources } from '../utils';
 
-export const LocalCluster: ClusterOption = {
+export const LocalCluster: DataSourceOption = {
   label: i18n.translate('dataSource.localCluster', {
     defaultMessage: 'Local cluster',
   }),
   id: '',
 };
 
-export interface ClusterSelectorProps {
+export interface DataSourceSelectorProps {
   savedObjectsClient: SavedObjectsClientContract;
   notifications: ToastsStart;
-  onSelectedDataSource: (clusterOption: ClusterOption[]) => void;
+  onSelectedDataSource: (dataSourceOption: DataSourceOption[]) => void;
   disabled: boolean;
   hideLocalCluster: boolean;
   fullWidth: boolean;
 }
 
-interface ClusterSelectorState {
-  clusterOptions: ClusterOption[];
-  selectedOption: ClusterOption[];
+interface DataSourceSelectorState {
+  dataSourceOptions: DataSourceOption[];
+  selectedOption: DataSourceOption[];
 }
 
-export interface ClusterOption {
+export interface DataSourceOption {
   label: string;
   id: string;
 }
 
-export class ClusterSelector extends React.Component<ClusterSelectorProps, ClusterSelectorState> {
+export class DataSourceSelector extends React.Component<
+  DataSourceSelectorProps,
+  DataSourceSelectorState
+> {
   private _isMounted: boolean = false;
 
-  constructor(props: ClusterSelectorProps) {
+  constructor(props: DataSourceSelectorProps) {
     super(props);
 
     this.state = {
-      clusterOptions: this.props.hideLocalCluster ? [] : [LocalCluster],
+      dataSourceOptions: this.props.hideLocalCluster ? [] : [LocalCluster],
       selectedOption: this.props.hideLocalCluster ? [] : [LocalCluster],
     };
   }
@@ -56,19 +59,19 @@ export class ClusterSelector extends React.Component<ClusterSelectorProps, Clust
     getDataSources(this.props.savedObjectsClient)
       .then((fetchedDataSources) => {
         if (fetchedDataSources?.length) {
-          const clusterOptions = fetchedDataSources.map((dataSource) => ({
+          const dataSourceOptions = fetchedDataSources.map((dataSource) => ({
             id: dataSource.id,
             label: dataSource.title,
           }));
 
           if (!this.props.hideLocalCluster) {
-            clusterOptions.unshift(LocalCluster);
+            dataSourceOptions.unshift(LocalCluster);
           }
 
           if (!this._isMounted) return;
           this.setState({
             ...this.state,
-            clusterOptions,
+            dataSourceOptions,
           });
         }
       })
@@ -92,23 +95,23 @@ export class ClusterSelector extends React.Component<ClusterSelectorProps, Clust
   render() {
     return (
       <EuiComboBox
-        aria-label={i18n.translate('clusterSelectorComboBoxAriaLabel', {
+        aria-label={i18n.translate('dataSourceSelectorComboBoxAriaLabel', {
           defaultMessage: 'Select a data source',
         })}
-        placeholder={i18n.translate('clusterSelectorComboBoxPlaceholder', {
+        placeholder={i18n.translate('dataSourceSelectorComboBoxPlaceholder', {
           defaultMessage: 'Select a data source',
         })}
         singleSelection={{ asPlainText: true }}
-        options={this.state.clusterOptions}
+        options={this.state.dataSourceOptions}
         selectedOptions={this.state.selectedOption}
         onChange={(e) => this.onChange(e)}
-        prepend={i18n.translate('clusterSelectorComboBoxPrepend', {
+        prepend={i18n.translate('dataSourceSelectorComboBoxPrepend', {
           defaultMessage: 'Data source',
         })}
         compressed
         isDisabled={this.props.disabled}
         fullWidth={this.props.fullWidth || false}
-        data-test-subj={'clusterSelectorComboBox'}
+        data-test-subj={'dataSourceSelectorComboBox'}
       />
     );
   }
diff --git a/src/plugins/data_source_management/public/components/cluster_selector/index.ts b/src/plugins/data_source_management/public/components/data_source_selector/index.ts
similarity index 57%
rename from src/plugins/data_source_management/public/components/cluster_selector/index.ts
rename to src/plugins/data_source_management/public/components/data_source_selector/index.ts
index 8e65dc8dc698..a1d1d97b9828 100644
--- a/src/plugins/data_source_management/public/components/cluster_selector/index.ts
+++ b/src/plugins/data_source_management/public/components/data_source_selector/index.ts
@@ -3,4 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { ClusterSelector } from './cluster_selector';
+export { DataSourceSelector } from './data_source_selector';
diff --git a/src/plugins/data_source_management/public/index.ts b/src/plugins/data_source_management/public/index.ts
index e58e8f9bce5e..0b12763b5a43 100644
--- a/src/plugins/data_source_management/public/index.ts
+++ b/src/plugins/data_source_management/public/index.ts
@@ -11,5 +11,5 @@ export function plugin() {
   return new DataSourceManagementPlugin();
 }
 export { DataSourceManagementPluginStart } from './types';
-export { ClusterSelector } from './components/cluster_selector';
+export { DataSourceSelector } from './components/data_source_selector';
 export { DataSourceManagementPlugin, DataSourceManagementPluginSetup } from './plugin';
diff --git a/src/plugins/data_source_management/public/plugin.ts b/src/plugins/data_source_management/public/plugin.ts
index d6144759cbb9..d5b2117e800b 100644
--- a/src/plugins/data_source_management/public/plugin.ts
+++ b/src/plugins/data_source_management/public/plugin.ts
@@ -7,7 +7,7 @@ import { DataSourcePluginSetup } from 'src/plugins/data_source/public';
 import { CoreSetup, CoreStart, Plugin } from '../../../core/public';
 
 import { PLUGIN_NAME } from '../common';
-import { createClusterSelector } from './components/cluster_selector/create_cluster_selector';
+import { createDataSourceSelector } from './components/data_source_selector/create_data_source_selector';
 
 import { ManagementSetup } from '../../management/public';
 import { IndexPatternManagementSetup } from '../../index_pattern_management/public';
@@ -18,7 +18,7 @@ import {
   AuthenticationMethodRegistery,
 } from './auth_registry';
 import { noAuthCredentialAuthMethod, sigV4AuthMethod, usernamePasswordAuthMethod } from './types';
-import { ClusterSelectorProps } from './components/cluster_selector/cluster_selector';
+import { DataSourceSelectorProps } from './components/data_source_selector/data_source_selector';
 
 export interface DataSourceManagementSetupDependencies {
   management: ManagementSetup;
@@ -28,7 +28,7 @@ export interface DataSourceManagementSetupDependencies {
 
 export interface DataSourceManagementPluginSetup {
   registerAuthenticationMethod: (authMethodValues: AuthenticationMethod) => void;
-  getDataSourcePicker: React.ComponentType<ClusterSelectorProps>;
+  getDataSourceSelector: React.ComponentType<DataSourceSelectorProps>;
 }
 
 export interface DataSourceManagementPluginStart {
@@ -96,7 +96,7 @@ export class DataSourceManagementPlugin
 
     return {
       registerAuthenticationMethod,
-      getDataSourcePicker: createClusterSelector(),
+      getDataSourceSelector: createDataSourceSelector(),
     };
   }
 
diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
index e9b088284537..3d3655b3bd64 100644
--- a/src/plugins/dev_tools/public/application.tsx
+++ b/src/plugins/dev_tools/public/application.tsx
@@ -44,7 +44,7 @@ import {
   ScopedHistory,
 } from 'src/core/public';
 
-import { ClusterSelector } from '../../data_source_management/public';
+import { DataSourceSelector } from '../../data_source_management/public';
 import { DevToolApp } from './dev_tool';
 import { DevToolsSetupDependencies } from './plugin';
 import { addHelpMenuToAppChrome } from './utils/util';
@@ -132,8 +132,8 @@ function DevToolsWrapper({
           </EuiToolTip>
         ))}
         {dataSourceEnabled ? (
-          <div className="devAppClusterSelector">
-            <ClusterSelector
+          <div className="devAppDataSourceSelector">
+            <DataSourceSelector
               savedObjectsClient={savedObjects.client}
               notifications={toasts}
               onSelectedDataSource={onChange}
diff --git a/src/plugins/dev_tools/public/index.scss b/src/plugins/dev_tools/public/index.scss
index a526bde3b659..56d7bc9c11c1 100644
--- a/src/plugins/dev_tools/public/index.scss
+++ b/src/plugins/dev_tools/public/index.scss
@@ -22,7 +22,7 @@
   flex-grow: 1;
 }
 
-.devAppClusterSelector {
+.devAppDataSourceSelector {
   margin: 7px 8px 0 0;
   min-width: 400px;
 }
diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js
index 45da6b07fd9e..cb13d06bfb18 100644
--- a/src/plugins/home/public/application/components/tutorial_directory.js
+++ b/src/plugins/home/public/application/components/tutorial_directory.js
@@ -51,7 +51,7 @@ import {
 import { getTutorials } from '../load_tutorials';
 import { injectI18n, FormattedMessage } from '@osd/i18n/react';
 import { i18n } from '@osd/i18n';
-import { ClusterSelector } from '../../../../data_source_management/public';
+import { DataSourceSelector } from '../../../../data_source_management/public';
 
 const ALL_TAB_ID = 'all';
 const SAMPLE_DATA_TAB_ID = 'sampleData';
@@ -229,8 +229,8 @@ class TutorialDirectoryUi extends React.Component {
     const { isDataSourceEnabled, isLocalClusterHidden } = this.state;
 
     return isDataSourceEnabled ? (
-      <div className="sampleDataClusterSelector">
-        <ClusterSelector
+      <div className="sampleDataSourceSelector">
+        <DataSourceSelector
           savedObjectsClient={getServices().savedObjectsClient}
           notifications={getServices().toastNotifications}
           onSelectedDataSource={this.onSelectedDataSourceChange}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index e15e72d6a2cb..14fe1fbabd88 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -595,7 +595,7 @@ exports[`Flyout should render cluster selector and import options when local clu
             }
           }
         >
-          <ClusterSelector
+          <DataSourceSelector
             disabled={false}
             fullWidth={true}
             hideLocalCluster={true}
@@ -750,7 +750,7 @@ exports[`Flyout should render cluster selector and import options when local clu
             }
           }
         >
-          <ClusterSelector
+          <DataSourceSelector
             disabled={false}
             fullWidth={true}
             hideLocalCluster={false}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index f170713e0238..586a573ffb53 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -55,7 +55,7 @@ import {
 import { i18n } from '@osd/i18n';
 import { FormattedMessage } from '@osd/i18n/react';
 import { OverlayStart, HttpStart } from 'src/core/public';
-import { ClusterSelector } from '../../../../../data_source_management/public';
+import { DataSourceSelector } from '../../../../../data_source_management/public';
 import {
   IndexPatternsContract,
   IIndexPattern,
@@ -817,7 +817,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
             ),
           }}
         >
-          <ClusterSelector
+          <DataSourceSelector
             savedObjectsClient={this.props.savedObjects}
             notifications={this.props.notifications.toasts}
             onSelectedDataSource={this.onSelectedDataSourceChange}