Merge pull request #252 from zilliztech/fix-role-update

this fix #251
zilliztech · Aug 28, 2023 · 93b62fa · 93b62fa
2 parents c17b44b + 273b4d9
commit 93b62fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/client/src/pages/user/Roles.tsx b/client/src/pages/user/Roles.tsx
@@ -66,7 +66,11 @@ const Roles = () => {
 
   const onUpdate = async (data: { isEditing: boolean }) => {
     fetchRoles();
-    openSnackBar(successTrans('create', { name: userTrans('role') }));
+    openSnackBar(
+      successTrans(data.isEditing ? 'update' : 'create', {
+        name: userTrans('role'),
+      })
+    );
     handleCloseDialog();
   };
 

diff --git a/client/src/pages/user/UpdateRoleDialog.tsx b/client/src/pages/user/UpdateRoleDialog.tsx
@@ -116,7 +116,9 @@ const UpdateRoleDialog: FC<CreateRoleProps> = ({
   };
 
   const onChange = (newSelection: any) => {
-    setForm(v => ({ ...v, privileges: [...newSelection] }));
+    setForm(v => {
+      return { ...v, privileges: [...newSelection] };
+    });
   };
 
   const optionGroups: PrivilegeOptionsProps[] = [

diff --git a/server/src/users/users.controller.ts b/server/src/users/users.controller.ts
@@ -231,7 +231,7 @@ export class UserController {
 
     try {
       // revoke all
-      this.userService.revokeAllRolePrivileges({ roleName });
+      await this.userService.revokeAllRolePrivileges({ roleName });
 
       // assign new user roles
       for (let i = 0; i < privileges.length; i++) {