Merge branch 'main' of github.com:maproulette/maproulette3 into depen…

…dabot/npm_and_yarn/nanoid-3.3.8

.dockerignore

@@ -1,4 +1,3 @@
-.git
 .github
 /build
 /dist

.env

@@ -71,7 +71,7 @@ REACT_APP_GEOGRAPHIC_INDEXING_DELAY=2
 # iD editor base URL
 REACT_APP_ID_EDITOR_SERVER_URL='https://www.openstreetmap.org/edit'
 
-# RapiD editor base URL
+# Rapid editor base URL
 REACT_APP_RAPID_EDITOR_SERVER_URL='https://rapideditor.org/edit'
 
 # Level0 editor base URL

.git-blame-ignore-revs

@@ -0,0 +1,10 @@
+# This file lists commits which contain large but uninteresting changes (like
+# applying code auto-formatting), so that you can ignore them in `git blame`
+# output.
+#
+# To do this, run `git blame --ignore-revs-file .git-blame-ignore-revs`,
+# or `git config blame.ignoreRevsFile .git-blame-ignore-revs` to configure
+# git to do this by default.
+
+# Format entire codebase with Biome
+40ec714bd10a541ebc33e47e7dfb85ade4fe890c

.github/workflows/docker-publish.yml

@@ -1,10 +1,10 @@
-name: Build Docker Image, Push to GHCR
+name: Build Docker image, push to GHCR, and trigger redeploy
 
 on:
   push:
-    # Publish HEAD of main branch as :latest image tag
+    # Run whenever main branch changes
     branches: [ "main" ]
-    # Publish semver tags as named image tags
+    # ...or whenever a new semver release tag is published
     tags: [ 'v*.*.*' ]
 
 env:
@@ -58,3 +58,16 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
+  trigger-redeploy:
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Send trigger-workflow webhook to maproulette-deploy repository
+        run: |
+          curl -X POST https://api.github.com/repos/maproulette/maproulette-deploy/dispatches \
+            --fail --silent --show-error --location \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.DEPLOY_REPO_TOKEN }}" \
+            -d '{ "event_type": "deploy maproulette-frontend@${{ github.ref_name }} (${{ github.sha }})" }'

.github/workflows/node.js.yml

@@ -27,6 +27,9 @@ jobs:
     - name: Install dependencies
       # --frozen-lockfile: don't generate a lockfile and fail if an update is needed
       run: yarn install --frozen-lockfile
+
+    - name: Check for formatting and linting errors
+      run: yarn run check
 
     - name: Run build
       run: yarn run build
@@ -35,8 +38,3 @@ jobs:
 
     - name: Run the tests
       run: yarn test -- --coverage
-
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -11,6 +11,7 @@ src/customLayers.json
 # testing
 /coverage
 chimp.js
+error.png
 
 # production
 /build
@@ -37,3 +38,8 @@ yarn-error.log*
 
 #vscode
 /.vscode
+
+# playwright
+/test-results/
+/playwright-report/
+playwright/.auth/

CHANGELOG.md

@@ -4,8 +4,74 @@ All notable changes to this project will be documented in this file.
 The format is based on
 [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
-This project adheres to
-[Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## [v3.16.4] - 2025-02-13
+Released with [maproulette-backend_v4.7.2](https://github.com/maproulette/maproulette-backend/releases/tag/v4.7.2)
+
+## What's Changed
+* disable completion buttons by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2542
+* Scrub for RapiD -> Rapid brand update by @watmildon in https://github.com/maproulette/maproulette3/pull/2543
+* Error tag and comment editing by @jschwarz2030 in https://github.com/maproulette/maproulette3/pull/2529
+
+## MR2 Changes
+* add ability to edit comments and show if edited by @jschwarz2030 in https://github.com/maproulette/maproulette-backend/pull/1167
+
+**Full Changelog**: https://github.com/maproulette/maproulette3/compare/v3.16.3...v3.16.4
+
+## [v3.16.3] - 2025-02-06
+Released with [maproulette-backend_v4.7.1](https://github.com/maproulette/maproulette-backend/releases/tag/v4.7.1)
+
+## What's Changed
+* add disable task confirmation feature by @jschwarz2030 in https://github.com/maproulette/maproulette3/pull/2516
+* conditionalize challenge result list filters for find challenge page by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2535
+* fix global challenge filtering bug on find challenge page by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2534
+* fix import formatting in ActiveTaskControls.jsx by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2533
+
+## MR2 Changes
+* fix isArchived and isGlobal filtering in extendFind endpoint by @CollinBeczak in https://github.com/maproulette/maproulette-backend/pull/1168
+* add disable task confirmation feature by @jschwarz2030 in https://github.com/maproulette/maproulette-backend/pull/1162
+
+**Full Changelog**: https://github.com/maproulette/maproulette3/compare/v3.16.2...v3.16.3
+
+## [v3.16.2] - 2025-02-03
+
+## What's Changed
+* Improve footer version info by @jake-low in https://github.com/maproulette/maproulette3/pull/2508
+* Fix OSM Element Tags widget not updating when switching to next task by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2510
+* Fix memory leak warning in the Achievement Badge Test by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2511
+* Fix docker build (.git directory is required now) by @jake-low in https://github.com/maproulette/maproulette3/pull/2512
+* Make tasks in task properties widget collapsible by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2502
+* Connect to new endpoint for fetching specifically task markers by @CollinBeczak, @jake-low in https://github.com/maproulette/maproulette3/pull/2356
+* Add global toggle to find challenge page by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2382
+* Fix mapillary infinite loop and improve UI by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2455
+* Replace many lodash _.get() calls with native ES expressions by @jake-low in https://github.com/maproulette/maproulette3/pull/2515
+
+## Development Changes
+* Add Biome code formatter by @jake-low
+* Fix SCSS syntax errors for Biome by @jake-low
+* Fix unused variable warnings by @jake-low
+* Reorganize package.json by @jake-low
+* Format all source files with Biome by @jake-low
+* Add .git-blame-ignore-revs file by @jake-low
+* Disable Biome linter (still using eslint for now) by @jake-low
+* Add pre-commit hook for linting/formatting by @jake-low
+* Update developer instructions to mention pre-commit hook by @jake-low
+* Check for formatting and linting errors in CI by @jake-low
+* Fix CodeQL warning about unescaped '.' in regex by @jake-low, @CollinBeczak
+
+## Testing Improvements
+* Add boilerplate for playwright e2e testing by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2519
+* Remove obsolete snapshots and fix websocket undefined error by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2523
+
+## Bug Fixes
+* Remove intl errors from selected context by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2520
+* Fix save challenge returning undefined bug by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2527
+* Fix external id editing conditions by @CollinBeczak in https://github.com/maproulette/maproulette3/pull/2528
+
+**Full Changelog**: https://github.com/maproulette/maproulette3/compare/v3.16.1...v3.16.2
+
+## [v3.16.1] - 2024-12-20
+
+* add OSM Element Tags widget (by @homersimpsons in #2499)
 
 ## [v3.16.0] - 2024-11-12
 Released with [maproulette-backend_v4.6.1](https://github.com/maproulette/maproulette-backend/releases/tag/v4.6.1)
@@ -1558,7 +1624,7 @@ Release with [maproulette-backend_v4.3.1](https://github.com/maproulette/maproul
 ### Added
 - Completion and review of multiple tasks together
 - Templates for generating forms to be filled by mapper during task completion
-- RapiD editor option by @gaoxm
+- Rapid editor option by @gaoxm
 - Updated help links by @mvexel
 - Additional resiliency to missing task geometries
 - Option to include specific task properties as columns in CSV exports

DEVELOPMENT.md

@@ -194,10 +194,24 @@ Unit tests are built with [Jest](https://facebook.github.io/jest/) +
 
 `yarn test` to run them in watch mode.
 
+## Linting and formatting
+
+Run `yarn format` to format your code. Run `yarn lint` to check for lint errors.
+
+If you want, you can enable a pre-commit hook to check for linting and formatting
+issues automatically when you run `git commit`. To enable the check, run this
+command in the root of the repository:
+
+```
+git config core.hooksPath hooks
+```
+
+If you want to skip the check for a particular commit (for work-in-progress commits
+for example), run `git commit --no-verify`.
+
 ## CSS Styling and Naming
 
-We are using SASS and [Tailwind
-CSS](https://tailwindcss.com) with PostCSS.
+We are using SASS and [Tailwind CSS](https://tailwindcss.com) with PostCSS.
 
 Tailwind configuration is controlled with the `src/tailwind.config.js` file.
 New CSS classes can be found in `src/styles/`

biome.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "include": ["src/"]
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "lineWidth": 100
+  },
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": false,
+    "rules": {
+      "recommended": true
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double"
+    }
+  }
+}

eslint.config.js

@@ -25,7 +25,7 @@ export default [
       },
     },
     rules: {
-      "no-unused-vars": "warn",
+      "no-unused-vars": ["warn", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
       "react/jsx-uses-react": "error",
       "react/jsx-uses-vars": "error",
       "unused-imports/no-unused-imports": "error",

hooks/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -ex
+
+yarn run check

index.html

@@ -30,7 +30,7 @@
           integrity="sha512-07I2e+7D8p6he1SIM+1twR5TIrhUQn9+I6yjqD53JQjFiMf8EtC93ty0/5vJTZGF8aAocvHYNEDJajGdNx1IsQ=="
           crossorigin=""/>
     <link
-      href="https://unpkg.com/mapillary-js@4.0.0/dist/mapillary.css"
+      href="https://unpkg.com/mapillary-js@4.1.2/dist/mapillary.css"
       rel="stylesheet"
     />