Merge pull request #120 from kloudlite/features/app-issue

Fixed select not showing value issue
kloudlite · Mar 5, 2024 · ef7d5db · ef7d5db
2 parents 4ee3fa3 + 58ba58b
commit ef7d5db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 23 deletions.
diff --git a/web/package.json b/web/package.json
@@ -26,7 +26,7 @@
 		"@codemirror/legacy-modes": "^6.3.3",
 		"@jengaicons/react": "^1.3.0",
 		"@mdx-js/react": "^2.3.0",
-		"@oshq/react-select": "^1.4.1",
+		"@oshq/react-select": "^1.4.2",
 		"@radix-ui/primitive": "^1.0.1",
 		"@radix-ui/react-alert-dialog": "1.0.4",
 		"@radix-ui/react-checkbox": "^1.0.4",

diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
diff --git a/web/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx b/web/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx
@@ -127,7 +127,7 @@ const AppCompute = () => {
           annotations: {
             ...(s.metadata?.annotations || {}),
             [keyconstants.cpuMode]: val.cpuMode,
-            [keyconstants.memPerCpu]: val.memPerCpu,
+            [keyconstants.memPerCpu]: `${val.memPerCpu}`,
             [keyconstants.selectionModeKey]: val.selectionMode,
             [keyconstants.selectedPlan]: val.selectedPlan,
             [keyconstants.repoAccountName]: val.repoAccountName,
@@ -145,32 +145,32 @@ const AppCompute = () => {
               // image: val.image === '' ? val.repoImageUrl : val.imageUrl,
               image:
                 values.repoAccountName === undefined ||
-                values.repoAccountName === ''
+                  values.repoAccountName === ''
                   ? `${values.repoName}:${values.repoImageTag}`
                   : `${registryHost}/${values.repoAccountName}/${values.repoName}:${values.repoImageTag}`,
               name: 'container-0',
               resourceCpu:
                 val.selectionMode === 'quick'
                   ? {
-                      max: `${val.cpu}m`,
-                      min: `${val.cpu}m`,
-                    }
+                    max: `${val.cpu}m`,
+                    min: `${val.cpu}m`,
+                  }
                   : {
-                      max: `${val.manualCpuMax}m`,
-                      min: `${val.manualCpuMin}m`,
-                    },
+                    max: `${val.manualCpuMax}m`,
+                    min: `${val.manualCpuMin}m`,
+                  },
               resourceMemory:
                 val.selectionMode === 'quick'
                   ? {
-                      max: `${(
-                        (values.cpu || 1) * parseValue(values.memPerCpu, 4)
-                      ).toFixed(2)}Mi`,
-                      min: `${val.cpu}Mi`,
-                    }
+                    max: `${(
+                      (values.cpu || 1) * parseValue(values.memPerCpu, 4)
+                    ).toFixed(2)}Mi`,
+                    min: `${val.cpu}Mi`,
+                  }
                   : {
-                      max: `${val.manualMemMax}Mi`,
-                      min: `${val.manualMemMin}Mi`,
-                    },
+                    max: `${val.manualMemMax}Mi`,
+                    min: `${val.manualMemMin}Mi`,
+                  },
             },
           ],
         },
@@ -200,6 +200,8 @@ const AppCompute = () => {
     }
   );
 
+  console.log('vau', values);
+
   return (
     <FadeIn
       onSubmit={(e) => {
@@ -286,8 +288,8 @@ const AppCompute = () => {
             errors.repoImageTag
               ? errors.repoImageTag
               : digestError
-              ? 'Failed to load Image tags.'
-              : ''
+                ? 'Failed to load Image tags.'
+                : ''
           }
           loading={digestLoading}
         />