diff --git a/lib/components/narrative/line-itin/realtime-time-column.js b/lib/components/narrative/line-itin/realtime-time-column.js index 127088883..76cc45e94 100644 --- a/lib/components/narrative/line-itin/realtime-time-column.js +++ b/lib/components/narrative/line-itin/realtime-time-column.js @@ -3,10 +3,9 @@ import { legType, timeOptionsType } from '@opentripplanner/core-utils/lib/types' -import { formatTime, getTimeFormat } from '@opentripplanner/core-utils/lib/time' +import { formatTime } from '@opentripplanner/core-utils/lib/time' import PropTypes from 'prop-types' import React from 'react' -import { connect } from 'react-redux' import styled from 'styled-components' const TimeText = styled.div`` @@ -129,16 +128,7 @@ function RealtimeTimeColumn ({ ) } -// Connect to redux store for timeOptions. -const mapStateToProps = (state, ownProps) => { - return { - timeOptions: { - format: getTimeFormat(state.otp.config) - } - } -} - -export default connect(mapStateToProps)(RealtimeTimeColumn) +export default RealtimeTimeColumn RealtimeTimeColumn.propTypes = { isDestination: PropTypes.bool.isRequired, diff --git a/lib/components/narrative/tabbed-itineraries.js b/lib/components/narrative/tabbed-itineraries.js index 991c454f7..d22ea748c 100644 --- 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.number, + pending: PropTypes.bool, activeItinerary: PropTypes.number, setActiveItinerary: PropTypes.func, setActiveLeg: PropTypes.func, @@ -85,6 +85,7 @@ class TabbedItineraries extends Component { expanded: true, routingType: 'ITINERARY', showRealtimeAnnotation, + timeFormat, ...itineraryClassProps }) : null @@ -95,29 +96,6 @@ class TabbedItineraries extends Component { } } -// connect to the redux store - -const mapStateToProps = (state, ownProps) => { - const activeSearch = getActiveSearch(state.otp) - // const { activeItinerary, activeLeg, activeStep } = activeSearch ? activeSearch.activeItinerary : {} - const pending = activeSearch ? activeSearch.pending : false - const realtimeEffects = getRealtimeEffects(state.otp) - const useRealtime = state.otp.useRealtime - return { - // swap out realtime itineraries with non-realtime depending on boolean - pending, - realtimeEffects, - activeItinerary: activeSearch && activeSearch.activeItinerary, - activeLeg: activeSearch && activeSearch.activeLeg, - activeStep: activeSearch && activeSearch.activeStep, - useRealtime, - companies: state.otp.currentQuery.companies, - tnc: state.otp.tnc, - timeFormat: getTimeFormat(state.otp.config), - user: state.user.loggedInUser - } -} - class TabButton extends Component { _onClick = () => { const {index, onClick} = this.props @@ -180,6 +158,28 @@ class TabButton extends Component { } } +// connect to the redux store + +const mapStateToProps = (state, ownProps) => { + const activeSearch = getActiveSearch(state.otp) + const pending = activeSearch ? Boolean(activeSearch.pending) : false + const realtimeEffects = getRealtimeEffects(state.otp) + const useRealtime = state.otp.useRealtime + return { + // swap out realtime itineraries with non-realtime depending on boolean + pending, + realtimeEffects, + activeItinerary: activeSearch && activeSearch.activeItinerary, + activeLeg: activeSearch && activeSearch.activeLeg, + activeStep: activeSearch && activeSearch.activeStep, + useRealtime, + companies: state.otp.currentQuery.companies, + tnc: state.otp.tnc, + timeFormat: getTimeFormat(state.otp.config), + user: state.user.loggedInUser + } +} + const mapDispatchToProps = (dispatch, ownProps) => { const {setActiveItinerary, setActiveLeg, setActiveStep, setUseRealtimeResponse} = narrativeActions return {