From d639b5a7f81f6e4fd8cc6b1d954a23ba0f898482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 14 Sep 2022 21:12:09 +0200
Subject: [PATCH] Datasources: New data source page should work with new nav
 (#55094)

---
 .../datasources/pages/NewDataSourcePage.tsx   | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/public/app/features/datasources/pages/NewDataSourcePage.tsx b/public/app/features/datasources/pages/NewDataSourcePage.tsx
index d695309d66e..498cae88f10 100644
--- a/public/app/features/datasources/pages/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/pages/NewDataSourcePage.tsx
@@ -1,16 +1,22 @@
 import React from 'react';
 
-import { NavModel } from '@grafana/data';
+import { NavModelItem } from '@grafana/data';
 import { Page } from 'app/core/components/Page/Page';
 
 import { NewDataSource } from '../components/NewDataSource';
 import { DATASOURCES_ROUTES } from '../constants';
 
-const navModel = getNavModel();
-
 export function NewDataSourcePage() {
+  const pageNav: NavModelItem = {
+    icon: 'database',
+    id: 'datasource-new',
+    text: 'Add data source',
+    url: DATASOURCES_ROUTES.New,
+    subTitle: 'Choose a data source type',
+  };
+
   return (
-    <Page navModel={navModel}>
+    <Page navId="datasources" pageNav={pageNav}>
       <Page.Contents>
         <NewDataSource />
       </Page.Contents>
@@ -18,19 +24,4 @@ export function NewDataSourcePage() {
   );
 }
 
-export function getNavModel(): NavModel {
-  const main = {
-    icon: 'database' as const,
-    id: 'datasource-new',
-    text: 'Add data source',
-    href: DATASOURCES_ROUTES.New,
-    subTitle: 'Choose a data source type',
-  };
-
-  return {
-    main: main,
-    node: main,
-  };
-}
-
 export default NewDataSourcePage;