Skip to content

Commit 03bcffa

Browse files
authored
ref(nav) move admin nav to nav secondary (#110375)
Address the todo comment in admin nav and move the nav definition inside the nav file
1 parent be68482 commit 03bcffa

File tree

2 files changed

+30
-36
lines changed

2 files changed

+30
-36
lines changed

static/app/views/admin/adminLayout.tsx

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,8 @@ import {Flex} from '@sentry/scraps/layout';
44

55
import SentryDocumentTitle from 'sentry/components/sentryDocumentTitle';
66
import {t} from 'sentry/locale';
7-
import {PrimaryNavigationGroup} from 'sentry/views/navigation/types';
87
import {BreadcrumbProvider} from 'sentry/views/settings/components/settingsBreadcrumb/context';
98
import SettingsLayout from 'sentry/views/settings/components/settingsLayout';
10-
import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
11-
12-
// TODO: Move this to /views/nav/secondary/sections/admin/adminSecondaryNav.tsx when new navigation is GA'd
13-
export function AdminNavigation() {
14-
return (
15-
<SettingsNavigation
16-
stickyTop="0"
17-
navigationObjects={[
18-
{
19-
id: 'admin-system-status',
20-
name: 'System Status',
21-
items: [
22-
{path: '/manage/status/environment/', title: 'Environment'},
23-
{path: '/manage/status/packages/', title: 'Packages'},
24-
{path: '/manage/status/mail/', title: 'Mail'},
25-
{path: '/manage/status/warnings/', title: 'Warnings'},
26-
{path: '/manage/settings/', title: 'Settings'},
27-
],
28-
},
29-
{
30-
id: 'admin-manage',
31-
name: 'Manage',
32-
items: [
33-
{path: '/manage/organizations/', title: 'Organizations'},
34-
{path: '/manage/projects/', title: 'Projects'},
35-
{path: '/manage/users/', title: 'Users'},
36-
],
37-
},
38-
]}
39-
primaryNavGroup={PrimaryNavigationGroup.ADMIN}
40-
/>
41-
);
42-
}
439

4410
export default function AdminLayout() {
4511
return (
Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
1-
import {AdminNavigation} from 'sentry/views/admin/adminLayout';
1+
import {PrimaryNavigationGroup} from 'sentry/views/navigation/types';
2+
import SettingsNavigation from 'sentry/views/settings/components/settingsNavigation';
23

34
export function AdminSecondaryNavigation() {
4-
return <AdminNavigation />;
5+
return (
6+
<SettingsNavigation
7+
stickyTop="0"
8+
navigationObjects={[
9+
{
10+
id: 'admin-system-status',
11+
name: 'System Status',
12+
items: [
13+
{path: '/manage/status/environment/', title: 'Environment'},
14+
{path: '/manage/status/packages/', title: 'Packages'},
15+
{path: '/manage/status/mail/', title: 'Mail'},
16+
{path: '/manage/status/warnings/', title: 'Warnings'},
17+
{path: '/manage/settings/', title: 'Settings'},
18+
],
19+
},
20+
{
21+
id: 'admin-manage',
22+
name: 'Manage',
23+
items: [
24+
{path: '/manage/organizations/', title: 'Organizations'},
25+
{path: '/manage/projects/', title: 'Projects'},
26+
{path: '/manage/users/', title: 'Users'},
27+
],
28+
},
29+
]}
30+
primaryNavGroup={PrimaryNavigationGroup.ADMIN}
31+
/>
32+
);
533
}

0 commit comments

Comments
 (0)