mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed some remaining issues
This commit is contained in:
parent
961695a61f
commit
baeec495a2
@ -17,7 +17,8 @@ function getIconFromSeverity(severity: AppNotificationSeverity): string {
|
|||||||
case AppNotificationSeverity.Success: {
|
case AppNotificationSeverity.Success: {
|
||||||
return 'fa fa-check';
|
return 'fa fa-check';
|
||||||
}
|
}
|
||||||
default: return null;
|
default:
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -210,4 +210,24 @@ describe('DashboardPage', () => {
|
|||||||
expect(ctx.dashboard.panels[0].type).toBe('add-panel');
|
expect(ctx.dashboard.panels[0].type).toBe('add-panel');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
dashboardPageScenario("Given panel with id 0", (ctx) => {
|
||||||
|
ctx.setup(() => {
|
||||||
|
ctx.mount();
|
||||||
|
ctx.setDashboardProp({
|
||||||
|
panels: [{ id: 0, type: 'graph'}],
|
||||||
|
schemaVersion: 17,
|
||||||
|
});
|
||||||
|
ctx.wrapper.setProps({
|
||||||
|
urlEdit: true,
|
||||||
|
urlFullscreen: true,
|
||||||
|
urlPanelId: '0'
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should go into edit mode' , () => {
|
||||||
|
expect(ctx.wrapper.state().isEditing).toBe(true);
|
||||||
|
expect(ctx.wrapper.state().fullscreenPanel.id).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
@ -90,7 +90,6 @@ export class DashboardPage extends PureComponent<Props, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
console.log('unmount', this.props.cleanUpDashboard);
|
|
||||||
if (this.props.dashboard) {
|
if (this.props.dashboard) {
|
||||||
this.props.cleanUpDashboard();
|
this.props.cleanUpDashboard();
|
||||||
}
|
}
|
||||||
@ -118,7 +117,7 @@ export class DashboardPage extends PureComponent<Props, State> {
|
|||||||
|
|
||||||
// Sync url state with model
|
// Sync url state with model
|
||||||
if (urlFullscreen !== dashboard.meta.fullscreen || urlEdit !== dashboard.meta.isEditing) {
|
if (urlFullscreen !== dashboard.meta.fullscreen || urlEdit !== dashboard.meta.isEditing) {
|
||||||
if (urlPanelId) {
|
if (!isNaN(parseInt(urlPanelId, 10))) {
|
||||||
this.onEnterFullscreen();
|
this.onEnterFullscreen();
|
||||||
} else {
|
} else {
|
||||||
this.onLeaveFullscreen();
|
this.onLeaveFullscreen();
|
||||||
|
@ -60,7 +60,7 @@ export class DashboardSrv {
|
|||||||
delete urlParams.edit;
|
delete urlParams.edit;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.panelId) {
|
if (options.panelId !== undefined) {
|
||||||
urlParams.panelId = options.panelId;
|
urlParams.panelId = options.panelId;
|
||||||
} else {
|
} else {
|
||||||
delete urlParams.panelId;
|
delete urlParams.panelId;
|
||||||
|
Loading…
Reference in New Issue
Block a user