Merge pull request #403 from HSLdevcom/DT-5837

DT-5837: Verify data

.dockerignore

@@ -7,3 +7,5 @@ README.md
 docker-compose.yml
 node_modules
 server/node_modules
+**/.env
+**/.env.example

.github/workflows/next_virtualmonitor-app(dev).yml

@@ -14,7 +14,7 @@ jobs:
     if: "!startsWith(github.event.head_commit.message, '[DEPLOY]')"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           token: ${{ secrets.GIT_SECRET }}
       - run: git config --global user.name 'Digitransit'
@@ -35,8 +35,8 @@ jobs:
     if: "startsWith(github.event.head_commit.message, '[DEPLOY]')"
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
-    - uses: azure/docker-login@v1
+      uses: actions/checkout@v3
+    - uses: azure/docker-login@v2
       with:
         login-server: https://index.docker.io/v1/
         username: ${{ secrets.AzureAppService_ContainerUsername_43e4c8bef39f4f7d9da4f67dc0bafa48 }}

.github/workflows/next_virtualmonitor-app.yml

@@ -15,9 +15,9 @@ jobs:
     runs-on: 'ubuntu-latest'
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: azure/docker-login@v1
+    - uses: azure/docker-login@v2
       with:
         login-server: https://index.docker.io/v1/
         username: ${{ secrets.AzureAppService_ContainerUsername_43e4c8bef39f4f7d9da4f67dc0bafa48 }}

.gitignore

@@ -25,3 +25,4 @@ yarn-debug.log*
 yarn-error.log*
 yarn.lock
 dump.rdb
+**/.env

package.json

@@ -9,7 +9,7 @@
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.3.19",
-    "@digitransit-component/digitransit-component-autosuggest": "1.9.4",
+    "@digitransit-component/digitransit-component-autosuggest": "1.9.10",
     "@habx/apollo-multi-endpoint-link": "^2.5.0",
     "@hsl-fi/modal": "^0.3.1",
     "@hsl-fi/site-header": "4.2.2",

server/.env.example

@@ -0,0 +1,15 @@
+MANAGEMENT_API_ID=<>
+MANAGEMENT_API_SECRET=<>
+REDIS_KEY=<>
+REDIS_PORT=<>
+APPSETTING_DB_ENDPOINT=<>
+APPSETTING_DB_ID=<>
+APPSETTING_DB_CONTAINER=<>
+OIDC_CLIENT_ID=<>
+OIDC_CLIENT_SECRET=<>
+OIDCHOST=<>
+API_SUBSCRIPTION_QUERY_PARAMETER_NAME=<>
+API_SUBSCRIPTION_TOKEN=<>
+DEBUGLOGGING=false
+MAP_URL=<>
+

server/package.json

@@ -5,6 +5,7 @@
   "description": "Backend for Azure Cosmos DB's SQL API",
   "scripts": {
     "start": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js",
+    "start-local": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node -r dotenv/config server.js",
     "lint": "eslint *.js --fix --quiet"
   },
   "dependencies": {
@@ -30,6 +31,7 @@
     "prettier": "^2.8.0",
     "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1"
+    "eslint-plugin-prettier": "^4.2.1",
+    "dotenv": "^16.3.1"
   }
 }

src/defaultConfig.js

@@ -12,6 +12,21 @@ export default {
     'lautta',
     'OULU',
     'digitraffic',
+    'Rauma',
+    'Hameenlinna',
+    'Kotka',
+    'Kouvola',
+    'Lappeenranta',
+    'Mikkeli',
+    'Vaasa',
+    'Joensuu',
+    'FOLI',
+    'Lahti',
+    'Kuopio',
+    'Rovaniemi',
+    'Kajaani',
+    'Salo',
+    'Pori',
   ],
   fonts: {
     weights: {

src/monitorConfig.js

@@ -94,6 +94,16 @@ export default {
     map: {
       inUse: false,
     },
+    stopSearchFilter: stop => {
+      const props = stop.properties;
+      if (
+        props?.id?.includes('GTFS:HSL') &&
+        props?.addendum?.GTFS?.modes?.includes('RAIL')
+      ) {
+        return false;
+      }
+      return true;
+    },
   },
   tampere: {
     colors: {

src/ui/StopCardRow.tsx

@@ -202,6 +202,14 @@ const StopCardRow: FC<IProps> = ({
   const possibleToMove = cards.length > 1;
   const possibleToDelete = hasMap ? cards.length > 2 : cards.length > 1;
   const filterSearchResults = (results, x) => {
+    if (config.stopSearchFilter) {
+      return results
+        .filter(result => {
+          const gtfsId = getGTFSId(result.properties.id);
+          return !columns.left.stops.some(s => s.gtfsId === gtfsId);
+        })
+        .filter(config.stopSearchFilter);
+    }
     return results.filter(result => {
       const gtfsId = getGTFSId(result.properties.id);
       return !columns.left.stops.some(s => s.gtfsId === gtfsId);