From 945bb2086aed3cb26bf792fc7420203ab4aef4f0 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 14:53:21 -0700
Subject: [PATCH] Fix dropdown display behavior (#1114) (#1116)

(cherry picked from commit 68d88f358775232b2f9bc1ed1bc81b96dbd669a5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../setup_integration.test.tsx.snap           | 46 +------------------
 .../components/setup_integration.tsx          | 18 +++-----
 2 files changed, 9 insertions(+), 55 deletions(-)

diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index c46b8a2b31..65d9b65be5 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -200,20 +200,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   onBlur={[Function]}
                                   onChange={[Function]}
                                   onFocus={[Function]}
-                                  options={
-                                    Array [
-                                      Object {
-                                        "disabled": true,
-                                        "text": "S3 Connection",
-                                        "value": "s3",
-                                      },
-                                      Object {
-                                        "disabled": true,
-                                        "text": "OpenSearch Index",
-                                        "value": "index",
-                                      },
-                                    ]
-                                  }
+                                  options={Array []}
                                   value="index"
                                 >
                                   <EuiFormControlLayout
@@ -244,22 +231,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                             onFocus={[Function]}
                                             onMouseUp={[Function]}
                                             value="index"
-                                          >
-                                            <option
-                                              disabled={true}
-                                              key="0"
-                                              value="s3"
-                                            >
-                                              S3 Connection
-                                            </option>
-                                            <option
-                                              disabled={true}
-                                              key="1"
-                                              value="index"
-                                            >
-                                              OpenSearch Index
-                                            </option>
-                                          </select>
+                                          />
                                         </EuiValidatableControl>
                                         <EuiFormControlLayoutIcons
                                           compressed={false}
@@ -1212,12 +1184,6 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
               options={
                 Array [
                   Object {
-                    "disabled": true,
-                    "text": "S3 Connection",
-                    "value": "s3",
-                  },
-                  Object {
-                    "disabled": false,
                     "text": "OpenSearch Index",
                     "value": "index",
                   },
@@ -1255,15 +1221,7 @@ exports[`Integration Setup Page Renders the form as expected 1`] = `
                         value="index"
                       >
                         <option
-                          disabled={true}
                           key="0"
-                          value="s3"
-                        >
-                          S3 Connection
-                        </option>
-                        <option
-                          disabled={false}
-                          key="1"
                           value="index"
                         >
                           OpenSearch Index
diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
index ae897403c7..0d0cddb3bd 100644
--- a/public/components/integrations/components/setup_integration.tsx
+++ b/public/components/integrations/components/setup_integration.tsx
@@ -212,17 +212,13 @@ export function SetupIntegrationForm({
       <EuiSpacer />
       <EuiFormRow label="Data Source" helpText="Select a data source to connect to.">
         <EuiSelect
-          options={integrationConnectionSelectorItems.map((item) => {
-            const copy: { value: string; text: string; disabled?: boolean } = { ...item };
-            switch (item.value) {
-              case 's3':
-                copy.disabled = !Object.hasOwn(integration.assets ?? {}, 'queries');
-                return copy;
-              case 'index':
-                copy.disabled = !Object.hasOwn(integration.assets ?? {}, 'savedObjects');
-                return copy;
-              default:
-                return copy;
+          options={integrationConnectionSelectorItems.filter((item) => {
+            if (item.value === 's3') {
+              return Object.hasOwn(integration.assets ?? {}, 'queries');
+            } else if (item.value === 'index') {
+              return Object.hasOwn(integration.assets ?? {}, 'savedObjects');
+            } else {
+              return false;
             }
           })}
           value={config.connectionType}