From b29911a3735b2ebca39b60cefde2fb08f058dfb0 Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Fri, 24 Jun 2022 23:14:07 +0530
Subject: [PATCH] Fix issue:- #5617  Only owner and admin should allow to make
 changes in entity and service  (#5625)

---
 .../src/components/MyAssetStats/MyAssetStats.component.tsx   | 1 -
 .../src/main/resources/ui/src/constants/constants.ts         | 3 +--
 .../main/resources/ui/src/constants/ingestion.constant.ts    | 2 +-
 .../pages/TeamsAndUsersPage/TeamsAndUsersPage.component.tsx  | 5 ++++-
 .../main/resources/ui/src/router/AuthenticatedAppRouter.tsx  | 4 ++--
 openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js  | 1 +
 6 files changed, 9 insertions(+), 7 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 99f707389da..cd6940f6f62 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
@@ -116,7 +116,6 @@ 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 b0ccc03dc1a..e3a10a2812a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -435,9 +435,8 @@ export const navLinkSettings = [
     name: 'Teams & Users',
     to: ROUTES.TEAMS_AND_USERS,
     disabled: false,
-    isAdminOnly: true,
   },
-  { name: 'Webhooks', to: '/webhooks', disabled: false },
+  { name: 'Webhooks', to: '/webhooks', disabled: false, isAdminOnly: true },
 ];
 
 export const TITLE_FOR_NON_OWNER_ACTION =
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/ingestion.constant.ts b/openmetadata-ui/src/main/resources/ui/src/constants/ingestion.constant.ts
index e8168d7267a..d8750a27326 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/ingestion.constant.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/ingestion.constant.ts
@@ -20,7 +20,7 @@ export const STEPS_FOR_ADD_INGESTION: Array<StepperStepType> = [
   { name: 'Schedule Interval', step: 3 },
 ];
 
-export const INGESTION_SCHEDULER_INITIAL_VALUE = '5 * * * *';
+export const INGESTION_SCHEDULER_INITIAL_VALUE = '0 * * * *';
 
 export const INITIAL_FILTER_PATTERN: FilterPattern = {
   includes: [],
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 3594bb9d86e..eee09188e5c 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
@@ -684,7 +684,10 @@ const TeamsAndUsersPage = () => {
   useEffect(() => {
     if (!isDataLoading) {
       if (teamAndUser) {
-        if (Object.values(UserType).includes(teamAndUser as UserType)) {
+        if (
+          Object.values(UserType).includes(teamAndUser as UserType) &&
+          (isAdminUser || isAuthDisabled)
+        ) {
           setIsTeamVisible(false);
           setactiveUserTab(teamAndUser as UserType);
           setCurrentTeam({} as Team);
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 1778009c331..4ad30e4d256 100644
--- a/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
@@ -156,12 +156,12 @@ 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} />
-      <AdminProtectedRoute
+      <Route
         exact
         component={TeamsAndUsersPage}
         path={ROUTES.TEAMS_AND_USERS}
       />
-      <AdminProtectedRoute
+      <Route
         exact
         component={TeamsAndUsersPage}
         path={ROUTES.TEAMS_AND_USERS_DETAILS}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js b/openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js
index 35390d0d609..1b885365e78 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/APIUtils.js
@@ -65,6 +65,7 @@ export const formatUsersResponse = (hits) => {
       email: d._source.email,
       type: d._source.entity_type,
       id: d._source.user_id,
+      teams: d._source.teams,
     };
   });
 };