diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts index 5a9db7ce748..1852a87ae03 100644 --- a/public/app/core/services/backend_srv.ts +++ b/public/app/core/services/backend_srv.ts @@ -447,7 +447,7 @@ export class BackendSrv implements BackendService { url, type, redirected, - request: { url, ...init }, + config: options, }; return fetchResponse; }), @@ -555,7 +555,7 @@ export class BackendSrv implements BackendService { data: [], status: this.HTTP_REQUEST_CANCELED, statusText: 'Request was aborted', - request: { url: parseUrlFromOptions(options), ...parseInitFromOptions(options) }, + config: options, }); } diff --git a/public/app/core/specs/backend_srv.test.ts b/public/app/core/specs/backend_srv.test.ts index b4ec54dac80..9313a2d592d 100644 --- a/public/app/core/specs/backend_srv.test.ts +++ b/public/app/core/specs/backend_srv.test.ts @@ -345,7 +345,8 @@ describe('backendSrv', () => { it('then it should not emit message', async () => { const url = 'http://localhost:3000/api/some-mock'; const { backendSrv, appEventsMock, expectDataSourceRequestCallChain } = getTestContext({ url }); - const result = await backendSrv.datasourceRequest({ url, method: 'GET', silent: true }); + const options = { url, method: 'GET', silent: true }; + const result = await backendSrv.datasourceRequest(options); expect(result).toEqual({ data: { test: 'hello world' }, ok: true, @@ -354,16 +355,7 @@ describe('backendSrv', () => { statusText: 'Ok', type: 'basic', url, - request: { - url, - method: 'GET', - body: undefined, - headers: { - map: { - accept: 'application/json, text/plain, */*', - }, - }, - }, + config: options, }); expect(appEventsMock.emit).not.toHaveBeenCalled(); expectDataSourceRequestCallChain({ url, method: 'GET', silent: true }); @@ -374,7 +366,8 @@ describe('backendSrv', () => { it('then it should not emit message', async () => { const url = 'http://localhost:3000/api/some-mock'; const { backendSrv, appEventsMock, expectDataSourceRequestCallChain } = getTestContext({ url }); - const result = await backendSrv.datasourceRequest({ url, method: 'GET' }); + const options = { url, method: 'GET' }; + const result = await backendSrv.datasourceRequest(options); const expectedResult = { data: { test: 'hello world' }, ok: true, @@ -383,16 +376,7 @@ describe('backendSrv', () => { statusText: 'Ok', type: 'basic', url, - request: { - url, - method: 'GET', - body: undefined as any, - headers: { - map: { - accept: 'application/json, text/plain, */*', - }, - }, - }, + config: options, }; expect(result).toEqual(expectedResult); @@ -447,16 +431,7 @@ describe('backendSrv', () => { statusText: 'Ok', type: 'basic', url: '/api/dashboard/', - request: { - url: '/api/dashboard/', - method: 'GET', - body: undefined, - headers: { - map: { - accept: 'application/json, text/plain, */*', - }, - }, - }, + config: options, }); const result = await slowRequest; @@ -464,16 +439,7 @@ describe('backendSrv', () => { data: [], status: -1, statusText: 'Request was aborted', - request: { - url: '/api/dashboard/', - method: 'GET', - body: undefined, - headers: { - map: { - accept: 'application/json, text/plain, */*', - }, - }, - }, + config: options, }); expect(unsubscribe).toHaveBeenCalledTimes(1); }); diff --git a/public/app/features/dashboard/panel_editor/QueryInspector.tsx b/public/app/features/dashboard/panel_editor/QueryInspector.tsx index 5152aa8046f..1dcbe4bb744 100644 --- a/public/app/features/dashboard/panel_editor/QueryInspector.tsx +++ b/public/app/features/dashboard/panel_editor/QueryInspector.tsx @@ -96,7 +96,10 @@ export class QueryInspector extends PureComponent { delete response.headers; } - if (response.request) { + if (response.config) { + response.request = response.config; + + delete response.config; delete response.request.transformRequest; delete response.request.transformResponse; delete response.request.paramSerializer; @@ -111,6 +114,7 @@ export class QueryInspector extends PureComponent { if (response.data) { response.response = response.data; + delete response.config; delete response.data; delete response.status; delete response.statusText; @@ -120,6 +124,7 @@ export class QueryInspector extends PureComponent { delete response.type; delete response.$$config; } + this.setState(prevState => ({ ...prevState, dsQuery: { diff --git a/public/app/types/events.ts b/public/app/types/events.ts index 64ef2d43a53..4ca94be726c 100644 --- a/public/app/types/events.ts +++ b/public/app/types/events.ts @@ -51,7 +51,7 @@ export interface DataSourceResponse { readonly redirected: boolean; readonly type: ResponseType; readonly url: string; - readonly request: any; + readonly config: any; } type DataSourceResponsePayload = DataSourceResponse;