From a81c8db8be7ad7fcfdf539eae02830688693df32 Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Tue, 26 Apr 2022 12:02:57 +0530 Subject: [PATCH] fixed issue:- 4481 Unable to select role and Team even if auth is disabled (#4482) --- .../ui/src/components/Users/Users.component.test.tsx | 1 + .../resources/ui/src/components/Users/Users.component.tsx | 5 +++-- .../resources/ui/src/components/Users/Users.interface.ts | 1 + .../ui/src/pages/UserPage/UserPage.component.tsx | 3 +++ .../resources/ui/src/pages/UserPage/UserPage.test.tsx | 8 ++++++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx index 0cc87884043..eb7406b3f76 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx @@ -140,6 +140,7 @@ const mockProp = { postFeedHandler: postFeed, isAdminUser: false, isLoggedinUser: false, + isAuthDisabled: true, updateUserDetails, }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx index aeec5d75465..af0b0ccedab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx @@ -94,6 +94,7 @@ const Users = ({ updateUserDetails, isAdminUser, isLoggedinUser, + isAuthDisabled, }: Props) => { const [activeTab, setActiveTab] = useState(1); const [fieldListVisible, setFieldListVisible] = useState(false); @@ -322,7 +323,7 @@ const Users = ({ ); - if (!isAdminUser) { + if (!isAdminUser && !isAuthDisabled) { return (
@@ -435,7 +436,7 @@ const Users = ({ ); - if (!isAdminUser) { + if (!isAdminUser && !isAuthDisabled) { return (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts index da73e091c09..41a911fd1c7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts @@ -39,6 +39,7 @@ export interface Props { isFeedLoading: boolean; isAdminUser: boolean; isLoggedinUser: boolean; + isAuthDisabled: boolean; updateUserDetails: (data: UserDetails) => void; feedFilterHandler: (v: FeedFilter) => void; fetchFeedHandler: (filterType: FeedFilter, after?: string) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx index f0a6270a029..ea8dd3a21b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx @@ -19,6 +19,7 @@ import { EntityThread } from 'Models'; import React, { useEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; import AppState from '../../AppState'; +import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; import { getFeedsWithFilter, postFeedById } from '../../axiosAPIs/feedsAPI'; import { getUserByName, updateUserDetail } from '../../axiosAPIs/userAPI'; import PageContainerV1 from '../../components/containers/PageContainerV1'; @@ -40,6 +41,7 @@ import { showErrorToast } from '../../utils/ToastUtils'; const UserPage = () => { const { username } = useParams<{ [key: string]: string }>(); const { isAdminUser } = useAuth(); + const { isAuthDisabled } = useAuthContext(); const [isLoading, setIsLoading] = useState(true); const [userData, setUserData] = useState({} as User); const [isError, setIsError] = useState(false); @@ -194,6 +196,7 @@ const UserPage = () => { feedFilterHandler={feedFilterHandler} fetchFeedHandler={getFeedData} isAdminUser={Boolean(isAdminUser)} + isAuthDisabled={Boolean(isAuthDisabled)} isFeedLoading={isFeedLoading} isLoggedinUser={isLoggedinUser(username)} paging={paging} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx index 4542e71ffe1..3c8766e6c26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx @@ -91,6 +91,14 @@ const mockUserData = { ], }; +jest.mock('../../authentication/auth-provider/AuthProvider', () => { + return { + useAuthContext: jest.fn(() => ({ + isAuthDisabled: true, + })), + }; +}); + jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => ({ username: 'xyz' })), }));