fix: handle router state edge case

RolnickLab · Jan 8, 2025 · e5d82e1 · e5d82e1
1 parent c9e1d28
commit e5d82e1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ui/src/pages/occurrences/occurrences.tsx b/ui/src/pages/occurrences/occurrences.tsx
@@ -214,14 +214,18 @@ const OccurrenceDetailsDialog = ({
 }) => {
   const navigate = useNavigate()
   const { state } = useLocation()
-  const { selectedView, setSelectedView } = useSelectedView(
-    state?.defaultTab ?? TABS.FIELDS,
-    'tab'
-  )
+  const { selectedView, setSelectedView } = useSelectedView(TABS.FIELDS, 'tab')
   const { projectId } = useParams()
   const { setDetailBreadcrumb } = useContext(BreadcrumbContext)
   const { occurrence, isLoading, error } = useOccurrenceDetails(id)
 
+  useEffect(() => {
+    // If a default tab is set from router state, set this as active
+    if (state?.defaultTab) {
+      setSelectedView(state.defaultTab)
+    }
+  }, [state?.defaultTab])
+
   useEffect(() => {
     setDetailBreadcrumb(
       occurrence ? { title: occurrence.displayName } : undefined