Release/6.7.1 (#459)

* Remove unneccesary fullstop on cookies page. https://eaflood.atlassian.net/browse/FSR-958 * update cookies.html to remove errant full stop * FSR-776 - Dependency Updates (#451) * updated dependencies * create dependabot yml file * moved yml file to correct location * Add release notes and bump version number to 6.7.1 * FSR-867 Update related links (#453) * Add "Get flood warnings" to "Alerts and warnings" page related links https://eaflood.atlassian.net/browse/FSR-867 * add 'getWarnings' to alerts and model warning includes appropriate journey click title * Add get warnings to related content on /rainfall-station and /river-and-sea-levels pages * remove related links from /privacy-notice and /terms-and-conditions --------- Co-authored-by: Max Bladen-Clark <[email protected]> Co-authored-by: Lee Gordon <[email protected]> --------- Co-authored-by: Max Bladen-Clark <[email protected]> Co-authored-by: Max Bladen-Clark <[email protected]> Co-authored-by: maxcbc <[email protected]> Co-authored-by: nikiwycherley <[email protected]>
DEFRA · Jul 11, 2023 · 2da43ab · 2da43ab
1 parent 3d37eb4
commit 2da43ab
Show file tree

Hide file tree

Showing 13 changed files with 876 additions and 1,094 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 20
+    versioning-strategy: increase
+    target-branch: development
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flood-app",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "description": "Flood risk app",
   "main": "index.js",
   "repository": "github:defra/flood-app",
@@ -63,15 +63,15 @@
     "jquery": "^3.6.0",
     "lodash.isequal": "^4.5.0",
     "moment-timezone": "^0.5.34",
-    "node-sass": "^7.0.0",
+    "node-sass": "^9.0.0",
     "node-schedule": "^2.1.0",
-    "nunjucks": "^3.2.3",
+    "nunjucks": "^3.2.4",
     "ol": "^6.9.0",
     "regenerator-runtime": "^0.13.9",
     "sinon": "^12.0.1",
     "standard": "^16.0.4",
     "uglify-js": "^3.14.4",
-    "webpack": "^5.65.0",
+    "webpack": "^5.88.1",
     "webpack-cli": "^4.9.1"
   },
   "standard": {

diff --git a/release-docs/CFF-6.7.1.txt b/release-docs/CFF-6.7.1.txt
@@ -0,0 +1,23 @@
+# Check for flooding 6.7.1 Wednesday 12th July 2023
+
+# Release
+
+6.7.1
+
+https://eaflood.atlassian.net/projects/FSR/versions/16479/tab/release-report-all-issues
+
+# Tickets
+
+https://eaflood.atlassian.net/browse/FSR-776 Dependency Updates
+https://eaflood.atlassian.net/browse/FSR-867 Review 'Related Content' Links
+https://eaflood.atlassian.net/browse/FSR-958 Remove Full stop from Cookies Policy
+
+# Instructions
+
+Application, service and database build for release
+
+Straight forward application build for release
+
+1 - Execute LFW_{STAGE}_04_UPDATE_FLOOD_APP_AND_SERVICE_PIPELINE
+
+Execute smoke tests and forward results
diff --git a/server/models/views/alerts-and-warnings.js b/server/models/views/alerts-and-warnings.js
@@ -11,6 +11,7 @@ class ViewModel {
       placeCentre: place ? place.center : [],
       timestamp: Date.now(),
       error: error ? true : null,
+      getWarnings: 'Alerts-and-warnings:Related-content:Get-warnings',
       isEngland: place ? place.isEngland.is_england : null,
       isDummyData: floods ? floods.isDummyData : false
     })

diff --git a/server/models/views/rainfall.js b/server/models/views/rainfall.js
@@ -18,6 +18,7 @@ class ViewModel {
       stationId: rainfallStation[0].station_reference,
       centroid: [rainfallStation[0].lon, rainfallStation[0].lat],
       region: rainfallStation[0].region,
+      getWarnings: 'Rainfall:Related-content:Get-warnings',
       planAhead: 'Rainfall:Related-content:Plan-ahead-for-flooding',
       whatToDo: 'Rainfall:Related-content:What-to-do-in-a-flood',
       recoverAfter: 'Rainfall:Related-content:Recover-after-a-flood',

diff --git a/server/models/views/river-and-sea-levels.js b/server/models/views/river-and-sea-levels.js
@@ -4,11 +4,14 @@ const { bingKeyMaps, floodRiskUrl } = require('../../config')
 const pageTitle = 'Find river, sea, groundwater and rainfall levels'
 const metaDescription = 'Find river, sea, groundwater and rainfall levels in England. Check the last updated height, trend and state recorded by the measuring station.'
 
+const getWarningsString = 'Rivers-and-sea-levels:Related-content:Get-warnings'
+
 function emptyResultsModel (q) {
   return {
     q,
     metaDescription,
     floodRiskUrl,
+    getWarnings: getWarningsString,
     pageTitle: formatTitle(q),
     clientModel: getClientModel()
   }
@@ -23,6 +26,7 @@ function disambiguationModel (q, places, rivers) {
     q,
     metaDescription,
     rivers,
+    getWarnings: getWarningsString,
     pageTitle: `${q} - ${pageTitle}`,
     place: places[0],
     clientModel: getClientModel()
@@ -47,6 +51,7 @@ function riverViewModel (stations) {
     queryGroup,
     floodRiskUrl,
     metaDescription,
+    getWarnings: getWarningsString,
     pageTitle: `${qualifiedRiverName} - ${pageTitle}`,
     q: qualifiedRiverName,
     clientModel: getClientModel(bbox)
@@ -70,6 +75,7 @@ function areaViewModel (areaName, stations) {
     floodRiskUrl,
     pageTitle,
     metaDescription,
+    getWarnings: getWarningsString,
     clientModel: getClientModel(bbox),
     distStatement: `Showing levels within 5 miles of ${areaName}.`
   }
@@ -95,6 +101,7 @@ function referencedStationViewModel (referencePoint, stations) {
     floodRiskUrl,
     pageTitle,
     metaDescription,
+    getWarnings: getWarningsString,
     clientModel: getClientModel(bbox),
     distStatement: referencePoint.distStatement
   }
@@ -133,6 +140,7 @@ function placeViewModel ({ location, place, stations = [], queryGroup }) {
     clientModel: getClientModel(isEngland ? place.bbox10k : []),
     queryGroup: activeFilter,
     placeAddress: place.address,
+    getWarnings: getWarningsString,
     pageTitle: title,
     metaDescription: description
   }

diff --git a/server/views/cookies.html b/server/views/cookies.html
@@ -89,7 +89,7 @@ <h2 class="govuk-heading-m" id="analytics-cookies-label">Analytics cookies (opti
           </tr>
           <tr class="govuk-table__row">
             <td class="govuk-table__cell" style="word-break: break-all">_ga_</td>
-            <td class="govuk-table__cell">Helps us measure how you use the service.</td>
+            <td class="govuk-table__cell">Helps us measure how you use the service</td>
             <td class="govuk-table__cell">2 years</td>
           </tr>
         </tbody>

diff --git a/server/views/privacy-notice.html b/server/views/privacy-notice.html
@@ -53,23 +53,6 @@ <h2 class="govuk-heading-m">Changes to this notice</h2>
      <p>If these changes affect how your personal data is processed, we'll take reasonable steps to let you know.</p>
      <p>This notice was last updated on 17 March 2022.</p>
   </div>
-  <div class="govuk-grid-column-one-third">
-     <div class="defra-related-items">
-        <h2 class="govuk-heading-s" id="subsection-title">
-           Related content
-        </h2>
-        <nav role="navigation" aria-labelledby="subsection-title">
-           <ul class="govuk-list govuk-!-font-size-16">
-              <li>
-                 <a href="/cookies">Cookies</a>
-              </li>
-              <li>
-                 <a href="/terms-and-conditions">Terms and conditions</a>
-              </li>
-           </ul>
-        </nav>
-     </div>
-  </div>
 </div>
 
 {% endblock %}
diff --git a/server/views/terms-and-conditions.html b/server/views/terms-and-conditions.html
@@ -119,24 +119,6 @@ <h2 class="govuk-heading-m">Changes to these terms and conditions</h2>
     <p>Please check these terms and conditions regularly. We can update them at any time without notice.</p>
     <p>You’ll agree to any changes if you continue to use the service after the terms and conditions have been updated.</p>
   </div>
-
-  <div class="govuk-grid-column-one-third">
-    <div class="defra-related-items">
-      <h2 class="govuk-heading-s" id="subsection-title">
-        Related content
-      </h2>
-      <nav role="navigation" aria-labelledby="subsection-title">
-        <ul class="govuk-list govuk-!-font-size-16">
-          <li>
-            <a href="/cookies">Cookies</a>
-          </li>
-          <li>
-            <a href="https://www.gov.uk/government/organisations/environment-agency/about/personal-information-charter">Personal information charter</a>
-          </li>
-        </ul>
-      </nav>
-    </div>
-  </div>
 </div>
 
 {% endblock %}
diff --git a/test/models/alerts-and-warnings.js b/test/models/alerts-and-warnings.js
@@ -59,3 +59,11 @@ lab.test('Test location sets page title', async () => {
 
   Code.expect(Result.pageTitle).to.equal('Newcastle Upon Tyne - flood alerts and warnings')
 })
+
+lab.test('Test getWarnings has appropriate Value', async () => {
+  const options = {}
+
+  const Result = await new ViewModel(options)
+
+  Code.expect(Result.getWarnings).to.equal('Alerts-and-warnings:Related-content:Get-warnings')
+})
diff --git a/test/models/rainfall.js b/test/models/rainfall.js
@@ -111,4 +111,12 @@ lab.experiment('Rainfall model test', () => {
     Code.expect(Result.postTitle).to.equal('Latest rainfall information at Lavenham gauge')
     Code.expect(Result.metaDescription).to.equal('Check the latest recorded rainfall at Lavenham gauge')
   })
+  lab.test('Test getWarnings has appropriate Value', async () => {
+    const rainfallTelemetryData = data.rainfallStationTelemetry
+    const rainfallStationData = data.rainfallStation.filter((rainfallStation) => rainfallStation.station_reference === 'E24195')
+
+    const result = new ViewModel(rainfallTelemetryData, rainfallStationData)
+
+    Code.expect(result.getWarnings).to.equal('Rainfall:Related-content:Get-warnings')
+  })
 })
diff --git a/test/models/river-and-sea-levels.js b/test/models/river-and-sea-levels.js
@@ -16,53 +16,64 @@ lab.experiment('river-and-sea-levels model test', () => {
   lab.afterEach(async () => {
     await sandbox.restore()
   })
-  lab.test('Test river-and-sea-level placeViewModel returns stations', async () => {
-    const stationsData = data.riverAndSeaLevelData
+  lab.experiment('placeViewModel', () => {
+    lab.test('Test river-and-sea-level placeViewModel returns stations', async () => {
+      const stationsData = data.riverAndSeaLevelData
 
-    const model = placeViewModel(stationsData)
+      const model = placeViewModel(stationsData)
 
-    Code.expect(model.stations.length).to.equal(76)
-    Code.expect(model.stations[0].river_name).to.equal('Valley Brook')
-    Code.expect(model.stations[0].region).to.equal('North West')
-  })
-  lab.test('Test river-and-sea-level placeViewModel returns stations in distance order from place', async () => {
-    const stationsData = data.riverAndSeaLevelDataUnordered
-    const firstStation = data.riverAndSeaLevelDataUnordered.stations[0]
-    const model = placeViewModel(stationsData)
-
-    Code.expect(model.stations[2].distance).to.be.greaterThan(model.stations[1].distance)
-    Code.expect(model.stations[0].river_name).to.not.equal(firstStation.river_name)
-    Code.expect(model.stations[0].region).to.equal('North West')
-  })
-  lab.test('Test river-and-sea-level placeViewModel filters stations into groups', async () => {
-    const stationsData = data.riverAndSeaLevelData
-    const model = placeViewModel(stationsData)
-
-    Code.expect(model.filters[0].count).to.equal(74)
-    Code.expect(model.filters[1].count).to.equal(0)
-    Code.expect(model.filters[2].count).to.equal(2)
-    Code.expect(model.filters[3].count).to.equal(0)
-  })
-  lab.test('Test river-and-sea-level placeViewModel returns formatted date time for stations', async () => {
-    const stationsData = data.riverAndSeaLevelData
-    const model = placeViewModel(stationsData)
+      Code.expect(model.stations.length).to.equal(76)
+      Code.expect(model.stations[0].river_name).to.equal('Valley Brook')
+      Code.expect(model.stations[0].region).to.equal('North West')
+    })
+    lab.test('Test river-and-sea-level placeViewModel returns stations in distance order from place', async () => {
+      const stationsData = data.riverAndSeaLevelDataUnordered
+      const firstStation = data.riverAndSeaLevelDataUnordered.stations[0]
+      const model = placeViewModel(stationsData)
 
-    Code.expect(model.stations[0].latestDatetime).to.equal('Latest at 5:30am on 16 July ')
-  })
-  lab.test('Test river-and-sea-level placeViewModel returns formattedValue with correct number of decimal places', async () => {
-    const stationsData = data.riverAndSeaLevelData
-    const model = placeViewModel(stationsData)
+      Code.expect(model.stations[2].distance).to.be.greaterThan(model.stations[1].distance)
+      Code.expect(model.stations[0].river_name).to.not.equal(firstStation.river_name)
+      Code.expect(model.stations[0].region).to.equal('North West')
+    })
+    lab.test('Test river-and-sea-level placeViewModel filters stations into groups', async () => {
+      const stationsData = data.riverAndSeaLevelData
+      const model = placeViewModel(stationsData)
 
-    const station = model.stations.find(item => {
-      return item.station_type === 'S'
+      Code.expect(model.filters[0].count).to.equal(74)
+      Code.expect(model.filters[1].count).to.equal(0)
+      Code.expect(model.filters[2].count).to.equal(2)
+      Code.expect(model.filters[3].count).to.equal(0)
     })
-    const rainfallStation = model.stations.find(item => {
-      return item.station_type === 'R'
+    lab.test('Test river-and-sea-level placeViewModel returns formatted date time for stations', async () => {
+      const stationsData = data.riverAndSeaLevelData
+      const model = placeViewModel(stationsData)
+
+      Code.expect(model.stations[0].latestDatetime).to.equal('Latest at 5:30am on 16 July ')
     })
+    lab.test('Test river-and-sea-level placeViewModel returns formattedValue with correct number of decimal places', async () => {
+      const stationsData = data.riverAndSeaLevelData
+      const model = placeViewModel(stationsData)
+
+      const station = model.stations.find(item => {
+        return item.station_type === 'S'
+      })
+      const rainfallStation = model.stations.find(item => {
+        return item.station_type === 'R'
+      })
+
+      Code.expect(station.formattedValue).to.equal('0.22m')
+      Code.expect(rainfallStation.formattedValue).to.equal('0m')
+    })
+
+    lab.test('Test getWarnings has appropriate Value', async () => {
+      const stationsData = data.riverAndSeaLevelData
 
-    Code.expect(station.formattedValue).to.equal('0.22m')
-    Code.expect(rainfallStation.formattedValue).to.equal('0m')
+      const result = placeViewModel(stationsData)
+
+      Code.expect(result.getWarnings).to.equal('Rivers-and-sea-levels:Related-content:Get-warnings')
+    })
   })
+
   lab.experiment('referencedStationViewModel', () => {
     lab.test('Test river-and-sea-level referencedStationViewModel sorts stations in distance order from rainfall station', async () => {
       const stationsData = data.riverAndSeaLevelDataUnordered
@@ -80,5 +91,19 @@ lab.experiment('river-and-sea-levels model test', () => {
       Code.expect(model.stations[1].distance).to.be.greaterThan(model.stations[0].distance)
       Code.expect(model.stations[2].distance).to.be.greaterThan(model.stations[1].distance)
     })
+    lab.test('Test getWarnings has appropriate Value', async () => {
+      const stationsData = data.riverAndSeaLevelDataUnordered
+      const [rainfallStation] = data.rainfallStation553564
+
+      const referencePoint = {
+        name: rainfallStation.station_name,
+        lat: rainfallStation.lat,
+        lon: rainfallStation.lon
+      }
+
+      const result = referencedStationViewModel(referencePoint, stationsData.stations)
+
+      Code.expect(result.getWarnings).to.equal('Rivers-and-sea-levels:Related-content:Get-warnings')
+    })
   })
 })