From 04fd2a2b44cd47b15bb2e0552dc9423ff108a67d Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Thu, 29 Sep 2022 10:26:22 +1300
Subject: [PATCH] fix(clustersetup): set a default access mode (#7746)

---
 app/kubernetes/views/configure/configure.html                 | 4 ++--
 app/kubernetes/views/configure/configureController.js         | 3 +++
 .../cluster/ConfigureView/StorageAccessModeSelector.tsx       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html
index fd5c203ee..7a5a16415 100644
--- a/app/kubernetes/views/configure/configure.html
+++ b/app/kubernetes/views/configure/configure.html
@@ -202,7 +202,7 @@
                     </tr>
                     <tr ng-repeat="class in ctrl.StorageClasses">
                       <td>
-                        <div class="flex-row vertical-center">
+                        <div class="flex flex-row items-center h-full">
                           <label class="switch mr-2 mb-0">
                             <input type="checkbox" ng-model="class.selected" /><span class="slider round" data-cy="kubeSetup-storageToggle{{ class.Name }}"></span>
                           </label>
@@ -218,7 +218,7 @@
                         ></storage-access-mode-selector>
                       </td>
                       <td>
-                        <div style="margin: 5px">
+                        <div class="flex flex-row items-center h-full">
                           <label class="switch mr-2 mb-0"
                             ><input type="checkbox" ng-model="class.AllowVolumeExpansion" /><span
                               class="slider round"
diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js
index 947c71281..512e00e5f 100644
--- a/app/kubernetes/views/configure/configureController.js
+++ b/app/kubernetes/views/configure/configureController.js
@@ -307,6 +307,9 @@ class KubernetesConfigureController {
         if (storage) {
           item.selected = true;
           item.AccessModes = storage.AccessModes.map((name) => this.availableAccessModes.find((accessMode) => accessMode.Name === name));
+        } else if (this.availableAccessModes.length) {
+          // set a default access mode if the storage class is not enabled and there are available access modes
+          item.AccessModes = [this.availableAccessModes[0]];
         }
       });
 
diff --git a/app/react/kubernetes/cluster/ConfigureView/StorageAccessModeSelector.tsx b/app/react/kubernetes/cluster/ConfigureView/StorageAccessModeSelector.tsx
index 0fa4a8dd7..7a17db48b 100644
--- a/app/react/kubernetes/cluster/ConfigureView/StorageAccessModeSelector.tsx
+++ b/app/react/kubernetes/cluster/ConfigureView/StorageAccessModeSelector.tsx
@@ -33,7 +33,7 @@ export function StorageAccessModeSelector({
       closeMenuOnSelect={false}
       onChange={(value) => onChange(storageClassName, value)}
       inputId={inputId}
-      placeholder="Select one or more teams"
+      placeholder="Not configured"
       data-cy={`kubeSetup-storageAccessSelect${storageClassName}`}
     />
   );