Merge pull request #1466 from opentripplanner/fix-print-layout-reload

Fix print layout reload

Author: binh-dam-ibigroup

lib/components/app/print-layout.tsx

@@ -1,12 +1,17 @@
 import { connect } from 'react-redux'
 import { FormattedMessage, injectIntl, IntlShape } from 'react-intl'
 import { Itinerary } from '@opentripplanner/types'
+import coreUtils from '@opentripplanner/core-utils'
 import React, { Component } from 'react'
 
-import * as apiActions from '../../actions/api'
 import * as formActions from '../../actions/form'
+import * as narrativeActions from '../../actions/narrative'
 import { AppReduxState } from '../../util/state-types'
-import { getActiveItinerary, getActiveSearch } from '../../util/state'
+import {
+  getActiveItineraries,
+  getActiveSearch,
+  getVisibleItineraryIndex
+} from '../../util/state'
 import { summarizeQuery } from '../form/user-settings-i18n'
 import { User } from '../user/types'
 import DefaultMap from '../map/default-map'
@@ -19,7 +24,8 @@ type Props = {
   intl: IntlShape
   itinerary: Itinerary
   location?: { search?: string }
-  parseUrlQueryString: (params?: any, source?: string) => any
+  parseUrlQueryString: (params?: any, source?: string) => void
+  setVisibleItinerary: (params: { index: number }) => void
   user: User
 }
 
@@ -37,6 +43,23 @@ class PrintLayout extends Component<Props> {
     }
   }
 
+  componentDidUpdate() {
+    const { activeSearch, itinerary, setVisibleItinerary } = this.props
+
+    // Display the desired itinerary on map.
+    if (!itinerary) {
+      const { ui_activeItinerary: uiActiveItinerary } =
+        coreUtils.query.getUrlParams() || {}
+      if (
+        activeSearch &&
+        uiActiveItinerary !== undefined &&
+        uiActiveItinerary !== '-1'
+      ) {
+        setVisibleItinerary({ index: +uiActiveItinerary })
+      }
+    }
+  }
+
   render() {
     const { activeSearch, intl, itinerary, user } = this.props
     const printVerb = intl.formatMessage({ id: 'common.forms.print' })
@@ -68,16 +91,17 @@ const mapStateToProps = (state: AppReduxState) => {
   const activeSearch = getActiveSearch(state)
   const { localUser, loggedInUser } = state.user
   const user = loggedInUser || localUser
+  const itineraries = getActiveItineraries(state)
   return {
     activeSearch,
-    itinerary: getActiveItinerary(state) as Itinerary,
+    itinerary: itineraries[getVisibleItineraryIndex(state)] as Itinerary,
     user
   }
 }
 
 const mapDispatchToProps = {
   parseUrlQueryString: formActions.parseUrlQueryString,
-  routingQuery: apiActions.routingQuery
+  setVisibleItinerary: narrativeActions.setVisibleItinerary
 }
 
 export default connect(