feat: make swings apply to current route tab

mbta · Oct 30, 2024 · adcbb1d · adcbb1d
1 parent ae70ddd
commit adcbb1d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/assets/src/hooks/useSwings.ts b/assets/src/hooks/useSwings.ts
@@ -12,14 +12,15 @@ const useSwings = (): Swing[] | null => {
     allOpenRouteIds(routeTabs)
   )
 
-  const newRouteIds = allOpenRouteIds(routeTabs)
+  const newRouteIds =
+    routeTabs.find((v) => v.isCurrentTab)?.selectedRouteIds ?? []
 
-  if (!equalByElements(routeIds, newRouteIds)) {
+  if (newRouteIds && !equalByElements(routeIds, newRouteIds)) {
     setRouteIds(newRouteIds)
   }
 
   useEffect(() => {
-    fetchSwings(routeIds).then(setSwings)
+    newRouteIds && fetchSwings(routeIds).then(setSwings)
   }, [routeIds])
 
   return swings

diff --git a/assets/tests/hooks/useSwings.test.tsx b/assets/tests/hooks/useSwings.test.tsx
@@ -52,7 +52,7 @@ describe("useSwings", () => {
     })
 
     await waitFor(() => {
-      expect(jest.mocked(Api.fetchSwings)).toHaveBeenCalledWith(["1", "2"])
+      expect(jest.mocked(Api.fetchSwings)).toHaveBeenCalledWith(["1"])
       expect(result.current).toEqual(swings)
     })
   })
@@ -78,7 +78,7 @@ describe("useSwings", () => {
         isCurrentTab: true,
       }),
       routeTabFactory.build({
-        selectedRouteIds: ["2"],
+        selectedRouteIds: ["1"],
         isCurrentTab: false,
       }),
     ]
@@ -89,20 +89,24 @@ describe("useSwings", () => {
     })
     routeTabs = [
       routeTabFactory.build({ selectedRouteIds: ["1"], isCurrentTab: false }),
-      routeTabFactory.build({ selectedRouteIds: ["2"], isCurrentTab: true }),
+      routeTabFactory.build({ selectedRouteIds: ["1"], isCurrentTab: true }),
     ]
     rerender()
     expect(jest.mocked(Api.fetchSwings)).toHaveBeenCalledTimes(1)
   })
 
   test("does refetch swings when selected routes change", () => {
-    let routeTabs = [routeTabFactory.build({ selectedRouteIds: ["1"] })]
+    let routeTabs = [
+      routeTabFactory.build({ selectedRouteIds: ["1"], isCurrentTab: true }),
+    ]
     const { rerender } = renderHook(useSwings, {
       wrapper: ({ children }) => (
         <Wrapper routeTabs={routeTabs}>{children}</Wrapper>
       ),
     })
-    routeTabs = [routeTabFactory.build({ selectedRouteIds: ["2"] })]
+    routeTabs = [
+      routeTabFactory.build({ selectedRouteIds: ["2"], isCurrentTab: true }),
+    ]
     rerender()
     expect(jest.mocked(Api.fetchSwings)).toHaveBeenCalledTimes(2)
   })