MM-193 (#51)

* Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * MM-155 Change Travis configuration to build and push images from environment branches (#38) * namespace info * better positioning of tooltip * icons moved * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations Co-authored-by: Anton <anton.jyrkiainen@helsinki.fi> * dev.yml and some small changes * testing trigger * changed login params * testing env changes * specified cypress json * more env updates * testing env * debug logs * testing old env * Removed console logs * removed push trigger * env updates * cypress envs only needed locally and in dev * removed redundant e2e stuff * credentials added to requests * removed redundant cypress things from travis-build.sh * 147 and 160 Session improvements and github actions (#42) * namespace info * better positioning of tooltip * icons moved * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * MM-155 Change Travis configuration to build and push images from environment branches (#39) * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * dev.yml and some small changes * testing trigger * changed login params * testing env changes * specified cypress json * more env updates * testing env * debug logs * testing old env * Removed console logs * removed push trigger * env updates * cypress envs only needed locally and in dev * removed redundant e2e stuff * credentials added to requests * removed redundant cypress things from travis-build.sh Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com> * MM-193 (#49) (#50) * 147 and 160 (#43) * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * MM-155 Change Travis configuration to build and push images from environment branches (#38) * namespace info * better positioning of tooltip * icons moved * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations Co-authored-by: Anton <anton.jyrkiainen@helsinki.fi> * dev.yml and some small changes * testing trigger * changed login params * testing env changes * specified cypress json * more env updates * testing env * debug logs * testing old env * Removed console logs * removed push trigger * env updates * cypress envs only needed locally and in dev * removed redundant e2e stuff * credentials added to requests * removed redundant cypress things from travis-build.sh * 147 and 160 Session improvements and github actions (#42) * namespace info * better positioning of tooltip * icons moved * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * MM-155 Change Travis configuration to build and push images from environment branches (#39) * Add travis configuration for development & stage branches * Remove latest env-file & production and stage cypress configurations * dev.yml and some small changes * testing trigger * changed login params * testing env changes * specified cypress json * more env updates * testing env * debug logs * testing old env * Removed console logs * removed push trigger * env updates * cypress envs only needed locally and in dev * removed redundant e2e stuff * credentials added to requests * removed redundant cypress things from travis-build.sh Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com> Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com> * filter lines * removed paranthesis Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com> Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com> Co-authored-by: Petteri Pesonen <teemu.p.pesonen@gmail.com>
HSLdevcom · Mar 12, 2021 · 19d880f · 19d880f
1 parent 3a350d2
commit 19d880f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/components/Generator.js b/src/components/Generator.js
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 import FlatButton from 'material-ui/FlatButton';
 import RaisedButton from 'material-ui/RaisedButton';
 import DatePicker from 'material-ui/DatePicker';
+import TextField from 'material-ui/TextField';
 import RadioGroup from './RadioGroup';
 import Checkbox from './Checkbox';
 import StopList from './StopList';
@@ -181,6 +182,17 @@ const Generator = props => {
         </Row>
       )}
 
+      <h3>Linjasuodatus</h3>
+      <Row>
+        <TextField
+          data-cy="routeFilterInput"
+          onChange={(event, value) => commonStore.setRouteFilter(value)}
+          value={commonStore.routeFilter}
+          hintText="Esim. 7*"
+          fullWidth
+        />
+      </Row>
+
       <Heading>Generointi</Heading>
       <Footer>
         <BuildSelect

diff --git a/src/stores/commonStore.js b/src/stores/commonStore.js
@@ -25,6 +25,7 @@ const store = observable({
   builds: [],
   selectedBuild: null,
   stopFilter: '',
+  routeFilter: '',
   templates: [],
   images: [],
   selectedTemplate: null,
@@ -307,4 +308,8 @@ store.setUser = user => {
 
 store.getUser = () => store.user;
 
+store.setRouteFilter = value => {
+  store.routeFilter = value;
+};
+
 export default store;
diff --git a/src/stores/generatorStore.js b/src/stores/generatorStore.js
@@ -113,6 +113,7 @@ store.setMinimapZoneSymbols = () => {
 
 store.generate = () => {
   const user = commonStore.getUser();
+  const routeFilter = commonStore.routeFilter;
   const format = date => moment(date).format('YYYY-MM-DD');
   const props = store.rows
     .filter(({ rowId }) => store.checkedRows.includes(rowId))
@@ -132,6 +133,7 @@ store.generate = () => {
       minimapZones: store.component === 'StopPoster' ? store.minimapZones : null,
       minimapZoneSymbols: store.component === 'StopPoster' ? store.minimapZoneSymbols : null,
       user,
+      routeFilter,
     }));
 
   store.resetChecked();