Feat-update-blocked-styles (#373)

* tenant block list * update blocked styles
NewFuture · Jun 30, 2024 · 3674c28 · 3674c28
1 parent 7ff919d
commit 3674c28
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/client-config-app/src/components/ImageList/ImageList.tsx b/client-config-app/src/components/ImageList/ImageList.tsx
@@ -86,7 +86,7 @@ const ImageList: React.FC<ImageListProps> = ({
                 onDragOver={dragOverHandler}
             >
                 {enableUpload && (
-                    <UploadButton className={styles.item} onUploadChangeHandler={uploadHandler} disbaled={!enable} />
+                    <UploadButton className={styles.item} onUploadChangeHandler={uploadHandler} disabled={!enable} />
                 )}
                 {files?.map((item: File, index) => (
                     <UploadImageItem

diff --git a/client-config-app/src/components/UploadButton/UploadButton.styles.ts b/client-config-app/src/components/UploadButton/UploadButton.styles.ts
@@ -8,9 +8,14 @@ export const useUploadButtonStyles = makeStyles({
         order: -999999,
     },
     icon: {
-        cursor: "pointer",
         width: "100%",
         height: "100%",
+    },
+    iconDisabled: {
+        cursor: "not-allowed",
+    },
+    iconEnabled: {
+        cursor: "pointer",
         color: tokens.colorNeutralForeground2,
         ...shorthands.transition("scale", "0.3s"),
         ":hover": {

diff --git a/client-config-app/src/components/UploadButton/UploadButton.tsx b/client-config-app/src/components/UploadButton/UploadButton.tsx
@@ -7,7 +7,7 @@ import { TransKeys } from "../../locales";
 
 export interface UploadButtonProps {
     onUploadChangeHandler: (file: File[]) => void;
-    disbaled?: boolean;
+    disabled?: boolean;
     className?: string;
 }
 
@@ -16,19 +16,21 @@ export interface UploadButtonProps {
 
  * @returns
  */
-export function UploadButton({ disbaled, onUploadChangeHandler, className }: UploadButtonProps) {
+export function UploadButton({ disabled, onUploadChangeHandler, className }: UploadButtonProps) {
     const styles = useUploadButtonStyles();
     const { t } = useTranslation();
     return (
         <div className={mergeClasses(styles.root, className)}>
-            <Tooltip content={t(TransKeys.uploadTips)} relationship="label">
+            <Tooltip content={t(disabled ? TransKeys.uploadDisabled : TransKeys.uploadTips)} relationship="label">
                 <label htmlFor="image-upload">
-                    <AddRegular className={styles.icon} />
+                    <AddRegular
+                        className={mergeClasses(styles.icon, disabled ? styles.iconDisabled : styles.iconEnabled)}
+                    />
                 </label>
             </Tooltip>
             <input
                 hidden
-                disabled={disbaled}
+                disabled={disabled}
                 type="file"
                 id="image-upload"
                 onChange={(e) => onUploadChangeHandler(Array.from(e.target.files!))}

diff --git a/client-config-app/src/config.json b/client-config-app/src/config.json
@@ -1,3 +1,3 @@
 {
-    "UploadBlockedTenants": ["698b0e46-51c0-4d3b-a023-16f2b23b8c1e", "72f988bf-86f1-41af-91ab-2d7cd011db47"]
+    "UploadBlockedTenants": ["698b0e46-51c0-4d3b-a023-16f2b23b8c1e"]
 }
diff --git a/client-config-app/src/locales/en.json b/client-config-app/src/locales/en.json
@@ -1,6 +1,7 @@
 {
     "feedback": "Feedback",
     "uploadTips": "Pick pictures or Drag and drop them",
+    "uploadDisabled": "Upload is blocked",
     "delete": "Delete",
     "loading": "Loading...",
     "radio": "stickers scope",

diff --git a/client-config-app/src/locales/index.ts b/client-config-app/src/locales/index.ts
@@ -3,6 +3,7 @@ export const enum TransKeys {
     // termsTitle = "termsTitle",
     // feedback = "feedback",
     uploadTips = "uploadTips",
+    uploadDisabled = "uploadDisabled",
     delete = "delete",
     title = "title",
     radio = "radio",

diff --git a/client-config-app/src/locales/zh-cn.json b/client-config-app/src/locales/zh-cn.json
@@ -1,6 +1,7 @@
 {
     "feedback": "反馈",
     "uploadTips": "选择图片或拖拽至此",
+    "uploadDisabled": "不可上传",
     "delete": "删除",
     "loading": "加载中...",
     "title_user": "我所收藏的表情包",