Merge develop branch back to main branch post release (#236)

* SIR-1101 - Updating water pollution to match smell date time format (#216) * build(deps): bump webpack from 5.95.0 to 5.96.1 (#213) Bumps [webpack](https://github.com/webpack/webpack) from 5.95.0 to 5.96.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.95.0...v5.96.1) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump postcode-validator from 3.10.1 to 3.10.2 (#219) Bumps [postcode-validator](https://github.com/melwynfurtado/postcode-validator) from 3.10.1 to 3.10.2. - [Release notes](https://github.com/melwynfurtado/postcode-validator/releases) - [Changelog](https://github.com/melwynfurtado/postcode-validator/blob/master/release.config.js) - [Commits](melwynfurtado/postcode-validator@v3.10.1...v3.10.2) --- updated-dependencies: - dependency-name: postcode-validator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Feature/sir 1144 (#221) * SIR-1144 adding a OSGB to WGS84 point transform * sonarcloud issue * Cya epic (#234) * SIR-888: water-pollution/your-details (#205) Looks good to me :) * SIR-887 : Story – WP – Check your answers (#208) * SIR-888: water-pollution/your-details (#205) Looks good to me :) * WIP - WP CYA Page * Technical implementation for SIR-887 * Fixed all lint errors * Refactored code and added comments * Refactored code and logic update * Added unit tests for check your answers page * SIR-1102 map widget for check your answers (#207) * linting that i missed * Fixed unit test case issues * fixing unit tests * reverting date test am and AM having issues * CYA routing boilerplate * changing to form-layout otherwise post doesn''t work * Fixed sonar issues part 1 * Fixed lint issues * Fixed sonar issues part 2 * Fixed sonar issues part 3 * Added test coverage part 1 * Added test coverage part 2 * Added test coverage part 3 * Additional logic added for UI renderning * Added null check * Reduced code complexity for sonar * Reduced code complexity for sonar * Updated logic complexity * Additional test cases for more coverage * Updated code based on review comments * Check your answers routing (#210) * SIR-1066 pollution-substance routing from CYA * updating var name for sonarcloud * test coverage * SIR-892 pollution-appearance routing from CYA (#211) * SIR-892 pollution-appearance routing from CYA * SIR-890 change location from CYA (#212) * SIR-890 change location from CYA * removing .only from unit tests * sonarcloud * SIR-1068 CYA routing for WP source (#217) --------- Co-authored-by: Tedd <[email protected]> * SIR-893 images-and-videos CYA routing * SIR-891 - observed date time from cya (#220) * SIR-891 - observed date time from cya * sonarcloud stuff * further test coverage for dates * SIR-889 : Story – WP – Check your answers – Watercourse & Extent (#218) * CYA - Watercourse & Extent redirection implementation * CYA - Prepopulate answers for watercourse & Extent pages * WIP - Updated test case * WIP - CYA Test cases * Added test cases for CYA watercourse & extent * SIR-894 : Story – WP – Check your answers – Dead animals (#222) * Technical implementation for SIR-894 * Removed console logs * fixing test missed from merge * SIR-895 : Story – WP – Check your answers – Other text (#225) * Technical implementation for SIR-895 * Added logs to check data on server * Added logs to check data on server * Added logs to check data on server * Removed logs --------- Co-authored-by: Tedd Mason <[email protected]> * Reset the referer flag in case if the user restarts the WP journey before report submission (#228) --------- Co-authored-by: sujithvg <[email protected]> * Updated package version and package-lock files (#235) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Tedd <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
DEFRA · Dec 11, 2024 · d8f6437 · d8f6437
1 parent f1da716
commit d8f6437
Show file tree

Hide file tree

Showing 71 changed files with 3,131 additions and 725 deletions.
diff --git a/client/js/map.js b/client/js/map.js
@@ -120,7 +120,9 @@ const dropPin = (coordinate) => {
     geometry: point
   })
   vectorSource.addFeature(marker)
-  pointElement.value = JSON.stringify(coordinate)
+  if (pointElement) {
+    pointElement.value = JSON.stringify(coordinate)
+  }
 }
 
 const panToPoint = (point, extentBuffer = 250) => {
@@ -145,7 +147,7 @@ const panToOSValue = (value) => {
   }
 }
 
-const initialiseMap = () => {
+const initialiseMap = options => {
   (
     async () => {
       await setToken()
@@ -159,35 +161,53 @@ const initialiseMap = () => {
       const oSLayer = new TileLayer({
         source: osSource
       })
-      map = new Map({
-        target: 'map',
-        interactions: defaultInteractions({
+
+      const interactions = options?.disableControls
+        ? []
+        : defaultInteractions({
           altShiftDragRotate: false,
           pinchRotate: false
-        }),
-        controls: defaultControls().extend([
-          new ScaleLine({
-            units: 'metric',
-            minWidth: 100
-          })
-        ]),
-        layers: [
-          oSLayer,
-          vectorLayer
-        ],
-        view: new View({
-          projection: OSGB36,
-          showFullExtent: false,
-          extent,
-          center,
-          zoom,
-          maxZoom
         })
+
+      const controls = defaultControls().extend([
+        new ScaleLine({
+          units: 'metric',
+          minWidth: 100
+        })
+      ])
+
+      const view = new View({
+        projection: OSGB36,
+        showFullExtent: false,
+        extent,
+        center: options?.point || center,
+        zoom: options?.zoom || zoom,
+        maxZoom
       })
-      // add Marker interaction
-      map.on('click', (e) => {
-        dropPin(e.coordinate)
+
+      const layers = [
+        oSLayer,
+        vectorLayer
+      ]
+
+      map = new Map({
+        target: 'map',
+        interactions,
+        controls,
+        layers,
+        view
       })
+
+      if (options?.point) {
+        dropPin(options.point)
+      }
+
+      if (!options?.disableControls) {
+        // add Marker interaction
+        map.on('click', (e) => {
+          dropPin(e.coordinate)
+        })
+      }
     }
   )()
 }

diff --git a/client/js/pages/check-your-answers.js b/client/js/pages/check-your-answers.js
@@ -0,0 +1,3 @@
+import { initialiseMap } from '../map.js'
+
+export { initialiseMap }
diff --git a/client/js/pages/location-map.js b/client/js/pages/location-map.js
@@ -25,5 +25,6 @@ const getLocation = async () => {
   ]
 }
 
-initialiseMap()
 initialiseLocationSearch()
+
+export { initialiseMap }
diff --git a/client/sass/application.scss b/client/sass/application.scss
@@ -434,6 +434,27 @@ margin-bottom: 0;
   }
 }
 
+.map--check-your-answers {
+  height: auto;
+
+  .ol-viewport {
+    height: 200px !important;
+  }
+
+  .ol-zoom, .ol-scale-line, .ol-attribution {
+    display: none;
+  }
+
+}
+
+.vertical-align-top {
+  vertical-align: top;
+}
+
+.map--cell {
+  height: 220px;
+}
+
 //////////////////////////////////////////////////
 // OS MAP STYLES END /////////////////////////////
 //////////////////////////////////////////////////
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smart-incident-reporting",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Digital service for incident reporting",
   "main": "index.js",
   "type": "module",
@@ -62,10 +62,10 @@
     "node-sass": "^9.0.0",
     "nunjucks": "^3.2.4",
     "ol": "^10.2.1",
-    "postcode-validator": "^3.10.1",
+    "postcode-validator": "^3.10.2",
     "proj4": "^2.14.0",
     "style-loader": "^4.0.0",
-    "webpack": "^5.95.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   },
   "devDependencies": {

diff --git a/server/plugins/on-post-handler.js b/server/plugins/on-post-handler.js
@@ -1,15 +1,37 @@
+import constants from '../utils/constants.js'
+
 const onPostHandler = {
   plugin: {
     name: 'on-post-handler',
     register: (server, _options) => {
       server.ext('onPostHandler', async (request, h) => {
         if (request.response.variety === 'view' && request.method === 'get') {
           request.response.headers['cache-control'] = 'no-cache, no-store, must-revalidate'
+          handleReferer(request)
         }
         return h.continue
       })
     }
   }
 }
 
+const handleReferer = request => {
+  if (request.headers.referer) {
+    // If referer was a check route then set the session referer
+    // Route then decides whether to redirect to referer or not
+    const setReferer = constants.setReferer.find(item => request.headers.referer.indexOf(item) > -1)
+    const clearReferer = constants.clearReferer.find(item => request.headers.referer.indexOf(item) > -1)
+    if (setReferer) {
+      request.yar.set(constants.redisKeys.REFERER, `/${setReferer}`)
+    } else if (clearReferer) {
+      request.yar.clear(constants.redisKeys.REFERER)
+    } else {
+      // do nothing for sonarcloud
+    }
+  } else {
+    // If no referer then clear referer key because user has broken the journey
+    request.yar.clear(constants.redisKeys.REFERER)
+  }
+}
+
 export default onPostHandler
diff --git a/server/plugins/views.js b/server/plugins/views.js
@@ -5,7 +5,7 @@ import config from '../utils/config.js'
 import constants from '../utils/constants.js'
 import fs from 'fs'
 import dirname from '../../dirname.cjs'
-import { findErrorMessageById } from '../utils/template-helpers.js'
+import { findErrorMessageById, getAnswer } from '../utils/template-helpers.js'
 const { version } = JSON.parse(fs.readFileSync('./package.json'))
 const analyticsAccount = config.analyticsAccount
 
@@ -25,6 +25,7 @@ export default {
           })
           // Add global functions for view templates
           env.addGlobal('findErrorMessageById', findErrorMessageById)
+          env.addGlobal('getAnswer', getAnswer)
           return next()
         }
       }

diff --git a/server/routes/__tests__/smell/location-map.spec.js b/server/routes/__tests__/smell/location-map.spec.js
@@ -41,6 +41,14 @@ describe(url, () => {
         ...baseAnswer,
         answerId: question.answers.northing.answerId,
         otherDetails: '343015'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lng.answerId,
+        otherDetails: '-2.511745'
+      }, {
+        ...baseAnswer,
+        answerId: question.answers.lat.answerId,
+        otherDetails: '52.983397'
       }])
     })
     it('Sad: errors on no point provided', async () => {

diff --git a/server/routes/__tests__/water-pollution.spec.js b/server/routes/__tests__/water-pollution.spec.js
@@ -9,5 +9,12 @@ describe(url, () => {
     it(`Should return success response and correct view for ${url}`, async () => {
       await submitGetRequest({ url }, header)
     })
+    it(`Happy: Reset the CYA journey if user restarts the WP journey before report submission ${url}`, async () => {
+      const sessionData = {
+        referer: '/water-pollution/check-your-answers'
+      }
+      const response = await submitGetRequest({ url }, header, constants.statusCodes.OK, sessionData)
+      expect(response.request.yar.get(constants.redisKeys.REFERER)).toEqual(null)
+    })
   })
 })
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { initialiseMap } from '../map.js'

		export { initialiseMap }