Merge branch 'main' of https://github.com/labring/laf

labring · Jun 14, 2024 · 41da39d · 41da39d
2 parents 287fca7 + a72ec2d
commit 41da39d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/server/src/application/application.controller.ts b/server/src/application/application.controller.ts
@@ -371,10 +371,12 @@ export class ApplicationController {
     if (
       dto.dedicatedDatabase?.replicas &&
       origin.resource.dedicatedDatabase?.replicas &&
-      dto.dedicatedDatabase?.replicas !==
+      dto.dedicatedDatabase?.replicas <
         origin.resource.dedicatedDatabase?.replicas
     ) {
-      return ResponseUtil.error('cannot change database replicas')
+      return ResponseUtil.error(
+        'To reduce the number of database replicas, please contact customer support.',
+      )
     }
 
     // check if a user exceeds the resource limit in a region

diff --git a/web/src/pages/app/mods/StatusBar/LogsModal/initLog.tsx b/web/src/pages/app/mods/StatusBar/LogsModal/initLog.tsx
@@ -112,7 +112,7 @@ export default function InitLog() {
           <div
             id="log-viewer-cover-container"
             className={clsx(
-              "absolute inset-0 z-[999] h-full w-full px-2 pt-0 font-mono text-base font-bold opacity-70",
+              "absolute inset-0 z-[999] h-full w-full px-2 pt-0 font-mono text-base font-bold opacity-60",
               darkMode ? "bg-lafDark-100" : "bg-lafWhite-600",
               { "log-viewer-cover-container-hide-scrollbar": !paused },
             )}

diff --git a/web/src/pages/home/mods/CreateAppModal/DatabaseBundleControl/index.tsx b/web/src/pages/home/mods/CreateAppModal/DatabaseBundleControl/index.tsx
@@ -22,6 +22,7 @@ import useGlobalStore from "@/pages/globalStore";
 export default function DatabaseBundleControl(props: {
   bundle: TypeBundle;
   originCapacity?: number;
+  originReplicas?: number;
   resourceOptions: any;
   type: "create" | "change";
   defaultDatabaseCapacity?: number;
@@ -36,6 +37,7 @@ export default function DatabaseBundleControl(props: {
     defaultDatabaseCapacity,
     defaultDedicatedDatabaseBundle,
     originCapacity,
+    originReplicas,
   } = props;
   const { t } = useTranslation();
   const darkMode = useColorMode().colorMode === COLOR_MODE.dark;
@@ -202,7 +204,8 @@ export default function DatabaseBundleControl(props: {
             })}
             {buildSlider({
               type: "replicas",
-              disable: disabledChangeType,
+              min: originReplicas,
+              // disable: disabledChangeType,
               value: _.get(bundle, "dedicatedDatabase.replicas") as unknown as number,
               specs: find(resourceOptions, { type: "dedicatedDatabaseReplicas" })?.specs || [],
               onChange: (value) => {

diff --git a/web/src/pages/home/mods/CreateAppModal/index.tsx b/web/src/pages/home/mods/CreateAppModal/index.tsx
@@ -352,6 +352,7 @@ const CreateAppModal = (props: {
                     <DatabaseBundleControl
                       bundle={bundle}
                       originCapacity={application?.bundle.resource.dedicatedDatabase?.capacity}
+                      originReplicas={application?.bundle.resource.dedicatedDatabase?.replicas}
                       onBundleItemChange={(k: string, v?: number) => {
                         setBundle((prev) => {
                           const v1 = _.cloneDeep(_.set(prev, k, v));