Merge pull request #2253 from HSLdevcom/DT-2598

DT-2598: Route page's Timetable view is broken
HSLdevcom · Apr 19, 2018 · 7d83d18 · 7d83d18
2 parents 0cdb155 + 3edaa5f
commit 7d83d18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/component/RoutePage.js b/app/component/RoutePage.js
@@ -178,6 +178,7 @@ class RoutePage extends React.Component {
               route={this.props.route}
               onSelectChange={this.onPatternChange}
               gtfsId={this.props.route.gtfsId}
+              activeTab={activeTab}
               className={cx({
                 'bp-large': this.context.breakpoint === 'large',
               })}

diff --git a/app/component/RoutePatternSelect.js b/app/component/RoutePatternSelect.js
@@ -18,6 +18,7 @@ class RoutePatternSelect extends Component {
     route: PropTypes.object,
     onSelectChange: PropTypes.func.isRequired,
     serviceDay: PropTypes.string.isRequired,
+    activeTab: PropTypes.string.isRequired,
     relay: PropTypes.object.isRequired,
     gtfsId: PropTypes.string.isRequired,
   };
@@ -47,7 +48,12 @@ class RoutePatternSelect extends Component {
         o => o.tripsForDate && o.tripsForDate.length > 0,
       ) !== undefined
         ? this.props.route.patterns
-            .filter(o => o.tripsForDate && o.tripsForDate.length > 0)
+            .filter(
+              o =>
+                this.props.activeTab !== 'aikataulu'
+                  ? o.tripsForDate && o.tripsForDate.length > 0
+                  : o,
+            )
             .map(pattern => (
               <option key={pattern.code} value={pattern.code}>
                 {pattern.stops[0].name} ➔ {pattern.headsign}