Merge pull request #1196 from PADAS/ERA-10572

ERA-10572: Support EFB schemas in ER > Add ajv validation library

Author: luixlive

.github/workflows/develop-workflow.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 20
 
       - name: "Configure python"
         uses: actions/setup-python@v5
@@ -59,10 +59,6 @@ jobs:
           if [[ ${SITE} =~ das-2-*-* ]]; then export SITE="stage"; else export SITE=$(echo ${SITE} | tr '[:upper:]' '[:lower:]'); fi
           if $(wget -q --method=HEAD "https://${SITE}.pamdas.org"); then echo "::set-output name=site_exists::true"; else echo "::set-output name=site_exists::false"; fi
 
-      - name: Rebuild Node SASS
-        if: steps.validate_env.outputs.site_exists == 'true'
-        run: npm rebuild node-sass
-
       - name: Yarn build
         if: steps.validate_env.outputs.site_exists == 'true'
         run: CI=false yarn build

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: |
           npm pkg set "buildbranch"="${{ github.head_ref || github.ref_name }}"
           npm pkg set "buildnum"="${{ github.run_number }}"

.github/workflows/pr-envs.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: |
           npm pkg set "buildbranch"="${{ github.event.pull_request.head.sha }}"
           npm pkg set "buildnum"="${{ github.run_number }}"

Dockerfile.dev

@@ -1,13 +1,14 @@
-FROM node:14.19.0-alpine
+FROM node:20-alpine
 WORKDIR /app
-RUN apk add --no-cache --virtual .build-deps git alpine-sdk python2
-COPY ./package.json ./
-COPY ./yarn.lock ./
+
+RUN apk add --no-cache git alpine-sdk python3
+
+COPY package.json .
+COPY yarn.lock .
 RUN yarn --ignore-scripts
-RUN npm rebuild node-sass
-COPY ./ ./
 
+COPY . .
 
 EXPOSE 3000
 
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

Dockerfile.mt

@@ -1,12 +1,11 @@
-FROM node:14.21.0-alpine as build
+FROM node:20-alpine as build
 WORKDIR /app
 
 RUN apk add --no-cache git alpine-sdk python3
 
 COPY package.json .
 COPY yarn.lock .
-RUN yarn --ignore-scripts && \
-    npm rebuild node-sass
+RUN yarn --ignore-scripts
 
 COPY . .
 RUN ls -la && yarn build

package.json

@@ -5,63 +5,62 @@
   "buildbranch": "generated_by_build",
   "buildnum": "also_generated_by_build",
   "dependencies": {
-    "@rjsf/bootstrap-4": "^5.0.0-beta.13",
-    "@rjsf/core": "^5.0.0-beta.13",
-    "@rjsf/utils": "^5.0.0-beta.13",
-    "@rjsf/validator-ajv6": "^5.0.0-beta.13",
-    "@turf/boolean-intersects": "^6.3.0",
-    "@turf/turf": "^5.1.6",
-    "axios": "1.6.0",
+    "@rjsf/bootstrap-4": "^5.23.1",
+    "@rjsf/core": "^5.23.1",
+    "@rjsf/utils": "^5.23.1",
+    "@rjsf/validator-ajv6": "^5.23.1",
+    "@turf/turf": "^7.1.0",
+    "ajv": "^8.17.1",
+    "ajv-draft-04": "^1.0.0",
+    "axios": "1.7.8",
     "axios-progress-bar": "^1.2.0",
-    "bootstrap": "5.2.2",
+    "bootstrap": "5.3.3",
     "buffer": "^6.0.3",
-    "date-fns": "^3.3.1",
-    "geodesy": "^2.0.1",
-    "humanize-duration": "^3.27.1",
-    "i18next": "^23.7.9",
-    "i18next-browser-languagedetector": "^7.2.0",
-    "i18next-http-backend": "^2.4.2",
+    "date-fns": "^4.1.0",
+    "geodesy": "^2.4.0",
+    "humanize-duration": "^3.32.1",
+    "i18next": "^24.0.2",
+    "i18next-browser-languagedetector": "^8.0.0",
     "i18next-chained-backend": "^4.6.2",
+    "i18next-http-backend": "^3.0.1",
     "i18next-localstorage-backend": "^4.2.0",
     "legacy-socket.io-client": "npm:socket.io-client@2.2.0",
-    "localforage": "^1.7.3",
-    "lodash-es": "^4.17.11",
-    "mapbox-gl": "^3.1.2",
-    "mb-isochrone": "^0.1.0",
+    "localforage": "^1.10.0",
+    "lodash-es": "^4.17.21",
+    "mapbox-gl": "^3.8.0",
     "pluralize": "^8.0.0",
-    "prop-types": "^15.7.2",
-    "react": "^18.2.0",
-    "react-bootstrap": "2.5.0",
-    "react-collapsible": "^2.6.2",
+    "prop-types": "^15.8.1",
+    "react": "^18.3.1",
+    "react-bootstrap": "2.10.6",
+    "react-collapsible": "^2.10.0",
     "react-css-loaders": "^0.0.5",
-    "react-datepicker": "^6.1.0",
-    "react-debounce-render": "^6.0.0",
-    "react-dom": "^18.2.0",
-    "react-error-boundary": "^1.2.5",
-    "react-fast-compare": "^2.0.4",
-    "react-flip-toolkit": "^7.0.13",
+    "react-datepicker": "^7.5.0",
+    "react-debounce-render": "^8.0.2",
+    "react-dom": "^18.3.1",
+    "react-error-boundary": "^4.1.2",
+    "react-fast-compare": "^3.2.2",
+    "react-flip-toolkit": "^7.2.4",
     "react-ga4": "^2.1.0",
-    "react-i18next": "^13.5.0",
+    "react-i18next": "^15.1.2",
     "react-infinite-scroller": "^1.2.6",
     "react-js-pagination": "^3.0.3",
-    "react-pin-field": "^3.1.3",
-    "react-redux": "^7.0.3",
-    "react-router-dom": "^6.4.2",
+    "react-pin-field": "^3.1.5",
+    "react-redux": "^9.1.2",
+    "react-router-dom": "^7.0.1",
     "react-scripts": "5.0.1",
-    "react-select": "^5.8.0",
-    "react-to-print": "^2.14.13",
-    "react-toastify": "^5.4.0",
-    "react-window": "^1.8.8",
-    "redux": "^4.0.0",
+    "react-select": "^5.8.3",
+    "react-to-print": "^3.0.2",
+    "react-toastify": "^10.0.6",
+    "react-window": "^1.8.10",
+    "redux": "^5.0.1",
     "redux-persist": "^5.10.0",
     "redux-promise": "^0.6.0",
-    "redux-thunk": "^2.3.0",
-    "reselect": "^4.0.0",
-    "socket.io-client": "^4.7.2",
-    "streamsaver": "^1.2.0",
+    "redux-thunk": "^3.1.0",
+    "reselect": "^5.1.1",
+    "socket.io-client": "^4.8.1",
     "suncalc": "^1.9.0",
-    "use-sound": "^4.0.1",
-    "uuid": "^3.4.0"
+    "use-sound": "^4.0.3",
+    "uuid": "^11.0.3"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -92,14 +91,15 @@
     "jest-coverage-thresholds-bumper": "^1.0.1",
     "jest-webgl-canvas-mock": "^0.2.3",
     "madge": "^5.0.1",
-    "msw": "^0.47.3",
-    "node-sass": "^6.0.1",
+    "msw": "^2.6.6",
     "redux-mock-store": "^1.5.3",
+    "sass": "^1.81.0",
     "socket.io-mock": "^1.3.2",
     "stylelint": "^13.13.1",
     "stylelint-config-css-modules": "^2.2.0",
     "stylelint-config-standard": "^22.0.0",
-    "stylelint-scss": "^3.21.0"
+    "stylelint-scss": "^3.21.0",
+    "undici": "5.0.0"
   },
   "jest": {
     "coverageThreshold": {
@@ -121,8 +121,6 @@
     "last 1 safari version"
   ],
   "resolutions": {
-    "eslint-loader": "3.0.2",
-    "node-fetch": "2.6.7",
-    "loader-utils": "2.0.4"
+    "resolve-url-loader": "5.0.0"
   }
-}
+}

public/locales/en-US/reports.json

@@ -134,6 +134,11 @@
       "locationLabel": "Event Location",
       "priorityLabel": "Priority",
       "reportedByLabel": "Reported By",
+      "schemaForm": {
+        "errors": {
+          "required": "This is a required field."
+        }
+      },
       "stateDropdown": {
         "active": "active",
         "resolved": "resolved"

public/locales/es/reports.json

@@ -123,6 +123,11 @@
       "locationLabel": "Ubicación del evento",
       "priorityLabel": "Prioridad",
       "reportedByLabel": "Reportado por",
+      "schemaForm": {
+        "errors": {
+          "required": "Este campo es obligatorio."
+        }
+      },
       "stateDropdown": {
         "active": "activo",
         "resolved": "resuelto"

public/locales/fr/reports.json

@@ -123,6 +123,11 @@
       "locationLabel": "Emplacement",
       "priorityLabel": "Priorité",
       "reportedByLabel": "Complété Par",
+      "schemaForm": {
+        "errors": {
+          "required": "Ceci est un champ obligatoire."
+        }
+      },
       "stateDropdown": {
         "active": "Actif",
         "resolved": "Résolu"

public/locales/ne-NP/reports.json

@@ -131,6 +131,11 @@
             "locationLabel": "घटनाको लोकेसन",
             "priorityLabel": "प्राथमिकता",
             "reportedByLabel": "द्वारा रिपार्ट गरिएको",
+            "schemaForm": {
+                "errors": {
+                    "required": "यो आवश्यक फिल्ड हो।"
+                }
+            },
             "stateDropdown": {
                 "active": "सक्रिय",
                 "resolved": "समाधान गरिएको"