Skip to content

CCM-13415: Validate unsupported personalisation in digital templates #776

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.

Sign up for GitHub

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

Merged
alexnuttall merged 14 commits into from
Dec 22, 2025
Merged

CCM-13415: Validate unsupported personalisation in digital templates #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d94831d
CCM-13415: Validate unsupported personalisation in digital templates
chris-elliott-nhsd Dec 5, 2025
45745a3
CCM-13415: Fix CI
chris-elliott-nhsd Dec 5, 2025
1e944bb
CCM-13415: Fix CI
chris-elliott-nhsd Dec 5, 2025
1c46d38
CCM-13415: Content changes
chris-elliott-nhsd Dec 10, 2025
f1f0ddb
CCM-13415: Use error code and render bullet pointed list
chris-elliott-nhsd Dec 16, 2025
36616f0
CCM-13415: Fix tests
chris-elliott-nhsd Dec 16, 2025
7e788f8
CCM-13415: Fix spacing
chris-elliott-nhsd Dec 16, 2025
170961a
CCM-13145: Fix linting
chris-elliott-nhsd Dec 16, 2025
38e7a67
CCM-13145: Fix tests
chris-elliott-nhsd Dec 16, 2025
6ec0025
CCM-13415: Add custom textarea component
chris-elliott-nhsd Dec 18, 2025
eb4fa49
CCM-13415: Fix CI
chris-elliott-nhsd Dec 18, 2025
633c74a
CCM-13415: Remove enum
chris-elliott-nhsd Dec 19, 2025
5c78ea2
CCM-13415: Fix linting
chris-elliott-nhsd Dec 19, 2025
8939c50
Merge branch 'main' into feature/CCM-13415_date-personalisation
alexnuttall Dec 22, 2025
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
6 changes: 5 additions & 1 deletion frontend/src/__tests__/components/forms/EmailTemplateForm/EmailTemplateForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
EmailTemplate,
} from 'nhs-notify-web-template-management-utils';
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
import { ErrorCodes } from '@utils/error-codes';

jest.mock('@utils/amplify-utils');

Expand Down Expand Up @@ -91,7 +92,10 @@ test('renders page with multiple errors', () => {
fieldErrors: {
emailTemplateName: ['Template name error'],
emailTemplateSubjectLine: ['Template subject line error'],
emailTemplateMessage: ['Template message error'],
emailTemplateMessage: [
'Template message error',
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
],
},
},
name: '',
Expand Down
134 changes: 104 additions & 30 deletions ..._tests__/components/forms/EmailTemplateForm/__snapshots__/EmailTemplateForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ exports[`Client-side validation triggers 1`] = `
<textarea
autocomplete="off"
class="nhsuk-textarea"
data-testid="emailTemplateMessage-input"
id="emailTemplateMessage"
name="emailTemplateMessage"
rows="12"
Expand Down Expand Up @@ -254,9 +253,6 @@ exports[`Client-side validation triggers 1`] = `
<li>
((nhsNumber))
</li>
<li>
((date))
</li>
</ul>
<p>
Make sure your personalisation fields exactly match the PDS personalisation fields. This includes using the correct order of upper and lower case letters.
Expand Down Expand Up @@ -753,16 +749,6 @@ exports[`renders page one error 1`] = `
Template name error
</a>
</li>
<li>
<a
href="#emailTemplateSubjectLine"
/>
</li>
<li>
<a
href="#emailTemplateMessage"
/>
</li>
</ul>
</div>
<h1
Expand Down Expand Up @@ -917,7 +903,6 @@ exports[`renders page one error 1`] = `
<textarea
autocomplete="off"
class="nhsuk-textarea"
data-testid="emailTemplateMessage-input"
id="emailTemplateMessage"
name="emailTemplateMessage"
rows="12"
Expand Down Expand Up @@ -1002,9 +987,6 @@ exports[`renders page one error 1`] = `
<li>
((nhsNumber))
</li>
<li>
((date))
</li>
</ul>
<p>
Make sure your personalisation fields exactly match the PDS personalisation fields. This includes using the correct order of upper and lower case letters.
Expand Down Expand Up @@ -1515,6 +1497,61 @@ exports[`renders page with multiple errors 1`] = `
Template message error
</a>
</li>
<li>
<a
href="#emailTemplateMessage"
>
<div
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
>
You cannot use the following custom personalisation fields in your message:
</div>
<ul
class="nhsuk-list nhsuk-list--bullet"
>
<li
class="nhsuk-u-margin-bottom-0"
>
date
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_1
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_2
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_3
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_4
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_5
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_6
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_7
</li>
</ul>
</a>
</li>
</ul>
</div>
<h1
Expand Down Expand Up @@ -1688,12 +1725,60 @@ exports[`renders page with multiple errors 1`] = `
Error:
</span>
Template message error
<div
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
>
You cannot use the following custom personalisation fields in your message:
</div>
<ul
class="nhsuk-list nhsuk-list--bullet"
>
<li
class="nhsuk-u-margin-bottom-0"
>
date
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_1
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_2
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_3
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_4
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_5
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_6
</li>
<li
class="nhsuk-u-margin-bottom-0"
>
address_line_7
</li>
</ul>
</span>
<textarea
aria-describedby="emailTemplateMessage--error-message"
autocomplete="off"
class="nhsuk-textarea nhsuk-textarea--error"
data-testid="emailTemplateMessage-input"
id="emailTemplateMessage"
name="emailTemplateMessage"
rows="12"
Expand Down Expand Up @@ -1778,9 +1863,6 @@ exports[`renders page with multiple errors 1`] = `
<li>
((nhsNumber))
</li>
<li>
((date))
</li>
</ul>
<p>
Make sure your personalisation fields exactly match the PDS personalisation fields. This includes using the correct order of upper and lower case letters.
Expand Down Expand Up @@ -2394,7 +2476,6 @@ exports[`renders page with preloaded field values 1`] = `
<textarea
autocomplete="off"
class="nhsuk-textarea"
data-testid="emailTemplateMessage-input"
id="emailTemplateMessage"
name="emailTemplateMessage"
rows="12"
Expand Down Expand Up @@ -2481,9 +2562,6 @@ exports[`renders page with preloaded field values 1`] = `
<li>
((nhsNumber))
</li>
<li>
((date))
</li>
</ul>
<p>
Make sure your personalisation fields exactly match the PDS personalisation fields. This includes using the correct order of upper and lower case letters.
Expand Down Expand Up @@ -3090,7 +3168,6 @@ exports[`renders page without back link for initial state with id - edit mode 1`
<textarea
autocomplete="off"
class="nhsuk-textarea"
data-testid="emailTemplateMessage-input"
id="emailTemplateMessage"
name="emailTemplateMessage"
rows="12"
Expand Down Expand Up @@ -3177,9 +3254,6 @@ exports[`renders page without back link for initial state with id - edit mode 1`
<li>
((nhsNumber))
</li>
<li>
((date))
</li>
</ul>
<p>
Make sure your personalisation fields exactly match the PDS personalisation fields. This includes using the correct order of upper and lower case letters.
Expand Down
25 changes: 25 additions & 0 deletions frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { EmailTemplate } from 'nhs-notify-web-template-management-utils';
import { redirect } from 'next/navigation';
import { processFormActions } from '@forms/EmailTemplateForm/server-action';
import { MAX_EMAIL_CHARACTER_LENGTH } from '@utils/constants';
import { ErrorCodes } from '@utils/error-codes';

jest.mock('@utils/amplify-utils');
jest.mock('@utils/form-actions');
Expand Down Expand Up @@ -91,6 +92,30 @@ describe('CreateEmailTemplate server actions', () => {
});
});

it('create-email-template - should return response when when template message contains unsupported personalisation', async () => {
const response = await processFormActions(
initialState,
getMockFormData({
'form-id': 'create-email-template',
emailTemplateName: 'template-name',
emailTemplateSubjectLine: 'template-subject-line',
emailTemplateMessage: 'a template message containing ((date))',
})
);

expect(response).toEqual({
...initialState,
errorState: {
formErrors: [],
fieldErrors: {
emailTemplateMessage: [
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
],
},
},
});
});

test('should save the template and redirect', async () => {
saveTemplateMock.mockResolvedValue({
...initialState,
Expand Down
40 changes: 0 additions & 40 deletions ...ests__/components/forms/LetterTemplateForm/__snapshots__/LetterTemplateForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,31 +960,6 @@ exports[`renders page one error 1`] = `
Template name error
</a>
</li>
<li>
<a
href="#letterTemplateCampaignId"
/>
</li>
<li>
<a
href="#letterTemplateLetterType"
/>
</li>
<li>
<a
href="#letterTemplateLanguage"
/>
</li>
<li>
<a
href="#letterTemplatePdf"
/>
</li>
<li>
<a
href="#letterTemplateCsv"
/>
</li>
</ul>
</div>
<form
Expand Down Expand Up @@ -1958,21 +1933,6 @@ exports[`renders page with multiple errors 1`] = `
CSV error
</a>
</li>
<li>
<a
href="#letterTemplateCampaignId"
/>
</li>
<li>
<a
href="#letterTemplateLetterType"
/>
</li>
<li>
<a
href="#letterTemplateLanguage"
/>
</li>
</ul>
</div>
<form
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/__tests__/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
TemplateFormState,
} from 'nhs-notify-web-template-management-utils';
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
import { ErrorCodes } from '@utils/error-codes';

jest.mock('@utils/amplify-utils');

Expand Down Expand Up @@ -115,7 +116,10 @@ test('renders page with multiple errors', () => {
formErrors: [],
fieldErrors: {
nhsAppTemplateName: ['Template name error'],
nhsAppTemplateMessage: ['Template message error'],
nhsAppTemplateMessage: [
'Template message error',
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
],
},
},
name: '',
Expand Down
Loading
Loading