Merge branch 'v3' into lahti-ticketlink

HSLdevcom · Oct 1, 2024 · 5a33c25 · 5a33c25
2 parents 8e44f2a + aade6c4
commit 5a33c25
Show file tree

Hide file tree

Showing 40 changed files with 388 additions and 243 deletions.
diff --git a/app/component/IndexPage.js b/app/component/IndexPage.js
@@ -300,20 +300,30 @@ class IndexPage extends React.Component {
     const destination = this.pendingDestination || this.props.destination;
     const sources = ['Favourite', 'History', 'Datasource'];
     const stopAndRouteSearchTargets = ['Stops', 'Routes'];
-    const locationSearchTargets = [
+    let locationSearchTargets = [
       'Locations',
       'CurrentPosition',
       'FutureRoutes',
-      'Stops',
     ];
 
-    if (useCitybikes(config.vehicleRental?.networks, config)) {
-      stopAndRouteSearchTargets.push('VehicleRentalStations');
-      locationSearchTargets.push('VehicleRentalStations');
-    }
-    if (config.includeParkAndRideSuggestions) {
-      stopAndRouteSearchTargets.push('ParkingAreas');
-      locationSearchTargets.push('ParkingAreas');
+    if (config.locationSearchTargetsFromOTP) {
+      // configurable setup
+      locationSearchTargets = [
+        ...locationSearchTargets,
+        ...config.locationSearchTargetsFromOTP,
+      ];
+    } else {
+      // default setup
+      locationSearchTargets.push('Stops');
+
+      if (useCitybikes(config.vehicleRental?.networks, config)) {
+        stopAndRouteSearchTargets.push('VehicleRentalStations');
+        locationSearchTargets.push('VehicleRentalStations');
+      }
+      if (config.includeParkAndRideSuggestions) {
+        stopAndRouteSearchTargets.push('ParkingAreas');
+        locationSearchTargets.push('ParkingAreas');
+      }
     }
     const locationSearchTargetsMobile = [
       ...locationSearchTargets,

diff --git a/app/component/RouteNumberContainer.js b/app/component/RouteNumberContainer.js
@@ -13,6 +13,7 @@ const RouteNumberContainer = (
     isCallAgency,
     withBicycle,
     occupancyStatus,
+    mode,
     ...props
   },
   { config },
@@ -23,7 +24,7 @@ const RouteNumberContainer = (
       className={className}
       isCallAgency={isCallAgency || route.type === 715}
       color={route.color ? `#${route.color}` : null}
-      mode={route.mode}
+      mode={mode !== undefined ? mode : route.mode}
       text={getLegText(route, config, interliningWithRoute)}
       withBicycle={withBicycle}
       occupancyStatus={occupancyStatus}
@@ -41,6 +42,7 @@ RouteNumberContainer.propTypes = {
   fadeLong: PropTypes.bool,
   withBicycle: PropTypes.bool,
   occupancyStatus: PropTypes.string,
+  mode: PropTypes.string,
 };
 
 RouteNumberContainer.defaultProps = {
@@ -52,6 +54,7 @@ RouteNumberContainer.defaultProps = {
   className: '',
   withBicycle: false,
   occupancyStatus: undefined,
+  mode: undefined,
 };
 
 RouteNumberContainer.contextTypes = {

diff --git a/app/component/StopTimetablePage.js b/app/component/StopTimetablePage.js
@@ -28,12 +28,12 @@ class StopTimetablePage extends React.Component {
   }
 
   onDateChange = value => {
+    this.setState({ date: value });
     this.props.relay.refetch(
       {
         date: value,
       },
       null,
-      () => this.setState({ date: value }),
     );
   };
 
@@ -48,11 +48,8 @@ class StopTimetablePage extends React.Component {
       <TimetableContainer
         stop={this.props.stop}
         date={this.state.date}
-        propsForDateSelect={{
-          startDate: unixToYYYYMMDD(unixTime(), this.context.config),
-          selectedDate: this.state.date,
-          onDateChange: this.onDateChange,
-        }}
+        startDate={unixToYYYYMMDD(unixTime(), this.context.config)}
+        onDateChange={this.onDateChange}
       />
     );
   }

diff --git a/app/component/SwipeableTabs.js b/app/component/SwipeableTabs.js
@@ -63,13 +63,8 @@ const handleKeyPress = (e, reactSwipeEl) => {
 };
 
 export default class SwipeableTabs extends React.Component {
-  constructor(props) {
-    super();
-    this.state = { tabIndex: props.tabIndex };
-  }
-
   static propTypes = {
-    tabIndex: PropTypes.number,
+    tabIndex: PropTypes.number.isRequired,
     tabs: PropTypes.arrayOf(PropTypes.node).isRequired,
     onSwipe: PropTypes.func.isRequired,
     hideArrows: PropTypes.bool,
@@ -82,7 +77,6 @@ export default class SwipeableTabs extends React.Component {
   static defaultProps = {
     hideArrows: false,
     navigationOnBottom: false,
-    tabIndex: 0,
     classname: undefined,
   };
 
@@ -100,7 +94,7 @@ export default class SwipeableTabs extends React.Component {
   }
 
   tabBalls = tabsLength => {
-    const tabIndex = parseInt(this.state.tabIndex, 10);
+    const tabIndex = parseInt(this.props.tabIndex, 10);
     const onLeft = tabIndex;
     const onRight = tabsLength - tabIndex - 1;
     let tabBalls = [];
@@ -161,17 +155,15 @@ export default class SwipeableTabs extends React.Component {
           )}
           tabIndex={0}
           className={`swipe-tab-ball ${
-            index === this.state.tabIndex ? 'selected' : ''
+            index === this.props.tabIndex ? 'selected' : ''
           } ${ball.smaller ? 'decreasing-small' : ''} ${
             ball.small ? 'decreasing' : ''
           } ${ball.hidden ? 'hidden' : ''}`}
           onClick={() => {
-            this.setState({ tabIndex: index });
             this.props.onSwipe(index);
           }}
           onKeyDown={e => {
             if (isKeyboardSelectionEvent(e)) {
-              this.setState({ tabIndex: index });
               this.props.onSwipe(index);
             }
           }}
@@ -247,7 +239,6 @@ export default class SwipeableTabs extends React.Component {
                   callback: i => {
                     // force transition after animation should be over because animation can randomly fail sometimes
                     setTimeout(() => {
-                      this.setState({ tabIndex: i });
                       this.props.onSwipe(i);
                     }, 300);
                   },
@@ -262,11 +253,7 @@ export default class SwipeableTabs extends React.Component {
             </div>
           </ScrollableWrapper>
         )}
-        <div
-          className={`swipe-header-container ${this.props.classname} ${
-            this.state.scrolled && !navigationOnBottom ? 'scrolled' : ''
-          }`}
-        >
+        <div className={`swipe-header-container ${this.props.classname}`}>
           {this.props.classname === 'swipe-desktop-view' && (
             <div className="desktop-view-divider" />
           )}
@@ -282,7 +269,7 @@ export default class SwipeableTabs extends React.Component {
             {!hideArrows && (
               <div
                 className={cx('swipe-button-container', {
-                  active: !(disabled || this.state.tabIndex <= 0),
+                  active: !(disabled || this.props.tabIndex <= 0),
                 })}
               >
                 <div
@@ -301,7 +288,7 @@ export default class SwipeableTabs extends React.Component {
                   <Icon
                     img="icon-icon_arrow-collapse--left"
                     className={`itinerary-arrow-icon ${
-                      disabled || this.state.tabIndex <= 0 ? 'disabled' : ''
+                      disabled || this.props.tabIndex <= 0 ? 'disabled' : ''
                     }`}
                   />
                 </div>
@@ -322,7 +309,7 @@ export default class SwipeableTabs extends React.Component {
             {!hideArrows && (
               <div
                 className={cx('swipe-button-container', {
-                  active: !(disabled || this.state.tabIndex >= tabs.length - 1),
+                  active: !(disabled || this.props.tabIndex >= tabs.length - 1),
                 })}
               >
                 <div
@@ -341,7 +328,7 @@ export default class SwipeableTabs extends React.Component {
                   <Icon
                     img="icon-icon_arrow-collapse--right"
                     className={`itinerary-arrow-icon ${
-                      disabled || this.state.tabIndex >= tabs.length - 1
+                      disabled || this.props.tabIndex >= tabs.length - 1
                         ? 'disabled'
                         : ''
                     }`}
@@ -361,7 +348,6 @@ export default class SwipeableTabs extends React.Component {
                   callback: i => {
                     // force transition after animation should be over because animation can randomly fail sometimes
                     setTimeout(() => {
-                      this.setState({ tabIndex: i });
                       this.props.onSwipe(i);
                     }, 300);
                   },

diff --git a/app/component/TerminalTimetablePage.js b/app/component/TerminalTimetablePage.js
@@ -34,12 +34,12 @@ class TerminalTimetablePage extends React.Component {
   }
 
   onDateChange = value => {
+    this.setState({ date: value });
     this.props.relay.refetch(
       {
         date: value,
       },
       null,
-      () => this.setState({ date: value }),
     );
   };
 
@@ -48,11 +48,8 @@ class TerminalTimetablePage extends React.Component {
       <TimetableContainer
         stop={this.props.station}
         date={this.state.date}
-        propsForDateSelect={{
-          startDate: unixToYYYYMMDD(unixTime(), this.context.config),
-          selectedDate: this.state.date,
-          onDateChange: this.onDateChange,
-        }}
+        startDate={unixToYYYYMMDD(unixTime(), this.context.config)}
+        onDateChange={this.onDateChange}
       />
     );
   }

diff --git a/app/component/Timetable.js b/app/component/Timetable.js
@@ -82,19 +82,12 @@ class Timetable extends React.Component {
         }),
       ).isRequired,
     }).isRequired,
-    propsForDateSelect: PropTypes.shape({
-      startDate: PropTypes.string,
-      selectedDate: PropTypes.string,
-      onDateChange: PropTypes.func,
-    }).isRequired,
-    date: PropTypes.string,
+    startDate: PropTypes.string.isRequired,
+    onDateChange: PropTypes.func.isRequired,
+    date: PropTypes.string.isRequired,
     language: PropTypes.string.isRequired,
   };
 
-  static defaultProps = {
-    date: undefined,
-  };
-
   static contextTypes = {
     router: routerShape.isRequired,
     match: matchShape.isRequired,
@@ -183,7 +176,7 @@ class Timetable extends React.Component {
   };
 
   dateForPrinting = () => {
-    const selectedDate = moment(this.props.propsForDateSelect.selectedDate);
+    const selectedDate = moment(this.props.date);
     return (
       <div className="printable-date-container">
         <div className="printable-date-icon">
@@ -331,9 +324,7 @@ class Timetable extends React.Component {
       }${locationType.toLowerCase()}/${this.props.stop.gtfsId}`;
     const timeTableRows = this.createTimeTableRows(timetableMap);
     const timeDifferenceDays = moment
-      .duration(
-        moment(this.props.propsForDateSelect.selectedDate).diff(moment()),
-      )
+      .duration(moment(this.props.date).diff(moment()))
       .asDays();
     return (
       <>
@@ -349,10 +340,10 @@ class Timetable extends React.Component {
             ) : null}
             <div className="timetable-topbar">
               <DateSelect
-                startDate={this.props.propsForDateSelect.startDate}
-                selectedDate={this.props.propsForDateSelect.selectedDate}
+                startDate={this.props.startDate}
+                selectedDate={this.props.date}
                 onDateChange={e => {
-                  this.props.propsForDateSelect.onDateChange(e);
+                  this.props.onDateChange(e);
                   const showRoutes = this.state.showRoutes.length
                     ? this.state.showRoutes.join(',')
                     : undefined;

diff --git a/app/component/itinerary/BicycleLeg.js b/app/component/itinerary/BicycleLeg.js
@@ -375,9 +375,9 @@ export default function BicycleLeg(
             <div
               role="button"
               tabIndex="0"
-              onClick={() => openSettings(true)}
+              onClick={() => openSettings(true, true)}
               onKeyPress={e =>
-                isKeyboardSelectionEvent(e) && openSettings(true)
+                isKeyboardSelectionEvent(e) && openSettings(true, true)
               }
               className="itinerary-transit-leg-route-bike"
             >

diff --git a/app/component/itinerary/Itinerary.js b/app/component/itinerary/Itinerary.js
@@ -88,7 +88,7 @@ export function RouteLeg(
 ) {
   const isCallAgency = isCallAgencyPickupType(leg);
   let routeNumber;
-  const mode = getRouteMode(leg.route);
+  const mode = getRouteMode(leg.route, config);
 
   const getOccupancyStatus = () => {
     if (hasOneTransitLeg) {
@@ -118,7 +118,7 @@ export function RouteLeg(
       <RouteNumberContainer
         alertSeverityLevel={getActiveLegAlertSeverityLevel(leg)}
         route={leg.route}
-        className={cx('line', leg.mode.toLowerCase())}
+        className={cx('line', mode)}
         interliningWithRoute={interliningWithRoute}
         mode={mode}
         vertical

diff --git a/app/component/itinerary/ItineraryListContainer.js b/app/component/itinerary/ItineraryListContainer.js
@@ -77,14 +77,12 @@ function ItineraryListContainer(
   };
 
   const onSelectActive = index => {
-    const subpath = getSubPath('');
     if (activeIndex === index) {
       onSelectImmediately(index);
     } else {
       router.replace({
         ...match.location,
         state: { selectedItineraryIndex: index },
-        pathname: `${getItineraryPagePath(params.from, params.to)}${subpath}`,
       });
 
       addAnalyticsEvent({