yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-03 22:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue:- 4530 Users & Teams Page shows loading screen on selecting navigation twice (#4533)

Browse Source
This commit is contained in:
Shailesh Parmar 2022-05-02 11:05:24 +05:30 committed by GitHub
parent 148c96c0a4
commit ca6f5b6cd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openmetadata-ui/src/main/resources/ui/src/pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx
View File

@ -134,6 +134,7 @@ const TeamsAndUsersPage = () => {
break; break;
} }
} }
setIsRightPannelLoading(false);
setIsUsersLoading(false); setIsUsersLoading(false);
}; };
@ -224,9 +225,10 @@ const TeamsAndUsersPage = () => {
getTeams(['users', 'owns', 'defaultRoles', 'owner']) getTeams(['users', 'owns', 'defaultRoles', 'owner'])
.then((res: AxiosResponse) => { .then((res: AxiosResponse) => {
if (res.data) { if (res.data) {
if (!teamAndUser && res.data.data > 0) { if (!teamAndUser && res.data.data.length > 0) {
getCurrentTeamUsers(res.data.data[0].name); getCurrentTeamUsers(res.data.data[0].name);
setCurrentTeam(res.data.data[0]); setCurrentTeam(res.data.data[0]);
setIsRightPannelLoading(false);
} }
setTeams(res.data.data); setTeams(res.data.data);
AppState.updateUserTeam(res.data.data); AppState.updateUserTeam(res.data.data);
@ -243,7 +245,6 @@ const TeamsAndUsersPage = () => {
}) })
.finally(() => { .finally(() => {
setIsLoading(false); setIsLoading(false);
handleRightPannelLoading(false);
}); });
}; };
@ -281,7 +282,6 @@ const TeamsAndUsersPage = () => {
showErrorToast(errMsg); showErrorToast(errMsg);
}) })
.finally(() => { .finally(() => {
setIsLoading(false);
setIsRightPannelLoading(false); setIsRightPannelLoading(false);
}); });
} }
@ -439,14 +439,16 @@ const TeamsAndUsersPage = () => {
* @param name - team name * @param name - team name
*/ */
const changeCurrentTeam = (name: string, isUsersCategory: boolean) => { const changeCurrentTeam = (name: string, isUsersCategory: boolean) => {
handleRightPannelLoading(true); if (name !== teamAndUser) {
history.push(getTeamAndUserDetailsPath(name)); handleRightPannelLoading(true);
if (isUsersCategory) { history.push(getTeamAndUserDetailsPath(name));
setIsTeamVisible(false); if (isUsersCategory) {
setCurrentTeam(undefined); setIsTeamVisible(false);
} else { setCurrentTeam(undefined);
setIsTeamVisible(true); } else {
setactiveUserTab(undefined); setIsTeamVisible(true);
setactiveUserTab(undefined);
}
} }
}; };