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

Fix: Fixes crash using back button with zoomed graph (#19122)

Browse Source 
Fixes: #19114
This commit is contained in:
Hugo Häggmark 2019-09-16 14:17:33 +02:00 committed by GitHub
parent 97ff75732d
commit e9f1e86c8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/features/explore/state/reducers.test.ts
View File

@ -20,6 +20,7 @@ import {
scanStopAction,
toggleGraphAction,
toggleTableAction,
changeRangeAction,
} from './actionTypes';
import { Reducer } from 'redux';
import { ActionOf } from 'app/core/redux/actionCreatorFactory';
@ -27,7 +28,7 @@ import { updateLocation } from 'app/core/actions/location';
import { serializeStateToUrlParam } from 'app/core/utils/explore';
import TableModel from 'app/core/table_model';
import { DataSourceApi, DataQuery } from '@grafana/ui';
import { LogsModel, LogsDedupStrategy } from '@grafana/data';
import { LogsModel, LogsDedupStrategy, dateTime } from '@grafana/data';
describe('Explore item reducer', () => {
describe('scanning', () => {
@ -196,6 +197,31 @@ describe('Explore item reducer', () => {
});
});
});
describe('changing range', () => {
describe('when changeRangeAction is dispatched', () => {
it('then it should set correct state', () => {
reducerTester()
.givenReducer(itemReducer, {
update: { ...makeInitialUpdateState(), range: true },
range: null,
absoluteRange: null,
})
.whenActionIsDispatched(
changeRangeAction({
exploreId: ExploreId.left,
absoluteRange: { from: 1546297200000, to: 1546383600000 },
range: { from: dateTime('2019-01-01'), to: dateTime('2019-01-02'), raw: { from: 'now-1d', to: 'now' } },
})
)
.thenStateShouldEqual({
update: { ...makeInitialUpdateState(), range: false },
absoluteRange: { from: 1546297200000, to: 1546383600000 },
range: { from: dateTime('2019-01-01'), to: dateTime('2019-01-02'), raw: { from: 'now-1d', to: 'now' } },
});
});
});
});
});
export const setup = (urlStateOverrides?: any) => {

1
public/app/features/explore/state/reducers.ts
View File

@ -540,6 +540,7 @@ export const itemReducer = reducerFactory<ExploreItemState>({} as ExploreItemSta
...state,
range,
absoluteRange,
update: makeInitialUpdateState(),
};
},
})