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

@grafana/runtime: Add cancellation of queries to DataSourceWithBackend (#22818)

Browse Source
This commit is contained in:
Marcus Efraimsson 2020-03-18 00:12:03 +01:00 committed by GitHub
parent 8edf8e3982
commit eb96a8fcc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/grafana-runtime/src/utils/DataSourceWithBackend.ts
View File

@ -37,13 +37,10 @@ export class DataSourceWithBackend<
* Ideally final -- any other implementation may not work as expected * Ideally final -- any other implementation may not work as expected
*/ */
query(request: DataQueryRequest): Observable<DataQueryResponse> { query(request: DataQueryRequest): Observable<DataQueryResponse> {
const { targets, intervalMs, maxDataPoints, range } = request; const { targets, intervalMs, maxDataPoints, range, requestId } = request;
let expressionCount = 0;
const orgId = config.bootData.user.orgId; const orgId = config.bootData.user.orgId;
const queries = targets.map(q => { const queries = targets.map(q => {
if (q.datasource === ExpressionDatasourceID) { if (q.datasource === ExpressionDatasourceID) {
expressionCount++;
return { return {
...q, ...q,
datasourceId: this.id, datasourceId: this.id,
@ -65,7 +62,6 @@ export class DataSourceWithBackend<
}); });
const body: any = { const body: any = {
expressionCount,
queries, queries,
}; };
if (range) { if (range) {
@ -75,10 +71,16 @@ export class DataSourceWithBackend<
} }
const req: Promise<DataQueryResponse> = getBackendSrv() const req: Promise<DataQueryResponse> = getBackendSrv()
.post('/api/ds/query', body) .datasourceRequest({
url: '/api/ds/query',
method: 'POST',
data: body,
requestId,
})
.then((rsp: any) => { .then((rsp: any) => {
return this.toDataQueryResponse(rsp); return this.toDataQueryResponse(rsp?.data);
}); });
return from(req); return from(req);
} }