Processed immediate activity in Setting/UserGroup.

Author: Imiss-U1025

client/packages/lowcoder/src/pages/setting/permission/addGroupUserDialog.tsx

@@ -31,8 +31,10 @@ function AddGroupUserDialog(props: {
   orgUsersFetching: boolean;
   groupUsers: GroupUser[];
   style?: CSSProperties;
+  setModify?: any;
+  modify?: boolean
 }) {
-  const { orgId, orgUsers, orgUsersFetching, groupUsers, groupId } = props;
+  const { orgId, orgUsers, orgUsersFetching, groupUsers, groupId, setModify, modify } = props;
   const groupUserIdMap = new Map(groupUsers.map((gUser) => [gUser.userId, gUser]));
   const [dialogVisible, setDialogVisible] = useState(false);
   const addableUsers = orgUsers.filter((user) => !groupUserIdMap.has(user.userId));
@@ -83,6 +85,9 @@ function AddGroupUserDialog(props: {
             }
           }
           dispatch(fetchGroupUsersAction({ groupId }));
+          setTimeout(() => {
+            setModify(!modify);
+          }, 200);
           setDialogVisible(false);
         }}
       >

client/packages/lowcoder/src/pages/setting/permission/groupUsersPermission.tsx

@@ -45,11 +45,13 @@ type GroupPermissionProp = {
   groupUsersFetching: boolean;
   currentUserGroupRole: string;
   currentUser: User;
+  setModify?: any;
+  modify?: boolean;
 };
 
 function GroupUsersPermission(props: GroupPermissionProp) {
   const { Column } = TableStyled;
-  const { group, orgId, groupUsersFetching, groupUsers, currentUserGroupRole, currentUser } = props;
+  const { group, orgId, groupUsersFetching, groupUsers, currentUserGroupRole, currentUser , setModify, modify} = props;
   const adminCount = groupUsers.filter((user) => isGroupAdmin(user.role)).length;
   const sortedGroupUsers = useMemo(() => {
     return [...groupUsers].sort((a, b) => {
@@ -83,6 +85,8 @@ function GroupUsersPermission(props: GroupPermissionProp) {
             groupUsers={groupUsers}
             orgId={orgId}
             groupId={group.groupId}
+            setModify={setModify}
+            modify={modify}
             trigger={
               <AddMemberButton buttonType="primary" icon={<StyledAddIcon />}>
                 {trans("memberSettings.addMember")}
@@ -145,6 +149,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                     groupId: group.groupId,
                   })
                 );
+                  setTimeout(() => {
+                      setModify(!modify);
+                  }, 200);
               }}
             >
               {TacoRoles.map((role) => (
@@ -175,6 +182,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                           dispatch(
                             quitGroupAction({ groupId: group.groupId, userId: currentUser.id })
                           );
+                            setTimeout(() => {
+                                setModify(!modify);
+                            }, 200);
                         }}
                       >
                         {trans("memberSettings.exitGroup")}
@@ -190,6 +200,9 @@ function GroupUsersPermission(props: GroupPermissionProp) {
                               groupId: group.groupId,
                             })
                           );
+                            setTimeout(() => {
+                                setModify(!modify);
+                            }, 200);
                         }}
                       >
                         {trans("memberSettings.moveOutGroup")}

client/packages/lowcoder/src/pages/setting/permission/orgUsersPermission.tsx

@@ -58,11 +58,13 @@ type UsersPermissionProp = {
   orgUsers: OrgUser[];
   orgUsersFetching: boolean;
   currentUser: User;
+  setModify?: any;
+  modify?: boolean;
 };
 
 function OrgUsersPermission(props: UsersPermissionProp) {
   const { Column } = TableStyled;
-  const { orgId, orgUsers, orgUsersFetching, currentUser } = props;
+  const { orgId, orgUsers, orgUsersFetching, currentUser , setModify, modify} = props;
   const adminCount = orgUsers.filter(
     (user) => user.role === ADMIN_ROLE || user.role === SUPER_ADMIN_ROLE,
   ).length;
@@ -277,6 +279,9 @@ function OrgUsersPermission(props: UsersPermissionProp) {
                                 orgId: orgId,
                               })
                             );
+                              setTimeout(() => {
+                                  setModify(!modify);
+                              }, 200);
                           },
                           confirmBtnType: "delete",
                           okText: trans("memberSettings.moveOutOrg"),

client/packages/lowcoder/src/pages/setting/permission/permissionDetail.tsx

@@ -29,6 +29,7 @@ export default function PermissionSetting() {  const user = useSelector(getUser)
   const [orgMemberElements, setOrgMemberElements] = useState<any>({ elements: [], total: 0 })
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
+  const [modify, setModify] = useState(false);
 
   const orgId = user.currentOrgId;
   const orgGroups = useSelector(getOrgGroups);
@@ -79,7 +80,7 @@ export default function PermissionSetting() {  const user = useSelector(getUser)
           }
       )
       },
-      [currentPage, pageSize]
+      [currentPage, pageSize, modify]
   )
 
   if (!orgId) {
@@ -96,6 +97,8 @@ export default function PermissionSetting() {  const user = useSelector(getUser)
                   // orgUsers={!orgMemberElements.elements.members ? [] : orgMemberElements.elements.members}
                   orgUsers={orgMemberElements.elements}
                   currentUser={currentUser}
+                  setModify={setModify}
+                  modify={modify}
               />
               <PaginationComp setCurrentPage={setCurrentPage} setPageSize={setPageSize} currentPage={currentPage} pageSize={pageSize} total={orgMemberElements.total} />
             </>
@@ -109,6 +112,8 @@ export default function PermissionSetting() {  const user = useSelector(getUser)
                       groupUsersFetching={groupUsersFetching}
                       currentUserGroupRole={currentUserGroupRole}
                       currentUser={currentUser}
+                      setModify={setModify}
+                      modify={modify}
                   />
                   <PaginationComp setCurrentPage={setCurrentPage} setPageSize={setPageSize} currentPage={currentPage} pageSize={pageSize} total={elements.total} />
                 </>

client/packages/lowcoder/src/pages/setting/permission/permissionList.tsx

@@ -68,6 +68,7 @@ export default function PermissionSetting() {
   const [elements, setElements] = useState<ElementsState>({ elements: [], total: 0 });
   const [currentPage, setCurrentPage] = useState(1);
   const [pageSize, setPageSize] = useState(10);
+  const [modify, setModify] = useState(false);
 
   useEffect( () => {
     fetchOrgGroups(
@@ -82,7 +83,7 @@ export default function PermissionSetting() {
       else
         console.error("ERROR: fetchFolderElements", result.error)
     })
-      }, [currentPage, pageSize]
+      }, [currentPage, pageSize, modify]
   )
   const visibleOrgGroups = elements.elements.filter((g) => !g.allUsersGroup);
   const allUsersGroup = elements.elements.find((g) => g.allUsersGroup);
@@ -116,6 +117,9 @@ export default function PermissionSetting() {
           setTimeout(() => {
             dispatch(fetchGroupsAction(orgId));
           }, 200);
+          setTimeout(() => {
+            setModify(!modify);
+          }, 200);
         }
       })
       .catch((e) => {
@@ -130,6 +134,9 @@ export default function PermissionSetting() {
       .then((resp) => {
         if (validateResponse(resp)) {
           dispatch(fetchGroupsAction(orgId));
+          setTimeout(() => {
+            setModify(!modify);
+          }, 200);
         }
       })
       .catch((e) => {
@@ -201,6 +208,9 @@ export default function PermissionSetting() {
                           return;
                         }
                         dispatch(updateGroupAction(record.key, { groupName: value }, orgId));
+                        setTimeout(() => {
+                          setModify(!modify);
+                        }, 200);
                         setNeedRenameId(undefined);
                       },
                     }}