Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 8.10.0 #884

Merged
merged 10 commits into from
Nov 19, 2024
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
32 changes: 32 additions & 0 deletions release-docs/CFF-8.10.0.md
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions server/models/views/lib/process-imtd-thresholds.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down Expand Up @@ -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
})
Expand All @@ -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
})
Expand Down
3 changes: 2 additions & 1 deletion server/src/sass/objects/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion test/models/lib/process-imtd-thresholds.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/models/station.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down Expand Up @@ -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'
}
Expand Down Expand Up @@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions test/routes/station.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading