From 3acfa1b8d077e11a68c50220393da0fe3a3d2cfc Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 27 May 2021 04:35:10 -0400
Subject: [PATCH] Dashboard: Fixes issue with title or folder change has no
 effect after exiting settings view (#34677) (#34786)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Dashboard: Fixes issue with title or folder change has no effect after existing settings view

* Updates snapshot

(cherry picked from commit 6394a60a08e3cb0045d1a94f1d0f7e97d973e0dd)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 .../app/features/dashboard/components/DashNav/DashNav.tsx | 8 +++++---
 .../app/features/dashboard/containers/DashboardPage.tsx   | 2 ++
 .../containers/__snapshots__/DashboardPage.test.tsx.snap  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index e1a07e4972e..946b04b4422 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -24,6 +24,8 @@ export interface OwnProps {
   isFullscreen: boolean;
   kioskMode: KioskMode;
   hideTimePicker: boolean;
+  folderTitle?: string;
+  title: string;
   onAddPanel: () => void;
 }
 
@@ -245,14 +247,14 @@ class DashNav extends PureComponent<Props> {
   }
 
   render() {
-    const { dashboard, isFullscreen } = this.props;
+    const { isFullscreen, title, folderTitle } = this.props;
     const onGoBack = isFullscreen ? this.onClose : undefined;
 
     return (
       <PageToolbar
         pageIcon={isFullscreen ? undefined : 'apps'}
-        title={dashboard.title}
-        parent={dashboard.meta.folderTitle}
+        title={title}
+        parent={folderTitle}
         onClickTitle={this.onDashboardNameClick}
         onClickParent={this.onFolderNameClick}
         onGoBack={onGoBack}
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index 9c94f7fbf61..b74e1bb86d6 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -310,6 +310,8 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
           <div aria-label={selectors.pages.Dashboard.DashNav.nav}>
             <DashNav
               dashboard={dashboard}
+              title={dashboard.title}
+              folderTitle={dashboard.meta.folderTitle}
               isFullscreen={!!viewPanel}
               onAddPanel={this.onAddPanel}
               kioskMode={kioskMode}
diff --git a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
index 1d1555c2560..5c36dbafa2b 100644
--- a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
+++ b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
@@ -116,6 +116,7 @@ exports[`DashboardPage Dashboard init completed  Should render dashboard grid 1`
       isFullscreen={false}
       kioskMode="off"
       onAddPanel={[Function]}
+      title="My dashboard"
     />
   </div>
   <div
@@ -495,6 +496,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
       isFullscreen={false}
       kioskMode="off"
       onAddPanel={[Function]}
+      title="My dashboard"
     />
   </div>
   <div