diff --git a/datahub-web/@datahub/data-models/addon/constants/entity/shared/tabs.ts b/datahub-web/@datahub/data-models/addon/constants/entity/shared/tabs.ts index e8da8a9ec7..78d376c3a4 100644 --- a/datahub-web/@datahub/data-models/addon/constants/entity/shared/tabs.ts +++ b/datahub-web/@datahub/data-models/addon/constants/entity/shared/tabs.ts @@ -4,9 +4,9 @@ * @interface ITabProperties */ export interface ITabProperties { - id: Tab; + id: string; title: string; - component: string; + component?: string; contentComponent?: string; tablistMenuComponent?: string; lazyRender?: boolean; diff --git a/datahub-web/@datahub/data-models/addon/entity/person/render-props.ts b/datahub-web/@datahub/data-models/addon/entity/person/render-props.ts index 037403e065..4a9860a86c 100644 --- a/datahub-web/@datahub/data-models/addon/entity/person/render-props.ts +++ b/datahub-web/@datahub/data-models/addon/entity/person/render-props.ts @@ -1,5 +1,5 @@ import { IEntityRenderProps } from '@datahub/data-models/types/entity/rendering/entity-render-props'; -import { Tab } from '@datahub/data-models/constants/entity/shared/tabs'; +import { Tab, ITabProperties } from '@datahub/data-models/constants/entity/shared/tabs'; import { getTabPropertiesFor } from '@datahub/data-models/entity/utils'; /** @@ -13,6 +13,7 @@ export interface IPersonEntitySpecificConfigs { isConnectedToLinkedin?: boolean; isConnectedToSlack?: boolean; }; + tablistMenuProperties: Record>; }; } @@ -27,10 +28,10 @@ export const getRenderProps = (): IEntityRenderProps => { return { entityPage: { tabIds, + route: 'user.profile', tabProperties: getTabPropertiesFor(tabIds), - defaultTab: Tab.Metadata, - attributePlaceholder: '–', - route: 'user.profile' + defaultTab: Tab.UserOwnership, + attributePlaceholder: '–' }, // Placeholder information search: { @@ -81,6 +82,7 @@ export const getPersonEntitySpecificRenderProps = (): IPersonEntitySpecificConfi userProfilePage: { headerProperties: { showExternalProfileLink: false - } + }, + tablistMenuProperties: {} } }); diff --git a/datahub-web/@datahub/user/addon/components/user/containers/tablist/entity-ownership.ts b/datahub-web/@datahub/user/addon/components/user/containers/tablist/entity-ownership.ts index 0e6643d623..34cf4d4fe9 100644 --- a/datahub-web/@datahub/user/addon/components/user/containers/tablist/entity-ownership.ts +++ b/datahub-web/@datahub/user/addon/components/user/containers/tablist/entity-ownership.ts @@ -3,7 +3,7 @@ import Component from '@ember/component'; import template from '../../../../templates/components/user/containers/tablist/entity-ownership'; import { layout } from '@ember-decorators/component'; import { alias } from '@ember/object/computed'; -import { ITabProperties } from '@datahub/data-models/types/entity/rendering/entity-render-props'; +import { ITabProperties } from '@datahub/data-models/constants/entity/shared/tabs'; /** * This is the tablist menu component that we use to show the tablist items for the user entity