diff --git a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx b/datahub-web-react/src/app/entity/container/ContainerEntity.tsx index d0ff8f4caf..d851d27c6c 100644 --- a/datahub-web-react/src/app/entity/container/ContainerEntity.tsx +++ b/datahub-web-react/src/app/entity/container/ContainerEntity.tsx @@ -91,11 +91,7 @@ export class ContainerEntity implements Entity { component: DocumentationTab, }, { - name: 'Properties', - component: PropertiesTab, - }, - { - name: 'Access Management', + name: 'Access', component: AccessManagement, display: { visible: (_, container: GetContainerQuery) => { @@ -111,6 +107,10 @@ export class ContainerEntity implements Entity { }, }, }, + { + name: 'Properties', + component: PropertiesTab, + }, ]} sidebarSections={this.getSidebarSections()} /> diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx index 83b3cdb321..2a473ae405 100644 --- a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx +++ b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx @@ -148,6 +148,18 @@ export class DatasetEntity implements Entity { name: 'Lineage', component: LineageTab, }, + { + name: 'Access', + component: AccessManagement, + display: { + visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement, + enabled: (_, dataset: GetDatasetQuery) => { + const accessAspect = dataset?.dataset?.access; + const rolesList = accessAspect?.roles; + return !!accessAspect && !!rolesList && rolesList.length > 0; + }, + }, + }, { name: 'Properties', component: PropertiesTab, @@ -203,18 +215,6 @@ export class DatasetEntity implements Entity { }, }, }, - { - name: 'Access Management', - component: AccessManagement, - display: { - visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement, - enabled: (_, dataset: GetDatasetQuery) => { - const accessAspect = dataset?.dataset?.access; - const rolesList = accessAspect?.roles; - return !!accessAspect && !!rolesList && rolesList.length > 0; - }, - }, - }, { name: 'Incidents', component: IncidentTab, diff --git a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx index eddcc2290e..e21f88bd9b 100644 --- a/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx +++ b/datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx @@ -189,6 +189,15 @@ export class DatasetEntity implements Entity { component: LineageTab, icon: PartitionOutlined, }, + { + name: 'Access', + component: AccessManagement, + icon: UnlockOutlined, + display: { + visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement, + enabled: (_, _2) => true, + }, + }, { name: 'Properties', component: PropertiesTab, @@ -254,15 +263,6 @@ export class DatasetEntity implements Entity { }, }, }, - { - name: 'Access Management', - component: AccessManagement, - icon: UnlockOutlined, - display: { - visible: (_, _1) => this.appconfig().config.featureFlags.showAccessManagement, - enabled: (_, _2) => true, - }, - }, { name: 'Incidents', icon: WarningOutlined,