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

DashboardScenes: Fix queryOptions interval not resetting on empty minInterval (#95659)

Browse Source 
* Fix queryOptions interval not resetting on empty minInterval

* fix

* refactor + tests
This commit is contained in:
Victor Marin 2024-11-08 16:22:20 +02:00 committed by GitHub
parent 3dfbae7331
commit d9dfa3ece3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.test.tsx
View File

@ -520,6 +520,27 @@ describe('PanelDataQueriesTab', () => {
});
expect(dataObj.state.minInterval).toBe('1s');
});
it('should update min interval to undefined if empty input', async () => {
const { queriesTab } = await setupScene('panel-1');
const dataObj = queriesTab.queryRunner;
expect(dataObj.state.maxDataPoints).toBeUndefined();
queriesTab.onQueryOptionsChange({
dataSource: { name: 'grafana-testdata', type: 'grafana-testdata-datasource', default: true },
queries: [],
minInterval: '1s',
});
expect(dataObj.state.minInterval).toBe('1s');
queriesTab.onQueryOptionsChange({
dataSource: { name: 'grafana-testdata', type: 'grafana-testdata-datasource', default: true },
queries: [],
minInterval: null,
});
expect(dataObj.state.minInterval).toBe(undefined);
});
});
describe('query caching', () => {

4
public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataQueriesTab.tsx
View File

@ -201,8 +201,8 @@ export class PanelDataQueriesTab extends SceneObjectBase<PanelDataQueriesTabStat
dataObjStateUpdate.maxDataPoints = options.maxDataPoints ?? undefined;
}
if (options.minInterval !== dataObj.state.minInterval && options.minInterval !== null) {
dataObjStateUpdate.minInterval = options.minInterval;
if (options.minInterval !== dataObj.state.minInterval) {
dataObjStateUpdate.minInterval = options.minInterval ?? undefined;
}
const timeFrom = options.timeRange?.from ?? undefined;