Browse Source

resolve conflict

tumao 4 years ago
parent
commit
ff9bc35e11

+ 4 - 0
client/src/http/Collection.ts

@@ -35,6 +35,10 @@ export class CollectionHttp extends BaseModel implements CollectionView {
     });
     });
   }
   }
 
 
+  static deleteCollection(collectionName: string) {
+    return super.delete({ path: `${this.COLLECTIONS_URL}/${collectionName}` });
+  }
+
   get _autoId() {
   get _autoId() {
     return this.autoID;
     return this.autoID;
   }
   }

+ 1 - 0
client/src/i18n/cn/success.ts

@@ -2,6 +2,7 @@ const successTrans = {
   connect: 'Connet milvus success',
   connect: 'Connet milvus success',
   create: `{{name}} has been created`,
   create: `{{name}} has been created`,
   load: `{{name}} has been loaded`,
   load: `{{name}} has been loaded`,
+  delete: `{{name}} has been deleted`,
 };
 };
 
 
 export default successTrans;
 export default successTrans;

+ 1 - 0
client/src/i18n/en/success.ts

@@ -2,6 +2,7 @@ const successTrans = {
   connect: 'Connet milvus success',
   connect: 'Connet milvus success',
   create: `{{name}} has been created`,
   create: `{{name}} has been created`,
   load: `{{name}} has been loaded`,
   load: `{{name}} has been loaded`,
+  delete: `{{name}} has been deleted`,
 };
 };
 
 
 export default successTrans;
 export default successTrans;

+ 9 - 2
client/src/pages/collections/Collections.tsx

@@ -121,7 +121,13 @@ const Collections = () => {
   const handleLoad = async (data: CollectionView) => {};
   const handleLoad = async (data: CollectionView) => {};
 
 
   const handleDelete = async () => {
   const handleDelete = async () => {
-    console.log('selected', selectedCollections);
+    for (const item of selectedCollections) {
+      await CollectionHttp.deleteCollection(item._name);
+    }
+    openSnackBar(successTrans('delete', { name: t('collection') }));
+    fetchData();
+    handleCloseDialog();
+    setSelectedCollections([]);
   };
   };
 
 
   const toolbarConfigs: ToolBarConfig[] = [
   const toolbarConfigs: ToolBarConfig[] = [
@@ -160,6 +166,7 @@ const Collections = () => {
       },
       },
       label: t('delete'),
       label: t('delete'),
       icon: 'delete',
       icon: 'delete',
+      disabled: data => data.length === 0,
     },
     },
   ];
   ];
 
 
@@ -252,7 +259,7 @@ const Collections = () => {
           colDefinitions={colDefinitions}
           colDefinitions={colDefinitions}
           rows={collectionList}
           rows={collectionList}
           rowCount={total}
           rowCount={total}
-          primaryKey="id"
+          primaryKey="_name"
           openCheckBox={true}
           openCheckBox={true}
           showHoverStyle={true}
           showHoverStyle={true}
           selected={selectedCollections}
           selected={selectedCollections}