Merge pull request #252 from opentripplanner/dev

Patch release
opentripplanner · Oct 8, 2020 · 4930580 · 4930580
2 parents 797dae8 + 0fd5e35
commit 4930580
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/lib/components/mobile/results-screen.js b/lib/components/mobile/results-screen.js
@@ -16,7 +16,7 @@ import MobileNavigationBar from './navigation-bar'
 import { MobileScreens, setMobileScreen } from '../../actions/ui'
 import { setUseRealtimeResponse } from '../../actions/narrative'
 import { clearActiveSearch } from '../../actions/form'
-import { getActiveSearch, getRealtimeEffects } from '../../util/state'
+import { getActiveItineraries, getActiveSearch, getRealtimeEffects } from '../../util/state'
 
 const LocationContainer = styled.div`
   font-weight: 300;
@@ -235,17 +235,15 @@ const mapStateToProps = (state, ownProps) => {
     : useRealtime ? activeSearch.response : activeSearch.nonRealtimeResponse
 
   const realtimeEffects = getRealtimeEffects(state.otp)
-
+  const itineraries = getActiveItineraries(state.otp)
   return {
     query: state.otp.currentQuery,
     realtimeEffects,
     error: response && response.error,
     resultCount:
       response
         ? activeSearch.query.routingType === 'ITINERARY'
-          ? response.plan
-            ? response.plan.itineraries.length
-            : 0
+          ? itineraries.length
           : response.otp.profile.length
         : null,
     useRealtime,

diff --git a/lib/components/narrative/itinerary-carousel.js b/lib/components/narrative/itinerary-carousel.js
@@ -15,7 +15,7 @@ class ItineraryCarousel extends Component {
   state = {}
   static propTypes = {
     itineraries: PropTypes.array,
-    pending: PropTypes.bool,
+    pending: PropTypes.number,
     activeItinerary: PropTypes.number,
     hideHeader: PropTypes.bool,
     itineraryClass: PropTypes.func,
@@ -102,9 +102,7 @@ class ItineraryCarousel extends Component {
 
 const mapStateToProps = (state, ownProps) => {
   const activeSearch = getActiveSearch(state.otp)
-  const itineraries = activeSearch && activeSearch.response && activeSearch.response.plan
-    ? getActiveItineraries(state.otp)
-    : null
+  const itineraries = getActiveItineraries(state.otp)
 
   return {
     itineraries,

diff --git a/lib/components/narrative/narrative-itineraries.js b/lib/components/narrative/narrative-itineraries.js
@@ -38,7 +38,7 @@ class NarrativeItineraries extends Component {
   static propTypes = {
     itineraries: PropTypes.array,
     itineraryClass: PropTypes.func,
-    pending: PropTypes.bool,
+    pending: PropTypes.number,
     activeItinerary: PropTypes.number,
     setActiveItinerary: PropTypes.func,
     setActiveLeg: PropTypes.func,

diff --git a/lib/components/narrative/tabbed-itineraries.js b/lib/components/narrative/tabbed-itineraries.js
@@ -15,7 +15,7 @@ class TabbedItineraries extends Component {
   static propTypes = {
     itineraries: PropTypes.array,
     itineraryClass: PropTypes.func,
-    pending: PropTypes.bool,
+    pending: PropTypes.number,
     activeItinerary: PropTypes.number,
     setActiveItinerary: PropTypes.func,
     setActiveLeg: PropTypes.func,