From ca6f5b6cd62930bacb56e2c3f8cea8a43aa50e44 Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Mon, 2 May 2022 11:05:24 +0530
Subject: [PATCH] Fixed issue:- 4530 Users & Teams Page shows loading screen on
 selecting navigation twice (#4533)

---
 .../TeamsAndUsersPage.component.tsx           | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

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