[Metrics UI] Prevent saved views from trampling URL state (#103146)

* [Metrics UI] Prevent saved views from trampling URL state

* Adding space back in
This commit is contained in:
Chris Cowan 2021-06-24 14:13:15 -07:00 committed by GitHub
parent d5f68eef4f
commit b12095b079
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -255,12 +255,21 @@ export const useSavedView = (props: Props) => {
}, [urlState, setUrlState, currentView, defaultViewId, data]);
useEffect(() => {
if (!currentView && !loading && data) {
if (!currentView && !loading && data && shouldLoadDefault) {
const viewToSet = views.find((v) => v.id === urlState.viewId);
if (viewToSet) setCurrentView(viewToSet);
else loadDefaultViewIfSet();
}
}, [loading, currentView, data, views, setCurrentView, loadDefaultViewIfSet, urlState.viewId]);
}, [
loading,
currentView,
data,
views,
setCurrentView,
loadDefaultViewIfSet,
urlState.viewId,
shouldLoadDefault,
]);
return {
views,