From dba0baec695cbc08a74d635bf4175289b24e34ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Mon, 3 Oct 2022 17:30:53 +0200
Subject: [PATCH] TopNav: Fix pages import dashboard and create new folder
 (#56182)

---
 .../folders/components/NewDashboardsFolder.tsx       | 12 ++++++++++--
 .../manage-dashboards/DashboardImportPage.tsx        | 10 ++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
index 737048b49e4..f7743e4e80d 100644
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ b/public/app/features/folders/components/NewDashboardsFolder.tsx
@@ -1,6 +1,8 @@
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
+import { NavModelItem } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { Button, Input, Form, Field } from '@grafana/ui';
 import { Page } from 'app/core/components/Page/Page';
 
@@ -39,11 +41,17 @@ export class NewDashboardsFolder extends PureComponent<Props> {
       });
   };
 
+  pageNav: NavModelItem = {
+    text: 'Create a new folder',
+    subTitle: 'Folders provide a way to group dashboards and alert rules.',
+    breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
+  };
+
   render() {
     return (
-      <Page navId="dashboards/folder/new">
+      <Page navId="dashboards/browse" pageNav={this.pageNav}>
         <Page.Contents>
-          <h3>New dashboard folder</h3>
+          {!config.featureToggles.topnav && <h3>New dashboard folder</h3>}
           <Form defaultValues={initialFormModel} onSubmit={this.onSubmit}>
             {({ register, errors }) => (
               <>
diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index f27de866813..23491016398 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/css';
 import React, { FormEvent, PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { AppEvents, GrafanaTheme2, LoadingState } from '@grafana/data';
+import { AppEvents, GrafanaTheme2, LoadingState, NavModelItem } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { reportInteraction } from '@grafana/runtime';
 import {
@@ -187,11 +187,17 @@ class UnthemedDashboardImport extends PureComponent<Props> {
     );
   }
 
+  pageNav: NavModelItem = {
+    text: 'Import dashboard',
+    subTitle: 'Import dashboard from file or Grafana.com"',
+    breadcrumbs: [{ title: 'Dashboards', url: 'dashboards' }],
+  };
+
   render() {
     const { loadingState } = this.props;
 
     return (
-      <Page navId="dashboards/import">
+      <Page navId="dashboards/browse" pageNav={this.pageNav}>
         <Page.Contents>
           {loadingState === LoadingState.Loading && (
             <VerticalGroup justify="center">