Merge pull request #1315 from opentripplanner/auto-sort-on-sort

auto-set sort direction on sort type change
opentripplanner · Dec 26, 2024 · e567ee7 · e567ee7
2 parents 576b26b + 34e6266
commit e567ee7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/components/form/call-taker/date-time-picker.tsx b/lib/components/form/call-taker/date-time-picker.tsx
@@ -14,7 +14,11 @@ import React, {
 } from 'react'
 
 import { AppReduxState, FilterType, SortType } from '../../../util/state-types'
-import { DepartArriveTypeMap, DepartArriveValue } from '../date-time-modal'
+import {
+  DepartArriveDefaultSortDirectionMap,
+  DepartArriveTypeMap,
+  DepartArriveValue
+} from '../date-time-modal'
 import { updateItineraryFilter } from '../../../actions/narrative'
 
 const { getCurrentDate, OTP_API_DATE_FORMAT, OTP_API_TIME_FORMAT } =
@@ -220,6 +224,9 @@ const DateTimeOptions = ({
         importedUpdateItineraryFilter({
           sort: {
             ...sort,
+            direction:
+              DepartArriveDefaultSortDirectionMap[departArrive] ||
+              sort.direction,
             type: DepartArriveTypeMap[newValue]
           }
         })

diff --git a/lib/components/form/date-time-modal.tsx b/lib/components/form/date-time-modal.tsx
@@ -32,6 +32,15 @@ export const DepartArriveTypeMap: Record<
   NOW: 'DURATION'
 }
 
+export const DepartArriveDefaultSortDirectionMap: Record<
+  DepartArriveValue,
+  FilterType['sort']['direction']
+> = {
+  ARRIVE: 'ASC',
+  DEPART: 'DESC',
+  NOW: 'DESC'
+}
+
 function DateTimeModal({
   config,
   date,
@@ -57,6 +66,10 @@ function DateTimeModal({
         updateItineraryFilter({
           sort: {
             ...sort,
+            direction:
+              DepartArriveDefaultSortDirectionMap[
+                params.departArrive as DepartArriveValue
+              ] || sort.direction,
             type: DepartArriveTypeMap[params.departArrive as DepartArriveValue]
           }
         })