Merged in bugfix/SHIBUI-2250 (pull request #565)

Fixed is issue with select boxes Approved-by: Bill Smith Approved-by: Jonathan Johnson
TIER · Nov 4, 2021 · 2dc05ff · 2dc05ff
2 parents d2220fe + 0370b0e
commit 2dc05ff
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 10 deletions.
diff --git a/backend/src/integration/resources/SHIBUI-1732-1.side b/backend/src/integration/resources/SHIBUI-1732-1.side
@@ -584,6 +584,13 @@
         ["xpath=//a[contains(.,'Add a new metadata provider')]", "xpath:innerText"]
       ],
       "value": ""
+    }, {
+      "id": "bb1d9d3f-631a-40eb-8f51-bd502a90c2b2",
+      "comment": "",
+      "command": "waitForElementEditable",
+      "target": "name=type",
+      "targets": [],
+      "value": "30000"
     }, {
       "id": "c6e4f105-81ce-4132-b82b-d28d11f27746",
       "comment": "",
@@ -597,6 +604,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "7a088a82-2f0c-4466-9304-60c7c504913c",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "2c98e69c-d595-48a7-ac67-eca5d9f3a784",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-2.side b/backend/src/integration/resources/SHIBUI-1732-2.side
@@ -564,6 +564,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "9a4b3759-61b9-478a-9888-00e512721d4f",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "7c10b23a-a427-4cc4-bae9-9e5606712b6e",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-3.side b/backend/src/integration/resources/SHIBUI-1732-3.side
@@ -686,19 +686,25 @@
       ],
       "value": ""
     }, {
-      "id": "e443eba7-3a7a-4706-b0a5-b40d114bbf07",
-      "comment": "",
-      "command": "click",
-      "target": "id=root_relyingPartyOverrides_CustomList_0",
-      "targets": [],
-      "value": ""
-    }, {
-      "id": "3c4af580-bcd1-454b-a278-0d5d3086a896",
+      "id": "5491ac17-6d58-4fe3-861a-06bc89470aa5",
       "comment": "",
       "command": "pause",
       "target": "1000",
       "targets": [],
       "value": ""
+    }, {
+      "id": "65be7a0b-462f-43be-9e2f-c7dc71f15467",
+      "comment": "",
+      "command": "select",
+      "target": "id=root_relyingPartyOverrides_CustomList_0",
+      "targets": [
+        ["id=root_relyingPartyOverrides_CustomList_0", "id"],
+        ["css=#root_relyingPartyOverrides_CustomList_0", "css:finder"],
+        ["xpath=//select[@id='root_relyingPartyOverrides_CustomList_0']", "xpath:attributes"],
+        ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div[2]/div/div/div/div/div/div/select", "xpath:idRelative"],
+        ["xpath=//select", "xpath:position"]
+      ],
+      "value": "label=foo"
     }, {
       "id": "e4abb650-c762-4060-bc81-428b4758f08e",
       "comment": "",
@@ -711,7 +717,7 @@
         ["xpath=//div[@id='root']/div/main/div/section/div[2]/div[2]/div[2]/div/form/div/div/div/div/div[8]/div/div/div/div[6]/div/div/div/div/div/div[2]/div/div/div/div/div/div/select", "xpath:idRelative"],
         ["xpath=//select", "xpath:position"]
       ],
-      "value": "foo"
+      "value": "label=foo"
     }, {
       "id": "992e127d-5ac1-4796-b54f-f212683624ac",
       "comment": "",
@@ -828,6 +834,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "f21989e9-8b54-4e55-a6f7-c699939f0992",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "3c298664-b8c4-40de-986e-a955c760ba3e",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-4.side b/backend/src/integration/resources/SHIBUI-1732-4.side
@@ -578,6 +578,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "94bd599c-4de3-4f7c-b28b-719012acf8b5",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "befba204-65a3-4a26-91ca-75141306ee8a",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-5.side b/backend/src/integration/resources/SHIBUI-1732-5.side
@@ -578,6 +578,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "12eebf6a-616b-4bb3-af32-aad829ba1133",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "577b9b53-a904-419f-b0d8-4e899aaee297",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-6.side b/backend/src/integration/resources/SHIBUI-1732-6.side
@@ -578,6 +578,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "c8293710-35ad-4ac6-a175-33ca8fcab2ff",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "a26d50d7-f81f-4fbe-9942-804853b58f19",
       "comment": "",

diff --git a/backend/src/integration/resources/SHIBUI-1732-7.side b/backend/src/integration/resources/SHIBUI-1732-7.side
@@ -554,6 +554,13 @@
         ["xpath=//input", "xpath:position"]
       ],
       "value": "Test"
+    }, {
+      "id": "506e9329-0c23-449b-b285-96541b2fa557",
+      "comment": "",
+      "command": "select",
+      "target": "name=type",
+      "targets": [],
+      "value": "label=FileBackedHttpMetadataResolver"
     }, {
       "id": "f26372d3-0701-4cc3-9746-8f96175686e6",
       "comment": "",

diff --git a/ui/src/app/form/component/widgets/SelectWidget.js b/ui/src/app/form/component/widgets/SelectWidget.js
@@ -127,7 +127,7 @@ const SelectWidget = ({
                     <option value="">{translator(placeholder)}</option>
                 )}
                 {(enumOptions).map(({ value, label }, i) =>
-                <option key={i} id={label} value={value} disabled={Array.isArray(enumDisabled) && (enumDisabled).indexOf(value) !== -1}>
+                    <option key={i} id={`${label}-${id}`} value={value} disabled={Array.isArray(enumDisabled) && (enumDisabled).indexOf(value) !== -1}>
                     {translator(label)}
                 </option>
                 )}