@defra/forms-engine-plugin 4.3.0 → 4.5.0

package/src/client/javascripts/map.js

@@ -0,0 +1,389 @@
+import { centroid } from '@turf/centroid'
+// @ts-expect-error - no types
+import OsGridRef, { LatLon } from 'geodesy/osgridref.js'
+
+import { processGeospatial } from '~/src/client/javascripts/geospatial-map.js'
+import { processLocation } from '~/src/client/javascripts/location-map.js'
+
+// Center of UK
+const DEFAULT_LAT = 53.825564
+const DEFAULT_LONG = -2.421975
+const COMPANY_SYMBOL_CODE = 169
+
+const defaultData = {
+  VTS_OUTDOOR_URL: '/api/maps/vts/OS_VTS_3857_Outdoor.json',
+  VTS_DARK_URL: '/api/maps/vts/OS_VTS_3857_Dark.json',
+  VTS_BLACK_AND_WHITE_URL: '/api/maps/vts/OS_VTS_3857_Black_and_White.json'
+}
+
+/**
+ * Converts lat long to easting and northing
+ * @param {object} param
+ * @param {number} param.lat
+ * @param {number} param.long
+ * @returns {{ easting: number, northing: number }}
+ */
+export function latLongToEastingNorthing({ lat, long }) {
+  const point = new LatLon(lat, long)
+
+  return point.toOsGrid()
+}
+
+/**
+ * Converts easting and northing to lat long
+ * @param {object} param
+ * @param {number} param.easting
+ * @param {number} param.northing
+ * @returns {{ lat: number, long: number }}
+ */
+export function eastingNorthingToLatLong({ easting, northing }) {
+  const point = new OsGridRef(easting, northing)
+  const latLong = point.toLatLon()
+
+  return { lat: latLong.latitude, long: latLong.longitude }
+}
+
+/**
+ * Converts lat long to an ordnance survey grid reference
+ * @param {object} param
+ * @param {number} param.lat
+ * @param {number} param.long
+ * @returns {string}
+ */
+export function latLongToOsGridRef({ lat, long }) {
+  const point = new LatLon(lat, long)
+
+  return point.toOsGrid().toString()
+}
+
+/**
+ * Converts an ordnance survey grid reference to lat long
+ * @param {string} osGridRef
+ * @returns {{ lat: number, long: number }}
+ */
+export function osGridRefToLatLong(osGridRef) {
+  const point = OsGridRef.parse(osGridRef)
+  const latLong = point.toLatLon()
+
+  return { lat: latLong.latitude, long: latLong.longitude }
+}
+
+/**
+ * Get the grid ref from the first coordinate of a long/lat feature
+ * @param {Feature} feature
+ */
+export function getCoordinateGridRef(feature) {
+  if (feature.geometry.type === 'Point') {
+    const [long, lat] = feature.geometry.coordinates
+    const point = new LatLon(lat, long)
+
+    return point.toOsGrid().toString()
+  } else if (feature.geometry.type === 'LineString') {
+    const [long, lat] = feature.geometry.coordinates[0]
+    const point = new LatLon(lat, long)
+
+    return point.toOsGrid().toString()
+  } else {
+    const [long, lat] = feature.geometry.coordinates[0][0]
+    const point = new LatLon(lat, long)
+
+    return point.toOsGrid().toString()
+  }
+}
+
+/**
+ * Get the centroid grid ref from a long/lat feature
+ * @param {Feature} feature
+ */
+export function getCentroidGridRef(feature) {
+  if (feature.geometry.type === 'Point') {
+    const [long, lat] = feature.geometry.coordinates
+    const point = new LatLon(lat, long)
+
+    return point.toOsGrid().toString()
+  } else {
+    const centre = centroid(feature)
+    const [long, lat] = centre.geometry.coordinates
+    const point = new LatLon(lat, long)
+
+    return point.toOsGrid().toString()
+  }
+}
+
+/** @type {InteractiveMapInitConfig} */
+export const defaultConfig = {
+  zoom: '6',
+  center: [DEFAULT_LONG, DEFAULT_LAT]
+}
+
+export const EVENTS = {
+  mapReady: 'map:ready',
+  interactMarkerChange: 'interact:markerchange',
+  drawReady: 'draw:ready',
+  drawCreated: 'draw:created',
+  drawEdited: 'draw:edited',
+  drawCancelled: 'draw:cancelled'
+}
+
+/**
+ * Make a form submit handler that only allows submissions from allowed buttons
+ * @param {HTMLButtonElement[]} buttons - the form buttons to allow submissions
+ */
+export function formSubmitFactory(buttons) {
+  /**
+   * The submit handler
+   * @param {SubmitEvent} e
+   */
+  const onFormSubmit = function (e) {
+    if (
+      !(e.submitter instanceof HTMLButtonElement) ||
+      !buttons.includes(e.submitter)
+    ) {
+      e.preventDefault()
+    }
+  }
+
+  return onFormSubmit
+}
+
+/**
+ * Initialise location maps
+ * @param {Partial<MapsEnvironmentConfig>} config - the map configuration
+ */
+export function initMaps(config = {}) {
+  const {
+    assetPath = '/assets',
+    apiPath = '/form/api',
+    data = defaultData
+  } = config
+  const locations = document.querySelectorAll('.app-location-field')
+  const geospatials = document.querySelectorAll('.app-geospatial-field')
+
+  // TODO: Fix this in `interactive-map`
+  // If there are location components on the page fix up the main form submit
+  // handler so it doesn't fire when using the integrated map search feature
+  if (locations.length) {
+    const form = locations[0].closest('form')
+
+    if (form === null) {
+      return
+    }
+
+    const buttons = Array.from(form.querySelectorAll('button'))
+    form.addEventListener('submit', formSubmitFactory(buttons), false)
+  }
+
+  if (geospatials.length) {
+    const form = geospatials[0].closest('form')
+
+    if (form === null) {
+      return
+    }
+
+    const buttons = Array.from(form.querySelectorAll('button'))
+    form.addEventListener('submit', formSubmitFactory(buttons), false)
+  }
+
+  locations.forEach((location, index) => {
+    processLocation({ assetPath, apiPath, data }, location, index)
+  })
+
+  geospatials.forEach((geospatial, index) => {
+    processGeospatial({ assetPath, apiPath, data }, geospatial, index)
+  })
+}
+
+/**
+ * OS API request proxy factory
+ * @param {string} apiPath - the root API path
+ */
+export function makeTileRequestTransformer(apiPath) {
+  /**
+   * Proxy OS API requests via our server
+   * @param {string} url - the request URL
+   * @param {string} resourceType - the resource type
+   */
+  return function transformTileRequest(url, resourceType) {
+    if (url.startsWith('https://api.os.uk')) {
+      if (resourceType === 'Tile') {
+        return {
+          url: url.replace(
+            'https://api.os.uk/maps/vector/v1/vts',
+            `${window.location.origin}${apiPath}`
+          ),
+          headers: {}
+        }
+      }
+
+      if (resourceType !== 'Style') {
+        return {
+          url: `${apiPath}/map-proxy?url=${encodeURIComponent(url)}`,
+          headers: {}
+        }
+      }
+    }
+
+    const spritesPath =
+      'https://raw.githubusercontent.com/OrdnanceSurvey/OS-Vector-Tile-API-Stylesheets/main'
+
+    // Proxy sprite requests
+    if (url.startsWith(spritesPath)) {
+      const path = url.substring(spritesPath.length)
+      return {
+        url: `${apiPath}/maps/vts${path}`,
+        headers: {}
+      }
+    }
+
+    return { url, headers: {} }
+  }
+}
+
+/**
+ * Create a Defra map instance
+ * @param {string} mapId - the map id
+ * @param {InteractiveMapInitConfig} initConfig - the map initial configuration
+ * @param {MapsEnvironmentConfig} mapsConfig - the map environment params
+ */
+export function createMap(mapId, initConfig, mapsConfig) {
+  const { assetPath, apiPath, data = defaultData } = mapsConfig
+  const logoAltText = 'Ordnance survey logo'
+
+  // @ts-expect-error - Defra namespace currently comes from UMD support files
+  const defra = window.defra
+
+  const interactPlugin = defra.interactPlugin({
+    markerColor: { outdoor: '#ff0000', dark: '#00ff00' },
+    interactionMode: 'marker',
+    multiSelect: false
+  })
+
+  /** @type {InteractiveMap} */
+  const map = new defra.InteractiveMap(mapId, {
+    enableFullscreen: true,
+    autoColorScheme: false,
+    mapProvider: defra.maplibreProvider(),
+    reverseGeocodeProvider: defra.openNamesProvider({
+      url: `${apiPath}/reverse-geocode-proxy?easting={easting}&northing={northing}`
+    }),
+    behaviour: 'inline',
+    minZoom: 6,
+    maxZoom: 18,
+    containerHeight: '400px',
+    enableZoomControls: true,
+    transformRequest: makeTileRequestTransformer(apiPath),
+    ...initConfig,
+    plugins: [
+      defra.mapStylesPlugin({
+        mapStyles: [
+          {
+            id: 'outdoor',
+            label: 'Outdoor',
+            url: data.VTS_OUTDOOR_URL,
+            thumbnail: `${assetPath}/interactive-map/assets/images/outdoor-map-thumb.jpg`,
+            logo: `${assetPath}/interactive-map/assets/images/os-logo.svg`,
+            logoAltText,
+            attribution: `Contains OS data ${String.fromCodePoint(COMPANY_SYMBOL_CODE)} Crown copyright and database rights ${new Date().getFullYear()}`,
+            backgroundColor: '#f5f5f0'
+          },
+          {
+            id: 'dark',
+            label: 'Dark',
+            url: data.VTS_DARK_URL,
+            mapColorScheme: 'dark',
+            appColorScheme: 'dark',
+            thumbnail: `${assetPath}/interactive-map/assets/images/dark-map-thumb.jpg`,
+            logo: `${assetPath}/interactive-map/assets/images/os-logo-white.svg`,
+            logoAltText,
+            attribution: `Contains OS data ${String.fromCodePoint(COMPANY_SYMBOL_CODE)} Crown copyright and database rights ${new Date().getFullYear()}`
+          },
+          {
+            id: 'black-and-white',
+            label: 'Black/White',
+            url: data.VTS_BLACK_AND_WHITE_URL,
+            thumbnail: `${assetPath}/interactive-map/assets/images/black-and-white-map-thumb.jpg`,
+            logo: `${assetPath}/interactive-map/assets/images/os-logo-black.svg`,
+            logoAltText,
+            attribution: `Contains OS data ${String.fromCodePoint(COMPANY_SYMBOL_CODE)} Crown copyright and database rights ${new Date().getFullYear()}`
+          }
+        ]
+      }),
+      interactPlugin,
+      defra.searchPlugin({
+        osNamesURL: `${apiPath}/geocode-proxy?query={query}`,
+        width: '300px',
+        showMarker: false
+      }),
+      defra.scaleBarPlugin({
+        units: 'metric'
+      }),
+      ...(initConfig.plugins ?? [])
+    ]
+  })
+
+  return { map, interactPlugin }
+}
+
+/**
+ * Updates the marker position and moves the map view port the new location
+ * @param {InteractiveMap} map - the map component instance (of InteractiveMap)
+ * @param {MapLibreMap} mapProvider - the map provider instance (of MapLibreMap)
+ * @param {MapCenter} center - the point
+ */
+export function centerMap(map, mapProvider, center) {
+  // Move the 'location' marker to the new point
+  map.addMarker('location', center)
+
+  // Pan & zoom the map to the new valid location
+  mapProvider.flyTo({
+    center,
+    zoom: 14,
+    essential: true
+  })
+}
+
+/**
+ * @typedef {object} InteractiveMap - an instance of a InteractiveMap
+ * @property {Function} on - register callback listeners to map events
+ * @property {Function} addPanel - adds a new panel to the map
+ * @property {Function} addMarker - adds/updates a marker
+ * @property {Function} removeMarker - removes a marker
+ * @property {Function} addButton - adds/updates a button
+ * @property {Function} toggleButtonState - toggle the state of a button
+ */
+
+/**
+ * @typedef {object} MapLibreMap
+ * @property {Function} flyTo - pans/zooms to a new location
+ * @property {Function} fitBounds - fits the my to the new bounds
+ */
+
+/**
+ * @typedef {[number, number]} MapCenter - Map center point as [long, lat]
+ */
+
+/**
+ * @typedef {object} InteractiveMapInitConfig - additional config that can be provided to InteractiveMap
+ * @property {string} zoom - the zoom level of the map
+ * @property {MapCenter} center - the center point of the map
+ * @property {{ id: string, coords: MapCenter }[]} [markers] - the markers to add to the map
+ * @property {any[]} [plugins] - additional plugins
+ */
+
+/**
+ * @typedef {object} TileData
+ * @property {string} VTS_OUTDOOR_URL - the outdoor tile URL
+ * @property {string} VTS_DARK_URL - the dark tile URL
+ * @property {string} VTS_BLACK_AND_WHITE_URL - the black and white tile URL
+ */
+
+/**
+ * @typedef {object} MapsEnvironmentConfig
+ * @property {string} assetPath - the root asset path
+ * @property {string} apiPath - the root API path
+ * @property {TileData} data - the tile data config
+ */
+
+/**
+ * @import { Feature } from '~/src/server/plugins/engine/types.js'
+ */

package/src/client/javascripts/shared.js

@@ -2,7 +2,9 @@ import { initAllAutocomplete as initAllAutocompleteImp } from '~/src/client/java
 import { initFileUpload as initFileUploadImp } from '~/src/client/javascripts/file-upload.js'
 import { initAllGovuk as initAllGovukImp } from '~/src/client/javascripts/govuk.js'
 import { initPreviewCloseLink as initPreviewCloseLinkImp } from '~/src/client/javascripts/preview-close-link.js'
-export { initMaps } from '~/src/client/javascripts/location-map.js'
+export { initMaps } from '~/src/client/javascripts/map.js'
+export * as map from '~/src/client/javascripts/map.js'
+export * as geospatialMap from '~/src/client/javascripts/geospatial-map.js'
 
 export const initAllGovuk = initAllGovukImp
 export const initAllAutocomplete = initAllAutocompleteImp

package/src/client/stylesheets/shared.scss

@@ -16,6 +16,13 @@
   visibility: hidden;
 }
 
+.js-enabled {
+  .js-hidden {
+    display: none;
+    visibility: hidden;
+  }
+}
+
 // Used in postcode lookup
 .govuk-button--link {
   @extend %govuk-link;

package/src/server/plugins/engine/components/ComponentBase.ts

@@ -15,6 +15,7 @@ import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
 import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
 
 export class ComponentBase {
+  id?: string
   page?: PageControllerClass
   parent: Component | undefined
   collection: ComponentCollection | undefined
@@ -40,6 +41,7 @@ export class ComponentBase {
       model: FormModel
     }
   ) {
+    this.id = def.id
     this.type = def.type
     this.name = def.name
     this.title = def.title

package/src/server/plugins/engine/components/FileUploadField.test.ts

@@ -405,7 +405,7 @@ describe('FileUploadField', () => {
                     actions: {
                       items: [
                         {
-                          href: `/test/file-upload-component/${validState[0].uploadId}/confirm-delete`,
+                          href: `/test/file-upload-component/${validState[0].status.form.file.fileId}/confirm-delete`,
                           text: 'Remove',
                           attributes: { id: 'myComponent__0' },
                           classes: 'govuk-link--no-visited-state',
@@ -424,7 +424,7 @@ describe('FileUploadField', () => {
                     actions: {
                       items: [
                         {
-                          href: `/test/file-upload-component/${validState[1].uploadId}/confirm-delete`,
+                          href: `/test/file-upload-component/${validState[1].status.form.file.fileId}/confirm-delete`,
                           text: 'Remove',
                           attributes: { id: 'myComponent__1' },
                           classes: 'govuk-link--no-visited-state',
@@ -443,7 +443,7 @@ describe('FileUploadField', () => {
                     actions: {
                       items: [
                         {
-                          href: `/test/file-upload-component/${validState[2].uploadId}/confirm-delete`,
+                          href: `/test/file-upload-component/${validState[2].status.form.file.fileId}/confirm-delete`,
                           text: 'Remove',
                           attributes: { id: 'myComponent__2' },
                           classes: 'govuk-link--no-visited-state',
@@ -454,7 +454,8 @@ describe('FileUploadField', () => {
                   }
                 ]
               }
-            }
+            },
+            multiple: true
           })
         )
       })
@@ -543,7 +544,7 @@ describe('FileUploadField', () => {
                     actions: {
                       items: [
                         {
-                          href: `/test/file-upload-component/${validState[2].uploadId}/confirm-delete`,
+                          href: `/test/file-upload-component/${validState[2].status.form.file.fileId}/confirm-delete`,
                           text: 'Remove',
                           attributes: { id: 'myComponent__0' },
                           classes: 'govuk-link--no-visited-state',
@@ -554,7 +555,8 @@ describe('FileUploadField', () => {
                   }
                 ]
               }
-            }
+            },
+            multiple: true
           })
         )
       })
@@ -583,7 +585,7 @@ describe('FileUploadField', () => {
                     actions: {
                       items: [
                         {
-                          href: `/test/file-upload-component/${validState[2].uploadId}/confirm-delete`,
+                          href: `/test/file-upload-component/${validState[2].status.form.file.fileId}/confirm-delete`,
                           text: 'Remove',
                           attributes: { id: 'myComponent__0' },
                           classes: 'govuk-link--no-visited-state',
@@ -594,7 +596,8 @@ describe('FileUploadField', () => {
                   }
                 ]
               }
-            }
+            },
+            multiple: true
           })
         )
       })

package/src/server/plugins/engine/components/FileUploadField.ts

@@ -73,9 +73,12 @@ export const tempStatusSchema = joi
       .valid(UploadStatus.ready, UploadStatus.pending)
       .required(),
     metadata: metadataSchema,
-    form: joi.object().required().keys({
-      file: tempFileSchema
-    }),
+    form: joi
+      .object()
+      .required()
+      .keys({
+        file: joi.array().items(tempFileSchema).single().required()
+      }),
     numberOfRejectedFiles: joi.number().optional()
   })
   .required()
@@ -191,7 +194,7 @@ export class FileUploadField extends FormComponent {
     errors?: FormSubmissionError[],
     query: FormQuery = {}
   ) {
-    const { options, page } = this
+    const { options, page, schema } = this
 
     // Allow preview URL direct access
     const isForceAccess = 'force' in query
@@ -233,7 +236,7 @@ export class FileUploadField extends FormComponent {
 
       // Remove summary list actions from previews
       if (!isForceAccess) {
-        const path = `/${item.uploadId}/confirm-delete`
+        const path = `/${file.fileId}/confirm-delete`
         const href = page?.getHref(`${page.path}${path}`) ?? '#'
 
         items.push({
@@ -263,6 +266,9 @@ export class FileUploadField extends FormComponent {
       attributes.accept = options.accept
     }
 
+    // Allow multiple file selection when schema permits more than 1 file
+    const allowsMultiple = schema.max !== 1 && schema.length !== 1
+
     const summaryList: SummaryList = {
       classes: 'govuk-summary-list--long-key',
       rows
@@ -277,6 +283,9 @@ export class FileUploadField extends FormComponent {
       // Override the component name we send to CDP
       name: 'file',
 
+      // Enable multi-file selection in the file picker
+      ...(allowsMultiple && { multiple: true }),
+
       upload: {
         count,
         summaryList

package/src/server/plugins/engine/components/FormComponent.ts

@@ -12,6 +12,7 @@ import {
 } from '~/src/server/plugins/engine/types/index.js'
 import {
   type ErrorMessageTemplateList,
+  type Feature,
   type FileState,
   type FormPayload,
   type FormState,
@@ -19,6 +20,7 @@ import {
   type FormSubmissionError,
   type FormSubmissionState,
   type FormValue,
+  type GeospatialState,
   type RepeatItemState,
   type RepeatListState,
   type UploadState
@@ -302,9 +304,36 @@ export function isUploadState(value?: unknown): value is UploadState {
   return value.every(isUploadValue)
 }
 
+/**
+ * Check for geospatial state
+ */
+export function isGeospatialState(value?: unknown): value is GeospatialState {
+  if (!Array.isArray(value)) {
+    return false
+  }
+
+  // Skip checks when empty
+  if (!value.length) {
+    return true
+  }
+
+  return value.every(isGeospatialValue)
+}
+
 /**
  * Check for upload state value
  */
 export function isUploadValue(value?: unknown): value is FileState {
   return isFormState(value) && typeof value.uploadId === 'string'
 }
+
+/**
+ * Check for geospatial state value
+ */
+export function isGeospatialValue(value?: unknown): value is Feature {
+  return (
+    isFormState(value) &&
+    typeof value.type === 'string' &&
+    value.type === 'Feature'
+  )
+}