Skip to content

Commit 24469a3

Browse files
committed
Fixed loading indicator in setting/permission.
1 parent 071e0ab commit 24469a3

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function GroupUsersPermission(props: GroupPermissionProp) {
9898
dataSource={sortedGroupUsers}
9999
rowKey="userId"
100100
pagination={false}
101-
loading={groupUsersFetching}
101+
loading={groupUsers.length === 0}
102102
>
103103
<Column
104104
title={trans("memberSettings.nameColumn")}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ function OrgUsersPermission(props: UsersPermissionProp) {
151151
dataSource={sortedOrgUsers}
152152
rowKey="userId"
153153
pagination={false}
154-
loading={orgUsersFetching}
154+
loading={orgUsers.length === 0}
155155
>
156156
<Column
157157
title={trans("memberSettings.nameColumn")}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,17 @@ export default function PermissionSetting() { const user = useSelector(getUser)
3939
const orgUsersFetching = useSelector((state: AppState) => state.ui.org.orgUsersFetching);
4040

4141
const groupIdMap = new Map(orgGroups.map((group) => [group.groupId, group]));
42+
const dispatch = useDispatch();
4243
const selectKey = useParams<{ groupId: string }>().groupId;
44+
useEffect(() => {
45+
if (!orgId) {
46+
return;
47+
}
48+
dispatch(fetchGroupsAction(orgId));
49+
}, [orgId]);
4350

4451
useEffect( () => {
45-
if (selectKey !== "users")
52+
if (selectKey !== "users" && !!groupIdMap.get(selectKey))
4653
fetchGroupUsrPagination(
4754
{
4855
groupId: groupIdMap.get(selectKey)!.groupId,
@@ -73,7 +80,7 @@ export default function PermissionSetting() { const user = useSelector(getUser)
7380
}
7481
)
7582
},
76-
[currentPage, pageSize, modify]
83+
[currentPage, pageSize, modify, groupIdMap.get(selectKey)]
7784
)
7885

7986
if (!orgId) {

0 commit comments

Comments
 (0)