From 3893809c71e4c37bbbb9b7762c81053e0fb4cdc8 Mon Sep 17 00:00:00 2001
From: Venus <venus.izadi@gmail.com>
Date: Thu, 15 Oct 2020 14:59:11 -0400
Subject: [PATCH] BugFix - Storage Size default to select-storage-size (#352)

---
 .../openshift_cluster_edit_modal.spec.tsx.snap    |  4 +++-
 .../engagement_form_fields.spec.tsx.snap          | 10 ++++------
 .../engagement_form_fields/persistent_storage.tsx | 15 +++++++++------
 src/schemas/fixtures/engagement_form_config.json  |  4 ----
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/components/engagement_edit_modals/__tests__/__snapshots__/openshift_cluster_edit_modal.spec.tsx.snap b/src/components/engagement_edit_modals/__tests__/__snapshots__/openshift_cluster_edit_modal.spec.tsx.snap
index 850ce77da..2917a07e2 100644
--- a/src/components/engagement_edit_modals/__tests__/__snapshots__/openshift_cluster_edit_modal.spec.tsx.snap
+++ b/src/components/engagement_edit_modals/__tests__/__snapshots__/openshift_cluster_edit_modal.spec.tsx.snap
@@ -365,7 +365,9 @@ Object {
                         <option
                           class=""
                           value=""
-                        />
+                        >
+                          Select storage size
+                        </option>
                       </select>
                       
                     </div>
diff --git a/src/components/engagement_form_fields/__tests__/__snapshots__/engagement_form_fields.spec.tsx.snap b/src/components/engagement_form_fields/__tests__/__snapshots__/engagement_form_fields.spec.tsx.snap
index 75fdbbec8..d50a34824 100644
--- a/src/components/engagement_form_fields/__tests__/__snapshots__/engagement_form_fields.spec.tsx.snap
+++ b/src/components/engagement_form_fields/__tests__/__snapshots__/engagement_form_fields.spec.tsx.snap
@@ -1142,10 +1142,9 @@ Object {
           >
             <option
               class=""
-              data-cy="none"
-              value="none"
+              value=""
             >
-              None
+              Select storage size
             </option>
             <option
               class=""
@@ -1223,10 +1222,9 @@ Object {
         >
           <option
             class=""
-            data-cy="none"
-            value="none"
+            value=""
           >
-            None
+            Select storage size
           </option>
           <option
             class=""
diff --git a/src/components/engagement_form_fields/persistent_storage.tsx b/src/components/engagement_form_fields/persistent_storage.tsx
index 6919494c5..9b7252606 100644
--- a/src/components/engagement_form_fields/persistent_storage.tsx
+++ b/src/components/engagement_form_fields/persistent_storage.tsx
@@ -44,8 +44,13 @@ export function PersistentStorageFormField({
         onChange={e => onChange('ocp_persistent_storage_size', e)}
         value={engagement?.ocp_persistent_storage_size || ''}
       >
-        {engagementFormConfig?.openshift_options?.persistent_storage?.options
-          ?.length > 0 ? (
+        {[
+          <FormSelectOption
+            key={'undefined storage'}
+            label="Select storage size"
+            value={undefined}
+          />,
+        ].concat(
           engagementFormConfig?.openshift_options?.persistent_storage?.options?.map(
             (option: any, index: any) => (
               <FormSelectOption
@@ -56,10 +61,8 @@ export function PersistentStorageFormField({
                 data-cy={option.value}
               />
             )
-          )
-        ) : (
-          <FormSelectOption label={''} value={''} />
-        )}
+          ))
+        }
       </FormSelect>
     </FormGroup>
   );
diff --git a/src/schemas/fixtures/engagement_form_config.json b/src/schemas/fixtures/engagement_form_config.json
index 2554a89e9..a3c6838b6 100644
--- a/src/schemas/fixtures/engagement_form_config.json
+++ b/src/schemas/fixtures/engagement_form_config.json
@@ -155,10 +155,6 @@
         }
       ],
       "options": [
-        {
-          "label": "None",
-          "value": "none"
-        },
         {
           "label": "50GB",
           "value": "50G"