MTC mtc-deploy branch with dev

.dockerignore

@@ -0,0 +1,3 @@
+node_modules/
+.git/
+.DS_Store 

.eslintrc.json

@@ -0,0 +1 @@
+node_modules/mastarm/lib/eslintrc.json

.flowconfig

@@ -7,6 +7,7 @@
 .*/node_modules/nock/node_modules/changelog/examples/.*
 .*/node_modules/npmconf/.*
 .*/node_modules/react-leaflet/src/.*
+.*/node_modules/react-leaflet/lib/*.*\.js\.flow
 .*/node_modules/reqwest/.*
 .*/node_modules/module-deps/test/invalid_pkg/package.json
 .*/node_modules/immutable/dist/immutable.js.flow

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # See https://help.github.com/articles/about-codeowners/
 
-# An IBI Group OTP/Data Tools member is required to approve PR merges
+# An Arcadis OTP/TRANSIT-data-tools member is required to approve PR merges
 * @ibi-group/otp-data-tools

.github/issue_template.md

@@ -1,4 +1,4 @@
-_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be dealt with in a timely manner. [IBI Group](https://www.ibigroup.com/) is able to provide technical support for custom deployments of this software. Please contact [Ritesh Warade](mailto:ritesh.warade@ibigroup.com?subject=Data%20Tools%20inquiry%20via%20GitHub&body=Name:%20%0D%0AAgency/Company:%20%0D%0ABest%20date/time%20for%20a%20demo/discussion:%20%0D%0ADescription%20of%20needs:%20) if your company or organization is interested in opening a support contract with us. Please remove this note when creating the issue._
+_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be dealt with in a timely manner. [Arcadis IBI Group](https://www.ibigroup.com/) is able to provide technical support for custom deployments of this software. Please contact [Jon Campbell](mailto:jon.campbell@ibigroup.com?subject=Data%20Tools%20inquiry%20via%20GitHub&body=Name:%20%0D%0AAgency/Company:%20%0D%0ABest%20date/time%20for%20a%20demo/discussion:%20%0D%0ADescription%20of%20needs:%20) if your company or organization is interested in opening a support contract with us. Please remove this note when creating the issue._
 
 ## Observed behavior (please include a screenshot if possible)
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,74 @@
+# This file was generated by GitHub
+
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "dev", master, "mtc-deploy" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "dev", "mtc-deploy" ]
+  schedule:
+    - cron: '24 19 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/node-ci.yml

@@ -1,28 +1,15 @@
 name: Node.js CI
 
-on: [push, pull_request]
-
+on:
+  workflow_call:
+    inputs:
+      e2e:
+        required: true
+        type: boolean
+
 jobs:
   test-build-release:
-
     runs-on: ubuntu-latest
-    # Add postgres for end-to-end
-    services:
-      postgres:
-        image: postgres:10.8
-        # Set postgres env variables according to test env.yml config
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
-        ports:
-          - 5432:5432
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
       - uses: actions/checkout@v2
       # install python 3.x in order to have mkdocs properly installed
@@ -31,19 +18,14 @@ jobs:
           python-version: '3.x'
       - name: Install mkdocs
         run: |
-          pip install mkdocs
+          pip install Jinja2==3.0.3 mkdocs
           mkdocs --version
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: Install npm/yarn packages using cache
         uses: bahmutov/npm-install@v1
-      # Inject slug vars, so that we can reference $GITHUB_HEAD_REF_SLUG for branch name
-      - name: Inject slug/short variables
-        uses: rlespinasse/[email protected]
-      - name: Check if End-to-end should run
-        run: ./scripts/check-if-e2e-should-run-on-ci.sh
       - name: Lint code
         run: yarn lint
       - name: Lint messages
@@ -56,49 +38,46 @@ jobs:
         run: yarn run build -- --minify
       - name: Build docs
         run: mkdocs build
-      - name: Start MongoDB
-        if: env.SHOULD_RUN_E2E == 'true'
-        uses: supercharge/[email protected]
-        with:
-          mongodb-version: 4.2
-      - name: Add aws credentials for datatools-server
-        if: env.SHOULD_RUN_E2E == 'true'
-        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=${AWS_REGION}' > ~/.aws/config
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: Install otp-runner
-        if: env.SHOULD_RUN_E2E == 'true'
-        run: yarn global add https://github.com/ibi-group/otp-runner.git
+      - name: Whether e2e should run
+        run: echo Running e2e - {{ inputs.e2e }}
+      - name: Write .env file for Docker
+        if: inputs.e2e
+        run: |
+          touch __tests__/e2e/.env 
+          echo BUGSNAG_KEY= ${{ secrets.BUGSNAG_KEY }} >> __tests__/e2e/.env
+          echo AUTH0_API_CLIENT= ${{ secrets.AUTH0_API_CLIENT }} >> __tests__/e2e/.env
+          echo AUTH0_API_SECRET= ${{ secrets.AUTH0_API_SECRET }} >> __tests__/e2e/.env
+          echo AUTH0_CLIENT_ID= ${{ secrets.AUTH0_CLIENT_ID }} >> __tests__/e2e/.env
+          echo AUTH0_PUBLIC_KEY=/datatools/datatools.pem >> __tests__/e2e/.env
+          echo AUTH0_CONNECTION_NAME= ${{ secrets.AUTH0_CONNECTION_NAME }} >> __tests__/e2e/.env
+          echo AUTH0_DOMAIN= ${{ secrets.AUTH0_DOMAIN }} >> __tests__/e2e/.env
+          echo AWS_ACCESS_KEY_ID= ${{ secrets.AWS_ACCESS_KEY_ID }} >> __tests__/e2e/.env
+          echo AWS_REGION=us-east-1 >> __tests__/e2e/.env
+          echo AWS_SECRET_ACCESS_KEY= ${{ secrets.AWS_SECRET_ACCESS_KEY }} >> __tests__/e2e/.env
+          echo GITHUB_REF_SLUG= $GITHUB_REF >> __tests__/e2e/.env
+          echo GITHUB_SHA= $GITHUB_SHA >> __tests__/e2e/.env
+          echo E2E_AUTH0_PASSWORD= ${{ secrets.E2E_AUTH0_PASSWORD }} >> __tests__/e2e/.env
+          echo E2E_AUTH0_USERNAME= ${{ secrets.E2E_AUTH0_USERNAME }} >> __tests__/e2e/.env
+          echo GRAPH_HOPPER_KEY= ${{ secrets.GRAPH_HOPPER_KEY }} >> __tests__/e2e/.env
+          echo LOGS_S3_BUCKET= ${{ secrets.LOGS_S3_BUCKET }} >> __tests__/e2e/.env
+          echo MAPBOX_ACCESS_TOKEN= ${{ secrets.MAPBOX_ACCESS_TOKEN }} >> __tests__/e2e/.env
+          echo MS_TEAMS_WEBHOOK_URL= ${{ secrets.MS_TEAMS_WEBHOOK_URL }} >> __tests__/e2e/.env
+          echo OSM_VEX= ${{ secrets.OSM_VEX }} >> __tests__/e2e/.env
+          echo RUN_E2E= "true" >> __tests__/e2e/.env
+          echo S3_BUCKET= ${{ secrets.S3_BUCKET }} >> __tests__/e2e/.env
+          echo SPARKPOST_EMAIL= ${{ secrets.SPARKPOST_EMAIL }} >> __tests__/e2e/.env
+          echo SPARKPOST_KEY= ${{ secrets.SPARKPOST_KEY }} >> __tests__/e2e/.env
+          echo TRANSITFEEDS_KEY= ${{ secrets.TRANSITFEEDS_KEY }} >> __tests__/e2e/.env
+          touch __tests__/e2e/server/datatools.pem
+          echo ${{ secrets.AUTH0_DATATOOLS_PEM }} | base64 --decode > __tests__/e2e/server/datatools.pem
+
       - name: Run e2e tests
-        if: env.SHOULD_RUN_E2E == 'true'
-        run: yarn test-end-to-end
-        env:
-          AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}
-          AUTH0_API_SECRET: ${{ secrets.AUTH0_API_SECRET }}
-          AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
-          AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
-          AUTH0_SECRET: ${{ secrets.AUTH0_SECRET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_REGION: ${{ secrets.AWS_REGION }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          E2E_AUTH0_PASSWORD: ${{ secrets.E2E_AUTH0_PASSWORD }}
-          E2E_AUTH0_USERNAME: ${{ secrets.E2E_AUTH0_USERNAME }}
-          GRAPH_HOPPER_KEY: ${{ secrets.GRAPH_HOPPER_KEY }}
-          GTFS_DATABASE_PASSWORD: ${{ secrets.GTFS_DATABASE_PASSWORD }}
-          GTFS_DATABASE_URL: ${{ secrets.GTFS_DATABASE_URL }}
-          GTFS_DATABASE_USER: ${{ secrets.GTFS_DATABASE_USER }}
-          LOGS_S3_BUCKET: ${{ secrets.LOGS_S3_BUCKET }}
-          MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
-          MONGO_DB_NAME: ${{ secrets.MONGO_DB_NAME }}
-          MS_TEAMS_WEBHOOK_URL: ${{ secrets.MS_TEAMS_WEBHOOK_URL }}
-          OSM_VEX: ${{ secrets.OSM_VEX }}
-          RUN_E2E: "true"
-          S3_BUCKET: ${{ secrets.S3_BUCKET }}
-          SPARKPOST_EMAIL: ${{ secrets.SPARKPOST_EMAIL }}
-          SPARKPOST_KEY: ${{ secrets.SPARKPOST_KEY }}
-          TRANSITFEEDS_KEY: ${{ secrets.TRANSITFEEDS_KEY }}
+        if: inputs.e2e
+        run: |
+          (echo "E2E Test Attempt 1" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Test Attempt 2" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Test Attempt 3" && docker compose --env-file __tests__/e2e/.env -f __tests__/e2e/docker-compose.yml up --abort-on-container-exit) || \
+          (echo "E2E Tests Failed" && exit 1)
       # At this point, the build is successful.
       - name: Semantic Release
         env:

.github/workflows/pull-req.yml

@@ -0,0 +1,27 @@
+name: PR E2E Checks
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+jobs:
+  pr-e2e-check:
+    # Run e2e tests:
+    # - on pull request changed from draft to ready-for-review
+    # - on commits to:
+    #   * PRs to master
+    #   * PRs to dev that are not draft
+    #   * PRs to dev on branches created by dependabot
+    if: "${{
+      github.event_name == 'pull_request' && (
+        github.event.action == 'review_requested' ||
+        github.base_ref == 'master' ||
+        (github.base_ref == 'dev' && (
+          github.event.pull_request.draft == false ||
+          startsWith(github.head_ref, 'dependabot/')
+        ))
+      )
+      }}"
+    uses: ./.github/workflows/node-ci.yml
+    with:
+      e2e: true
+    secrets: inherit

.github/workflows/push.yml

@@ -0,0 +1,11 @@
+name: Commit Checks
+
+on: [push]
+
+jobs:
+  push-checks:
+    uses: ./.github/workflows/node-ci.yml
+    with:
+      # Run e2e tests on pushes to dev and master.
+      e2e: ${{ github.ref_name == 'dev' || github.ref_name == 'master' }}
+    secrets: inherit

.gitignore

@@ -8,6 +8,9 @@ tmp/
 .tags
 *.pid
 
+# Ignore mobility data jar for building rules
+*.jar
+
 # Optional npm cache directory
 .npm
 
@@ -30,7 +33,9 @@ env.yml
 env.yml-original
 .env
 !configurations/test/env.yml
+!docker/server/env.yml
 scripts/*client.json
+*.pem
 
 # Vs code settings
 .vscode/

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 ----------------------
+## Next
+ * Support German language and add initial translations.
+## Former
  * Fix timetable previous stop time checks from checking text columns.
  * Add feature allowing routing to avoid highways.
  * Support Polish language and add initial translations.

README.md

@@ -1,6 +1,22 @@
 # datatools-ui
 
-The core application for IBI Group's transit Data Tools suite. This application provides GTFS editing, management, validation, and deployment to OpenTripPlanner.
+[![Join the chat at https://matrix.to/#/#transit-data-tools:gitter.im](https://badges.gitter.im/repo.png)](https://matrix.to/#/#transit-data-tools:gitter.im)
+
+The core application for IBI Group's TRANSIT-Data-Tools suite. This application provides GTFS editing, management, validation, and deployment to OpenTripPlanner.
+
+## Quick Start
+
+A pre-configured datatools instance can be lauched via Docker by running
+
+```bash
+cd docker
+cp ../configurations/default/env.yml.tmp ../configurations/default/env.yml
+docker compose up
+```
+
+from the datatools-ui directory. Datatools will then be running on port `9966`.
+
+Deployment functionality will not work, and persistence may only work in certain cases (look into Docker volumes for more info).
 
 ## Configuration
 
@@ -12,6 +28,10 @@ View the [latest release documentation](http://data-tools-docs.ibi-transit.com/e
 
 Note: `dev` branch docs (which refer to the default `branch` and are more up-to-date and accurate for most users) can be found [here](http://data-tools-docs.ibi-transit.com/en/dev/).
 
+## Getting in touch
+
+We have a Gitter [space](https://matrix.to/#/#transit-data-tools:gitter.im) for the full TRANSIT-Data-Tools project where you can post questions and comments.
+
 ## Shoutouts 🙏
 
 <img src="browserstack-logo-600x315.png" height="80" title="BrowserStack Logo" alt="BrowserStack Logo" />