Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 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
Expand Up @@ -42,7 +42,7 @@
"dependencies": {
"@aws-sdk/client-sns": "^3.985.0",
"@defra/forms-engine-plugin": "^4.0.54",
"@defra/forms-model": "^3.0.611",
"@defra/forms-model": "^3.0.614",
"@defra/hapi-tracing": "^1.30.0",
"@elastic/ecs-pino-format": "^1.5.0",
"@hapi/boom": "^10.0.1",
Expand Down
10 changes: 9 additions & 1 deletion src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,15 @@ export const config = convict({
format: Boolean,
default: false,
env: 'USE_MAPS_FEATURE'
}
},

feedbackViaEmail: {
doc: 'The email address (not including the mailto prefix) for feedback when the built-in CSAT form is disabled.',
format: String,
nullable: false,
default: 'defraforms@defra.gov.uk',
env: 'FEEDBACK_VIA_EMAIL'
} as SchemaObj<string | undefined>
})

config.validate({ allowed: 'strict' })
6 changes: 3 additions & 3 deletions src/server/plugins/error-preview/error-preview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ describe('Error preview route', () => {
'govuk-error-summary__title govuk-!-margin-bottom-2'
)

expect($links[3].textContent).toBe('Enter [short description]')
expect($links[4].textContent).toBe('Enter [short description]')

expect($headings[3].textContent.trim()).toBe('If you set answer limits')
expect($headings[3]).toHaveClass(
'govuk-error-summary__title govuk-!-margin-bottom-2'
)

expect($links[4].textContent).toBe(
expect($links[5].textContent).toBe(
'[short description] must be [min length] characters or more'
)
expect($links[5].textContent).toBe(
expect($links[6].textContent).toBe(
'[short description] must be [max length] characters or less'
)
})
Expand Down
3 changes: 2 additions & 1 deletion src/server/plugins/nunjucks/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export function context(request) {
serviceBannerText: config.get('serviceBannerText'),
serviceName: config.get('serviceName'),
serviceVersion: config.get('serviceVersion'),
useMapsFeature: config.get('useMapsFeature')
useMapsFeature: config.get('useMapsFeature'),
feedbackViaEmail: config.get('feedbackViaEmail')
},
cspNonce: request?.plugins.blankie?.nonces?.script,
currentPath: request ? `${request.path}${request.url.search}` : undefined,
Expand Down
12 changes: 9 additions & 3 deletions src/server/views/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,15 @@
{% set feedbackLink = feedbackLink or config.feedbackLink %}
{% if phaseTag and not hidePhaseBanner %}
{% set feedbackLinkHtml -%}
<a href="{{ currentPath if context.isForceAccess else feedbackLink }}" class="govuk-link" {%- if not context.isForceAccess %} target="_blank" rel="noopener noreferrer" {%- endif %}>
give your feedback (opens in new tab)
</a>
{% if feedbackLink %}
<a href="{{ currentPath if context.isForceAccess else feedbackLink }}" class="govuk-link" {%- if not context.isForceAccess %} target="_blank" rel="noopener noreferrer" {%- endif %}>
give your feedback (opens in new tab)
</a>
{% else %}
<a href="mailto:{{ config.feedbackViaEmail }}" class="govuk-link">
give your feedback by email
</a>
{% endif %}
{%- endset %}

{{ govukPhaseBanner({
Expand Down
Loading