fix delete database

Signed-off-by: shanghaikid <jiangruiyi@gmail.com>

client/src/pages/database/Database.tsx

@@ -39,14 +39,14 @@ const Database = () => {
   };
 
   const handleDelete = async () => {
-    for (const user of selectedDatabase) {
+    for (const db of selectedDatabase) {
       const param: DropDatabaseParams = {
-        db_name: user.name,
+        db_name: db.name,
       };
       await DatabaseHttp.dropDatabase(param);
     }
 
-    openSnackBar(successTrans('delete', { name: dbTrans('user') }));
+    openSnackBar(successTrans('delete', { name: dbTrans('database') }));
     fetchDatabases();
     handleCloseDialog();
   };
@@ -81,7 +81,9 @@ const Database = () => {
             component: (
               <DeleteTemplate
                 label={btnTrans('drop')}
-                title={dialogTrans('deleteTitle', { type: dbTrans('database') })}
+                title={dialogTrans('deleteTitle', {
+                  type: dbTrans('database'),
+                })}
                 text={dbTrans('deleteWarning')}
                 handleDelete={handleDelete}
               />

server/src/database/databases.controller.ts

@@ -2,7 +2,7 @@ import { NextFunction, Request, Response, Router } from 'express';
 import { dtoValidationMiddleware } from '../middlewares/validation';
 import { milvusService } from '../milvus';
 import { DatabasesService } from './databases.service';
-import { CreateDatabaseDto, DropDatabaseDto } from './dto';
+import { CreateDatabaseDto } from './dto';
 
 export class DatabasesController {
   private databasesService: DatabasesService;
@@ -25,11 +25,9 @@ export class DatabasesController {
       dtoValidationMiddleware(CreateDatabaseDto),
       this.createDatabase.bind(this)
     );
-    this.router.delete(
-      '/',
-      dtoValidationMiddleware(DropDatabaseDto),
-      this.createDatabase.bind(this)
-    );
+
+    this.router.delete('/:name', this.dropDatabase.bind(this));
+
     return this.router;
   }
 
@@ -55,9 +53,9 @@ export class DatabasesController {
   }
 
   async dropDatabase(req: Request, res: Response, next: NextFunction) {
-    const dropDatabaseData = req.body;
+    const db_name = req.params?.name;
     try {
-      const result = await this.databasesService.dropDatabase(dropDatabaseData);
+      const result = await this.databasesService.dropDatabase({ db_name });
       res.send(result);
     } catch (error) {
       next(error);

server/src/database/databases.service.ts

@@ -9,7 +9,7 @@ import { throwErrorFromSDK } from '../utils/Error';
 export class DatabasesService {
   constructor(private milvusService: MilvusService) {}
 
-  async createDatabase(data?: CreateDatabaseRequest) {
+  async createDatabase(data: CreateDatabaseRequest) {
     const res = await this.milvusService.client.createDatabase(data);
     throwErrorFromSDK(res);
     return res;
@@ -21,9 +21,9 @@ export class DatabasesService {
     return res;
   }
 
-  async dropDatabase(data?: DropDatabasesRequest) {
-    const res = await this.milvusService.client.listDatabases(data);
-    throwErrorFromSDK(res.status);
+  async dropDatabase(data: DropDatabasesRequest) {
+    const res = await this.milvusService.client.dropDatabase(data);
+    throwErrorFromSDK(res);
     return res;
   }
 

server/src/database/dto.ts

@@ -4,8 +4,3 @@ export class CreateDatabaseDto {
   @IsString()
   readonly db_name: string;
 }
-
-export class DropDatabaseDto {
-  @IsString()
-  readonly db_name: string;
-}