Browse Source

update UI

Signed-off-by: ryjiang <jiangruiyi@gmail.com>
ryjiang 1 year ago
parent
commit
6199c7c6b4

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

@@ -82,10 +82,9 @@ const Collections = () => {
     CollectionObject[]
   >([]);
 
-  const { setDialog, openSnackBar } = useContext(rootContext);
+  const { setDialog } = useContext(rootContext);
   const { t: collectionTrans } = useTranslation('collection');
   const { t: btnTrans } = useTranslation('btn');
-  const { t: successTrans } = useTranslation('success');
   const { t: commonTrans } = useTranslation();
   const gridTrans = commonTrans('grid');
 
@@ -135,17 +134,7 @@ const Collections = () => {
           open: true,
           type: 'custom',
           params: {
-            component: (
-              <CreateCollectionDialog
-                onCreate={async () => {
-                  openSnackBar(
-                    successTrans('create', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
-                }}
-              />
-            ),
+            component: <CreateCollectionDialog />,
           },
         });
       },
@@ -165,11 +154,6 @@ const Collections = () => {
               <LoadCollectionDialog
                 collection={selectedCollections[0].collection_name}
                 onLoad={async () => {
-                  openSnackBar(
-                    successTrans('load', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
                   setSelectedCollections([]);
                 }}
               />
@@ -201,11 +185,6 @@ const Collections = () => {
               <ReleaseCollectionDialog
                 collection={selectedCollections[0].collection_name}
                 onRelease={async () => {
-                  openSnackBar(
-                    successTrans('release', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
                   setSelectedCollections([]);
                 }}
               />
@@ -273,11 +252,6 @@ const Collections = () => {
             component: (
               <RenameCollectionDialog
                 cb={async (collectionName: string) => {
-                  openSnackBar(
-                    successTrans('rename', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
                   setSelectedCollections([]);
                 }}
                 collectionName={selectedCollections[0].collection_name}
@@ -302,11 +276,6 @@ const Collections = () => {
             component: (
               <DuplicateCollectionDialog
                 cb={async () => {
-                  openSnackBar(
-                    successTrans('duplicate', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
                   setSelectedCollections([]);
                 }}
                 collectionName={selectedCollections[0].collection_name}
@@ -332,11 +301,6 @@ const Collections = () => {
             component: (
               <DropCollectionDialog
                 onDelete={async () => {
-                  openSnackBar(
-                    successTrans('delete', {
-                      name: collectionTrans('collection'),
-                    })
-                  );
                   setSelectedCollections([]);
                 }}
                 collections={selectedCollections}
@@ -420,24 +384,10 @@ const Collections = () => {
                     v.status === LOADING_STATE.UNLOADED ? (
                       <LoadCollectionDialog
                         collectionName={v.collection_name}
-                        onLoad={async () => {
-                          openSnackBar(
-                            successTrans('load', {
-                              name: collectionTrans('collection'),
-                            })
-                          );
-                        }}
                       />
                     ) : (
                       <ReleaseCollectionDialog
                         collectionName={v.collection_name}
-                        onRelease={async () => {
-                          openSnackBar(
-                            successTrans('release', {
-                              name: collectionTrans('collection'),
-                            })
-                          );
-                        }}
                       />
                     ),
                 },

+ 10 - 1
client/src/pages/dialogs/CreateCollectionDialog.tsx

@@ -59,9 +59,10 @@ const useStyles = makeStyles((theme: Theme) => ({
 const CreateCollectionDialog: FC<CollectionCreateProps> = ({ onCreate }) => {
   const { createCollection } = useContext(dataContext);
   const classes = useStyles();
-  const { handleCloseDialog } = useContext(rootContext);
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const { t: collectionTrans } = useTranslation('collection');
   const { t: btnTrans } = useTranslation('btn');
+  const { t: successTrans } = useTranslation('success');
   const { t: warningTrans } = useTranslation('warning');
 
   const [form, setForm] = useState({
@@ -242,10 +243,18 @@ const CreateCollectionDialog: FC<CollectionCreateProps> = ({ onCreate }) => {
       consistency_level: consistencyLevel,
     };
 
+    // create collection
     await createCollection({
       ...param,
     });
 
+    // show success message
+    openSnackBar(
+      successTrans('create', {
+        name: collectionTrans('collection'),
+      })
+    );
+
     onCreate && onCreate();
     handleCloseDialog();
   };

+ 9 - 1
client/src/pages/dialogs/DropCollectionDialog.tsx

@@ -6,10 +6,11 @@ import { DropCollectionProps } from './Types';
 
 const DropCollectionDialog: FC<DropCollectionProps> = props => {
   const { collections, onDelete } = props;
-  const { handleCloseDialog } = useContext(rootContext);
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const { dropCollection } = useContext(dataContext);
   const { t: collectionTrans } = useTranslation('collection');
   const { t: btnTrans } = useTranslation('btn');
+  const { t: successTrans } = useTranslation('success');
   const { t: dialogTrans } = useTranslation('dialog');
 
   const handleDelete = async () => {
@@ -17,6 +18,13 @@ const DropCollectionDialog: FC<DropCollectionProps> = props => {
       await dropCollection(item.collection_name);
     }
 
+    // show success message
+    openSnackBar(
+      successTrans('delete', {
+        name: collectionTrans('collection'),
+      })
+    );
+
     handleCloseDialog();
     onDelete && (await onDelete());
   };

+ 8 - 1
client/src/pages/dialogs/DuplicateCollectionDailog.tsx

@@ -35,10 +35,11 @@ const DuplicateCollectionDialog: FC<DuplicateCollectionDialogProps> = props => {
 
   const { validation, checkIsValid, disabled } = useFormValidation(checkedForm);
 
-  const { handleCloseDialog } = useContext(rootContext);
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const { t: dialogTrans } = useTranslation('dialog');
   const { t: warningTrans } = useTranslation('warning');
   const { t: collectionTrans } = useTranslation('collection');
+  const { t: successTrans } = useTranslation('success');
   const { t: btnTrans } = useTranslation('btn');
 
   const handleInputChange = (value: string) => {
@@ -48,6 +49,12 @@ const DuplicateCollectionDialog: FC<DuplicateCollectionDialogProps> = props => {
   const handleConfirm = async () => {
     // duplicate
     await duplicateCollection(collectionName, form.duplicate);
+    // show success message
+    openSnackBar(
+      successTrans('duplicate', {
+        name: collectionTrans('collection'),
+      })
+    );
     // close dialog
     handleCloseDialog();
     cb && (await cb(form.duplicate));

+ 9 - 1
client/src/pages/dialogs/LoadCollectionDialog.tsx

@@ -42,9 +42,10 @@ const LoadCollectionDialog = (props: any) => {
   const { collectionName, onLoad } = props;
   const { t: dialogTrans } = useTranslation('dialog');
   const { t: collectionTrans } = useTranslation('collection');
+  const { t: successTrans } = useTranslation('success');
   const { t: btnTrans } = useTranslation('btn');
   const { t: warningTrans } = useTranslation('warning');
-  const { handleCloseDialog } = useContext(rootContext);
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const [form, setForm] = useState({
     replica: 1,
   });
@@ -101,6 +102,13 @@ const LoadCollectionDialog = (props: any) => {
     // load collection request
     await loadCollection(collectionName, params);
 
+    // show success message
+    openSnackBar(
+      successTrans('load', {
+        name: collectionTrans('collection'),
+      })
+    );
+
     // callback
     if (onLoad) {
       await onLoad(collectionName);

+ 10 - 1
client/src/pages/dialogs/ReleaseCollectionDialog.tsx

@@ -19,7 +19,9 @@ const ReleaseCollectionDialog = (props: any) => {
   const { collectionName, onRelease } = props;
   const { t: dialogTrans } = useTranslation('dialog');
   const { t: btnTrans } = useTranslation('btn');
-  const { handleCloseDialog } = useContext(rootContext);
+  const { t: successTrans } = useTranslation('success');
+  const { t: collectionTrans } = useTranslation('collection');
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const [disabled, setDisabled] = useState(false);
 
   // confirm action
@@ -30,6 +32,13 @@ const ReleaseCollectionDialog = (props: any) => {
       // release collection
       await releaseCollection(collectionName);
 
+      // show success message
+      openSnackBar(
+        successTrans('release', {
+          name: collectionTrans('collection'),
+        })
+      );
+
       // execute callback
       onRelease && (await onRelease(collectionName));
       // enable confirm button

+ 7 - 1
client/src/pages/dialogs/RenameCollectionDialog.tsx

@@ -32,9 +32,10 @@ const RenameCollectionDialog: FC<RenameCollectionProps> = props => {
 
   const { validation, checkIsValid, disabled } = useFormValidation(checkedForm);
 
-  const { handleCloseDialog } = useContext(rootContext);
+  const { handleCloseDialog, openSnackBar } = useContext(rootContext);
   const { t: dialogTrans } = useTranslation('dialog');
   const { t: warningTrans } = useTranslation('warning');
+  const { t: successTrans } = useTranslation('success');
   const { t: collectionTrans } = useTranslation('collection');
   const { t: btnTrans } = useTranslation('btn');
 
@@ -44,6 +45,11 @@ const RenameCollectionDialog: FC<RenameCollectionProps> = props => {
 
   const handleConfirm = async () => {
     await renameCollection(collectionName, form.new_collection_name);
+    openSnackBar(
+      successTrans('rename', {
+        name: collectionTrans('collection'),
+      })
+    );
     handleCloseDialog();
     cb && (await cb(form.new_collection_name));
   };