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

Explore: lookup datasource by name when present in legacy URLs (#85222)

Browse Source 
* [explore] lookup datasource by name when present in legacy compact URLs

* update unit test

* prettier fix

---------

Co-authored-by: Kristina Durivage <kristina.durivage@grafana.com>
This commit is contained in:
Christian Briones
2024-05-10 04:48:42 -07:00
committed by GitHub
parent dce39237c4
commit 867d36fe59
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/features/explore/hooks/useStateSync/index.test.tsx
View File

@@ -138,7 +138,14 @@ describe('useStateSync', () => {
const { location, waitForNextUpdate, store } = setup({
queryParams: {
panes: JSON.stringify({
one: { datasource: 'loki-uid', queries: [{ datasource: { name: 'loki', uid: 'loki-uid' }, refId: '1+2' }] },
one: {
datasource: 'loki-uid',
queries: [
{ datasource: { name: 'loki', uid: 'loki-uid' }, refId: '1+2' },
{ datasource: 'loki-uid', refId: '3' },
{ datasource: 'loki', refId: '4' },
],
},
two: { datasource: 'elastic-uid', queries: [{ datasource: { name: 'elastic', uid: 'elastic-uid' } }] },
}),
schemaVersion: 1,
@@ -182,9 +189,16 @@ describe('useStateSync', () => {
if (panes) {
// check if the URL is properly encoded when finishing rendering the hook. (this would be '1 2' otherwise)
expect(JSON.parse(panes)['one'].queries[0].refId).toBe('1+2');
expect(JSON.parse(panes)['one'].queries[0].datasource?.uid).toBe('loki-uid');
// we expect panes in the state to be in the same order as the ones in the URL
expect(Object.keys(store.getState().explore.panes)).toStrictEqual(Object.keys(JSON.parse(panes)));
// check that the datasources for the queries resolved correctly when set to a name or uid
expect(JSON.parse(panes)['one'].queries[1].refId).toBe('3');
expect(JSON.parse(panes)['one'].queries[1].datasource?.uid).toBe('loki-uid');
expect(JSON.parse(panes)['one'].queries[2].refId).toBe('4');
expect(JSON.parse(panes)['one'].queries[2].datasource?.uid).toBe('loki-uid');
}
});

2
public/app/features/explore/hooks/useStateSync/internal.utils.ts
View File

@@ -122,7 +122,7 @@ export function getQueryFilter(datasource?: DataSourceApi) {
}
// Due to legacy URLs, `datasource` in queries may be a string. This logic should probably be in the migration
if (typeof q.datasource === 'string') {
return q.datasource === datasource?.uid;
return q.datasource === datasource?.uid || q.datasource === datasource?.name;
}
return q.datasource.uid === datasource?.uid;