IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 06:56:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15975 from grafana/fixed-alert-link-issue

Browse Source 
Fixed issue with AlertList panel links resulting in panel not found errors
This commit is contained in:
Torkel Ödegaard 2019-03-13 15:52:14 +01:00 committed by GitHub
commit 4bbd6ab79c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/dashboard/containers/DashboardPage.tsx
View File

@ -92,11 +92,12 @@ export class DashboardPage extends PureComponent<Props, State> {
componentWillUnmount() { componentWillUnmount() {
if (this.props.dashboard) { if (this.props.dashboard) {
this.props.cleanUpDashboard(); this.props.cleanUpDashboard();
this.setPanelFullscreenClass(false);
} }
} }
componentDidUpdate(prevProps: Props) { componentDidUpdate(prevProps: Props) {
const { dashboard, editview, urlEdit, urlFullscreen, urlPanelId } = this.props; const { dashboard, editview, urlEdit, urlFullscreen, urlPanelId, urlUid } = this.props;
if (!dashboard) { if (!dashboard) {
return; return;
@ -107,6 +108,12 @@ export class DashboardPage extends PureComponent<Props, State> {
document.title = dashboard.title + ' - Grafana'; document.title = dashboard.title + ' - Grafana';
} }
// Due to the angular -> react url bridge we can ge an update here with new uid before the container unmounts
// Can remove this condition after we switch to react router
if (prevProps.urlUid !== urlUid) {
return;
}
// handle animation states when opening dashboard settings // handle animation states when opening dashboard settings
if (!prevProps.editview && editview) { if (!prevProps.editview && editview) {
this.setState({ isSettingsOpening: true }); this.setState({ isSettingsOpening: true });