Navigation: Use new page layout in Service accounts item page (#54200)

* use navId, pageNav and update alignments of service account page

* Fixing item header when feature is disabled

* Fix orgs item page

* Minor tweak to subtitle for service account item page

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
This commit is contained in:
Leo
2022-08-25 13:11:30 +02:00
committed by GitHub
co-authored by Torkel Ödegaard
parent 552d3fec8d
commit 9f8cb17b01
4 changed files with 29 additions and 78 deletions
+2 -10
View File
@@ -2,7 +2,7 @@
import { css, cx } from '@emotion/css';
import React from 'react';
import { GrafanaTheme2, NavModel, NavModelItem } from '@grafana/data';
import { GrafanaTheme2 } from '@grafana/data';
import { config } from '@grafana/runtime';
import { CustomScrollbar, useStyles2 } from '@grafana/ui';
@@ -32,7 +32,7 @@ export const OldPage: PageType = ({
usePageTitle(navModel, pageNav);
const pageHeaderNav = getPageHeaderNav(navModel, pageNav);
const pageHeaderNav = pageNav ?? navModel?.main;
return (
<div className={cx(styles.wrapper, className)}>
@@ -59,14 +59,6 @@ export const OldPage: PageType = ({
);
};
function getPageHeaderNav(navModel?: NavModel, pageNav?: NavModelItem): NavModelItem | undefined {
if (pageNav?.children && pageNav.children.length > 0) {
return pageNav;
}
return navModel?.main;
}
OldPage.Header = PageHeader;
OldPage.Contents = PageContents;
OldPage.OldNavOnly = OldNavOnly;