Merge branch 'main' into feat/df-922-version-metadata-refactor

Author: mokhld

package-lock.json

@@ -31,6 +31,7 @@
     "./schema.js": "./.server/server/schemas/index.js",
     "./templates/*": "./.server/server/plugins/engine/views/*",
     "./cache-service.js": "./.server/server/services/cacheService.js",
+    "./map-plugin.js": "./.server/server/plugins/map/index.js",
     "./package.json": "./package.json"
   },
   "scripts": {
@@ -84,9 +85,10 @@
   "dependencies": {
     "@defra/forms-model": "^3.0.637",
     "@defra/hapi-tracing": "^1.29.0",
-    "@defra/interactive-map": "^0.0.4-alpha",
+    "@defra/interactive-map": "^0.0.11-alpha",
     "@elastic/ecs-pino-format": "^1.5.0",
     "@hapi/boom": "^10.0.1",
+    "@hapi/bourne": "^3.0.0",
     "@hapi/catbox": "^12.1.1",
     "@hapi/catbox-memory": "^6.0.2",
     "@hapi/catbox-redis": "^7.0.2",
@@ -98,6 +100,8 @@
     "@hapi/vision": "^7.0.3",
     "@hapi/wreck": "^18.1.0",
     "@hapi/yar": "^11.0.3",
+    "@turf/bbox": "^7.3.4",
+    "@turf/centroid": "^7.3.4",
     "@types/humanize-duration": "^3.27.4",
     "accessible-autocomplete": "^3.0.1",
     "atob": "^2.1.2",
@@ -182,16 +186,15 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-jest": "^28.14.0",
     "eslint-plugin-jsdoc": "^50.8.0",
-    "globals": "^17.3.0",
-    "neostandard": "^0.12.2",
-    "typescript-eslint": "^8.56.1",
     "global-jsdom": "^26.0.0",
+    "globals": "^17.3.0",
     "husky": "^9.1.7",
     "jest": "^30.2.0",
     "jest-extended": "^7.0.0",
     "jsdom": "^26.1.0",
     "lint-staged": "^15.5.2",
     "mockdate": "^3.0.5",
+    "neostandard": "^0.12.2",
     "nock": "^14.0.10",
     "postcss": "^8.5.6",
     "postcss-load-config": "^6.0.1",
@@ -208,6 +211,7 @@
     "terser-webpack-plugin": "^5.3.14",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3",
+    "typescript-eslint": "^8.56.1",
     "webpack": "^5.102.1",
     "webpack-assets-manifest": "^6.4.0",
     "webpack-cli": "^6.0.1"

package.json

@@ -304,16 +304,19 @@ function pollUploadStatus(uploadId) {
  * @param {HTMLInputElement} fileInput - The file input element
  * @param {HTMLButtonElement} uploadButton - The upload button
  * @param {HTMLButtonElement} continueButton - The continue button
- * @param {File | null} selectedFile - The selected file
+ * @param {File[]} selectedFiles - The selected files
  */
 function handleStandardFormSubmission(
   formElement,
   fileInput,
   uploadButton,
   continueButton,
-  selectedFile
+  selectedFiles
 ) {
-  renderSummary(selectedFile, 'Uploading…', formElement)
+  // Render in reverse so first file ends up at the top of the summary list
+  for (let i = selectedFiles.length - 1; i >= 0; i--) {
+    renderSummary(selectedFiles[i], 'Uploading…', formElement)
+  }
 
   fileInput.focus()
 
@@ -403,8 +406,8 @@ function initUpload() {
   }
 
   const formElement = /** @type {HTMLFormElement} */ (form)
-  /** @type {File | null} */
-  let selectedFile = null
+  /** @type {File[]} */
+  let selectedFiles = []
   let isSubmitting = false
   const uploadId = formElement.dataset.uploadId
 
@@ -414,12 +417,12 @@ function initUpload() {
     }
 
     if (fileInput.files && fileInput.files.length > 0) {
-      selectedFile = fileInput.files[0]
+      selectedFiles = Array.from(fileInput.files)
     }
   })
 
   uploadButton.addEventListener('click', (event) => {
-    if (!selectedFile) {
+    if (selectedFiles.length === 0) {
       event.preventDefault()
       showError(
         'Select a file',
@@ -436,12 +439,13 @@ function initUpload() {
 
     isSubmitting = true
 
+    // Show all selected files in the summary table
     handleStandardFormSubmission(
       formElement,
       fileInput,
       uploadButton,
       continueButton,
-      selectedFile
+      selectedFiles
     )
 
     handleAjaxFormSubmission(