Merge pull request #610 from opentripplanner/remove-obsolete-otp-ui-props

Remove obsolete OTP UI props

Author: binh-dam-ibigroup

Diff for: lib/components/narrative/connected-trip-details.js

@@ -1,7 +1,6 @@
-import coreUtils from '@opentripplanner/core-utils'
-import TripDetailsBase from '@opentripplanner/trip-details'
 import { connect } from 'react-redux'
 import styled from 'styled-components'
+import TripDetailsBase from '@opentripplanner/trip-details'
 
 const TripDetails = styled(TripDetailsBase)`
   b {
@@ -11,17 +10,11 @@ const TripDetails = styled(TripDetailsBase)`
 
 // Connect imported TripDetails class to redux store.
 
-const mapStateToProps = (state, ownProps) => {
+const mapStateToProps = (state) => {
+  const { itinerary } = state.otp.config
   return {
-    defaultFareKey: state.otp.config.itinerary?.defaultFareKey || undefined,
-    fareKeyNameMap: state.otp.config.itinerary?.fareKeyNameMap || {},
-    longDateFormat: coreUtils.time.getLongDateFormat(state.otp.config),
-    messages: state.otp.config.language.tripDetails,
-    routingType: state.otp.currentQuery.routingType,
-    timeOptions: {
-      format: coreUtils.time.getTimeFormat(state.otp.config)
-    },
-    tnc: state.otp.tnc
+    defaultFareKey: itinerary?.defaultFareKey || undefined,
+    fareKeyNameMap: itinerary?.fareKeyNameMap || {}
   }
 }
 

Diff for: lib/components/user/monitored-trip/trip-status-rendering-strategies/upcoming-trip-renderer.js

@@ -1,9 +1,9 @@
-import React from 'react'
 import { FormattedMessage } from 'react-intl'
+import React from 'react'
 
-import FormattedDuration from '../../../util/formatted-duration'
 import { getMinutesUntilItineraryStart } from '../../../../util/itinerary'
 import { getTripStatus, REALTIME_STATUS } from '../../../../util/viewer'
+import FormattedDuration from '../../../util/formatted-duration'
 
 import baseRenderer from './base-renderer'
 
@@ -12,8 +12,7 @@ import baseRenderer from './base-renderer'
  * future. Some realtime data might already exist when these trips are within
  * their lead time, so additional calculations and output occurs in those cases.
  */
-export default function upcomingTripRenderer ({
-  dateFormat,
+export default function upcomingTripRenderer({
   monitoredTrip,
   onTimeThresholdSeconds
 }) {
@@ -27,10 +26,11 @@ export default function upcomingTripRenderer ({
   // set default panel bootstrap style
   data.panelBsStyle = 'info'
   const tripStart = data.matchingItinerary.startTime
-  const monitoringStart = tripStart - monitoredTrip.leadTimeInMinutes * ONE_MINUTE
+  const monitoringStart =
+    tripStart - monitoredTrip.leadTimeInMinutes * ONE_MINUTE
   data.bodyText = (
     <FormattedMessage
-      id='components.TripStatusRenderers.upcoming.tripBegins'
+      id="components.TripStatusRenderers.upcoming.tripBegins"
       values={{
         monitoringStart: monitoringStart,
         tripStart: tripStart
@@ -45,7 +45,7 @@ export default function upcomingTripRenderer ({
     data.panelBsStyle = undefined
     data.headingText = (
       <FormattedMessage
-        id='components.TripStatusRenderers.upcoming.nextTripBegins'
+        id="components.TripStatusRenderers.upcoming.nextTripBegins"
         values={{
           tripDatetime: tripStart
         }}
@@ -67,10 +67,10 @@ export default function upcomingTripRenderer ({
     if (data.journeyState.hasRealtimeData) {
       // calculate the deviation from the scheduled departure time (positive
       // value indicates delay)
-      const departureDeviationSeconds = (
-        data.matchingItinerary.startTime -
-          data.journeyState.scheduledDepartureTimeEpochMillis
-      ) / 1000
+      const departureDeviationSeconds =
+        (data.matchingItinerary.startTime -
+          data.journeyState.scheduledDepartureTimeEpochMillis) /
+        1000
       const absDeviation = Math.abs(departureDeviationSeconds)
       const tripStatus = getTripStatus(
         true,
@@ -79,13 +79,15 @@ export default function upcomingTripRenderer ({
       )
       if (tripStatus === REALTIME_STATUS.ON_TIME) {
         // about on time
-        data.headingText = <FormattedMessage id='components.TripStatusRenderers.upcoming.tripStartsSoonOnTime' />
+        data.headingText = (
+          <FormattedMessage id="components.TripStatusRenderers.upcoming.tripStartsSoonOnTime" />
+        )
         data.panelBsStyle = 'success'
       } else if (tripStatus === REALTIME_STATUS.LATE) {
         // delayed
         data.headingText = (
           <FormattedMessage
-            id='components.TripStatusRenderers.upcoming.tripStartIsDelayed'
+            id="components.TripStatusRenderers.upcoming.tripStartIsDelayed"
             values={{
               duration: <FormattedDuration values={absDeviation} />
             }}
@@ -96,7 +98,7 @@ export default function upcomingTripRenderer ({
         // early
         data.headingText = (
           <FormattedMessage
-            id='components.TripStatusRenderers.upcoming.tripStartIsEarly'
+            id="components.TripStatusRenderers.upcoming.tripStartIsEarly"
             values={{
               duration: <FormattedDuration values={absDeviation} />
             }}
@@ -105,7 +107,9 @@ export default function upcomingTripRenderer ({
         data.panelBsStyle = 'warning'
       }
     } else {
-      data.headingText = <FormattedMessage id='components.TripStatusRenderers.upcoming.tripStartsSoonNoUpdates' />
+      data.headingText = (
+        <FormattedMessage id="components.TripStatusRenderers.upcoming.tripStartsSoonNoUpdates" />
+      )
     }
   }
 

Diff for: lib/components/user/monitored-trip/trip-status.js

@@ -1,13 +1,9 @@
-import {
-  getDateFormat,
-  getLongDateFormat,
-  getTimeFormat
-} from '@opentripplanner/core-utils/lib/time'
-import AlertsBody from '@opentripplanner/itinerary-body/lib/TransitLegBody/alerts-body'
-import React from 'react'
+/* eslint-disable react/prop-types */
 import { Button, Glyphicon, Panel } from 'react-bootstrap'
-import { injectIntl, FormattedMessage } from 'react-intl'
 import { connect } from 'react-redux'
+import { FormattedMessage, injectIntl } from 'react-intl'
+import AlertsBody from '@opentripplanner/itinerary-body/lib/TransitLegBody/alerts-body'
+import React from 'react'
 import styled from 'styled-components'
 
 import {
@@ -23,25 +19,24 @@ const StyledFooterButton = styled(Button)`
   margin-right: 10px;
 `
 
-export function FooterButton ({ bsStyle, glyphIcon, onClick, text }) {
+export function FooterButton({ bsStyle, glyphIcon, onClick, text }) {
   return (
     <StyledFooterButton bsStyle={bsStyle} onClick={onClick}>
       <Glyphicon glyph={glyphIcon} /> {text}
     </StyledFooterButton>
   )
 }
 
-function MonitoredTripAlerts ({ alerts, longDateFormat, timeFormat }) {
+function MonitoredTripAlerts({ alerts }) {
   return (
     <Panel.Body>
       <h4>
-        <FormattedMessage id='components.TripStatus.alerts' values={{alerts: alerts.length}} />
+        <FormattedMessage
+          id="components.TripStatus.alerts"
+          values={{ alerts: alerts.length }}
+        />
       </h4>
-      <AlertsBody
-        alerts={alerts}
-        longDateFormat={longDateFormat}
-        timeFormat={timeFormat}
-      />
+      <AlertsBody alerts={alerts} />
     </Panel.Body>
   )
 }
@@ -52,12 +47,10 @@ function MonitoredTripAlerts ({ alerts, longDateFormat, timeFormat }) {
  * passed to this component with the necessary data for rendering each portion
  * of this component.
  */
-function TripStatus ({
+function TripStatus({
   confirmAndDeleteUserMonitoredTrip,
-  longDateFormat,
   planNewTripFromMonitoredTrip,
   renderData,
-  timeFormat,
   togglePauseTrip,
   toggleSnoozeTrip
 }) {
@@ -72,11 +65,7 @@ function TripStatus ({
       <Panel.Body>{renderData.bodyText}</Panel.Body>
       {/* Alerts */}
       {renderData.shouldRenderAlerts && (
-        <MonitoredTripAlerts
-          alerts={renderData.alerts}
-          longDateFormat={longDateFormat}
-          timeFormat={timeFormat}
-        />
+        <MonitoredTripAlerts alerts={renderData.alerts} />
       )}
       {/* Footer buttons */}
       <Panel.Body>
@@ -96,17 +85,17 @@ function TripStatus ({
         )}
         {renderData.shouldRenderDeleteTripButton && (
           <FooterButton
-            bsStyle='error'
-            glyphIcon='trash'
+            bsStyle="error"
+            glyphIcon="trash"
             onClick={confirmAndDeleteUserMonitoredTrip}
-            text={<FormattedMessage id='components.TripStatus.deleteTrip' />}
+            text={<FormattedMessage id="components.TripStatus.deleteTrip" />}
           />
         )}
         {renderData.shouldRenderPlanNewTripButton && (
           <FooterButton
-            glyphIcon='search'
+            glyphIcon="search"
             onClick={planNewTripFromMonitoredTrip}
-            text={<FormattedMessage id='components.TripStatus.planNewTrip' />}
+            text={<FormattedMessage id="components.TripStatus.planNewTrip" />}
           />
         )}
       </Panel.Body>
@@ -117,40 +106,29 @@ function TripStatus ({
 // connect to the redux store
 const mapStateToProps = (state, ownProps) => {
   const { monitoredTrip } = ownProps
-  const dateFormat = getDateFormat(state.otp.config)
-  const longDateFormat = getLongDateFormat(state.otp.config)
-  const timeFormat = getTimeFormat(state.otp.config)
-
   const renderData = getRenderData({
-    dateFormat,
-    longDateFormat,
     monitoredTrip,
-    onTimeThresholdSeconds: state.otp.config.onTimeThresholdSeconds,
-    timeFormat
+    onTimeThresholdSeconds: state.otp.config.onTimeThresholdSeconds
   })
 
   return {
-    dateFormat,
-    longDateFormat,
-    renderData,
-    timeFormat
+    renderData
   }
 }
 
 const mapDispatchToProps = (dispatch, ownProps) => {
   const { intl, monitoredTrip } = ownProps
   return {
-    confirmAndDeleteUserMonitoredTrip: () => dispatch(
-      confirmAndDeleteUserMonitoredTrip(monitoredTrip.id, intl)
-    ),
-    planNewTripFromMonitoredTrip: () => dispatch(
-      planNewTripFromMonitoredTrip(monitoredTrip)
-    ),
+    confirmAndDeleteUserMonitoredTrip: () =>
+      dispatch(confirmAndDeleteUserMonitoredTrip(monitoredTrip.id, intl)),
+    planNewTripFromMonitoredTrip: () =>
+      dispatch(planNewTripFromMonitoredTrip(monitoredTrip)),
     togglePauseTrip: () => dispatch(togglePauseTrip(monitoredTrip, intl)),
     toggleSnoozeTrip: () => dispatch(toggleSnoozeTrip(monitoredTrip, intl))
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(
-  injectIntl(TripStatus)
-)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(injectIntl(TripStatus))