Chore: Remove angular dependency from backendSrv (#20999)
* 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>
This commit is contained in:
committed by
Hugo Häggmark
co-authored by
Hugo Häggmark
Marcus Andersson
parent
6ff315a299
commit
cf2cc71393
+1
-1
@@ -33,7 +33,7 @@ export class QueryEditor extends PureComponent<Props> {
|
||||
|
||||
query.scenarioId = query.scenarioId || 'random_walk';
|
||||
|
||||
// const scenarioList = await this.backendSrv.get('/api/tsdb/testdata/scenarios');
|
||||
// const scenarioList = await backendSrv.get('/api/tsdb/testdata/scenarios');
|
||||
const scenarioList = await datasource.getScenarios();
|
||||
const current: any = _.find(scenarioList, { id: query.scenarioId });
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import {
|
||||
DataQueryError,
|
||||
} from '@grafana/data';
|
||||
import { Scenario, TestDataQuery } from './types';
|
||||
import { getBackendSrv } from 'app/core/services/backend_srv';
|
||||
import { getBackendSrv } from '@grafana/runtime';
|
||||
import { queryMetricTree } from './metricTree';
|
||||
import { from, merge, Observable } from 'rxjs';
|
||||
import { runStream } from './runStreams';
|
||||
|
||||
+13
-8
@@ -4,7 +4,9 @@ import { e2e } from '@grafana/e2e';
|
||||
|
||||
import { QueryCtrl } from 'app/plugins/sdk';
|
||||
import { defaultQuery } from './runStreams';
|
||||
import { getBackendSrv } from 'app/core/services/backend_srv';
|
||||
import { getBackendSrv } from '@grafana/runtime';
|
||||
import { promiseToDigest } from 'app/core/utils/promiseToDigest';
|
||||
import { IScope } from 'angular';
|
||||
|
||||
export const defaultPulse: any = {
|
||||
timeStep: 60,
|
||||
@@ -29,12 +31,13 @@ export class TestDataQueryCtrl extends QueryCtrl {
|
||||
newPointValue: number;
|
||||
newPointTime: any;
|
||||
selectedPoint: any;
|
||||
digest: (promise: Promise<any>) => Promise<any>;
|
||||
|
||||
showLabels = false;
|
||||
selectors: typeof e2e.pages.Dashboard.Panels.DataSource.TestData.QueryTab.selectors;
|
||||
|
||||
/** @ngInject */
|
||||
constructor($scope: any, $injector: any) {
|
||||
constructor($scope: IScope, $injector: any) {
|
||||
super($scope, $injector);
|
||||
|
||||
this.target.scenarioId = this.target.scenarioId || 'random_walk';
|
||||
@@ -73,12 +76,14 @@ export class TestDataQueryCtrl extends QueryCtrl {
|
||||
}
|
||||
|
||||
$onInit() {
|
||||
return getBackendSrv()
|
||||
.get('/api/tsdb/testdata/scenarios')
|
||||
.then((res: any) => {
|
||||
this.scenarioList = res;
|
||||
this.scenario = _.find(this.scenarioList, { id: this.target.scenarioId });
|
||||
});
|
||||
return promiseToDigest(this.$scope)(
|
||||
getBackendSrv()
|
||||
.get('/api/tsdb/testdata/scenarios')
|
||||
.then((res: any) => {
|
||||
this.scenarioList = res;
|
||||
this.scenario = _.find(this.scenarioList, { id: this.target.scenarioId });
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
scenarioChanged() {
|
||||
|
||||
Reference in New Issue
Block a user