opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-23 11:33:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore/Tech debt: Remove (most) instances of $q angular service use (#20668)

Browse Source 
* Chore/Tech debt: Remove (most) instances of $q angular service use
Removes instances where the angular $q service is used and replaces
it with native Promises.
This commit is contained in:
kay delaney
2019-12-05 09:04:03 +00:00
committed by GitHub
parent 62f0aca3e6
commit 880fbcb09a
58 changed files with 320 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/postgres/datasource.ts
View File

@ -1,7 +1,6 @@
import _ from 'lodash';
import ResponseParser from './response_parser';
import PostgresQuery from 'app/plugins/datasource/postgres/postgres_query';
import { IQService } from 'angular';
import { BackendSrv } from 'app/core/services/backend_srv';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
@ -21,14 +20,13 @@ export class PostgresDatasource {
constructor(
instanceSettings: { name: any; id?: any; jsonData?: any },
private backendSrv: BackendSrv,
private $q: IQService,
private templateSrv: TemplateSrv,
private timeSrv: TimeSrv
) {
this.name = instanceSettings.name;
this.id = instanceSettings.id;
this.jsonData = instanceSettings.jsonData;
this.responseParser = new ResponseParser(this.$q);
this.responseParser = new ResponseParser();
this.queryModel = new PostgresQuery({});
this.interval = (instanceSettings.jsonData || {}).timeInterval || '1m';
}
@ -84,7 +82,7 @@ export class PostgresDatasource {
});
if (queries.length === 0) {
return this.$q.when({ data: [] });
return Promise.resolve({ data: [] });
}
return this.backendSrv
@ -102,7 +100,7 @@ export class PostgresDatasource {
annotationQuery(options: any) {
if (!options.annotation.rawQuery) {
return this.$q.reject({
return Promise.reject({
message: 'Query missing in annotation definition',
});
}