Merge pull request #1202 from opentripplanner/fix-mode-selector-sync-bug

fix: mode selector settings sync with url correctly
opentripplanner · Apr 30, 2024 · af8be49 · af8be49
2 parents e484762 + 0462123
commit af8be49
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/lib/components/form/batch-settings.tsx b/lib/components/form/batch-settings.tsx
@@ -49,7 +49,7 @@ type Props = {
   modeSettingValues: ModeSettingValues
   onPlanTripClick: () => void
   routingQuery: any
-  setUrlSearch: (evt: any) => void
+  setQueryParam: (evt: any) => void
   spacedOutModeSelector?: boolean
   updateQueryTimeIfLeavingNow: () => void
 }
@@ -81,7 +81,7 @@ function BatchSettings({
   modeSettingValues,
   onPlanTripClick,
   routingQuery,
-  setUrlSearch,
+  setQueryParam,
   spacedOutModeSelector,
   updateQueryTimeIfLeavingNow
 }: Props) {
@@ -189,6 +189,17 @@ function BatchSettings({
     updateQueryTimeIfLeavingNow
   ])
 
+  /**
+   * Stores parameters in both the Redux `currentQuery` and URL
+   * @param params Params to store
+   */
+  const _onSettingsUpdate = useCallback(
+    (params: any) => {
+      setQueryParam({ queryParamData: params, ...params })
+    },
+    [setQueryParam]
+  )
+
   const _toggleModeButton = useCallback(
     (buttonId: string, newState: boolean) => {
       let newButtons
@@ -200,11 +211,11 @@ function BatchSettings({
 
       // encodeQueryParams serializes the mode buttons for the URL
       // to get nice looking URL params and consistency
-      setUrlSearch(
+      _onSettingsUpdate(
         encodeQueryParams(queryParamConfig, { modeButtons: newButtons })
       )
     },
-    [enabledModeButtons, setUrlSearch]
+    [enabledModeButtons, _onSettingsUpdate]
   )
 
   /**
@@ -242,7 +253,7 @@ function BatchSettings({
             id: 'components.BatchSearchScreen.modeSelectorLabel'
           })}
           modeButtons={processedModeButtons}
-          onSettingsUpdate={setUrlSearch}
+          onSettingsUpdate={_onSettingsUpdate}
           onToggleModeButton={_toggleModeButton}
         />
         <PlanTripButton
@@ -296,7 +307,7 @@ const mapStateToProps = (state: any) => {
 
 const mapDispatchToProps = {
   routingQuery: apiActions.routingQuery,
-  setUrlSearch: apiActions.setUrlSearch,
+  setQueryParam: formActions.setQueryParam,
   updateQueryTimeIfLeavingNow: formActions.updateQueryTimeIfLeavingNow
 }