Dashboard: Fixes issue with title or folder change has no effect after exiting settings view (#34677)

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

* Updates snapshot
pull/34634/head^2
Torkel Ödegaard 5 years ago committed by GitHub
parent 29be741f26
commit 6394a60a08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      public/app/features/dashboard/components/DashNav/DashNav.tsx
  2. 2
      public/app/features/dashboard/containers/DashboardPage.tsx
  3. 2
      public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap

@ -24,6 +24,8 @@ export interface OwnProps {
isFullscreen: boolean; isFullscreen: boolean;
kioskMode: KioskMode; kioskMode: KioskMode;
hideTimePicker: boolean; hideTimePicker: boolean;
folderTitle?: string;
title: string;
onAddPanel: () => void; onAddPanel: () => void;
} }
@ -245,14 +247,14 @@ class DashNav extends PureComponent<Props> {
} }
render() { render() {
const { dashboard, isFullscreen } = this.props; const { isFullscreen, title, folderTitle } = this.props;
const onGoBack = isFullscreen ? this.onClose : undefined; const onGoBack = isFullscreen ? this.onClose : undefined;
return ( return (
<PageToolbar <PageToolbar
pageIcon={isFullscreen ? undefined : 'apps'} pageIcon={isFullscreen ? undefined : 'apps'}
title={dashboard.title} title={title}
parent={dashboard.meta.folderTitle} parent={folderTitle}
onClickTitle={this.onDashboardNameClick} onClickTitle={this.onDashboardNameClick}
onClickParent={this.onFolderNameClick} onClickParent={this.onFolderNameClick}
onGoBack={onGoBack} onGoBack={onGoBack}

@ -310,6 +310,8 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
<div aria-label={selectors.pages.Dashboard.DashNav.nav}> <div aria-label={selectors.pages.Dashboard.DashNav.nav}>
<DashNav <DashNav
dashboard={dashboard} dashboard={dashboard}
title={dashboard.title}
folderTitle={dashboard.meta.folderTitle}
isFullscreen={!!viewPanel} isFullscreen={!!viewPanel}
onAddPanel={this.onAddPanel} onAddPanel={this.onAddPanel}
kioskMode={kioskMode} kioskMode={kioskMode}

@ -116,6 +116,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1`
isFullscreen={false} isFullscreen={false}
kioskMode="off" kioskMode="off"
onAddPanel={[Function]} onAddPanel={[Function]}
title="My dashboard"
/> />
</div> </div>
<div <div
@ -495,6 +496,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
isFullscreen={false} isFullscreen={false}
kioskMode="off" kioskMode="off"
onAddPanel={[Function]} onAddPanel={[Function]}
title="My dashboard"
/> />
</div> </div>
<div <div

Loading…
Cancel
Save