From eeab12b0fc4e8caafee07b994012d7177cd672b6 Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Thu, 9 Jun 2022 23:37:29 +0530
Subject: [PATCH] Fix issue #5355 Selecting Users or Admins renders first
 team's details (#5368)

Co-authored-by: Vivek Ratnavel Subramanian <vivekratnavel90@gmail.com>
---
 .../src/components/MyAssetStats/MyAssetStats.component.tsx | 1 +
 .../src/main/resources/ui/src/constants/constants.ts       | 7 ++++++-
 .../resources/ui/src/router/AuthenticatedAppRouter.tsx     | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyAssetStats/MyAssetStats.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyAssetStats/MyAssetStats.component.tsx
index 2cca2be8d00..21ca64d5a31 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyAssetStats/MyAssetStats.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyAssetStats/MyAssetStats.component.tsx
@@ -106,6 +106,7 @@ const MyAssetStats: FunctionComponent<Props> = ({
         count: countTeams,
         link: getTeamAndUserDetailsPath(),
         dataTestId: 'terms',
+        adminOnly: true,
       },
     };
   };
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index a18b14e5a0c..9e9a2000a79 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -420,7 +420,12 @@ export const navLinkSettings = [
   { name: 'Roles', to: '/roles', disabled: false, isAdminOnly: true },
   { name: 'Services', to: '/services', disabled: false },
   { name: 'Tags', to: '/tags', disabled: false },
-  { name: 'Teams & Users', to: ROUTES.TEAMS_AND_USERS, disabled: false },
+  {
+    name: 'Teams & Users',
+    to: ROUTES.TEAMS_AND_USERS,
+    disabled: false,
+    isAdminOnly: true,
+  },
   { name: 'Webhooks', to: '/webhooks', disabled: false },
 ];
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
index 7fa1b6c4292..1715c4b541f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
@@ -150,7 +150,7 @@ const AuthenticatedAppRouter: FunctionComponent = () => {
       <Route exact component={ExplorePage} path={ROUTES.EXPLORE} />
       <Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_SEARCH} />
       <Route component={ExplorePage} path={ROUTES.EXPLORE_WITH_TAB} />
-      <Route
+      <AdminProtectedRoute
         exact
         component={TeamsAndUsersPage}
         path={ROUTES.TEAMS_AND_USERS}