diff --git a/web/package.json b/web/package.json index eb44b4420..6b73673b7 100644 --- 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 index 80118b9dd..cde05dbba 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -18,8 +18,8 @@ dependencies: specifier: ^2.3.0 version: 2.3.0(react@18.2.0) '@oshq/react-select': - specifier: ^1.4.1 - version: 1.4.1(@radix-ui/react-portal@1.0.4)(classnames@2.5.1)(framer-motion@10.17.8)(rc-virtual-list@3.11.4)(react@18.2.0) + specifier: ^1.4.2 + version: 1.4.2(@radix-ui/react-portal@1.0.4)(classnames@2.5.1)(framer-motion@10.17.8)(rc-virtual-list@3.11.4)(react@18.2.0) '@radix-ui/primitive': specifier: ^1.0.1 version: 1.0.1 @@ -2664,8 +2664,8 @@ packages: json-parse-even-better-errors: 2.3.1 dev: true - /@oshq/react-select@1.4.1(@radix-ui/react-portal@1.0.4)(classnames@2.5.1)(framer-motion@10.17.8)(rc-virtual-list@3.11.4)(react@18.2.0): - resolution: {integrity: sha512-ftP4UtE7SflDloFUUar45PzwFcivUCOHeJsO/59g2NiCQ7flAF1FGsBValIRZx3h8pe3/nPotvLL+u118oySJQ==} + /@oshq/react-select@1.4.2(@radix-ui/react-portal@1.0.4)(classnames@2.5.1)(framer-motion@10.17.8)(rc-virtual-list@3.11.4)(react@18.2.0): + resolution: {integrity: sha512-yQwzBxFb5z2XwmuEZHLdJGmpzn1+Xo+zn5u/DV1FzvUKlRUWXo/ChQ73ZG62uN/mODTEJhsUW8SbPiP93G89iw==} peerDependencies: '@radix-ui/react-portal': ^1.0.4 classnames: ^2.3.2 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 index 1df4ae993..e37144968 100644 --- 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 ( { @@ -286,8 +288,8 @@ const AppCompute = () => { errors.repoImageTag ? errors.repoImageTag : digestError - ? 'Failed to load Image tags.' - : '' + ? 'Failed to load Image tags.' + : '' } loading={digestLoading} />