IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-22 17:06:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11282 from alexanderzobnin/fix-11086

Browse Source 
Fix rendering link to panel in collapsed row
This commit is contained in:
Carl Bergquist 2018-03-20 12:40:30 +01:00 committed by GitHub
commit 10a0460dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/dashboard/specs/viewstate_srv_specs.ts
View File

@ -30,7 +30,10 @@ describe('when updating view state', function() {
beforeEach(
angularMocks.inject(function(dashboardViewStateSrv, $location, $rootScope) {
$rootScope.onAppEvent = function() {};
$rootScope.dashboard = { meta: {} };
$rootScope.dashboard = {
meta: {},
panels: [],
};
viewState = dashboardViewStateSrv.create($rootScope);
location = $location;
})

22
public/app/features/dashboard/view_state_srv.ts
View File

@ -1,6 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
import config from 'app/core/config';
import { DashboardModel } from './dashboard_model';
// represents the transient view state
// like fullscreen panel & edit
@ -8,7 +9,7 @@ export class DashboardViewState {
state: any;
panelScopes: any;
$scope: any;
dashboard: any;
dashboard: DashboardModel;
editStateChanged: any;
fullscreenPanel: any;
oldTimeRange: any;
@ -89,6 +90,12 @@ export class DashboardViewState {
}
}
if ((this.state.fullscreen || this.dashboard.meta.soloMode) && this.state.panelId) {
// Trying to render panel in fullscreen when it's in the collapsed row causes an issue.
// So in this case expand collapsed row first.
this.toggleCollapsedPanelRow(this.state.panelId);
}
// if no edit state cleanup tab parm
if (!this.state.edit) {
delete this.state.tab;
@ -103,6 +110,19 @@ export class DashboardViewState {
this.syncState();
}
toggleCollapsedPanelRow(panelId) {
for (let panel of this.dashboard.panels) {
if (panel.collapsed) {
for (let rowPanel of panel.panels) {
if (rowPanel.id === panelId) {
this.dashboard.toggleRow(panel);
return;
}
}
}
}
}
syncState() {
if (this.panelScopes.length === 0) {
return;