fix: some frontend bugs

Gozargah · Jul 30, 2024 · 2f2cbd1 · 2f2cbd1
1 parent 582b2bb
commit 2f2cbd1
Show file tree

Hide file tree

Showing 13 changed files with 1,255 additions and 1,113 deletions.
diff --git a/app/dashboard/build/404.html b/app/dashboard/build/404.html
@@ -33,7 +33,7 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/dashboard/assets/index.a97b5769.js"></script>
+    <script type="module" crossorigin src="/dashboard/assets/index.9b159dc0.js"></script>
     <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.8aa8dc93.js">
     <link rel="stylesheet" href="/dashboard/assets/index.59de2328.css">
   </head>

diff --git a/app/dashboard/build/assets/index.a97b5769.js → app/dashboard/build/assets/index.9b159dc0.js b/app/dashboard/build/assets/index.a97b5769.js → app/dashboard/build/assets/index.9b159dc0.js
diff --git a/app/dashboard/build/index.html b/app/dashboard/build/index.html
@@ -33,7 +33,7 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/dashboard/assets/index.a97b5769.js"></script>
+    <script type="module" crossorigin src="/dashboard/assets/index.9b159dc0.js"></script>
     <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.8aa8dc93.js">
     <link rel="stylesheet" href="/dashboard/assets/index.59de2328.css">
   </head>

diff --git a/app/dashboard/build/locales/en.json b/app/dashboard/build/locales/en.json
diff --git a/app/dashboard/build/locales/fa.json b/app/dashboard/build/locales/fa.json
diff --git a/app/dashboard/build/locales/ru.json b/app/dashboard/build/locales/ru.json
diff --git a/app/dashboard/build/locales/zh.json b/app/dashboard/build/locales/zh.json
diff --git a/app/dashboard/public/locales/en.json b/app/dashboard/public/locales/en.json
diff --git a/app/dashboard/public/locales/fa.json b/app/dashboard/public/locales/fa.json
diff --git a/app/dashboard/public/locales/ru.json b/app/dashboard/public/locales/ru.json
diff --git a/app/dashboard/public/locales/zh.json b/app/dashboard/public/locales/zh.json
diff --git a/app/dashboard/src/components/StatusBadge.tsx b/app/dashboard/src/components/StatusBadge.tsx
@@ -43,7 +43,7 @@ export const StatusBadge: FC<UserStatusProps> = ({
             fontWeight="medium"
             letterSpacing="tighter"
           >
-            {userStatus === "on_hold" ? t(userStatus) : userStatus}
+            {userStatus && t(`status.${userStatus}`)}
             {extraText && `: ${extraText}`}
           </Text>
         )}

diff --git a/app/dashboard/src/components/UserDialog.tsx b/app/dashboard/src/components/UserDialog.tsx
@@ -187,10 +187,18 @@ const schema = z.discriminatedUnion("status", [
     status: z.literal("active"),
     ...baseSchema,
   }),
-z.object({
+  z.object({
     status: z.literal("disabled"),
     ...baseSchema,
   }),
+  z.object({
+    status: z.literal("limited"),
+    ...baseSchema,
+  }),
+  z.object({
+    status: z.literal("expired"),
+    ...baseSchema,
+  }),
   z.object({
     status: z.literal("on_hold"),
     on_hold_expire_duration: z.coerce
@@ -292,8 +300,8 @@ export const UserDialog: FC<UserDialogProps> = () => {
           : "no_reset",
       status:
         values.status === "active" ||
-        values.status === "disabled" ||
-        values.status === "on_hold"
+          values.status === "disabled" ||
+          values.status === "on_hold"
           ? values.status
           : "active",
     };
@@ -412,7 +420,7 @@ export const UserDialog: FC<UserDialogProps> = () => {
                                     return (
                                       <Tooltip
                                         placement="top"
-                                        label={"status: " + t(field.value)}
+                                        label={"status: " + t(`status.${field.value}`)}
                                         textTransform="capitalize"
                                       >
                                         <Box>
@@ -603,13 +611,13 @@ export const UserDialog: FC<UserDialogProps> = () => {
                                         target: {
                                           value: date
                                             ? dayjs(
-                                                dayjs(date)
-                                                  .set("hour", 23)
-                                                  .set("minute", 59)
-                                                  .set("second", 59)
-                                              )
-                                                .utc()
-                                                .valueOf() / 1000
+                                              dayjs(date)
+                                                .set("hour", 23)
+                                                .set("minute", 59)
+                                                .set("second", 59)
+                                            )
+                                              .utc()
+                                              .valueOf() / 1000
                                             : 0,
                                           name: "expire",
                                         },