Merge remote-tracking branch 'upstream/master' into olc/split-FR

.github/codeql-config.yml

@@ -0,0 +1,4 @@
+name: 'CodeQL config'
+query-filters:
+  - exclude:
+      id: js/missing-rate-limiting

.github/labeler.yml

@@ -1,5 +1,4 @@
 infrastructure:
-  - .circleci/*
   - .github/**/*
   - docker-compose.yml
   - web/Dockerfile
@@ -8,11 +7,11 @@ dependencies:
   - poetry.lock
   - pyproject.toml
   - mobileapp/package.json
-  - mobileapp/package-lock.json
+  - mobileapp/pnpm-lock.yaml
   - mockserver/package.json
-  - mockserver/yarn.lock
+  - mockserver/pnpm-lock.yaml
   - web/package.json
-  - web/yarn.lock
+  - web/pnpm-lock.yaml
 
 frontend 🎨:
   - any: ['web/**/*', '!web/public/locales/**/*']

.github/workflows/CI.yml

@@ -25,7 +25,7 @@ jobs:
           fetch-depth: 2
       - name: Check frontend files
         id: check-frontend
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/web/**/*
@@ -34,25 +34,25 @@ jobs:
             **/web/**/*.md
       - name: Check config files
         id: check-config
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/config/**/*.yaml
       - name: Check markdown files
         id: check-markdown
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/*.md
       - name: Check json files
         id: check-json
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/*.json
       - name: Check python files
         id: check-python
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/*.py
@@ -61,14 +61,14 @@ jobs:
             .python-version
       - name: Check if workflows have changed
         id: check-workflows
-        uses: tj-actions/changed-files@v34.5.0
+        uses: tj-actions/changed-files@v35.5.0
         with:
           files: |
             **/.github/workflows/**/*.yml
       - name: Log outputs
         run: |
           echo "frontend changed: ${{ steps.check-frontend.outputs.any_changed }}"
-          echo "geometries changed: ${{ steps.check-geometries.outputs.any_changed }}"
+          echo "config changed: ${{ steps.check-config.outputs.any_changed }}"
           echo "markdown changed: ${{ steps.check-markdown.outputs.any_changed }}"
           echo "json changed: ${{ steps.check-json.outputs.any_changed }}"
           echo "python changed: ${{ steps.check-python.outputs.any_changed }}"
@@ -80,21 +80,13 @@ jobs:
     uses: ./.github/workflows/prettier.yml
 
   validate_local_links:
-    name: Validate Markdown
-    needs: [setup, prettier]
+    name: Validate
+    needs: [setup]
     if: >-
       needs.setup.outputs.markdown != 'false' ||
       needs.setup.outputs.workflows != 'false'
     uses: ./.github/workflows/validate-local-links-in-md.yml
 
-  jest:
-    name: Jest
-    needs: [setup, prettier]
-    if: >-
-      needs.setup.outputs.frontend != 'false' ||
-      needs.setup.outputs.workflows != 'false'
-    uses: ./.github/workflows/jest.yml
-
   jsonlint:
     name: JSONLint
     needs: [setup, prettier]
@@ -104,36 +96,57 @@ jobs:
     uses: ./.github/workflows/jsonlint.yml
 
   # Frontend checks
-  eslint:
-    name: ESLint
-    needs: [setup, prettier]
+  unit_test:
+    name: Unit test
+    needs: [setup]
     if: >-
       needs.setup.outputs.frontend != 'false' ||
       needs.setup.outputs.workflows != 'false'
-    uses: ./.github/workflows/eslint.yml
+    uses: ./.github/workflows/unit_test.yml
 
-  verify:
-    name: Verify
-    needs: [setup, prettier]
-    if: >-
-      needs.setup.outputs.frontend != 'false' ||
-      needs.setup.outputs.config != 'false' ||
-      needs.setup.outputs.workflows != 'false'
-    uses: ./.github/workflows/verify.yml
+  # eslint:
+  #   name: ESLint
+  #   needs: [setup, prettier]
+  #   if: >-
+  #     needs.setup.outputs.frontend != 'false' ||
+  #     needs.setup.outputs.workflows != 'false'
+  #   uses: ./.github/workflows/eslint.yml
 
-  cypress:
-    name: Cypress
-    needs: [eslint, verify, jest]
-    uses: ./.github/workflows/cypress.yml
-    secrets: inherit
+  # cypress:
+  #   name: Cypress
+  #   needs: [eslint, validate_generated_files, unit_test]
+  #   uses: ./.github/workflows/cypress.yml
+  #   secrets: inherit
 
   # Python checks
   python:
     name: Python
     needs: [setup]
-    if: needs.setup.outputs.python != 'false' || needs.setup.outputs.workflows != 'false'
+    if: >-
+      needs.setup.outputs.python != 'false' ||
+      needs.setup.outputs.workflows != 'false'
     uses: ./.github/workflows/python.yml
 
+  # Config checks
+  validate_config_filenames:
+    name: Validate
+    needs: [setup]
+    if: >-
+      needs.setup.outputs.config != 'false' ||
+      needs.setup.outputs.workflows != 'false'
+    uses: ./.github/workflows/validate_filenames.yml
+
+  validate_generated_files:
+    name: Validate
+    needs: [setup]
+    if: >-
+      needs.setup.outputs.frontend != 'false' ||
+      needs.setup.outputs.config != 'false' ||
+      needs.setup.outputs.workflows != 'false'
+    uses: ./.github/workflows/validate_generated_files.yml
+
+  # Code quality checks
   codeql:
+    needs: [setup, prettier]
     name: CodeQL
     uses: ./.github/workflows/codeql.yml

.github/workflows/codeql.yml

@@ -30,13 +30,12 @@ jobs:
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
+          config-file: ./.github/codeql-config.yml
           # 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
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         with:

.github/workflows/cypress.yml

@@ -8,11 +8,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Setup PNPM
+        uses: pnpm/action-setup@v2
+        with:
+          version: 7
       - name: Cypress run
         uses: cypress-io/github-action@v5
         env:
           TZ: Europe/Copenhagen
         with:
           working-directory: ./web
-          start: yarn develop
-          wait-on: 'http://localhost:8080'
+          start: pnpm dev
+          wait-on: 'http://localhost:5173'

.github/workflows/eslint.yml

@@ -19,24 +19,26 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup Node
+      - name: Setup PNPM
+        uses: pnpm/action-setup@v2
+        with:
+          version: 7
+      - name: Setup Node v18.x
         uses: actions/setup-node@v3
         with:
-          node-version: lts/*
-          cache: 'yarn'
-          cache-dependency-path: web/yarn.lock
-      - name: Restore node_modules
-        id: cache
+          node-version: 18
+      - name: Restore node_modules for web
+        id: cache-web
         uses: actions/cache@v3
         with:
           path: ./web/node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('./web/yarn.lock') }}
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('./web/pnpm-lock.yaml') }}
       - name: Install web dependencies
         if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Generate zone config
         if: steps.cache.outputs.cache-hit == 'true'
-        run: yarn generate-zones-config
+        run: pnpm generate-zones-config
       - name: Restore ESLint cache
         uses: actions/cache@v3
         with:
@@ -48,6 +50,8 @@ jobs:
             ${{ runner.os }}-eslint_cache
       - name: ESLint
         run: node_modules/.bin/eslint .
+          --ignore-path .gitignore
+          --ext .ts,.tsx .
           --cache
           --cache-location node_modules/.cache/eslint/.eslintcache
           --format @microsoft/eslint-formatter-sarif