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: Fix new-old-new query history bug (#90214)

Browse Source 
* Remove cancelActiveListeners() and delay()

* Wait for handle history to resolve

* Do not sync from URL when state changes

---------

Co-authored-by: harisrozajac <haris.rozajac12@gmail.com>
This commit is contained in:
Piotr Jamróz 2024-07-11 12:37:47 +02:00 committed by GitHub
parent 62494248e3
commit b09798c3fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/explore/hooks/useStateSync/index.ts
View File

@ -20,6 +20,7 @@ export function useStateSync(params: ExploreQueryParams) {
const { location } = useGrafana();
const dispatch = useDispatch();
const panesState = useSelector(selectPanes);
const panesStateRef = useRef(panesState);
const orgId = useSelector((state) => state.user.orgId);
const prevParams = useRef(params);
const initState = useRef<'notstarted' | 'pending' | 'done'>('notstarted');
@ -53,6 +54,10 @@ export function useStateSync(params: ExploreQueryParams) {
return () => unsubscribe();
}, [dispatch, location]);
useEffect(() => {
panesStateRef.current = panesState;
}, [panesState]);
useEffect(() => {
const isURLOutOfSync = prevParams.current?.panes !== params.panes;
@ -74,7 +79,7 @@ export function useStateSync(params: ExploreQueryParams) {
prevParams.current = params;
if (isURLOutOfSync && initState.current === 'done') {
syncFromURL(urlState, panesState, dispatch);
syncFromURL(urlState, panesStateRef.current, dispatch);
}
}, [dispatch, panesState, orgId, location, params, warning]);
}, [dispatch, orgId, location, params, warning]);
}