fix(web): fix bucket display name in edit mode (#1606)

labring · Oct 25, 2023 · d16bb36 · d16bb36
1 parent adaed0c
commit d16bb36
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/web/public/locales/en/translation.json b/web/public/locales/en/translation.json
@@ -251,7 +251,7 @@
     "EditBucket": "Edit Bucket",
     "DeleteBucket": "Delete Buckets",
     "BucketNameRule": "The bucket name must consist of lowercase letters, numbers and hyphens (-), with a length between 3 and 32 characters, and cannot start or end with a hyphen (-).",
-    "BucketNamePlaceholder": "bucket-name",
+    "BucketNamePlaceholder": "bucket name",
     "StorageList": "Storages",
     "EmptyStorageTip": "You have not created a Bucket",
     "UploadFile": "Upload File",
@@ -659,5 +659,6 @@
   "SavedSuccessfully": "Saved Successfully",
   "Bind": "Bind",
   "UnBind": "Unbind",
-  "UnBindSuccess": "Unbind Successfully"
+  "UnBindSuccess": "Unbind Successfully",
+  "CreateSuccess": "create success"
 }
diff --git a/web/public/locales/zh-CN/translation.json b/web/public/locales/zh-CN/translation.json
@@ -252,7 +252,7 @@
     "CreateBucket": "创建 Bucket",
     "EditBucket": "编辑 Bucket",
     "DeleteBucket": "删除 Bucket",
-    "BucketNamePlaceholder": "bucket-name",
+    "BucketNamePlaceholder": "bucket 名称",
     "EmptyStorageTip": "您还没有创建 Bucket",
     "UploadFile": "上传文件",
     "UploadFolder": "上传文件夹",
@@ -659,5 +659,6 @@
   "Bind": "绑定",
   "UnBind": "解绑",
   "UnBindSuccess": "解绑成功",
-  "SavedSuccessfully": "保存成功"
+  "SavedSuccessfully": "保存成功",
+  "CreateSuccess": "创建成功"
 }
diff --git a/web/public/locales/zh/translation.json b/web/public/locales/zh/translation.json
@@ -252,7 +252,7 @@
     "CreateBucket": "创建 Bucket",
     "EditBucket": "编辑 Bucket",
     "DeleteBucket": "删除 Bucket",
-    "BucketNamePlaceholder": "bucket-name",
+    "BucketNamePlaceholder": "bucket 名称",
     "EmptyStorageTip": "您还没有创建 Bucket",
     "UploadFile": "上传文件",
     "UploadFolder": "上传文件夹",
@@ -659,5 +659,6 @@
   "Bind": "绑定",
   "UnBind": "解绑",
   "UnBindSuccess": "解绑成功",
-  "SavedSuccessfully": "保存成功"
+  "SavedSuccessfully": "保存成功",
+  "CreateSuccess": "创建成功"
 }
diff --git a/web/src/pages/app/storages/mods/CreateBucketModal/index.tsx b/web/src/pages/app/storages/mods/CreateBucketModal/index.tsx
@@ -69,7 +69,7 @@ function CreateBucketModal(props: { storage?: TBucket; children: React.ReactElem
       res = await bucketUpdateMutation.mutateAsync(values);
       if (!res.error) {
         store.setCurrentStorage(res.data);
-        showSuccess("update success.");
+        showSuccess(t("UpdateSuccess"));
         onClose();
       }
     } else {
@@ -79,7 +79,7 @@ function CreateBucketModal(props: { storage?: TBucket; children: React.ReactElem
       });
       if (!res.error) {
         store.setCurrentStorage(res.data);
-        showSuccess("create success.");
+        showSuccess(t("CreateSuccess"));
         onClose();
       }
     }
@@ -109,9 +109,11 @@ function CreateBucketModal(props: { storage?: TBucket; children: React.ReactElem
               <FormControl isInvalid={!!errors?.name}>
                 <FormLabel htmlFor="name"> {t("StoragePanel.BucketName")}</FormLabel>
                 <InputGroup>
-                  <InputAddon className="!mr-0 !rounded-r-none !pr-0">
-                    {currentApp.appid + "-"}
-                  </InputAddon>
+                  {!isEdit && (
+                    <InputAddon className="!mr-0 !rounded-r-none !pr-0">
+                      {currentApp.appid + "-"}
+                    </InputAddon>
+                  )}
                   <Input
                     {...register("name", {
                       required: t("StoragePanel.BucketNameisRequired").toString(),
@@ -124,8 +126,9 @@ function CreateBucketModal(props: { storage?: TBucket; children: React.ReactElem
                     placeholder={String(t("StoragePanel.BucketNamePlaceholder"))}
                     disabled={isEdit}
                     className={clsx(
-                      "!ml-0 !rounded-l-none !border-none !pl-0",
+                      "!rounded-l-none !border-none",
                       darkMode ? "!bg-[#FFFFFF0A]" : "!bg-lafWhite-600",
+                      isEdit ? "" : "!ml-0 !pl-0",
                     )}
                   />
                 </InputGroup>