diff --git a/package-lock.json b/package-lock.json index 935ee2de8..ca0c362a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "flood-app", - "version": "8.9.0", + "version": "8.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "flood-app", - "version": "8.9.0", + "version": "8.10.0", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 70b376d27..5e129aaca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flood-app", - "version": "8.9.0", + "version": "8.10.0", "description": "Flood risk app", "main": "index.js", "repository": "github:defra/flood-app", diff --git a/release-docs/CFF-8.10.0.md b/release-docs/CFF-8.10.0.md new file mode 100644 index 000000000..70daad6ec --- /dev/null +++ b/release-docs/CFF-8.10.0.md @@ -0,0 +1,32 @@ +# Check For Flooding Release + +* Version: 8.10.0 +* Proposed Release Date: 20/11/2024 +* Jira Release Overview: https://eaflood.atlassian.net/projects/FSR/versions/16852/tab/release-report-all-issues + +## Tickets + + * FSR-1356: Latest Levels - Content Changes + + * FSR-1357: Map Buttons Issue + + * FSR-1361: TA Update November 2024 + +## Instructions + + + 1 - Update LFW_{STAGE}_99_LOAD_FLOOD_ALERT_AREAS jenkins job with the following properties update for the updated database name for production: + + DB_NAME=floodprdg + ###### OR ######## + DB_NAME=floodprdb + + 2 - Execute LFW_{STAGE}_99_LOAD_FLOOD_ALERT_AREAS ##NOTE if above property update not made this job will fail. + + 3 - Execute LFW_{stage}_04_UPDATE_FLOOD_APP_AND_SERVICE_PIPELINE + +Execute smoke tests and forward results + +## Related Infrastructure Changes Required + +* None diff --git a/server/models/views/lib/process-imtd-thresholds.js b/server/models/views/lib/process-imtd-thresholds.js index cb2cc284b..71123a1b6 100644 --- a/server/models/views/lib/process-imtd-thresholds.js +++ b/server/models/views/lib/process-imtd-thresholds.js @@ -19,7 +19,7 @@ function processImtdThresholds (imtdThresholds, stationStageDatum, stationSubtra } else if (pc5) { thresholds.push({ id: 'pc5', - description: 'Top of normal range. Low lying land flooding possible above this level', + description: 'Top of normal range. Low-lying land flooding possible above this level', shortname: TOP_OF_NORMAL_RANGE, value: pc5 }) @@ -51,7 +51,7 @@ function calculateAlertThreshold (imtdThresholds, stationStageDatum, stationSubt if (Number(imtdThresholdAlert) !== Number(pc5)) { imtdThresholdAlerts.push({ id: 'alertThreshold', - description: 'Low lying land flooding possible above this level. One or more flood alerts may be issued', + description: 'Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: 'Possible flood alerts', value: imtdThresholdAlert }) @@ -60,7 +60,7 @@ function calculateAlertThreshold (imtdThresholds, stationStageDatum, stationSubt if (Number(imtdThresholdAlert) === Number(pc5)) { imtdThresholdAlerts.push({ id: 'alertThreshold', - description: 'Top of normal range. Low lying land flooding possible above this level. One or more flood alerts may be issued', + description: 'Top of normal range. Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: TOP_OF_NORMAL_RANGE, value: imtdThresholdAlert }) diff --git a/server/src/sass/objects/_buttons.scss b/server/src/sass/objects/_buttons.scss index db101edcb..bfb692516 100644 --- a/server/src/sass/objects/_buttons.scss +++ b/server/src/sass/objects/_buttons.scss @@ -30,12 +30,13 @@ text-decoration: none; } &:visited { - color: govuk-colour('black'); + color: govuk-colour('blue'); } &:hover { background-color: govuk-colour('light-grey'); } &:focus { + color: govuk-colour('blue'); background-color: $govuk-focus-colour; border-color: $govuk-focus-colour; box-shadow: 0 2px 0 govuk-colour('black'); diff --git a/test/models/lib/process-imtd-thresholds.js b/test/models/lib/process-imtd-thresholds.js index 797bb9605..c70aca0c3 100644 --- a/test/models/lib/process-imtd-thresholds.js +++ b/test/models/lib/process-imtd-thresholds.js @@ -4,7 +4,7 @@ const data = require('../../data') const lab = exports.lab = Lab.script() const processImtdThresholds = require('../../../server/models/views/lib/process-imtd-thresholds') -const alertExpectedText = { id: 'alertThreshold', description: 'Top of normal range. Low lying land flooding possible above this level. One or more flood alerts may be issued', shortname: 'Top of normal range' } +const alertExpectedText = { id: 'alertThreshold', description: 'Top of normal range. Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: 'Top of normal range' } const warningExpectedText = { id: 'warningThreshold', description: 'Property flooding is possible above this level', shortname: 'Possible flood warnings' } function expectThresholds (thresholds, warningThreshold, alertThreshold) { diff --git a/test/models/station.js b/test/models/station.js index 793a23ce1..477ec84b8 100644 --- a/test/models/station.js +++ b/test/models/station.js @@ -45,7 +45,7 @@ lab.experiment('Station model test', () => { Code.expect(Result.thresholds[2].values).to.equal([ { id: 'alertThreshold', - description: 'Low lying land flooding possible above this level. One or more flood alerts may be issued', + description: 'Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: 'Possible flood alerts', value: '3.22' } @@ -75,7 +75,7 @@ lab.experiment('Station model test', () => { Code.expect(Result.thresholds[2].values).to.equal([ { id: 'alertThreshold', - description: 'Top of normal range. Low lying land flooding possible above this level. One or more flood alerts may be issued', + description: 'Top of normal range. Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: 'Top of normal range', value: '2.84' } @@ -229,7 +229,7 @@ lab.experiment('Station model test', () => { [ { id: 'alertThreshold', - description: 'Low lying land flooding possible above this level. One or more flood alerts may be issued', + description: 'Low-lying land flooding possible above this level. One or more flood alerts may be issued.', shortname: 'Possible flood alerts', value: '3.88' } diff --git a/test/routes/station.js b/test/routes/station.js index 3af2d32d2..dcbeb0488 100644 --- a/test/routes/station.js +++ b/test/routes/station.js @@ -2028,8 +2028,8 @@ lab.experiment('Test - /station/{id}', () => { const response = await server.inject(options) Code.expect(response.statusCode).to.equal(200) - Code.expect(response.payload).to.not.contain('Low lying land flooding is possible above this level. One or more flood alerts may be issued') - Code.expect(response.payload).to.not.contain('Property flooding is possible above this level. One or more flood warnings may be issued') + Code.expect(response.payload).to.not.contain('Low-lying land flooding is possible above this level. One or more flood alerts may be issued.') + Code.expect(response.payload).to.not.contain('Property flooding is possible above this level. One or more flood warnings may be issued.') }) lab.test('GET station/5146 with missing percentile ', async () => { const floodService = require('../../server/services/flood')