fix:desktop password login and static host (#4639)

Signed-off-by: jingyang <3161362058@qq.com>
labring · Mar 28, 2024 · 851cd69 · 851cd69
1 parent df38d07
commit 851cd69
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 15 deletions.
diff --git a/frontend/desktop/src/components/region/RegionToggle.tsx b/frontend/desktop/src/components/region/RegionToggle.tsx
@@ -36,6 +36,7 @@ export default function RegionToggle() {
     target.searchParams.append('token', token);
     await router.replace(target);
   };
+
   return (
     <>
       <HStack h="36px" borderRadius={'12px'} position={'relative'}>
@@ -127,7 +128,7 @@ export default function RegionToggle() {
                             <Text>{t('Description')}</Text>
                           </HStack>
                           <Text color={'#111824'} lineHeight={'20px'}>
-                            {t(region?.description?.description?.zh)}
+                            {region?.description?.description?.[i18n.language as 'zh' | 'en']}
                           </Text>
                         </Box>
                       </Box>

diff --git a/frontend/desktop/src/pages/api/auth/password/exist.ts b/frontend/desktop/src/pages/api/auth/password/exist.ts
@@ -22,7 +22,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
     // const userRes = await findUser({realUserUid: payload.realUserUid})
     // const passwordProvider = userRes?.oauthProvider.find(val=>val.providerType === ProviderType.PASSWORD)
-    const isExist = globalPrisma.oauthProvider.findUnique({
+    const isExist = await globalPrisma.oauthProvider.findUnique({
       where: {
         providerId_providerType: {
           providerType: ProviderType.PASSWORD,

diff --git a/frontend/packages/client-sdk/src/utils/kubernetes.ts b/frontend/packages/client-sdk/src/utils/kubernetes.ts
@@ -35,7 +35,7 @@ function K8sApi(config: string): k8s.KubeConfig {
       name: cluster.name,
       caData: cluster.caData,
       caFile: cluster.caFile,
-      server: inCluster && hosts ? hosts : 'https://apiserver.cluster.local:6443',
+      server: inCluster && hosts ? hosts : cluster.server,
       skipTLSVerify: cluster.skipTLSVerify
     };
 

diff --git a/frontend/providers/applaunchpad/src/pages/app/edit/components/Form.tsx b/frontend/providers/applaunchpad/src/pages/app/edit/components/Form.tsx
@@ -393,15 +393,15 @@ const Form = ({
                     disabled={isEdit}
                     title={isEdit ? t('Not allowed to change app name') || '' : ''}
                     autoFocus={true}
-                    maxLength={30}
+                    maxLength={60}
                     placeholder={
                       t(
                         'Starts with a letter and can contain only lowercase letters, digits, and hyphens (-)'
                       ) || ''
                     }
                     {...register('appName', {
                       required: t('Not allowed to change app name') || '',
-                      maxLength: 30,
+                      maxLength: 60,
                       pattern: {
                         value: /^[a-z][a-z0-9]+([-.][a-z0-9]+)*$/g,
                         message: t(

diff --git a/frontend/providers/applaunchpad/src/pages/app/edit/index.tsx b/frontend/providers/applaunchpad/src/pages/app/edit/index.tsx
@@ -212,7 +212,7 @@ const EditApp = ({ appName, tabType }: { appName?: string; tabType: string }) =>
   const submitError = useCallback(() => {
     // deep search message
     const deepSearch = (obj: any): string => {
-      if (!obj) return t('Submit Error');
+      if (!obj || typeof obj !== 'object') return t('Submit Error');
       if (!!obj.message) {
         return obj.message;
       }

diff --git a/frontend/providers/applaunchpad/src/services/backend/kubernetes.ts b/frontend/providers/applaunchpad/src/services/backend/kubernetes.ts
@@ -33,7 +33,7 @@ export function K8sApi(config: string): k8s.KubeConfig {
       name: cluster.name,
       caData: cluster.caData,
       caFile: cluster.caFile,
-      server: inCluster && hosts ? hosts : 'https://apiserver.cluster.local:6443',
+      server: inCluster && hosts ? hosts : cluster.server,
       skipTLSVerify: cluster.skipTLSVerify
     };
 

diff --git a/frontend/providers/dbprovider/src/pages/db/edit/index.tsx b/frontend/providers/dbprovider/src/pages/db/edit/index.tsx
@@ -136,7 +136,7 @@ const EditApp = ({ dbName, tabType }: { dbName?: string; tabType?: 'form' | 'yam
   const submitError = useCallback(() => {
     // deep search message
     const deepSearch = (obj: any): string => {
-      if (!obj) return t('Submit Error');
+      if (!obj || typeof obj !== 'object') return t('Submit Error');
       if (!!obj.message) {
         return obj.message;
       }

diff --git a/frontend/providers/objectstorage/src/components/BucketContainer/HostStatus.tsx b/frontend/providers/objectstorage/src/components/BucketContainer/HostStatus.tsx
@@ -6,6 +6,7 @@ import {
   Circle,
   HStack,
   IconButton,
+  Link,
   Menu,
   MenuButton,
   MenuItem,
@@ -97,9 +98,12 @@ export function HostStatus() {
         </HStack>
       ) : (
         <HStack>
-          <Text>
-            {t('Current Domain')}: {domain}
-          </Text>
+          <Box>
+            {t('Current Domain')}:
+            <Link href={`https://${domain}`} isExternal style={{ textDecoration: 'none' }}>
+              {domain}
+            </Link>
+          </Box>
           <StatusTag hostStatus={hostStatus} />
           <Menu>
             <MenuButton
@@ -120,7 +124,7 @@ export function HostStatus() {
                   const name = `static-host-${currentBucket?.name}`;
                   sealosApp.runEvents('openDesktopApp', {
                     appKey: 'system-applaunchpad',
-                    pathname: '/app/detail',
+                    pathname: '/app/edit',
                     query: { name },
                     messageData: { type: 'InternalAppCall', name }
                   });

diff --git a/frontend/providers/objectstorage/src/pages/api/site/openHost.ts b/frontend/providers/objectstorage/src/pages/api/site/openHost.ts
@@ -19,8 +19,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
           runCMD: '',
           cmdParam: '',
           replicas: 1,
-          cpu: 1000,
-          memory: 512,
+          cpu: 200,
+          memory: 128,
           networks: [
             {
               networkName: `network-${appName}`,

diff --git a/frontend/providers/objectstorage/src/pages/api/site/status.ts b/frontend/providers/objectstorage/src/pages/api/site/status.ts
@@ -14,7 +14,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     const headers = {
       Authorization: req.headers.authorization
     };
-    console.log(headers);
     const result = await appLanuchPadClient.get('/getAppByAppName', {
       headers,
       params: {