feat:db delete some databases (#4379)

* feat:db delete some databases Signed-off-by: jingyang <3161362058@qq.com> * license command Signed-off-by: jingyang <3161362058@qq.com> * fix --------- Signed-off-by: jingyang <3161362058@qq.com>
labring · Dec 5, 2023 · b6654c4 · b6654c4
1 parent d518f58
commit b6654c4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/frontend/providers/dbprovider/src/constants/db.ts b/frontend/providers/dbprovider/src/constants/db.ts
@@ -160,10 +160,10 @@ export const DBTypeList = [
   { id: DBTypeEnum.mongodb, label: 'mongo' },
   { id: DBTypeEnum.mysql, label: 'mysql' },
   { id: DBTypeEnum.redis, label: 'redis' },
-  { id: DBTypeEnum.kafka, label: 'kafka' },
-  { id: DBTypeEnum.qdrant, label: 'qdrant' },
-  { id: DBTypeEnum.nebula, label: 'nebula' },
-  { id: DBTypeEnum.weaviate, label: 'weaviate' }
+  { id: DBTypeEnum.kafka, label: 'kafka' }
+  // { id: DBTypeEnum.qdrant, label: 'qdrant' },
+  // { id: DBTypeEnum.nebula, label: 'nebula' },
+  // { id: DBTypeEnum.weaviate, label: 'weaviate' }
 ];
 
 export const DBComponentNameMap = {

diff --git a/frontend/providers/dbprovider/src/pages/api/delDBByName.ts b/frontend/providers/dbprovider/src/pages/api/delDBByName.ts
@@ -12,6 +12,7 @@ import { DeleteJobByName, GetJobByName } from './migrate/delJobByName';
 export default async function handler(req: NextApiRequest, res: NextApiResponse<ApiResp>) {
   try {
     const { name } = req.query as { name: string };
+
     if (!name) {
       throw new Error('deploy name is empty');
     }
@@ -29,13 +30,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
     });
 
     // get migrates and delete
-    const migrates = await getMigrateList({ migrateName: name, req });
-    console.log(migrates, 'migrates');
-    await Promise.all(
-      migrates.map((item) => delMigrateByName({ migrateName: item.metadata.name, req }))
-    ).catch((error) => {
+    try {
+      const migrates = await getMigrateList({ migrateName: name, req });
+      await Promise.all(
+        migrates.map((item) => delMigrateByName({ migrateName: item.metadata.name, req }))
+      );
+    } catch (error) {
       console.log(error);
-    });
+    }
 
     // get backup and delete
     const backups = await getBackups({ dbName: name, req });
@@ -68,6 +70,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 
     jsonRes(res, { data: result?.body });
   } catch (err: any) {
+    console.log(err, 'delete db by name err');
     jsonRes(res, {
       code: 500,
       error: err

diff --git a/frontend/providers/dbprovider/src/services/request.ts b/frontend/providers/dbprovider/src/services/request.ts
@@ -133,7 +133,7 @@ export function DELETE<T = any>(
   data?: { [key: string]: any },
   config?: AxiosRequestConfig
 ): Promise<T> {
-  return request.get(url, {
+  return request.delete(url, {
     params: data,
     ...config
   });

diff --git a/service/license/src/pages/cluster/components/CommandForm.tsx b/service/license/src/pages/cluster/components/CommandForm.tsx
@@ -46,7 +46,7 @@ export default function CommandForm({
     const commandParts = [
       basePath,
       cloudVersion ? ` --cloud-version=${cloudVersion} ` : '',
-      ' --image-registry=registry.cn-shanghai.aliyuncs.com ',
+      enterprise ? '' : ' --image-registry=registry.cn-shanghai.aliyuncs.com ',
       enterprise ? '' : ' --proxy-prefix=https://mirror.ghproxy.com ',
       masterIps ? ` --master-ips=${masterIps} ` : '',
       nodeIps ? ` --node-ips=${nodeIps} ` : '',

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