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

DashboardSrv/NavModelSrv: Remove legacy angularjs (#36810)

Browse Source 
* DashboardSrv: Remove ngInject + promiseToDigest wrapper

* NavModelSrv: Remove ngInject that is doing nothing

* DashboardSrv: Use getBackendSrv instead of just importing the backendSrv directly
This commit is contained in:
Ashley Harrison 2021-07-19 11:38:12 +01:00 committed by GitHub
parent 4cadbba686
commit 9c6085ee0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/nav_model_srv.ts
View File

@ -6,7 +6,6 @@ import { NavModel } from '@grafana/data';
export class NavModelSrv {
navItems: any;
/** @ngInject */
constructor() {
this.navItems = config.bootData.navTree;
}

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

@ -3,17 +3,14 @@ import { appEvents } from 'app/core/app_events';
import { DashboardModel } from '../state/DashboardModel';
import { removePanel } from '../utils/panel';
import { DashboardMeta } from 'app/types';
import { GrafanaRootScope } from 'app/routes/GrafanaCtrl';
import { backendSrv } from 'app/core/services/backend_srv';
import { promiseToDigest } from '../../../core/utils/promiseToDigest';
import { getBackendSrv } from 'app/core/services/backend_srv';
import { saveDashboard } from 'app/features/manage-dashboards/state/actions';
import { RemovePanelEvent } from '../../../types/events';
export class DashboardSrv {
dashboard?: DashboardModel;
/** @ngInject */
constructor(private $rootScope: GrafanaRootScope) {
constructor() {
appEvents.subscribe(RemovePanelEvent, (e) => this.onRemovePanel(e.payload));
}
@ -48,20 +45,17 @@ export class DashboardSrv {
}
starDashboard(dashboardId: string, isStarred: any) {
const backendSrv = getBackendSrv();
let promise;
if (isStarred) {
promise = promiseToDigest(this.$rootScope)(
backendSrv.delete('/api/user/stars/dashboard/' + dashboardId).then(() => {
return false;
})
);
promise = backendSrv.delete('/api/user/stars/dashboard/' + dashboardId).then(() => {
return false;
});
} else {
promise = promiseToDigest(this.$rootScope)(
backendSrv.post('/api/user/stars/dashboard/' + dashboardId).then(() => {
return true;
})
);
promise = backendSrv.post('/api/user/stars/dashboard/' + dashboardId).then(() => {
return true;
});
}
return promise.then((res: boolean) => {