Merge branch 'master' into fix-share-file-3382

Author: cesnietor

web-app/src/screens/Console/Buckets/BucketDetails/EditLifecycleConfiguration.tsx

@@ -92,10 +92,9 @@ const EditLifecycleConfiguration = ({
 
               return { label: value, value: value };
             });
-
             setTiersList(objList);
             if (objList.length > 0) {
-              setStorageClass(objList[0].value);
+              setStorageClass(lifecycleRule.transition?.storage_class || "");
             }
           }
           setLoadingTiers(false);
@@ -104,18 +103,28 @@ const EditLifecycleConfiguration = ({
           setLoadingTiers(false);
         });
     }
-  }, [loadingTiers]);
+  }, [loadingTiers, lifecycleRule.transition?.storage_class]);
 
   useEffect(() => {
     let valid = true;
 
     if (ilmType !== "expiry") {
-      if (storageClass === "") {
+      if (
+        (transitionDays !== "0" && storageClass === "") ||
+        (NCTransitionDays !== "0" && NCTransitionSC === "")
+      ) {
         valid = false;
       }
     }
     setIsFormValid(valid);
-  }, [ilmType, expiryDays, transitionDays, storageClass]);
+  }, [
+    ilmType,
+    expiryDays,
+    transitionDays,
+    storageClass,
+    NCTransitionDays,
+    NCTransitionSC,
+  ]);
 
   useEffect(() => {
     if (lifecycleRule.status === "Enabled") {
@@ -439,15 +448,15 @@ const EditLifecycleConfiguration = ({
                     value={NCTransitionDays}
                     min="0"
                   />
-                  <InputBox
+                  <Select
+                    label="Non-current Version Transition Storage Class"
                     id="noncurrentversion_t_SC"
                     name="noncurrentversion_t_SC"
-                    onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
-                      setNCTransitionSC(e.target.value);
-                    }}
-                    placeholder="Set Non-current Version Transition Storage Class"
-                    label="Non-current Version Transition Storage Class"
                     value={NCTransitionSC}
+                    onChange={(value) => {
+                      setNCTransitionSC(value);
+                    }}
+                    options={tiersList}
                   />
                 </Fragment>
               )}