IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06: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/influxdb/datasource.ts
View File

@@ -8,7 +8,6 @@ import { InfluxQueryBuilder } from './query_builder';
import { InfluxQuery, InfluxOptions } from './types';
import { BackendSrv } from 'app/core/services/backend_srv';
import { TemplateSrv } from 'app/features/templating/template_srv';
import { IQService } from 'angular';
export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxOptions> {
type: string;
@@ -26,7 +25,6 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
/** @ngInject */
constructor(
instanceSettings: DataSourceInstanceSettings<InfluxOptions>,
private $q: IQService,
private backendSrv: BackendSrv,
private templateSrv: TemplateSrv
) {
@@ -76,7 +74,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
});
if (allQueries === '') {
return this.$q.when({ data: [] });
return Promise.resolve({ data: [] });
}
// add global adhoc filters to timeFilter
@@ -135,7 +133,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
annotationQuery(options: any) {
if (!options.annotation.query) {
return this.$q.reject({
return Promise.reject({
message: 'Query missing in annotation definition',
});
}
@@ -227,7 +225,7 @@ export default class InfluxDatasource extends DataSourceApi<InfluxQuery, InfluxO
_seriesQuery(query: string, options?: any) {
if (!query) {
return this.$q.when({ results: [] });
return Promise.resolve({ results: [] });
}
if (options && options.range) {