Skip to content

Fix passing of timeOptions for otp-ui components #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2020
Merged

Fix passing of timeOptions for otp-ui components #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/components/narrative/connected-trip-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const mapStateToProps = (state, ownProps) => {
messages: state.otp.config.language.tripDetails,
routingType: state.otp.currentQuery.routingType,
tnc: state.otp.tnc,
timeFormat: coreUtils.time.getTimeFormat(state.otp.config),
timeOptions: {
format: coreUtils.time.getTimeFormat(state.otp.config)
},
longDateFormat: coreUtils.time.getLongDateFormat(state.otp.config)
}
}
Expand Down
6 changes: 1 addition & 5 deletions lib/components/narrative/line-itin/connected-itinerary-body.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ class ConnectedItineraryBody extends Component {
TransitLegSummary={TransitLegSummary}
TimeColumnContent={RealtimeTimeColumn}
/>
<TripDetails
itinerary={itinerary}
longDateFormat={config.dateTime.longDateFormat}
timeOptions={timeOptions}
/>
<TripDetails itinerary={itinerary} />
<TripTools itinerary={itinerary} />
</ItineraryBodyContainer>
)
Expand Down
16 changes: 14 additions & 2 deletions lib/components/narrative/line-itin/realtime-time-column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import {
legType,
timeOptionsType
} from '@opentripplanner/core-utils/lib/types'
import { formatTime } from '@opentripplanner/core-utils/lib/time'
import { formatTime, getTimeFormat } 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``
Expand Down Expand Up @@ -53,7 +54,7 @@ const TimeColumnLate = styled(TimeColumnBase)`
* This component displays the scheduled departure/arrival time for a leg,
* and, for transit legs, displays any delays or earliness where applicable.
*/
export default function RealtimeTimeColumn ({
function RealtimeTimeColumn ({
isDestination,
leg,
timeOptions
Expand Down Expand Up @@ -128,6 +129,17 @@ export default function RealtimeTimeColumn ({
)
}

// Connect to redux store for timeOptions.
const mapStateToProps = (state, ownProps) => {
return {
timeOptions: {
format: getTimeFormat(state.otp.config)
}
}
}

export default connect(mapStateToProps)(RealtimeTimeColumn)

RealtimeTimeColumn.propTypes = {
isDestination: PropTypes.bool.isRequired,
leg: legType.isRequired,
Expand Down
Loading