Merge branch 'release-3.0' into feature/FCRM-5441

__mocks__/@esri/arcgis-rest-feature-service.js

@@ -0,0 +1,15 @@
+let expectedParameters
+const queryFeatureSpy = {
+  expectParameters: (params) => { expectedParameters = params }
+}
+
+const queryFeatures = async (requestObject) => {
+  if (expectedParameters) {
+    expect(requestObject).toEqual(expectedParameters)
+  }
+  return {
+    features: 'QUERY_FEATURES_RESPONSE'
+  }
+}
+
+module.exports = { queryFeatures, queryFeatureSpy }

__mocks__/@esri/arcgis-rest-request.js

@@ -0,0 +1,17 @@
+
+const response = {
+  token: 'TEST_TOKEN',
+  refreshToken: () => {
+    response.token = 'REFRESHED_TOKEN'
+    return response.token
+  }
+}
+const _invalidateToken = () => { response.token = undefined }
+
+const _resetToken = () => { response.token = 'TEST_TOKEN' }
+
+const ApplicationCredentialsManager = {
+  fromCredentials: () => (response)
+}
+
+module.exports = { ApplicationCredentialsManager, _invalidateToken, _resetToken }

client/js/defra-map/index.js

@@ -69,7 +69,20 @@ const surfaceWaterStyleLayers = [
 //   'Risk of Flooding from Surface Water Depth CCSW1 > 900mm/1',
 //   'Risk of Flooding from Surface Water Depth CCSW1 > 1200mm/1'
 // ]
+
+const fixLocalStorage = () => {
+  // Temp fix until 0.5.0
+  // Map will not load if localStorage basemap is not one of default OR dark
+  // but 0.3.0 sets the value to 'default,light', which screws up
+  // the map component after an upgrade to 0.4.0
+  const basemap = window.localStorage.getItem('basemap')
+  if (basemap !== 'default' && basemap !== 'dark') {
+    window.localStorage.removeItem('basemap')
+  }
+}
+
 getDefraMapConfig().then((defraMapConfig) => {
+  fixLocalStorage() // Temp fix until 0.5.0
   const getVectorTileUrl = (layerName) => `${defraMapConfig.agolVectorTileUrl}/${layerName + defraMapConfig.layerNameSuffix}/VectorTileServer`
   const getFeatureLayerUrl = (layerName) => `${defraMapConfig.agolServiceUrl}/${layerName}/FeatureServer`
   const getModelFeatureLayerUrl = (layerName) => `${defraMapConfig.agolServiceUrl}/${layerName + defraMapConfig.layerNameSuffix}/FeatureServer`
@@ -364,7 +377,7 @@ getDefraMapConfig().then((defraMapConfig) => {
     maxZoom: 20,
     centre: [340367, 322766],
     height: '100%',
-    hasGeoLocation: true,
+    hasGeoLocation: false,
     framework: 'esri',
     symbols: [symbols.waterStorageAreas, symbols.floodDefences, symbols.mainRivers],
     requestCallback: getRequest,
@@ -387,7 +400,7 @@ getDefraMapConfig().then((defraMapConfig) => {
       keyDisplay: 'min',
       segments: [{
         heading: 'Datasets',
-        collapse: 'collapse',
+        collapse: 'expanded',
         items: [
           {
             id: 'fz',
@@ -570,7 +583,7 @@ getDefraMapConfig().then((defraMapConfig) => {
         {
           heading: 'Map features',
           parentIds: ['fz'],
-          collapse: 'collapse',
+          collapse: 'expanded',
           items: [
             keyItemDefinitions.floodZone1,
             keyItemDefinitions.floodZone2,
@@ -582,7 +595,7 @@ getDefraMapConfig().then((defraMapConfig) => {
         {
           heading: 'Map features',
           parentIds: ['rsd', 'rsu', 'sw'],
-          collapse: 'collapse',
+          collapse: 'expanded',
           items: [
             keyItemDefinitions.floodExtents,
             keyItemDefinitions.waterStorageAreas,
@@ -593,7 +606,7 @@ getDefraMapConfig().then((defraMapConfig) => {
         {
           heading: 'Map features',
           parentIds: ['mo'],
-          collapse: 'collapse',
+          collapse: 'expanded',
           items: [
             keyItemDefinitions.waterStorageAreas,
             keyItemDefinitions.floodDefences,

config/.env-example

@@ -1,6 +1,7 @@
 ENV=dev
 HOST=0.0.0.0
 PORT=8050
+fmpAppType=internal
 CONNECTIONSTRING=http://dummyuri
 ERRBIT_POST_ERRORS=false
 ERRBIT_KEY=replace_this
@@ -19,7 +20,7 @@ ordnanceSurveyOsClientId=replace_this
 ordnanceSurveyOsClientSecret=replace_this
 ordnanceSurveyOsMapsKey=replace_this
 siteUrl=http://dummyuri
-functionAppUrl==http://dummyuri
+functionAppUrl=http://dummyuri
 ignoreUseAutomatedService=true
 placeApiUrl=http://dummyuri
 #AGOL

config/__tests__/config.spec.js

@@ -11,6 +11,7 @@ describe('Ensure config is correct', () => {
     const { config } = require('../index')
     const expectedConfig = {
       env: 'dev',
+      appType: 'internal',
       server: { port: '8050' },
       geoserver: 'http://dummyuri',
       views: { isCached: false },
@@ -28,7 +29,7 @@ describe('Ensure config is correct', () => {
         osClientSecret: 'replace_this'
       },
       siteUrl: 'http://dummyuri',
-      functionAppUrl: '=http://dummyuri',
+      functionAppUrl: 'http://dummyuri',
       ignoreUseAutomatedService: true,
       placeApi: { url: 'http://dummyuri' },
       agol: {

config/index.js

@@ -4,6 +4,7 @@ require('./environment')
 
 const config = {
   env: process.env.ENV,
+  appType: process.env.fmpAppType,
   server: {
     port: process.env.PORT
   },

config/schema.js

@@ -8,6 +8,7 @@ const serverSchema = Joi.object()
 
 const schema = Joi.object({
   env: Joi.string().required(),
+  appType: Joi.string().required().allow('internal', 'public'),
   server: serverSchema,
   geoserver: Joi.string().uri().required(),
   logging: Joi.object(),

package.json

@@ -38,7 +38,7 @@
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.25.9",
-    "@defra/flood-map": "^0.3.0",
+    "@defra/flood-map": "^0.4.0",
     "@esri/arcgis-rest-feature-service": "^4.0.6",
     "@esri/arcgis-rest-request": "^4.2.3",
     "@hapi/boom": "^9.1.4",

server/__test-helpers__/copy.js

@@ -1,12 +1,19 @@
-
 const assertCopy = (selector, expectedCopy) => {
-  const element = document.querySelector(selector)
-  if (expectedCopy) {
+  try {
+    const element = document.querySelector(selector)
+    if (expectedCopy) {
     // the REGEX trims all whitespace and only compares the actual text that will be rendered
-    expect(element.textContent.replace(/\s\s+/g, ' ').trim())
-      .toContain(expectedCopy.replace(/\s\s+/g, ' ').trim())
-  } else {
-    expect(element).toBeNull()
+      expect(element.textContent.replace(/\s\s+/g, ' ').trim())
+        .toContain(expectedCopy.replace(/\s\s+/g, ' ').trim())
+    } else {
+      expect(element).toBeNull()
+    }
+  } catch (error) {
+    // This Assert only runs when the expected assert fails.
+    // It is added as the exact location of the failure is hard to infer, when a fail occurs
+    // and this helps give a more meaningful failure message.
+    const failMessage = `expected selector ${selector} to contain ${expectedCopy || 'NO CONTENT'}`
+    expect(failMessage).toBeNull()
   }
 }
 

server/constants.js

@@ -3,6 +3,7 @@ const HOME = 'home'
 const TRIAGE = 'triage'
 const ABOUT_MAP = 'about-map'
 const LOCATION = 'location'
+const ENGLAND_ONLY = 'england-only'
 const MAP = 'map'
 const RESULTS = 'results'
 const CONTACT = 'contact'
@@ -18,6 +19,7 @@ const views = {
   TRIAGE,
   ABOUT_MAP,
   LOCATION,
+  ENGLAND_ONLY,
   MAP,
   RESULTS,
   CONTACT,

server/index.js

@@ -43,6 +43,7 @@ async function createServer () {
   await server.register(require('./plugins/error-pages'))
   await server.register(require('blipp'))
   await server.register(require('./plugins/full-url'))
+  await server.register(require('./plugins/register-cookie'))
 
   server.ext('onPreResponse', async (request, h) => {
     request.response.header('cache-control', 'no-cache')

server/plugins/register-cookie.js

@@ -3,15 +3,14 @@ const { config } = require('../../config')
 exports.plugin = {
   name: 'register-cookie',
   register: (server, options) => {
-    // Cookie used to notify the client
-    // browser that the download is complete
-    server.state('pdf-download', {
-      ttl: 10000,
+    // Cookie used to store a successful p4 request to stop duplication
+    server.state('p4Request', {
+      ttl: null, // ttl is session
       isSecure: config.siteUrl.startsWith('https'),
       path: '/',
       isSameSite: false,
       isHttpOnly: true,
-      encoding: 'none',
+      encoding: 'base64json',
       clearInvalid: true,
       strictHeader: true
     })