mirror of
https://github.com/grafana/grafana.git
synced 2025-02-10 23:55:47 -06:00
* Chore: Remove angular dependency from backendSrv * Refactor: Naive soultion for logging out unauthorized users * Refactor: Restructures to different streams * Refactor: Restructures datasourceRequest * Refactor: Flipped back if statement * Refactor: Extracted getFromFetchStream * Refactor: Extracts toFailureStream operation * Refactor: Fixes issue when options.params contains arrays * Refactor: Fixes broken test (but we need a lot more) * Refactor: Adds explaining comments * Refactor: Adds latest RxJs version so cancellations work * Refactor: Cleans up the takeUntil code * Refactor: Adds tests for request function * Refactor: Separates into smaller functions * Refactor: Adds last error tests * Started to changed so we require getBackendSrv from the @grafana-runtime when applicable. * Using the getBackendSrv from @grafana/runtime. * Changed so we use the getBackendSrv from the @grafana-runtime when possible. * Fixed so Server Admin -> Orgs works again. * Removed unused dependency. * Fixed digest issues on the Server Admin -> Users page. * Fix: Fixes digest problems in Playlists * Fix: Fixes digest issues in VersionHistory * Tests: Fixes broken tests * Fix: Fixes digest issues in Alerting => Notification channels * Fixed digest issues on the Intive page. * Fixed so we run digest after password reset email sent. * Fixed digest issue when trying to sign up account. * Fixed so the Server Admin -> Edit Org works with backendSrv * Fixed so Server Admin -> Users works with backend srv. * Fixed digest issues in Server Admin -> Orgs * Fix: Fixes digest issues in DashList plugin * Fixed digest issues on Server Admin -> users. * Fix: Fixes digest issues with Snapshots * Fixed digest issue when deleting a user. * Fix: Fixes digest issues with dashLink * Chore: Changes RxJs version to 6.5.4 which includes the same cancellation fix * Fix: Fixes digest issue when toggling folder in manage dashboards * Fix: Fixes bug in executeInOrder * Fix: Fixes digest issue with CreateFolderCtrl and FolderDashboardsCtrl * Fix: Fixes tslint error in test * Refactor: Changes default behaviour for emitted messages as before migration * Fix: Fixes various digest issues when saving, starring or deleting dashboards * Fix: Fixes digest issues with FolderPickerCtrl * Fixed digest issue. * Fixed digest issues. * Fixed issues with angular digest. * Removed the this.digest pattern. Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com> Co-authored-by: Marcus Andersson <systemvetaren@gmail.com>
93 lines
2.9 KiB
TypeScript
93 lines
2.9 KiB
TypeScript
import coreModule from 'app/core/core_module';
|
|
import locationUtil from 'app/core/utils/location_util';
|
|
import { UrlQueryMap } from '@grafana/runtime';
|
|
import { DashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv';
|
|
import { ILocationService } from 'angular';
|
|
import { Scope, CoreEvents, AppEventEmitter } from 'app/types';
|
|
import { backendSrv } from 'app/core/services/backend_srv';
|
|
|
|
export class LoadDashboardCtrl {
|
|
/** @ngInject */
|
|
constructor(
|
|
$scope: Scope & AppEventEmitter,
|
|
$routeParams: UrlQueryMap,
|
|
dashboardLoaderSrv: DashboardLoaderSrv,
|
|
$location: ILocationService,
|
|
$browser: any
|
|
) {
|
|
$scope.appEvent(CoreEvents.dashboardFetchStart);
|
|
|
|
if (!$routeParams.uid && !$routeParams.slug) {
|
|
backendSrv.get('/api/dashboards/home').then((homeDash: { redirectUri: string; meta: any }) => {
|
|
if (homeDash.redirectUri) {
|
|
const newUrl = locationUtil.stripBaseFromUrl(homeDash.redirectUri);
|
|
$location.path(newUrl);
|
|
} else {
|
|
const meta = homeDash.meta;
|
|
meta.canSave = meta.canShare = meta.canStar = false;
|
|
$scope.initDashboard(homeDash, $scope);
|
|
}
|
|
});
|
|
return;
|
|
}
|
|
|
|
// if no uid, redirect to new route based on slug
|
|
if (!($routeParams.type === 'script' || $routeParams.type === 'snapshot') && !$routeParams.uid) {
|
|
// @ts-ignore
|
|
backendSrv.getDashboardBySlug($routeParams.slug).then(res => {
|
|
if (res) {
|
|
$location.path(locationUtil.stripBaseFromUrl(res.meta.url)).replace();
|
|
}
|
|
});
|
|
return;
|
|
}
|
|
|
|
dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug, $routeParams.uid).then((result: any) => {
|
|
if (result.meta.url) {
|
|
const url = locationUtil.stripBaseFromUrl(result.meta.url);
|
|
|
|
if (url !== $location.path()) {
|
|
// replace url to not create additional history items and then return so that initDashboard below isn't executed multiple times.
|
|
$location.path(url).replace();
|
|
return;
|
|
}
|
|
}
|
|
|
|
result.meta.autofitpanels = $routeParams.autofitpanels;
|
|
result.meta.kiosk = $routeParams.kiosk;
|
|
|
|
$scope.initDashboard(result, $scope);
|
|
});
|
|
}
|
|
}
|
|
|
|
export class NewDashboardCtrl {
|
|
/** @ngInject */
|
|
constructor($scope: any, $routeParams: UrlQueryMap) {
|
|
$scope.initDashboard(
|
|
{
|
|
meta: {
|
|
canStar: false,
|
|
canShare: false,
|
|
isNew: true,
|
|
folderId: Number($routeParams.folderId),
|
|
},
|
|
dashboard: {
|
|
title: 'New dashboard',
|
|
panels: [
|
|
{
|
|
type: 'add-panel',
|
|
gridPos: { x: 0, y: 0, w: 12, h: 9 },
|
|
title: 'Panel Title',
|
|
},
|
|
],
|
|
},
|
|
},
|
|
$scope
|
|
);
|
|
}
|
|
}
|
|
|
|
coreModule.controller('LoadDashboardCtrl', LoadDashboardCtrl);
|
|
coreModule.controller('NewDashboardCtrl', NewDashboardCtrl);
|