IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved remove panel logic to dashboard srv

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-02-05 15:15:15 +01:00
parent a624c9713a
commit 49a597fcd0
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/services/keybindingSrv.ts
View File

@ -144,7 +144,7 @@ export class KeybindingSrv {
this.$location.search(search);
}
setupDashboardBindings(scope, dashboard, onRemovePanel) {
setupDashboardBindings(scope, dashboard) {
this.bind('mod+o', () => {
dashboard.graphTooltip = (dashboard.graphTooltip + 1) % 3;
appEvents.emit('graph-hover-clear');
@ -212,7 +212,7 @@ export class KeybindingSrv {
// delete panel
this.bind('p r', () => {
if (dashboard.meta.focusPanelId && dashboard.meta.canEdit) {
onRemovePanel(dashboard.meta.focusPanelId);
appEvents.emit('remove-panel', dashboard.meta.focusPanelId);
dashboard.meta.focusPanelId = 0;
}
});

13
public/app/features/dashboard/services/DashboardSrv.ts
View File

@ -2,28 +2,35 @@ import coreModule from 'app/core/core_module';
import { appEvents } from 'app/core/app_events';
import locationUtil from 'app/core/utils/location_util';
import { DashboardModel } from '../state/DashboardModel';
import { removePanel } from '../utils/panel';
export class DashboardSrv {
dash: any;
dash: DashboardModel;
/** @ngInject */
constructor(private backendSrv, private $rootScope, private $location) {
appEvents.on('save-dashboard', this.saveDashboard.bind(this), $rootScope);
appEvents.on('panel-change-view', this.onPanelChangeView);
appEvents.on('remove-panel', this.onRemovePanel);
}
create(dashboard, meta) {
return new DashboardModel(dashboard, meta);
}
setCurrent(dashboard) {
setCurrent(dashboard: DashboardModel) {
this.dash = dashboard;
}
getCurrent() {
getCurrent(): DashboardModel {
return this.dash;
}
onRemovePanel = (panelId: number) => {
const dashboard = this.getCurrent();
removePanel(dashboard, dashboard.getPanelById(panelId), true);
};
onPanelChangeView = (options) => {
const urlParams = this.$location.search();

10
public/app/features/dashboard/state/initDashboard.ts
View File

@ -13,7 +13,6 @@ import { updateLocation } from 'app/core/actions';
import { notifyApp } from 'app/core/actions';
import locationUtil from 'app/core/utils/location_util';
import { setDashboardLoadingState, ThunkResult, setDashboardModel, setDashboardLoadingSlow } from './actions';
import { removePanel } from '../utils/panel';
// Types
import { DashboardLoadingState, DashboardRouteInfo } from 'app/types';
@ -185,15 +184,8 @@ export function initDashboard({
// init unsaved changes tracking
unsavedChangesSrv.init(dashboard, $scope);
keybindingSrv.setupDashboardBindings($scope, dashboard);
// dashboard keybindings should not live in core, this needs a bigger refactoring
// So declaring this here so it can depend on the removePanel util function
// Long term onRemovePanel should be handled via react prop callback
const onRemovePanel = (panelId: number) => {
removePanel(dashboard, dashboard.getPanelById(panelId), true);
};
keybindingSrv.setupDashboardBindings($scope, dashboard, onRemovePanel);
} catch (err) {
dispatch(notifyApp(createErrorNotification('Dashboard init failed', err)));
console.log(err);