fix: some global config will be clear when save color

GZTimeWalker · GZTimeWalker · commit c547bb25ac2e · 2024-05-11T01:32:58.000+08:00
diff --git a/src/GZCTF/ClientApp/package.json b/src/GZCTF/ClientApp/package.json
@@ -35,7 +35,7 @@
     "embla-carousel": "^8.0.4",
     "embla-carousel-autoplay": "^8.0.4",
     "embla-carousel-react": "^8.0.4",
-    "i18next": "^23.11.3",
+    "i18next": "^23.11.4",
     "i18next-browser-languagedetector": "^7.2.1",
     "katex": "^0.16.10",
     "lz-string": "^1.5.0",
diff --git a/src/GZCTF/ClientApp/pnpm-lock.yaml b/src/GZCTF/ClientApp/pnpm-lock.yaml
diff --git a/src/GZCTF/ClientApp/src/pages/admin/Settings.tsx b/src/GZCTF/ClientApp/src/pages/admin/Settings.tsx
@@ -61,19 +61,11 @@ const Configs: FC = () => {
       })
       .catch((e) => showErrorNotification(e, t))
       .finally(() => {
-        mutateConfig({ ...conf.globalConfig })
+        mutateConfig({ ...conf.globalConfig, ...conf.containerPolicy })
         setDisabled(false)
       })
   }
 
-  useEffect(() => {
-    if (color && /^#[0-9A-F]{6}$/i.test(color)) {
-      setGlobalConfig({ ...(globalConfig ?? {}), customTheme: color })
-    } else {
-      setGlobalConfig({ ...(globalConfig ?? {}), customTheme: '' })
-    }
-  }, [color])
-
   const colors = color && /^#[0-9A-F]{6}$/i.test(color) ? generateColors(color) : theme.colors.brand
 
   return (
@@ -85,7 +77,14 @@ const Configs: FC = () => {
         size="md"
         leftSection={<Icon path={saved ? mdiContentSaveOutline : mdiCheck} size={1} />}
         onClick={() => {
-          updateConfig({ globalConfig, accountPolicy, containerPolicy })
+          updateConfig({
+            globalConfig: {
+              ...(globalConfig ?? {}),
+              customTheme: color && /^#[0-9A-F]{6}$/i.test(color) ? color : '',
+            },
+            accountPolicy,
+            containerPolicy,
+          })
           setSaved(false)
           setTimeout(() => {
             setSaved(true)
