Merge pull request #5338 from TheRealJon/1832933-bz

Bug 1832933: Fix select descriptor
openshift · May 15, 2020 · 9c32723 · 9c32723
2 parents e0521e3 + 2f4120b
commit 9c32723
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/frontend/packages/operator-lifecycle-manager/src/components/create-operand-form.tsx b/frontend/packages/operator-lifecycle-manager/src/components/create-operand-form.tsx
@@ -885,6 +885,21 @@ export const CreateOperandForm: React.FC<CreateOperandFormProps> = ({
         />
       );
     }
+    if (capabilities.some((c) => c.startsWith(SpecCapability.select))) {
+      return (
+        <div>
+          <Dropdown
+            title={`Select ${displayName}`}
+            selectedKey={currentValue}
+            items={capabilities
+              .filter((c) => c.startsWith(SpecCapability.select))
+              .map((c) => c.split(SpecCapability.select)[1])
+              .reduce((all, option) => ({ [option]: option, ...all }), {})}
+            onChange={(value) => updateFormData(path, value)}
+          />
+        </div>
+      );
+    }
     if (capabilities.includes(SpecCapability.text)) {
       return (
         <div>
@@ -940,21 +955,6 @@ export const CreateOperandForm: React.FC<CreateOperandFormProps> = ({
         </div>
       );
     }
-    if (capabilities.some((c) => c.startsWith(SpecCapability.select))) {
-      return (
-        <div>
-          <Dropdown
-            title={`Select ${displayName}`}
-            selectedKey={currentValue}
-            items={capabilities
-              .filter((c) => c.startsWith(SpecCapability.select))
-              .map((c) => c.split(SpecCapability.select)[1])
-              .reduce((all, option) => ({ [option]: option, ...all }), {})}
-            onChange={(value) => updateFormData(path, value)}
-          />
-        </div>
-      );
-    }
     return null;
   };