From 64efc2fcaeb59c5a6d0335302693a506c1d23334 Mon Sep 17 00:00:00 2001 From: keyurx11 Date: Mon, 28 Oct 2024 14:53:21 +0000 Subject: [PATCH 1/7] FSR-1356: Add hyphen in 'low-lying land' and full stop to 'One or more flood alerts may be issued' on station threshold level list --- server/models/views/lib/process-imtd-thresholds.js | 6 +++--- test/models/lib/process-imtd-thresholds.js | 2 +- test/models/station.js | 6 +++--- test/routes/station.js | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) 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/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') From 4865cbdb4c580ba62cc81fcb268cd7d255751003 Mon Sep 17 00:00:00 2001 From: keyurx11 Date: Mon, 28 Oct 2024 12:19:30 +0000 Subject: [PATCH 2/7] FSR-1357: Ensure map button text color remains blue on refresh and after visit across all pages --- server/src/sass/objects/_buttons.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/sass/objects/_buttons.scss b/server/src/sass/objects/_buttons.scss index db101edcb..7195e589d 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('black'); background-color: $govuk-focus-colour; border-color: $govuk-focus-colour; box-shadow: 0 2px 0 govuk-colour('black'); From 96565aa815f9213bcb71ee1bb84db08a9558a3ce Mon Sep 17 00:00:00 2001 From: keyurx11 Date: Tue, 5 Nov 2024 14:13:09 +0000 Subject: [PATCH 3/7] FSR-1357: Change button color to remain blue for all events --- server/src/sass/objects/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/sass/objects/_buttons.scss b/server/src/sass/objects/_buttons.scss index 7195e589d..bfb692516 100644 --- a/server/src/sass/objects/_buttons.scss +++ b/server/src/sass/objects/_buttons.scss @@ -36,7 +36,7 @@ background-color: govuk-colour('light-grey'); } &:focus { - color: govuk-colour('black'); + color: govuk-colour('blue'); background-color: $govuk-focus-colour; border-color: $govuk-focus-colour; box-shadow: 0 2px 0 govuk-colour('black'); From 32733de813750961d3117a7c6061663378a9410d Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 13 Nov 2024 12:16:28 +0000 Subject: [PATCH 4/7] Bump version number (8.10.0) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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", From 8edf6cf8973077f0f82eba5ad5e18272f462a0aa Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 13 Nov 2024 12:16:51 +0000 Subject: [PATCH 5/7] Add release notes (8.10.0) --- release-docs/CFF-8.10.0.md | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 release-docs/CFF-8.10.0.md diff --git a/release-docs/CFF-8.10.0.md b/release-docs/CFF-8.10.0.md new file mode 100644 index 000000000..37d02cb66 --- /dev/null +++ b/release-docs/CFF-8.10.0.md @@ -0,0 +1,43 @@ +# Check For Flooding Release + +* Version: 8.10.0 +* Proposed Release Date: +* Jira Release Overview: https://eaflood.atlassian.net/projects/FSR/versions/16852/tab/release-report-all-issues + +## Sense Check + +* Note that this is the definitive release notes for WebOps. The release notes in flood-service and flood-db are for CFF dev team use only. +* Cross check the list of Jira tickets below with those in the Jira release linked to above and update where needed +* Add additional Jira tickets from the related release notes in the 'Release 8.10.0' PR's created in: + * [flood-service](https://github.com/DEFRA/flood-service) + +* Add any required infrastructure changes such as redirects to the infrastructure changes section below +* Once this sense check is done, delete this section + +## Tickets + + + + * Merge pull request #876 from DEFRA/fix/FSR-1357-map-button-text-color-persistence + + * Merge pull request #883 from DEFRA/feature/FSR-1356-station-page-threshold-level-content-updates + + * FSR-1357: Change button color to remain blue for all events + + * FSR-1357: Ensure map button text color remains blue on refresh and after visit across all pages + + * FSR-1356: Add hyphen in 'low-lying land' and full stop to 'One or more flood alerts may be issued' on station threshold level list + + + +## Instructions + + + 1 - Execute LFW_{STAGE}_04_UPDATE_FLOOD_APP_AND_SERVICE_PIPELINE + + +Execute smoke tests and forward results + +## Related Infrastructure Changes Required + +* None From 4ccfadd0ac41c83eae484a349f45b7592a2a5973 Mon Sep 17 00:00:00 2001 From: Keyurx11 <58322871+Keyurx11@users.noreply.github.com> Date: Wed, 13 Nov 2024 12:20:21 +0000 Subject: [PATCH 6/7] Update CFF-8.10.0.md --- release-docs/CFF-8.10.0.md | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/release-docs/CFF-8.10.0.md b/release-docs/CFF-8.10.0.md index 37d02cb66..8a9d7600a 100644 --- a/release-docs/CFF-8.10.0.md +++ b/release-docs/CFF-8.10.0.md @@ -1,7 +1,7 @@ # Check For Flooding Release * Version: 8.10.0 -* Proposed Release Date: +* Proposed Release Date: 20/11/2024 * Jira Release Overview: https://eaflood.atlassian.net/projects/FSR/versions/16852/tab/release-report-all-issues ## Sense Check @@ -15,20 +15,10 @@ * Once this sense check is done, delete this section ## Tickets - - - - * Merge pull request #876 from DEFRA/fix/FSR-1357-map-button-text-color-persistence - - * Merge pull request #883 from DEFRA/feature/FSR-1356-station-page-threshold-level-content-updates - * FSR-1357: Change button color to remain blue for all events + * FSR-1356: Latest Levels - Content Changes - * FSR-1357: Ensure map button text color remains blue on refresh and after visit across all pages - - * FSR-1356: Add hyphen in 'low-lying land' and full stop to 'One or more flood alerts may be issued' on station threshold level list - - + * FSR-1357: Map Buttons Issue ## Instructions From 7bb538e8ba3afa6fcd7f96c70114894891102746 Mon Sep 17 00:00:00 2001 From: Keyurx11 <58322871+Keyurx11@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:50:30 +0000 Subject: [PATCH 7/7] Update CFF-8.10.0.md --- release-docs/CFF-8.10.0.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/release-docs/CFF-8.10.0.md b/release-docs/CFF-8.10.0.md index 8a9d7600a..70daad6ec 100644 --- a/release-docs/CFF-8.10.0.md +++ b/release-docs/CFF-8.10.0.md @@ -4,27 +4,26 @@ * Proposed Release Date: 20/11/2024 * Jira Release Overview: https://eaflood.atlassian.net/projects/FSR/versions/16852/tab/release-report-all-issues -## Sense Check - -* Note that this is the definitive release notes for WebOps. The release notes in flood-service and flood-db are for CFF dev team use only. -* Cross check the list of Jira tickets below with those in the Jira release linked to above and update where needed -* Add additional Jira tickets from the related release notes in the 'Release 8.10.0' PR's created in: - * [flood-service](https://github.com/DEFRA/flood-service) - -* Add any required infrastructure changes such as redirects to the infrastructure changes section below -* Once this sense check is done, delete this section - ## Tickets * FSR-1356: Latest Levels - Content Changes - + * FSR-1357: Map Buttons Issue + + * FSR-1361: TA Update November 2024 ## Instructions - 1 - Execute LFW_{STAGE}_04_UPDATE_FLOOD_APP_AND_SERVICE_PIPELINE + 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