From 16b886e57f56b092ec9d0b42de42d2ba7657577d Mon Sep 17 00:00:00 2001
From: Lu Yu <nluyu@amazon.com>
Date: Fri, 22 Mar 2024 16:28:21 +0000
Subject: [PATCH 1/3] remove arrowdown icon from data source selector

Signed-off-by: Lu Yu <nluyu@amazon.com>
---
 .../create_data_source_menu.test.tsx.snap     | 14 ++++---------
 .../data_source_selectable.test.tsx.snap      | 21 ++++++-------------
 .../data_source_selectable.tsx                |  5 ++---
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
index 207e38d657da..e8e57c9b6e4c 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
@@ -20,9 +20,6 @@ Object {
             <div
               class="euiPopover__anchor"
             >
-              <span
-                data-euiicon-type="database"
-              />
               <button
                 aria-label="dataSourceMenuButton"
                 class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -30,12 +27,12 @@ Object {
                 type="button"
               >
                 <span
-                  class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                  class="euiButtonContent euiButtonEmpty__content"
                 >
                   <span
                     class="euiButtonContent__icon"
                     color="inherit"
-                    data-euiicon-type="arrowDown"
+                    data-euiicon-type="database"
                   />
                   <span
                     class="euiButtonEmpty__text"
@@ -64,9 +61,6 @@ Object {
           <div
             class="euiPopover__anchor"
           >
-            <span
-              data-euiicon-type="database"
-            />
             <button
               aria-label="dataSourceMenuButton"
               class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -74,12 +68,12 @@ Object {
               type="button"
             >
               <span
-                class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                class="euiButtonContent euiButtonEmpty__content"
               >
                 <span
                   class="euiButtonContent__icon"
                   color="inherit"
-                  data-euiicon-type="arrowDown"
+                  data-euiicon-type="database"
                 />
                 <span
                   class="euiButtonEmpty__text"
diff --git a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
index 944750bde432..2994baa77dcd 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/data_source_selectable.test.tsx.snap
@@ -5,16 +5,13 @@ exports[`DataSourceSelectable should filter options if configured 1`] = `
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
@@ -81,16 +78,13 @@ exports[`DataSourceSelectable should render normally with local cluster is hidde
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
@@ -142,16 +136,13 @@ exports[`DataSourceSelectable should render normally with local cluster not hidd
   anchorPosition="downLeft"
   button={
     <React.Fragment>
-      <EuiIcon
-        type="database"
-      />
       <EuiButtonEmpty
         aria-label="dataSourceMenuButton"
         className="euiHeaderLink"
         data-test-subj="dataSourceSelectableContextMenuHeaderLink"
         disabled={false}
-        iconSide="right"
-        iconType="arrowDown"
+        iconSide="left"
+        iconType="database"
         onClick={[Function]}
         size="s"
       >
diff --git a/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx b/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
index 9c71c1f0aaa1..7e35d7882237 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
+++ b/src/plugins/data_source_management/public/components/data_source_menu/data_source_selectable.tsx
@@ -125,7 +125,6 @@ export class DataSourceSelectable extends React.Component<
   render() {
     const button = (
       <>
-        <EuiIcon type="database" />
         <EuiButtonEmpty
           className="euiHeaderLink"
           onClick={this.onClick.bind(this)}
@@ -133,8 +132,8 @@ export class DataSourceSelectable extends React.Component<
           aria-label={i18n.translate('dataSourceSelectable.dataSourceOptionsButtonAriaLabel', {
             defaultMessage: 'dataSourceMenuButton',
           })}
-          iconType="arrowDown"
-          iconSide="right"
+          iconType="database"
+          iconSide="left"
           size="s"
           disabled={this.props.disabled || false}
         >

From ddfb33a553c9d8aa307047b151a573daa4d7c32d Mon Sep 17 00:00:00 2001
From: Lu Yu <nluyu@amazon.com>
Date: Mon, 25 Mar 2024 23:06:49 +0000
Subject: [PATCH 2/3] add change log

Signed-off-by: Lu Yu <nluyu@amazon.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f66d66183da8..3533d6459002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - [Dynamic Configurations] Pass request headers when making application config calls ([#6164](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6164))
 - [Discover] Options button to configure legacy mode and remove the top navigation option ([#6170](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6170))
 - [Multiple Datasource] Add default functionality for customer to choose default datasource ([#6058](https://github.com/opensearch-project/OpenSearch-Dashboards/issues/6058))
+- [Multiple Datasource] Remove arrow down icon from data source selectable component ([#6257](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/6257))
 
 
 ### 🐛 Bug Fixes

From 809f68bbca09eee271db61dc329fb242cacade7e Mon Sep 17 00:00:00 2001
From: Lu Yu <nluyu@amazon.com>
Date: Tue, 26 Mar 2024 00:42:46 +0000
Subject: [PATCH 3/3] update snapshot

Signed-off-by: Lu Yu <nluyu@amazon.com>
---
 .../create_data_source_menu.test.tsx.snap     | 55 ++-----------------
 1 file changed, 5 insertions(+), 50 deletions(-)

diff --git a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
index 34e24a3d1913..cb7e4410472c 100644
--- a/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
+++ b/src/plugins/data_source_management/public/components/data_source_menu/__snapshots__/create_data_source_menu.test.tsx.snap
@@ -12,9 +12,6 @@ Object {
         <div
           class="euiPopover__anchor"
         >
-          <span
-            data-euiicon-type="database"
-          />
           <button
             aria-label="dataSourceMenuButton"
             class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -22,12 +19,12 @@ Object {
             type="button"
           >
             <span
-              class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+              class="euiButtonContent euiButtonEmpty__content"
             >
               <span
                 class="euiButtonContent__icon"
                 color="inherit"
-                data-euiicon-type="arrowDown"
+                data-euiicon-type="database"
               />
               <span
                 class="euiButtonEmpty__text"
@@ -46,9 +43,6 @@ Object {
       <div
         class="euiPopover__anchor"
       >
-        <span
-          data-euiicon-type="database"
-        />
         <button
           aria-label="dataSourceMenuButton"
           class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
@@ -56,12 +50,12 @@ Object {
           type="button"
         >
           <span
-            class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+            class="euiButtonContent euiButtonEmpty__content"
           >
             <span
               class="euiButtonContent__icon"
               color="inherit"
-              data-euiicon-type="arrowDown"
+              data-euiicon-type="database"
             />
             <span
               class="euiButtonEmpty__text"
@@ -171,46 +165,7 @@ Object {
     </div>
     <div />
   </body>,
-  "container": <div>
-    <nav
-      aria-label="App menu"
-      class="euiHeaderLinks osdTopNavMenu myclass"
-      data-test-subj="top-nav"
-    >
-      <div
-        class="euiHeaderLinks__list euiHeaderLinks__list--gutterXS"
-      >
-        <div
-          class="euiPopover euiPopover--anchorDownLeft"
-          id="dataSourceSelectableContextMenuPopover"
-        >
-          <div
-            class="euiPopover__anchor"
-          >
-            <button
-              aria-label="dataSourceMenuButton"
-              class="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small euiHeaderLink"
-              data-test-subj="dataSourceSelectableContextMenuHeaderLink"
-              type="button"
-            >
-              <span
-                class="euiButtonContent euiButtonEmpty__content"
-              >
-                <span
-                  class="euiButtonContent__icon"
-                  color="inherit"
-                  data-euiicon-type="database"
-                />
-                <span
-                  class="euiButtonEmpty__text"
-                />
-              </span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </nav>
-  </div>,
+  "container": <div />,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],