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

increase page size and make sure the cache supports query params (#30892)

Browse Source
This commit is contained in:
Erik Sundell 2021-02-04 11:22:20 +01:00 committed by GitHub
parent 56ef7c4a4c
commit b43a17f962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/app/plugins/datasource/cloud-monitoring/api.test.ts
View File

@ -22,7 +22,7 @@ async function getTestContext({ path = 'some-resource', options = {}, response =
const fetchMock = jest.spyOn(backendSrv, 'fetch');
fetchMock.mockImplementation((options: any) => {
const data = { [options.url.match(/([^\/]*)\/*$/)[1]]: response };
const data = { [options.url.match(/([^\/]*)\/*$/)![1].split('?')[0]]: response };
return of(createFetchResponse(data));
});
@ -39,35 +39,41 @@ async function getTestContext({ path = 'some-resource', options = {}, response =
describe('api', () => {
describe('when resource was cached', () => {
it('should return cached value and not load from source', async () => {
const path = 'some-resource';
const { res, api, fetchMock } = await getTestContext({ path, cache: response });
test.each(['some-resource', 'some-resource?some=param', 'test/some-resource?param'])(
'should return cached value and not load from source',
async (path) => {
const { res, api, fetchMock } = await getTestContext({ path, cache: response });
expect(res).toEqual(response);
expect(api.cache[path]).toEqual(response);
expect(fetchMock).not.toHaveBeenCalled();
});
expect(res).toEqual(response);
expect(api.cache[path]).toEqual(response);
expect(fetchMock).not.toHaveBeenCalled();
}
);
});
describe('when resource was not cached', () => {
it('should return from source and not from cache', async () => {
const path = 'some-resource';
const { res, api, fetchMock } = await getTestContext({ path, response });
test.each(['some-resource', 'some-resource?some=param', 'test/some-resource?param'])(
'should return from source and not from cache',
async (path) => {
const { res, api, fetchMock } = await getTestContext({ path, response });
expect(res).toEqual(response);
expect(api.cache[path]).toEqual(response);
expect(fetchMock).toHaveBeenCalled();
});
expect(res).toEqual(response);
expect(api.cache[path]).toEqual(response);
expect(fetchMock).toHaveBeenCalled();
}
);
});
describe('when cache should be bypassed', () => {
it('should return from source and not from cache', async () => {
const options = { useCache: false };
const path = 'some-resource';
const { res, fetchMock } = await getTestContext({ path, response, cache: response, options });
test.each(['some-resource', 'some-resource?some=param', 'test/some-resource?param'])(
'should return from source and not from cache',
async (path) => {
const options = { useCache: false };
const { res, fetchMock } = await getTestContext({ path, response, cache: response, options });
expect(res).toEqual(response);
expect(fetchMock).toHaveBeenCalled();
});
expect(res).toEqual(response);
expect(fetchMock).toHaveBeenCalled();
}
);
});
});

2
public/app/plugins/datasource/cloud-monitoring/api.ts
View File

@ -45,7 +45,7 @@ export default class Api {
})
.pipe(
map((response) => {
const responsePropName = path.match(/([^\/]*)\/*$/)![1];
const responsePropName = path.match(/([^\/]*)\/*$/)![1].split('?')[0];
let res = [];
if (response && response.data && response.data[responsePropName]) {
res = response.data[responsePropName].map(responseMap);

2
public/app/plugins/datasource/cloud-monitoring/datasource.ts
View File

@ -256,7 +256,7 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
}
async getSLOServices(projectName: string): Promise<Array<SelectableValue<string>>> {
return this.api.get(`${this.templateSrv.replace(projectName)}/services`, {
return this.api.get(`${this.templateSrv.replace(projectName)}/services?pageSize=1000`, {
responseMap: ({ name }: { name: string }) => ({
value: name.match(/([^\/]*)\/*$/)![1],
label: name.match(/([^\/]*)\/*$/)![1],