From cd42be468b6175e8bea80a8a4d2a83d88b6040ed Mon Sep 17 00:00:00 2001 From: dhruv Date: Thu, 25 Jan 2024 07:36:58 +0530 Subject: [PATCH 1/2] "Update roles in 'Create User if a new role is added" --- src/pages/AccessManagement/Roles.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/AccessManagement/Roles.tsx b/src/pages/AccessManagement/Roles.tsx index 23d0a373..44bf8a80 100644 --- a/src/pages/AccessManagement/Roles.tsx +++ b/src/pages/AccessManagement/Roles.tsx @@ -56,7 +56,7 @@ const Roles: FC = () => { }; }, []); - let rows = + const rows = getRolesIsSuccess && getRolesData?.data ? ( getRolesData?.data.map((role: any) => { return ( @@ -108,7 +108,7 @@ const Roles: FC = () => { }; const handleCreateRole = () => { - let userRole: any = []; + const userRole: any = []; if (selectedPrivilege === 'admin' || selectedPrivilege === 'editor') { userRole?.push({ privilege: selectedPrivilege, @@ -135,6 +135,7 @@ const Roles: FC = () => { } } updateRoleMutation({ userName: createRoleInput, privilege: userRole }); + getRolesRefetch(); handleClose(); }; @@ -258,7 +259,7 @@ const Roles: FC = () => { - + Date: Thu, 25 Jan 2024 07:54:20 +0530 Subject: [PATCH 2/2] Disable create button if user got created --- src/pages/AccessManagement/Users.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pages/AccessManagement/Users.tsx b/src/pages/AccessManagement/Users.tsx index 3c5fda7e..297ea2fc 100644 --- a/src/pages/AccessManagement/Users.tsx +++ b/src/pages/AccessManagement/Users.tsx @@ -51,7 +51,7 @@ const Users: FC = () => { const { getRolesData } = useRole(); - let rows = + const rows = getUserIsSuccess && getUserData?.data ? ( getUserData?.data.map((user: any) => { return ( @@ -88,7 +88,7 @@ const Users: FC = () => { }; const handleCreateUser = () => { - let userRole: any = []; + const userRole: any = []; if (SelectedRole !== '') { userRole.push(SelectedRole); } @@ -99,7 +99,6 @@ const Users: FC = () => { if (getUserData?.data?.includes(createUserInput) || createUserInput.length < 3) { return true; } - if (SelectedRole !== '') { if (getRolesData?.data?.includes(SelectedRole)) { return false; @@ -201,7 +200,7 @@ const Users: FC = () => { color="gray" className={classes.modalActionBtn} onClick={handleCreateUser} - disabled={createVaildtion()}> + disabled={createVaildtion() || !!createUserData?.data}> Create