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 a6579f827d1..61412fdd5b9 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 @@ -26,6 +26,7 @@ import Users from './Users.component'; import { UserPageTabs } from './Users.interface'; const mockParams = { + fqn: 'test', tab: UserPageTabs.ACTIVITY, }; @@ -140,7 +141,6 @@ jest.mock('../common/EntityDescription/Description', () => { const updateUserDetails = jest.fn(); const mockProp = { - username: 'test', queryFilters: { myData: 'my-data', following: 'following', 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 925340ec2ec..56c98487b9f 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 @@ -30,6 +30,7 @@ import { useAuth } from '../../hooks/authHooks'; import { searchData } from '../../rest/miscAPI'; import { getEntityName } from '../../utils/EntityUtils'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { getDecodedFqn } from '../../utils/StringsUtils'; import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Chip from '../common/Chip/Chip.component'; import DescriptionV1 from '../common/EntityDescription/DescriptionV1'; @@ -49,20 +50,17 @@ import UserProfileInheritedRoles from './UsersProfile/UserProfileInheritedRoles/ import UserProfileRoles from './UsersProfile/UserProfileRoles/UserProfileRoles.component'; import UserProfileTeams from './UsersProfile/UserProfileTeams/UserProfileTeams.component'; -const Users = ({ - userData, - username, - queryFilters, - updateUserDetails, -}: Props) => { - const { tab: activeTab = UserPageTabs.ACTIVITY } = - useParams<{ tab: UserPageTabs }>(); +const Users = ({ userData, queryFilters, updateUserDetails }: Props) => { + const { fqn: username, tab: activeTab = UserPageTabs.ACTIVITY } = + useParams<{ fqn: string; tab: UserPageTabs }>(); const [assetCount, setAssetCount] = useState(0); const { isAdminUser } = useAuth(); const history = useHistory(); const location = useLocation(); const { currentUser } = useAuthContext(); + const decodedUsername = useMemo(() => getDecodedFqn(username), [username]); + const [previewAsset, setPreviewAsset] = useState(); @@ -158,7 +156,7 @@ const Users = ({ @@ -204,7 +202,7 @@ const Users = ({ }), }, ], - [activeTab, userData, username, setPreviewAsset, tabDataRender] + [activeTab, userData, decodedUsername, setPreviewAsset, tabDataRender] ); const handleDescriptionChange = useCallback( 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 e7d667973e3..0f47e011d1b 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 @@ -19,7 +19,6 @@ export interface Props { myData: string; following: string; }; - username: string; handlePaginate: (page: string | number) => void; updateUserDetails: (data: Partial) => Promise; } diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx index 1d7d0c5d744..dd4ff94868d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.tsx @@ -73,7 +73,7 @@ const StoredProcedureTab = () => { setIsLoading(false); } }, - [decodedDatabaseSchemaFQN, pageSize] + [decodedDatabaseSchemaFQN, pageSize, showDeleted, handlePagingChange] ); const storedProcedurePagingHandler = useCallback( @@ -87,7 +87,7 @@ const StoredProcedureTab = () => { } handlePageChange(currentPage); }, - [paging, handlePageChange] + [paging, handlePageChange, fetchStoreProcedureDetails] ); const tableColumn: ColumnsType = useMemo( 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 d27da6ae31e..aca0f193f65 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 @@ -148,7 +148,6 @@ const UserPage = () => { }} updateUserDetails={updateUserDetails} userData={userData} - username={username} /> ); };