{currentTeam?.users?.map((user, index) => {
const User = {
@@ -245,7 +253,7 @@ const TeamsPage = () => {
return (
<>
{' '}
{currentTeam?.owns?.map((dataset, index) => {
@@ -287,8 +295,7 @@ const TeamsPage = () => {
)}`}
key={team.name}
onClick={() => {
- fetchCurrentTeam(team.name);
- setCurrentTab(1);
+ changeCurrentTeam(team.name);
}}>
{team.displayName}
@@ -351,6 +358,11 @@ const TeamsPage = () => {
setUserList(AppState.users);
}, [AppState.users]);
+ useEffect(() => {
+ fetchCurrentTeam(team);
+ setCurrentTab(1);
+ }, [team]);
+
return (
<>
{error ? (
diff --git a/catalog-rest-service/src/main/resources/ui/src/pages/topic-details/index.tsx b/catalog-rest-service/src/main/resources/ui/src/pages/topic-details/index.tsx
index 4746acca783..5d17dcd2525 100644
--- a/catalog-rest-service/src/main/resources/ui/src/pages/topic-details/index.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/pages/topic-details/index.tsx
@@ -19,7 +19,10 @@ import PageContainer from '../../components/containers/PageContainer';
import Loader from '../../components/Loader/Loader';
import ManageTab from '../../components/my-data-details/ManageTab';
import SchemaEditor from '../../components/schema-editor/SchemaEditor';
-import { getServiceDetailsPath } from '../../constants/constants';
+import {
+ getServiceDetailsPath,
+ getTeamDetailsPath,
+} from '../../constants/constants';
import { EntityType } from '../../enums/entity.enum';
import { User } from '../../generated/entity/teams/user';
import { useAuth } from '../../hooks/authHooks';
@@ -351,7 +354,16 @@ const MyTopicDetailPage = () => {
isTagEditable
entityName={name}
extraInfo={[
- { key: 'Owner', value: owner?.name || '' },
+ {
+ key: 'Owner',
+ value:
+ owner?.type === 'team'
+ ? getTeamDetailsPath(owner?.name || '')
+ : owner?.name || '',
+ placeholderText: owner?.displayName || '',
+ isLink: owner?.type === 'team',
+ openInNewTab: false,
+ },
{ key: 'Tier', value: tier ? tier.split('.')[1] : '' },
...getConfigDetails(),
]}
diff --git a/catalog-rest-service/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx b/catalog-rest-service/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
index 5470555ea39..c25f02aa706 100644
--- a/catalog-rest-service/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/router/AuthenticatedAppRouter.tsx
@@ -52,6 +52,7 @@ const AuthenticatedAppRouter: FunctionComponent = () => {
+
{/* */}
diff --git a/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx b/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
index 5327fa0e1cd..8680486553a 100644
--- a/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/utils/TableUtils.tsx
@@ -100,7 +100,8 @@ export const getOwnerFromId = (
const team = AppState.userTeams.find((item) => item.id === id);
if (team) {
retVal = {
- name: team.displayName || team.name,
+ name: team.name,
+ displayName: team.displayName || team.name,
id: team.id,
type: 'team',
};