From 50c031dcf0c376e345299e93311572be9728db46 Mon Sep 17 00:00:00 2001 From: Rob Gregg Date: Thu, 11 Mar 2021 15:15:33 +0000 Subject: [PATCH 1/2] fix(narrative-itineraries.js, default-itinerary.js): Added setActiveLeg as a prop to ItineraryBody c Both files were not passing setActiveLeg as a prop so I imported where necessary and passed in the prop. fix #338 --- lib/components/narrative/default/default-itinerary.js | 4 +++- lib/components/narrative/narrative-itineraries.js | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index 36170108e..bd72789bc 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -6,6 +6,7 @@ import ItineraryBody from '../line-itin/connected-itinerary-body' import ItinerarySummary from './itinerary-summary' import SimpleRealtimeAnnotation from '../simple-realtime-annotation' import { getTotalFareAsString } from '../../../util/state' +import { setActiveLeg } from "../../../actions/narrative"; const { isBicycle, isTransit } = coreUtils.itinerary const { formatDuration, formatTime } = coreUtils.time @@ -121,6 +122,7 @@ export default class DefaultItinerary extends NarrativeItinerary { expanded, itinerary, LegIcon, + setActiveLeg, showRealtimeAnnotation, timeFormat } = this.props @@ -184,7 +186,7 @@ export default class DefaultItinerary extends NarrativeItinerary { {(active && expanded) && <> {showRealtimeAnnotation && } - + } diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js index eb8585e9a..7867b7265 100644 --- a/lib/components/narrative/narrative-itineraries.js +++ b/lib/components/narrative/narrative-itineraries.js @@ -15,11 +15,12 @@ import { import Icon from '../narrative/icon' import { ComponentContext } from '../../util/contexts' import { - getResponsesWithErrors, getActiveItineraries, getActiveSearch, - getRealtimeEffects + getRealtimeEffects, + getResponsesWithErrors } from '../../util/state' + import SaveTripButton from './save-trip-button' // TODO: move to utils? @@ -201,6 +202,7 @@ class NarrativeItineraries extends Component { itinerary={itinerary} key={index} LegIcon={LegIcon} + setActiveLeg={setActiveLeg} onClick={active ? this._toggleDetailedItinerary : undefined} routingType='ITINERARY' showRealtimeAnnotation={showRealtimeAnnotation} From a8137c4816f79176caca5aeb1196f71495b62cef Mon Sep 17 00:00:00 2001 From: Rob Gregg Date: Thu, 11 Mar 2021 17:19:11 +0000 Subject: [PATCH 2/2] fix(default-itinerary.js): Removed some unused code. The previous commit had a line of unused code. 338 --- lib/components/narrative/default/default-itinerary.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index bd72789bc..abd1eac24 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -6,7 +6,6 @@ import ItineraryBody from '../line-itin/connected-itinerary-body' import ItinerarySummary from './itinerary-summary' import SimpleRealtimeAnnotation from '../simple-realtime-annotation' import { getTotalFareAsString } from '../../../util/state' -import { setActiveLeg } from "../../../actions/narrative"; const { isBicycle, isTransit } = coreUtils.itinerary const { formatDuration, formatTime } = coreUtils.time