labring · c121914yu · Nov 29, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/frontend/providers/dbprovider/src/pages/api/getSecretByName.ts b/frontend/providers/dbprovider/src/pages/api/getSecretByName.ts
@@ -25,38 +25,49 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       kubeconfig: await authSession(req)
     });
 
+    const base = {
+      passwordKey: 'password',
+      usernameKey: 'username',
+      portKey: 'port',
+      hostKey: 'host'
+    };
+
     const data = await (async () => {
       const dbTypeMap = {
         [DBTypeEnum.postgresql]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'postgresql'
         },
         [DBTypeEnum.mongodb]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'mongodb'
         },
         [DBTypeEnum.mysql]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'mysql'
         },
         [DBTypeEnum.redis]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'redis'
         },
         [DBTypeEnum.kafka]: {
-          passwordKey: 'password',
-          connectKey: 'kafka'
+          ...base,
+          connectKey: 'kafka',
+          passwordKey: 'clientPassword',
+          usernameKey: 'clientUser',
+          portKey: 'endpoint',
+          hostKey: 'superusers'
         },
         [DBTypeEnum.qdrant]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'qdrant'
         },
         [DBTypeEnum.nebula]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'nebula'
         },
         [DBTypeEnum.weaviate]: {
-          passwordKey: 'password',
+          ...base,
           connectKey: 'weaviate'
         }
       };
@@ -69,13 +80,23 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
         return Promise.reject('Get secret errpr');
       }
 
-      const username = Buffer.from(secret.body.data['username'], 'base64').toString('utf-8');
+      const username = Buffer.from(
+        secret.body.data[dbTypeMap[dbType].usernameKey],
+        'base64'
+      ).toString('utf-8');
+
       const password = Buffer.from(
         secret.body.data[dbTypeMap[dbType].passwordKey],
         'base64'
       ).toString('utf-8');
-      const host = Buffer.from(secret.body.data['host'], 'base64').toString('utf-8');
-      const port = Buffer.from(secret.body.data['port'], 'base64').toString('utf-8');
+
+      const host = Buffer.from(secret.body.data[dbTypeMap[dbType].hostKey], 'base64').toString(
+        'utf-8'
+      );
+
+      const port = Buffer.from(secret.body.data[dbTypeMap[dbType].portKey], 'base64').toString(
+        'utf-8'
+      );
 
       return {
         username,

diff --git a/frontend/providers/dbprovider/src/pages/api/getServiceByName.ts b/frontend/providers/dbprovider/src/pages/api/getServiceByName.ts
@@ -21,7 +21,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       data: body
     });
   } catch (err: any) {
-    console.log(err?.body, 'db get service name err');
+    console.log(err?.body, 'api:getServiceByName');
     if (err?.body?.code === 404) {
       return jsonRes(res);
     }

diff --git a/frontend/providers/dbprovider/src/pages/api/getStatefulSetByName.ts b/frontend/providers/dbprovider/src/pages/api/getStatefulSetByName.ts
@@ -50,7 +50,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       data: await GetStatefulSetByName({ name: temp, req })
     });
   } catch (err: any) {
-    console.log(err?.body, 'db get service name err');
+    console.log(err?.body, 'api:getStatefulSetByName');
     jsonRes(res, {
       code: 500,
       error: err

diff --git a/frontend/providers/dbprovider/src/pages/api/monitor/getMonitorData.ts b/frontend/providers/dbprovider/src/pages/api/monitor/getMonitorData.ts
@@ -66,7 +66,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     });
 
     const { dbName, dbType, queryKey, start, end, step } = req.query;
-    console.log(dbName, dbType, queryKey);
 
     const endTime = Date.now(); // 当前时间的时间戳
     const startTime = endTime - 60 * 60 * 1000; // 前向推进1个小时的时间戳
@@ -80,6 +79,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       end: endTime / 1000,
       step: '1m'
     };
+    console.log(params, 'getMonitorData');
 
     const result = await handleAxiosStream(
       {

diff --git a/frontend/providers/dbprovider/src/pages/db/detail/index.tsx b/frontend/providers/dbprovider/src/pages/db/detail/index.tsx
@@ -41,7 +41,7 @@ const AppDetail = ({
   const { t } = useTranslation();
 
   const { listNav } = useMemo(() => {
-    const PublicNetMigration = ['postgresql', 'apecloud-mysql'].includes(dbType);
+    const PublicNetMigration = ['postgresql', 'apecloud-mysql', 'mongodb'].includes(dbType);
     const MigrateSupported = ['postgresql', 'mongodb', 'apecloud-mysql'].includes(dbType);
     const BackupSupported = ['postgresql', 'mongodb', 'apecloud-mysql', 'redis'].includes(dbType);
 

diff --git a/frontend/providers/template/delRoleBinding.ts b/frontend/providers/template/delRoleBinding.ts
diff --git a/service/license/public/locales/en/common.json b/service/license/public/locales/en/common.json
@@ -102,7 +102,8 @@
   "Cluster Pay Success": "Buy {{clusterType}} Success",
   "common": {
     "input": {
-      "Repeat Value": "Repeat Value"
+      "Repeat Value": "Repeat Value",
+      "No Elements to Delete": "No Elements to Delete"
     }
   },
   "Enter Save": "Enter Save"

diff --git a/service/license/public/locales/zh/common.json b/service/license/public/locales/zh/common.json
@@ -102,7 +102,8 @@
   "Cluster Pay Success": "购买 {{clusterType}} 成功",
   "common": {
     "input": {
-      "Repeat Value": "出入重复"
+      "Repeat Value": "出入重复",
+      "No Elements to Delete": "没有元素可以删除"
     }
   },
   "Enter Save": "回车保存"

diff --git a/service/license/src/components/Textarea/TagTextarea.tsx b/service/license/src/components/Textarea/TagTextarea.tsx
@@ -26,22 +26,37 @@ const TagTextarea = ({ defaultValues, onUpdate, inputStyle, ...props }: Props) =
   const [tags, setTags] = useState<string[]>(defaultValues);
 
   const onUpdateValue = useCallback(
-    (value?: string) => {
+    (value?: string, type: 'create' | 'delete' = 'create') => {
       setFocus(false);
-      if (!value || !InputRef.current?.value) {
-        return;
-      }
-      if (tags.includes(value)) {
-        return toast({
-          status: 'error',
-          title: t('common.input.Repeat Value'),
-          position: 'top',
-          duration: 2000
-        });
+      if (type === 'create') {
+        if (!value || !InputRef.current?.value) {
+          return;
+        }
+        if (tags.includes(value)) {
+          return toast({
+            status: 'info',
+            title: t('common.input.Repeat Value'),
+            position: 'top',
+            duration: 2000
+          });
+        }
+        setTags([...tags, value]);
+        onUpdate([...tags, value]);
+        InputRef.current.value = '';
+      } else {
+        if (tags.length === 0) {
+          return toast({
+            status: 'info',
+            title: t('common.input.No Elements to Delete'),
+            position: 'top',
+            duration: 2000
+          });
+        }
+        // Delete the last element
+        tags.pop();
+        setTags(tags);
+        onUpdate(tags);
       }
-      setTags([...tags, value]);
-      onUpdate([...tags, value]);
-      InputRef.current.value = '';
     },
     [onUpdate, t, tags, toast]
   );
@@ -67,6 +82,7 @@ const TagTextarea = ({ defaultValues, onUpdate, inputStyle, ...props }: Props) =
           setFocus(true);
         }
       }}
+      overflowY={'auto'}
     >
       <Flex alignItems={'center'} gap={2} flexWrap={'wrap'}>
         {tags.map((tag, i) => (
@@ -108,6 +124,10 @@ const TagTextarea = ({ defaultValues, onUpdate, inputStyle, ...props }: Props) =
               e.preventDefault();
               onUpdateValue(InputRef.current?.value);
             }
+            if (e.keyCode === 8 && InputRef.current?.value === '') {
+              e.preventDefault();
+              onUpdateValue(InputRef.current?.value, 'delete');
+            }
           }}
           {...inputStyle}
         />

diff --git a/service/license/src/pages/cluster/components/CommandForm.tsx b/service/license/src/pages/cluster/components/CommandForm.tsx
@@ -21,9 +21,14 @@ import { useForm } from 'react-hook-form';
 type CommandFormProps = {
   basePath: string;
   cloudVersion: string;
+  enterprise?: boolean;
 };
 
-export default function CommandForm({ basePath, cloudVersion }: CommandFormProps) {
+export default function CommandForm({
+  basePath,
+  cloudVersion,
+  enterprise = false
+}: CommandFormProps) {
   const { isOpen, onOpen, onClose } = useDisclosure();
   const [displayCommand, setDisplayCommand] = useState('');
   const [copyCommand, setCopyCommand] = useState('');
@@ -42,7 +47,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
       basePath,
       cloudVersion ? ` --cloud-version=${cloudVersion} ` : '',
       ' --image-registry=registry.cn-shanghai.aliyuncs.com ',
-      ' --proxy-prefix=https://gh-proxy.com ',
+      enterprise ? '' : ' --proxy-prefix=https://mirror.ghproxy.com ',
       masterIps ? ` --master-ips=${masterIps} ` : '',
       nodeIps ? ` --node-ips=${nodeIps} ` : '',
       data?.podSubnet ? ` --pod-cidr=${data?.podSubnet} ` : '',
@@ -148,7 +153,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
                   fontWeight: 400
                 }}
                 w={'320px'}
-                h="50px"
+                h="80px"
                 defaultValues={getValues('masterIP') || []}
                 onUpdate={(e) => {
                   setValue('masterIP', e);
@@ -169,7 +174,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
                   fontSize: '12px',
                   fontWeight: 400
                 }}
-                h="50px"
+                h="80px"
                 w={'320px'}
                 defaultValues={getValues('nodeIP') || []}
                 onUpdate={(e) => {
@@ -189,7 +194,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
             <Flex alignItems={'center'} justifyContent={'start'} gap={'40px'}>
               <Label>ssh 密码</Label>
               <Input
-                placeholder="不填则免密登录"
+                placeholder="默认免密登录"
                 {...register('sshPassword', {
                   required: true
                 })}
@@ -212,7 +217,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
               />
             </Flex>
             <Flex alignItems={'center'} justifyContent={'start'} gap={'40px'}>
-              <Label>Sealos Cloud 端口</Label>
+              <Label>Cloud 端口</Label>
               <Input
                 {...register('cloudPort', {
                   required: true
@@ -223,7 +228,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
             <Flex alignItems={'center'} justifyContent={'start'} gap={'40px'}>
               <Label>证书路径</Label>
               <Input
-                placeholder={'不填则使用 Sealos 提供的自签证书'}
+                placeholder={'默认使用 Sealos 提供的自签证书'}
                 {...register('certPath', {
                   required: false
                 })}
@@ -233,7 +238,7 @@ export default function CommandForm({ basePath, cloudVersion }: CommandFormProps
             <Flex alignItems={'center'} justifyContent={'start'} gap={'40px'}>
               <Label>证书 Key 路径</Label>
               <Input
-                placeholder={'不填则使用 Sealos 提供的自签证书'}
+                placeholder={'默认使用 Sealos 提供的自签证书'}
                 {...register('certKeyPath', {
                   required: false
                 })}

diff --git a/service/license/src/pages/cluster/components/Tutorial.tsx b/service/license/src/pages/cluster/components/Tutorial.tsx
@@ -154,6 +154,7 @@ export default function Tutorial({
               <CommandForm
                 basePath={`tar xzvf ${fileNameParams} && cd sealos-cloud && bash install.sh `}
                 cloudVersion={ossVersion}
+                enterprise={true}
               />
             </AccordionPanel>
           </AccordionItem>
@@ -169,7 +170,7 @@ export default function Tutorial({
           </AccordionButton>
           <AccordionPanel py="20px" pl="40px" gap={'12px'}>
             <CommandForm
-              basePath={`curl -sfL https://gh-proxy.com/https://raw.githubusercontent.com/labring/sealos/main/scripts/cloud/install.sh -o /tmp/install.sh && bash scripts/load-images.sh  && /tmp/install.sh --zh `}
+              basePath={`curl -sfL https://mirror.ghproxy.com/https://raw.githubusercontent.com/labring/sealos/main/scripts/cloud/install.sh -o /tmp/install.sh && bash scripts/load-images.sh  && bash /tmp/install.sh --zh `}
               cloudVersion={ossVersion}
             />
             <Center