fix: crash when only one available storage class

qiniu · Nov 21, 2024 · 6df9649 · 6df9649
1 parent 172976c
commit 6df9649
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/src/renderer/components/forms/change-storage-class-form.tsx b/src/renderer/components/forms/change-storage-class-form.tsx
@@ -7,7 +7,6 @@ import StorageClass from "@common/models/storage-class";
 
 export interface ChangeStorageClassFormData {
   storageClassKodoName: string,
-  someInput: string,
 }
 
 interface ChangeStorageClassFormProps {
@@ -52,7 +51,7 @@ const ChangeStorageClassForm: React.FC<ChangeStorageClassFormProps> = ({
 
   useEffect(() => {
     reset({
-      storageClassKodoName: availableStorageClasses[0].kodoName ?? "Standard",
+      storageClassKodoName: availableStorageClasses[0]?.kodoName ?? "",
     });
   }, []);
 
@@ -97,33 +96,37 @@ const ChangeStorageClassForm: React.FC<ChangeStorageClassFormProps> = ({
               </div>
             </Form.Group>
         }
-        <Form.Group as={Fragment} controlId="storageClassKodoName">
-          <Form.Label className="text-end">
-            {translate("forms.changeStorageClass.storageClassKodoName.label")}
-          </Form.Label>
-          <div>
-            {
-              availableStorageClasses.map(storageClass => (
-                <Form.Check
-                  {...register("storageClassKodoName")}
-                  id={`storageClassKodoName-${storageClass.kodoName}`}
-                  key={storageClass.kodoName}
-                  type="radio"
-                  label={storageClass.nameI18n[currentLanguage]}
-                  value={storageClass.kodoName}
-                />
-              ))
-            }
-            <Form.Text>
-              {
-                availableStorageClasses
-                  .find(storageClasses =>
-                    storageClasses.kodoName === watch("storageClassKodoName"))
-                  ?.billingI18n[currentLanguage]
-              }
-            </Form.Text>
-          </div>
-        </Form.Group>
+        {
+          !availableStorageClasses.length
+          ? null
+          : <Form.Group as={Fragment} controlId="storageClassKodoName">
+            <Form.Label className="text-end">
+              {translate("forms.changeStorageClass.storageClassKodoName.label")}
+            </Form.Label>
+              <div>
+                {
+                  availableStorageClasses.map(storageClass => (
+                    <Form.Check
+                      {...register("storageClassKodoName")}
+                      id={`storageClassKodoName-${storageClass.kodoName}`}
+                      key={storageClass.kodoName}
+                      type="radio"
+                      label={storageClass.nameI18n[currentLanguage]}
+                      value={storageClass.kodoName}
+                    />
+                  ))
+                }
+                <Form.Text>
+                  {
+                    availableStorageClasses
+                      .find(storageClasses =>
+                        storageClasses.kodoName === watch("storageClassKodoName"))
+                      ?.billingI18n[currentLanguage]
+                  }
+                </Form.Text>
+              </div>
+          </Form.Group>
+        }
       </fieldset>
     </Form>
   );

diff --git a/src/renderer/components/modals/file/change-file-storage-class/index.tsx b/src/renderer/components/modals/file/change-file-storage-class/index.tsx
@@ -58,11 +58,12 @@ const ChangeFileStorageClass: React.FC<ModalProps & ChangeFileStorageClassProps>
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 
   const {
+    watch,
     handleSubmit,
     formState: {
       isSubmitting,
@@ -135,7 +136,7 @@ const ChangeFileStorageClass: React.FC<ModalProps & ChangeFileStorageClassProps>
       </Modal.Body>
       <Modal.Footer>
         {
-          !memoFileItem || isSubmitSuccessful
+          !memoFileItem || !watch("storageClassKodoName") || isSubmitSuccessful
             ? null
             : <Button
               variant="primary"

diff --git a/src/renderer/components/modals/file/change-files-storage-class/index.tsx b/src/renderer/components/modals/file/change-files-storage-class/index.tsx
@@ -87,7 +87,7 @@ const ChangeFilesStorageClass: React.FC<ModalProps & ChangeFilesStorageClassProp
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 

diff --git a/src/renderer/components/modals/preview-file/file-operation/change-storage-class.tsx b/src/renderer/components/modals/preview-file/file-operation/change-storage-class.tsx
@@ -62,11 +62,12 @@ const ChangeStorageClass: React.FC<ChangeStorageClassProps> = ({
   const changeStorageClassFormController = useForm<ChangeStorageClassFormData>({
     mode: "onChange",
     defaultValues: {
-      storageClassKodoName: storageClasses[0]?.kodoName ?? "Standard",
+      storageClassKodoName: storageClasses[0]?.kodoName ?? "",
     },
   });
 
   const {
+    watch,
     handleSubmit,
     formState: {
       isSubmitting,
@@ -123,7 +124,7 @@ const ChangeStorageClass: React.FC<ChangeStorageClassProps> = ({
         onSubmit={handleSubmitChangeStorageClass}
       />
       {
-        !SubmitButtonPortal || isSubmitSuccessful
+        !SubmitButtonPortal || !watch("storageClassKodoName") || isSubmitSuccessful
           ? null
           : <SubmitButtonPortal>
             <Button