mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -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>
142 lines
4.3 KiB
TypeScript
142 lines
4.3 KiB
TypeScript
import { e2e } from '@grafana/e2e';
|
|
|
|
import coreModule from 'app/core/core_module';
|
|
import { DashboardSrv } from '../../services/DashboardSrv';
|
|
import { CloneOptions } from '../../state/DashboardModel';
|
|
|
|
const template = `
|
|
<div class="modal-body">
|
|
<div class="modal-header">
|
|
<h2 class="modal-header-title">
|
|
<i class="fa fa-save"></i>
|
|
<span class="p-l-1">Save changes</span>
|
|
</h2>
|
|
|
|
<a class="modal-header-close" ng-click="ctrl.dismiss();">
|
|
<i class="fa fa-remove"></i>
|
|
</a>
|
|
</div>
|
|
|
|
<form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
|
|
<div class="p-t-1">
|
|
<div class="gf-form-group" ng-if="ctrl.timeChange || ctrl.variableValueChange">
|
|
<gf-form-switch class="gf-form"
|
|
label="Save current time range" ng-if="ctrl.timeChange" label-class="width-12" switch-class="max-width-6"
|
|
checked="ctrl.saveTimerange" on-change="buildUrl()">
|
|
</gf-form-switch>
|
|
<gf-form-switch class="gf-form"
|
|
label="Save current variables" ng-if="ctrl.variableValueChange" label-class="width-12" switch-class="max-width-6"
|
|
checked="ctrl.saveVariables" on-change="buildUrl()">
|
|
</gf-form-switch>
|
|
</div>
|
|
<div class="gf-form">
|
|
<label class="gf-form-hint">
|
|
<input
|
|
type="text"
|
|
name="message"
|
|
class="gf-form-input"
|
|
placeholder="Add a note to describe your changes …"
|
|
give-focus="true"
|
|
ng-model="ctrl.message"
|
|
ng-model-options="{allowInvalid: true}"
|
|
ng-maxlength="this.max"
|
|
maxlength="64"
|
|
autocomplete="off" />
|
|
<small class="gf-form-hint-text muted" ng-cloak>
|
|
<span ng-class="{'text-error': ctrl.saveForm.message.$invalid && ctrl.saveForm.message.$dirty }">
|
|
{{ctrl.message.length || 0}}
|
|
</span>
|
|
/ {{ctrl.max}} characters
|
|
</small>
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="gf-form-button-row text-center">
|
|
<button
|
|
id="saveBtn"
|
|
type="submit"
|
|
class="btn btn-primary"
|
|
ng-class="{'btn-primary--processing': ctrl.isSaving}"
|
|
ng-disabled="ctrl.saveForm.$invalid || ctrl.isSaving"
|
|
aria-label={{ctrl.selectors.save}}
|
|
>
|
|
<span ng-if="!ctrl.isSaving">Save</span>
|
|
<span ng-if="ctrl.isSaving === true">Saving...</span>
|
|
</button>
|
|
<button class="btn btn-inverse" ng-click="ctrl.dismiss();">Cancel</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
`;
|
|
|
|
export class SaveDashboardModalCtrl {
|
|
message: string;
|
|
saveVariables = false;
|
|
saveTimerange = false;
|
|
time: any;
|
|
originalTime: any;
|
|
current: any[] = [];
|
|
originalCurrent: any[] = [];
|
|
max: number;
|
|
saveForm: any;
|
|
isSaving: boolean;
|
|
dismiss: () => void;
|
|
timeChange = false;
|
|
variableValueChange = false;
|
|
selectors: typeof e2e.pages.SaveDashboardModal.selectors;
|
|
|
|
/** @ngInject */
|
|
constructor(private dashboardSrv: DashboardSrv) {
|
|
this.message = '';
|
|
this.max = 64;
|
|
this.isSaving = false;
|
|
this.timeChange = this.dashboardSrv.getCurrent().hasTimeChanged();
|
|
this.variableValueChange = this.dashboardSrv.getCurrent().hasVariableValuesChanged();
|
|
this.selectors = e2e.pages.SaveDashboardModal.selectors;
|
|
}
|
|
|
|
save(): void | Promise<any> {
|
|
if (!this.saveForm.$valid) {
|
|
return;
|
|
}
|
|
|
|
const options: CloneOptions = {
|
|
saveVariables: this.saveVariables,
|
|
saveTimerange: this.saveTimerange,
|
|
message: this.message,
|
|
};
|
|
|
|
const dashboard = this.dashboardSrv.getCurrent();
|
|
const saveModel = dashboard.getSaveModelClone(options);
|
|
|
|
this.isSaving = true;
|
|
return this.dashboardSrv.save(saveModel, options).then(this.postSave.bind(this, options));
|
|
}
|
|
|
|
postSave(options?: { saveVariables?: boolean; saveTimerange?: boolean }) {
|
|
if (options.saveVariables) {
|
|
this.dashboardSrv.getCurrent().resetOriginalVariables();
|
|
}
|
|
|
|
if (options.saveTimerange) {
|
|
this.dashboardSrv.getCurrent().resetOriginalTime();
|
|
}
|
|
|
|
this.dismiss();
|
|
}
|
|
}
|
|
|
|
export function saveDashboardModalDirective() {
|
|
return {
|
|
restrict: 'E',
|
|
template: template,
|
|
controller: SaveDashboardModalCtrl,
|
|
bindToController: true,
|
|
controllerAs: 'ctrl',
|
|
scope: { dismiss: '&' },
|
|
};
|
|
}
|
|
|
|
coreModule.directive('saveDashboardModal', saveDashboardModalDirective);
|