Commitef9d9bb

committed

Fixed loading indicator in setting/permission.

1 parent4c32449 commitef9d9bbCopy full SHA for ef9d9bb

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ function GroupUsersPermission(props: GroupPermissionProp) {`
`98`	`98`	`dataSource={sortedGroupUsers}`
`99`	`99`	`rowKey="userId"`
`100`	`100`	`pagination={false}`
`101`		`-loading={groupUsersFetching}`
	`101`	`+loading={groupUsers.length===0}`
`102`	`102`	`>`
`103`	`103`	`<Column`
`104`	`104`	`title={trans("memberSettings.nameColumn")}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ function OrgUsersPermission(props: UsersPermissionProp) {`
`151`	`151`	`dataSource={sortedOrgUsers}`
`152`	`152`	`rowKey="userId"`
`153`	`153`	`pagination={false}`
`154`		`-loading={orgUsersFetching}`
	`154`	`+loading={orgUsers.length===0}`
`155`	`155`	`>`
`156`	`156`	`<Column`
`157`	`157`	`title={trans("memberSettings.nameColumn")}`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,10 +39,17 @@ export default function PermissionSetting() { const user = useSelector(getUser)`
`39`	`39`	`constorgUsersFetching=useSelector((state:AppState)=>state.ui.org.orgUsersFetching);`
`40`	`40`
`41`	`41`	`constgroupIdMap=newMap(orgGroups.map((group)=>[group.groupId,group]));`
	`42`	`+constdispatch=useDispatch();`
`42`	`43`	`constselectKey=useParams<{groupId:string}>().groupId;`
	`44`	`+useEffect(()=>{`
	`45`	`+if(!orgId){`
	`46`	`+return;`
	`47`	`+}`
	`48`	`+dispatch(fetchGroupsAction(orgId));`
	`49`	`+},[orgId]);`
`43`	`50`
`44`	`51`	`useEffect(()=>{`
`45`		`-if(selectKey!=="users")`
	`52`	`+if(selectKey!=="users"&&!!groupIdMap.get(selectKey))`
`46`	`53`	`fetchGroupUsrPagination(`
`47`	`54`	`{`
`48`	`55`	`groupId:groupIdMap.get(selectKey)!.groupId,`
`@@ -73,7 +80,7 @@ export default function PermissionSetting() { const user = useSelector(getUser)`
`73`	`80`	`}`
`74`	`81`	`)`
`75`	`82`	`},`
`76`		`-[currentPage,pageSize,modify]`
	`83`	`+[currentPage,pageSize,modify,groupIdMap.get(selectKey)]`
`77`	`84`	`)`
`78`	`85`
`79`	`86`	`if(!orgId){`

Comments

(0)