Production release

.env

@@ -4,6 +4,7 @@ REACT_APP_API_URL=http://localhost:4000
 REACT_APP_JORE_API_URL=https://kartat.hsl.fi/jore/graphql
 REACT_APP_CLIENT_ID=7833861618225795
 REACT_APP_REDIRECT_URI=http://localhost:3000
+REACT_APP_LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
 REACT_APP_NAMESPACE=hsl-kartta
 
 CYPRESS_TESTING_HSLID_USERNAME=

.env.dev

@@ -4,6 +4,7 @@ REACT_APP_API_URL=https://dev.kartat.hsl.fi/julkaisin-api
 REACT_APP_JORE_API_URL=https://dev.kartat.hsl.fi/jore/graphql
 REACT_APP_CLIENT_ID=7833861618225795
 REACT_APP_REDIRECT_URI=https://dev.kartat.hsl.fi/julkaisin
+REACT_APP_LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
 REACT_APP_NAMESPACE=hsl-kartta
 
 CYPRESS_TESTING_HSLID_USERNAME=

.env.local

@@ -4,6 +4,7 @@ REACT_APP_API_URL=http://localhost:4000
 REACT_APP_JORE_API_URL=https://dev.kartat.hsl.fi/jore/graphql
 REACT_APP_CLIENT_ID=7833861618225795
 REACT_APP_REDIRECT_URI=http://localhost:3000
+REACT_APP_LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
 REACT_APP_NAMESPACE=hsl-kartta
 
 CYPRESS_TESTING_HSLID_USERNAME=

.env.prod

@@ -2,6 +2,7 @@
 
 REACT_APP_API_URL=https://kartat.hsl.fi/julkaisin-api
 REACT_APP_JORE_API_URL=https://kartat.hsl.fi/jore/graphql
-REACT_APP_CLIENT_ID=7833861618225795
+REACT_APP_CLIENT_ID=0704589208046070
 REACT_APP_REDIRECT_URI=https://kartat.hsl.fi/julkaisin
+REACT_APP_LOGIN_PROVIDER_URI=https://id.hsl.fi
 REACT_APP_NAMESPACE=hsl-kartta

.github/workflows/check_version.yml

@@ -0,0 +1,22 @@
+name: Check version numbering is updated prior to merging
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  check_version:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+    - name: Check if version has been updated
+      id: check
+      uses: EndBug/version-check@v2
+    - name: Fail if version is not changed prior to merge
+      if: steps.check.outputs.changed == 'false'
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.setFailed('No version number change found. Run `yarn version`-command to upgrade version before merge can be completed.')

package.json

@@ -1,8 +1,8 @@
 {
   "name": "hsl-map-publisher-ui",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "private": true,
-  "license": "MIT",
+  "license": "AGPL-3.0-only",
   "homepage": "./",
   "dependencies": {
     "@material-ui/core": "^4.11.0",

src/components/Build.js

@@ -101,7 +101,7 @@ const Build = props => {
         {props.pending < 1 && props.ready > 0 && (
           <RaisedButton
             onClick={() => downloadBuild({ id: props.id })}
-            label="Lataa PDF"
+            label="Lataa tulosteet"
             style={{ marginLeft: 10 }}
             primary
           />

src/components/BuildDetails.js

@@ -10,7 +10,7 @@ import FlatButton from 'material-ui/FlatButton';
 import RaisedButton from 'material-ui/RaisedButton';
 import Divider from 'material-ui/Divider';
 
-import { downloadPoster, downloadBuildSection } from '../util/api';
+import { downloadPoster, downloadBuildSection, downloadCoverPageBuild } from '../util/api';
 
 const Root = styled.div`
   overflow: auto;
@@ -117,7 +117,7 @@ const Poster = props => (
       <FlatButton
         disabled={props.status !== 'READY'}
         onClick={() => downloadPoster({ id: props.id })}
-        label="Lataa PDF"
+        label={props.component === 'StopRoutePlate' ? 'Lataa CSV' : 'Lataa PDF'}
         primary
       />
       <FlatButton
@@ -160,6 +160,22 @@ class BuildDetails extends Component {
     this.setState({ last: { value, isValid } });
   };
 
+  isCoverPagePrintingAllowed = posters => {
+    // Enable timetable cover page only if the build contains timetables
+    const hasTimetablePosters = posters.filter(poster => poster.component === 'Timetable');
+    return hasTimetablePosters.length > 0;
+  };
+
+  hasSpreadsheetDownload = posters => {
+    const hasCSVFiles = posters.filter(poster => poster.component === 'StopRoutePlate');
+    return hasCSVFiles.length > 0;
+  };
+
+  hasOnlySpreadsheetDownloads = posters => {
+    const hasOnlyCSVFiles = posters.filter(poster => poster.component === 'StopRoutePlate');
+    return hasOnlyCSVFiles.length === posters.length;
+  };
+
   render() {
     const buildDownloadEnabled = this.state.first.isValid && this.state.last.isValid;
     return (
@@ -222,6 +238,21 @@ class BuildDetails extends Component {
               label="Lataa PDF"
               primary
             />
+            <RaisedButton
+              disabled={
+                buildDownloadEnabled ? !this.isCoverPagePrintingAllowed(this.props.posters) : true
+              }
+              style={{ marginLeft: '1rem' }}
+              onClick={() =>
+                downloadCoverPageBuild({
+                  id: this.props.id,
+                  first: this.state.first.value - 1,
+                  last: this.state.last.value,
+                })
+              }
+              label="Lataa kansilehdellinen PDF"
+              primary
+            />
           </Buttons>
         </Root>
       </Dialog>

src/components/Generator.js

@@ -3,6 +3,7 @@ import { inject, observer, PropTypes } from 'mobx-react';
 import styled from 'styled-components';
 import FlatButton from 'material-ui/FlatButton';
 import RaisedButton from 'material-ui/RaisedButton';
+import { Switch } from '@material-ui/core';
 import DatePicker from 'material-ui/DatePicker';
 import TextField from 'material-ui/TextField';
 import RadioGroup from './RadioGroup';
@@ -13,7 +14,7 @@ import SelectTemplate from './SelectTemplate';
 import SelectRuleTemplates from './SelectRuleTemplates';
 import { componentsWithMapOptions } from '../stores/generatorStore';
 import TerminalSelect from './TerminalSelect';
-import LineSelect from './LineSelect';
+import { ObservedLineSelect, ObservedSingleLineSelect } from './LineSelect';
 
 const Root = styled.div`
   display: flex;
@@ -78,6 +79,15 @@ const Generator = props => {
       case 'LineTimetable':
         text = generatorStore.selectedLines.length;
         break;
+
+      case 'StopRoutePlate':
+        if (generatorStore.useLineQuery && generatorStore.selectedRoutePlateLine) {
+          text = 1;
+        } else {
+          text = stopCount;
+        }
+        break;
+
       default:
         text = 0;
         break;
@@ -119,6 +129,22 @@ const Generator = props => {
                 />
               </div>
             )}
+            {generatorStore.component === 'StopRoutePlate' && (
+              <div style={{ marginLeft: '20px' }}>
+                <span style={{ opacity: generatorStore.useLineQuery ? 0.4 : 1.0 }}>
+                  Pysäkkihaku
+                </span>
+                <Switch
+                  checked={generatorStore.useLineQuery}
+                  onChange={() => generatorStore.toggleUseLineQuery()}
+                  color="primary"
+                  inputProps={{ 'aria-label': 'Linjahaku' }}
+                  className="muiSwitch-toggle"
+                  style={{ color: '#0077c7' }}
+                />
+                <span style={{ opacity: generatorStore.useLineQuery ? 1.0 : 0.4 }}>Linjahaku</span>
+              </div>
+            )}
           </div>
         </Column>
 
@@ -156,9 +182,17 @@ const Generator = props => {
         </Column>
 
         <Column>
-          <h3>Voimassaolokausi alkaa</h3>
+          <h3>
+            {generatorStore.component === 'StopRoutePlate'
+              ? 'Vertailuvälin alku'
+              : 'Voimassaolokausi alkaa'}
+          </h3>
           <DatePicker
-            name="Voimassaolokausi alkaa"
+            name={
+              generatorStore.component === 'StopRoutePlate'
+                ? 'Vertailuvälin alku'
+                : 'Voimassaolokausi alkaa'
+            }
             value={generatorStore.dateBegin}
             onChange={(event, value) => generatorStore.setDateBegin(value)}
             hintText="oletus"
@@ -167,9 +201,17 @@ const Generator = props => {
         </Column>
 
         <Column>
-          <h3>Voimassaolokausi loppuu</h3>
+          <h3>
+            {generatorStore.component === 'StopRoutePlate'
+              ? 'Vertailuvälin loppu'
+              : 'Voimassaolokausi loppuu'}
+          </h3>
           <DatePicker
-            name="Voimassaolokausi loppuu"
+            name={
+              generatorStore.component === 'StopRoutePlate'
+                ? 'Vertailuvälin loppu'
+                : 'Voimassaolokausi loppuu'
+            }
             value={generatorStore.dateEnd}
             onChange={(event, value) => generatorStore.setDateEnd(value)}
             hintText="oletus"
@@ -190,7 +232,7 @@ const Generator = props => {
 
       {generatorStore.component === 'LineTimetable' && (
         <Main>
-          <LineSelect
+          <ObservedLineSelect
             setLineQuery={commonStore.setLineQuery}
             lines={commonStore.lines}
             lineQuery={commonStore.lineQuery}
@@ -201,7 +243,20 @@ const Generator = props => {
         </Main>
       )}
 
-      {generatorStore.component !== 'LineTimetable' && (
+      {generatorStore.component === 'StopRoutePlate' && generatorStore.useLineQuery && (
+        <Main>
+          <ObservedSingleLineSelect
+            setLineQuery={commonStore.setLineQuery}
+            lines={commonStore.lines}
+            lineQuery={commonStore.lineQuery}
+            selectedRoutePlateLine={generatorStore.selectedRoutePlateLine}
+            setSelectedRoutePlateLine={generatorStore.setSelectedRoutePlateLine}
+            clearSelectedRoutePlateLine={generatorStore.clearSelectedRoutePlateLine}
+          />
+        </Main>
+      )}
+
+      {generatorStore.component !== 'LineTimetable' && !generatorStore.useLineQuery && (
         <div>
           <Main>
             <StopList
@@ -210,19 +265,22 @@ const Generator = props => {
               disabled={generatorStore.component === 'LineTimetable'}
             />
           </Main>
-          <Main>
-            <SelectTemplate
-              currentTemplate={commonStore.currentTemplate}
-              templates={commonStore.templates}
-              onSelectTemplate={commonStore.selectTemplate}
-              showControls={false}
-            />
-          </Main>
+          {generatorStore.component !== 'StopRoutePlate' && (
+            <Main>
+              <SelectTemplate
+                currentTemplate={commonStore.currentTemplate}
+                templates={commonStore.templates}
+                onSelectTemplate={commonStore.selectTemplate}
+                showControls={false}
+              />
+            </Main>
+          )}
         </div>
       )}
 
       {generatorStore.component !== 'TerminalPoster' &&
-        generatorStore.component !== 'LineTimetable' && (
+        generatorStore.component !== 'LineTimetable' &&
+        generatorStore.component !== 'StopRoutePlate' && (
           <Main>
             <SelectRuleTemplates
               selectedRuleTemplates={generatorStore.selectedRuleTemplates}
@@ -278,8 +336,7 @@ const Generator = props => {
         </Row>
       )}
 
-
-      {generatorStore.component !== 'LineTimetable' && (
+      {generatorStore.component !== 'LineTimetable' && !generatorStore.useLineQuery && (
         <div>
           <h3>Poissuodatettavat linjat</h3>
           <Row>
@@ -311,12 +368,17 @@ const Generator = props => {
         <RaisedButton
           data-cy="generate-button"
           disabled={
-            (stopCount < 1 && generatorStore.component !== 'LineTimetable') ||
+            (stopCount < 1 &&
+              generatorStore.component !== 'LineTimetable' &&
+              !generatorStore.useLineQuery) ||
+            (generatorStore.useLineQuery && generatorStore.selectedRoutePlateLine === null) ||
             !generatorStore.buildId ||
             (generatorStore.component === 'TerminalPoster' && generatorStore.terminalId === '') ||
             (generatorStore.component === 'LineTimetable' && generatorStore.lineId === '') ||
             (generatorStore.component === 'LineTimetable' && !generatorStore.dateBegin) ||
-            (generatorStore.component === 'LineTimetable' && !generatorStore.dateEnd)
+            (generatorStore.component === 'LineTimetable' && !generatorStore.dateEnd) ||
+            (generatorStore.component === 'StopRoutePlate' && !generatorStore.dateBegin) ||
+            (generatorStore.component === 'StopRoutePlate' && !generatorStore.dateEnd)
           }
           onClick={async () => {
             if ((await commonStore.currentTemplate) === undefined) {

src/components/LineSelect.js

@@ -24,7 +24,7 @@ const ListContainer = styled.div`
 `;
 
 const mapLineItems = (lines, onClick) => {
-  if (lines.length > 0) {
+  if (lines.length > 0 && lines[0] !== null) {
     return lines.map((line, index) => (
       <ListItem onClick={() => onClick(line)} key={index}>
         <ListItemTitle>{line.lineIdParsed}</ListItemTitle> <p>{line.nameFi}</p>
@@ -54,6 +54,26 @@ const LineSelect = props => (
   </div>
 );
 
+const SingleLineSelect = props => (
+  <div>
+    <SectionHeading>Linjahaku</SectionHeading>
+    <TextField
+      id="line-select"
+      hintText="Hae linjaa..."
+      onChange={event =>
+        event.target.value ? props.setLineQuery(event.target.value) : props.setLineQuery('')
+      }
+      value={props.lineQuery}
+      style={{ width: '100%' }}
+    />
+    <ListContainer>{mapLineItems(props.lines, props.setSelectedRoutePlateLine)}</ListContainer>
+    <div>
+      <SelectedLinesTitle>Valittu linja</SelectedLinesTitle>
+      {mapLineItems([props.selectedRoutePlateLine], props.clearSelectedRoutePlateLine)}
+    </div>
+  </div>
+);
+
 LineSelect.propTypes = {
   setLineQuery: PropTypes.func.isRequired,
   lineQuery: PropTypes.string.isRequired,
@@ -63,4 +83,20 @@ LineSelect.propTypes = {
   selectedLines: PropTypes.object.isRequired,
 };
 
-export default observer(LineSelect);
+SingleLineSelect.propTypes = {
+  setLineQuery: PropTypes.func.isRequired,
+  lineQuery: PropTypes.string.isRequired,
+  lines: PropTypes.object.isRequired,
+  selectedRoutePlateLine: PropTypes.object,
+  setSelectedRoutePlateLine: PropTypes.func.isRequired,
+  clearSelectedRoutePlateLine: PropTypes.func.isRequired,
+};
+
+SingleLineSelect.defaultProps = {
+  selectedRoutePlateLine: null,
+};
+
+export const ObservedLineSelect = observer(LineSelect);
+export const ObservedSingleLineSelect = observer(SingleLineSelect);
+
+export default { ObservedLineSelect, ObservedSingleLineSelect };