mirror of
https://github.com/grafana/grafana.git
synced 2025-02-13 00: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>
160 lines
4.3 KiB
TypeScript
160 lines
4.3 KiB
TypeScript
import _ from 'lodash';
|
|
import coreModule from '../../core/core_module';
|
|
import { ILocationService, IScope } from 'angular';
|
|
import { getBackendSrv } from '@grafana/runtime';
|
|
import { NavModelSrv } from 'app/core/nav_model_srv';
|
|
import { AppEventEmitter } from 'app/types';
|
|
import { AppEvents } from '@grafana/data';
|
|
import { promiseToDigest } from '../../core/utils/promiseToDigest';
|
|
|
|
export interface PlaylistItem {
|
|
value: any;
|
|
id: any;
|
|
type: string;
|
|
order: any;
|
|
}
|
|
export class PlaylistEditCtrl {
|
|
filteredDashboards: any = [];
|
|
filteredTags: any = [];
|
|
searchQuery = '';
|
|
loading = false;
|
|
playlist: any = {
|
|
interval: '5m',
|
|
};
|
|
|
|
playlistItems: any = [];
|
|
dashboardresult: any = [];
|
|
tagresult: any = [];
|
|
navModel: any;
|
|
isNew: boolean;
|
|
|
|
/** @ngInject */
|
|
constructor(
|
|
private $scope: IScope & AppEventEmitter,
|
|
private $location: ILocationService,
|
|
$route: any,
|
|
navModelSrv: NavModelSrv
|
|
) {
|
|
this.navModel = navModelSrv.getNav('dashboards', 'playlists', 0);
|
|
this.isNew = !$route.current.params.id;
|
|
|
|
if ($route.current.params.id) {
|
|
const playlistId = $route.current.params.id;
|
|
|
|
promiseToDigest(this.$scope)(
|
|
getBackendSrv()
|
|
.get('/api/playlists/' + playlistId)
|
|
.then((result: any) => {
|
|
this.playlist = result;
|
|
})
|
|
);
|
|
|
|
promiseToDigest(this.$scope)(
|
|
getBackendSrv()
|
|
.get('/api/playlists/' + playlistId + '/items')
|
|
.then((result: any) => {
|
|
this.playlistItems = result;
|
|
})
|
|
);
|
|
}
|
|
}
|
|
|
|
filterFoundPlaylistItems() {
|
|
this.filteredDashboards = _.reject(this.dashboardresult, playlistItem => {
|
|
return _.find(this.playlistItems, listPlaylistItem => {
|
|
return parseInt(listPlaylistItem.value, 10) === playlistItem.id;
|
|
});
|
|
});
|
|
|
|
this.filteredTags = _.reject(this.tagresult, tag => {
|
|
return _.find(this.playlistItems, listPlaylistItem => {
|
|
return listPlaylistItem.value === tag.term;
|
|
});
|
|
});
|
|
}
|
|
|
|
addPlaylistItem(playlistItem: PlaylistItem) {
|
|
playlistItem.value = playlistItem.id.toString();
|
|
playlistItem.type = 'dashboard_by_id';
|
|
playlistItem.order = this.playlistItems.length + 1;
|
|
|
|
this.playlistItems.push(playlistItem);
|
|
this.filterFoundPlaylistItems();
|
|
}
|
|
|
|
addTagPlaylistItem(tag: { term: any }) {
|
|
const playlistItem: any = {
|
|
value: tag.term,
|
|
type: 'dashboard_by_tag',
|
|
order: this.playlistItems.length + 1,
|
|
title: tag.term,
|
|
};
|
|
|
|
this.playlistItems.push(playlistItem);
|
|
this.filterFoundPlaylistItems();
|
|
}
|
|
|
|
removePlaylistItem(playlistItem: PlaylistItem) {
|
|
_.remove(this.playlistItems, listedPlaylistItem => {
|
|
return playlistItem === listedPlaylistItem;
|
|
});
|
|
this.filterFoundPlaylistItems();
|
|
}
|
|
|
|
savePlaylist(playlist: any, playlistItems: PlaylistItem[]) {
|
|
let savePromise;
|
|
|
|
playlist.items = playlistItems;
|
|
|
|
savePromise = playlist.id
|
|
? promiseToDigest(this.$scope)(getBackendSrv().put('/api/playlists/' + playlist.id, playlist))
|
|
: promiseToDigest(this.$scope)(getBackendSrv().post('/api/playlists', playlist));
|
|
|
|
savePromise.then(
|
|
() => {
|
|
this.$scope.appEvent(AppEvents.alertSuccess, ['Playlist saved']);
|
|
this.$location.path('/playlists');
|
|
},
|
|
() => {
|
|
this.$scope.appEvent(AppEvents.alertError, ['Unable to save playlist']);
|
|
}
|
|
);
|
|
}
|
|
|
|
isPlaylistEmpty() {
|
|
return !this.playlistItems.length;
|
|
}
|
|
|
|
backToList() {
|
|
this.$location.path('/playlists');
|
|
}
|
|
|
|
searchStarted(promise: Promise<any>) {
|
|
promise.then((data: any) => {
|
|
this.dashboardresult = data.dashboardResult;
|
|
this.tagresult = data.tagResult;
|
|
this.filterFoundPlaylistItems();
|
|
});
|
|
}
|
|
|
|
movePlaylistItem(playlistItem: PlaylistItem, offset: number) {
|
|
const currentPosition = this.playlistItems.indexOf(playlistItem);
|
|
const newPosition = currentPosition + offset;
|
|
|
|
if (newPosition >= 0 && newPosition < this.playlistItems.length) {
|
|
this.playlistItems.splice(currentPosition, 1);
|
|
this.playlistItems.splice(newPosition, 0, playlistItem);
|
|
}
|
|
}
|
|
|
|
movePlaylistItemUp(playlistItem: PlaylistItem) {
|
|
this.movePlaylistItem(playlistItem, -1);
|
|
}
|
|
|
|
movePlaylistItemDown(playlistItem: PlaylistItem) {
|
|
this.movePlaylistItem(playlistItem, 1);
|
|
}
|
|
}
|
|
|
|
coreModule.controller('PlaylistEditCtrl', PlaylistEditCtrl);
|