Skip to content

Commit 07c9b86

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-13415: Fix CI
1 parent 4886939 commit 07c9b86

File tree

8 files changed

+56
-33
lines changed

8 files changed

+56
-33
lines changed

‎frontend/src/__tests__/components/forms/EmailTemplateForm/server-action.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ describe('CreateEmailTemplate server actions', () => {
107107
errorState: {
108108
formErrors: [],
109109
fieldErrors: {
110-
emailTemplateMessage: ['Template message contains invalid personalisation fields'],
110+
emailTemplateMessage: [
111+
'Template message contains invalid personalisation fields',
112+
],
111113
},
112114
},
113115
});

‎frontend/src/__tests__/components/forms/NhsAppTemplateForm/server-action.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ describe('CreateNHSAppTemplate server actions', () => {
100100
getMockFormData({
101101
'form-id': 'create-nhs-app-template',
102102
nhsAppTemplateName: 'template-name',
103-
nhsAppTemplateMessage:
104-
'a template message containing ((date))',
103+
nhsAppTemplateMessage: 'a template message containing ((date))',
105104
})
106105
);
107106

@@ -110,7 +109,9 @@ describe('CreateNHSAppTemplate server actions', () => {
110109
errorState: {
111110
formErrors: [],
112111
fieldErrors: {
113-
nhsAppTemplateMessage: ['Template message contains invalid personalisation fields'],
112+
nhsAppTemplateMessage: [
113+
'Template message contains invalid personalisation fields',
114+
],
114115
},
115116
},
116117
});

‎frontend/src/__tests__/components/forms/SmsTemplateForm/server-action.test.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ describe('CreateSmsTemplate server actions', () => {
9494
getMockFormData({
9595
'form-id': 'create-sms-template',
9696
smsTemplateName: 'template-name',
97-
smsTemplateMessage:
98-
'a template message containing ((date))',
97+
smsTemplateMessage: 'a template message containing ((date))',
9998
})
10099
);
101100

@@ -104,7 +103,9 @@ describe('CreateSmsTemplate server actions', () => {
104103
errorState: {
105104
formErrors: [],
106105
fieldErrors: {
107-
smsTemplateMessage: ['Template message contains invalid personalisation fields'],
106+
smsTemplateMessage: [
107+
'Template message contains invalid personalisation fields',
108+
],
108109
},
109110
},
110111
});

‎frontend/src/components/forms/EmailTemplateForm/server-action.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import {
66
import { z } from 'zod';
77
import { createTemplate, saveTemplate } from '@utils/form-actions';
88
import { redirect, RedirectType } from 'next/navigation';
9-
import { MAX_EMAIL_CHARACTER_LENGTH, INVALID_PERSONALISATION_FIELDS } from '@utils/constants';
9+
import {
10+
MAX_EMAIL_CHARACTER_LENGTH,
11+
INVALID_PERSONALISATION_FIELDS,
12+
} from '@utils/constants';
1013
import content from '@content/content';
1114

1215
const {
@@ -31,11 +34,15 @@ export const $EmailTemplateFormSchema = z.object({
3134
.refine((templateMessage) => !templateMessage.includes('http://'), {
3235
message: form.emailTemplateMessage.error.insecureLink,
3336
})
34-
.refine((templateMessage) => !INVALID_PERSONALISATION_FIELDS.some(
35-
(personalisationFieldName) => templateMessage.includes(`((${personalisationFieldName}))`)
36-
), {
37-
message: form.emailTemplateMessage.error.invalidPersonalisation,
38-
}),
37+
.refine(
38+
(templateMessage) =>
39+
!INVALID_PERSONALISATION_FIELDS.some((personalisationFieldName) =>
40+
templateMessage.includes(`((${personalisationFieldName}))`)
41+
),
42+
{
43+
message: form.emailTemplateMessage.error.invalidPersonalisation,
44+
}
45+
),
3946
});
4047

4148
export async function processFormActions(

‎frontend/src/components/forms/NhsAppTemplateForm/server-action.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,15 @@ export const $CreateNhsAppTemplateSchema = z.object({
5151
(templateMessage) => !hasInvalidCharactersInLinks(templateMessage),
5252
{ message: form.nhsAppTemplateMessage.error.invalidUrlCharacter }
5353
)
54-
.refine((templateMessage) => INVALID_PERSONALISATION_FIELDS.some(
55-
(field) => !templateMessage.includes(`((${field}))`)
56-
), {
57-
message: form.nhsAppTemplateMessage.error.invalidPersonalisation,
58-
}),
54+
.refine(
55+
(templateMessage) =>
56+
!INVALID_PERSONALISATION_FIELDS.some((personalisationFieldName) =>
57+
templateMessage.includes(`((${personalisationFieldName}))`)
58+
),
59+
{
60+
message: form.nhsAppTemplateMessage.error.invalidPersonalisation,
61+
}
62+
),
5963
});
6064

6165
export async function processFormActions(

‎frontend/src/components/forms/SmsTemplateForm/server-action.ts‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import {
66
import { z } from 'zod';
77
import { saveTemplate, createTemplate } from '@utils/form-actions';
88
import { redirect, RedirectType } from 'next/navigation';
9-
import { MAX_SMS_CHARACTER_LENGTH, INVALID_PERSONALISATION_FIELDS } from '@utils/constants';
9+
import {
10+
MAX_SMS_CHARACTER_LENGTH,
11+
INVALID_PERSONALISATION_FIELDS,
12+
} from '@utils/constants';
1013
import content from '@content/content';
1114

1215
const {
@@ -28,11 +31,15 @@ export const $CreateSmsTemplateSchema = z.object({
2831
.refine((templateMessage) => !templateMessage.includes('http://'), {
2932
message: form.smsTemplateMessage.error.insecureLink,
3033
})
31-
.refine((templateMessage) => INVALID_PERSONALISATION_FIELDS.some(
32-
(field) => !templateMessage.includes(`((${field}))`)
33-
), {
34-
message: form.smsTemplateMessage.error.invalidPersonalisation,
35-
}),
34+
.refine(
35+
(templateMessage) =>
36+
!INVALID_PERSONALISATION_FIELDS.some((personalisationFieldName) =>
37+
templateMessage.includes(`((${personalisationFieldName}))`)
38+
),
39+
{
40+
message: form.smsTemplateMessage.error.invalidPersonalisation,
41+
}
42+
),
3643
});
3744

3845
export async function processFormActions(

‎frontend/src/content/content.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ const enterATemplateName = 'Enter a template name';
1111
const enterATemplateMessage = 'Enter a template message';
1212
const templateMessageTooLong = 'Template message too long';
1313
const templateMessageHasInsecureLink = 'URLs must start with https://';
14-
const templateMessageContainsInvalidPersonalisation = 'Template message contains invalid personalisation fields';
14+
const templateMessageContainsInvalidPersonalisation =
15+
'Template message contains invalid personalisation fields';
1516
const selectAnOption = 'Select an option';
1617

1718
const header = {

‎frontend/src/utils/constants.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ export const MAX_SMS_CHARACTER_LENGTH = 918 as const;
22
export const MAX_EMAIL_CHARACTER_LENGTH = 100_000 as const;
33

44
export const INVALID_PERSONALISATION_FIELDS = [
5-
'date',
6-
'address_line_1',
7-
'address_line_2',
8-
'address_line_3',
9-
'address_line_4',
10-
'address_line_5',
11-
'address_line_6',
12-
'address_line_7',
5+
'date',
6+
'address_line_1',
7+
'address_line_2',
8+
'address_line_3',
9+
'address_line_4',
10+
'address_line_5',
11+
'address_line_6',
12+
'address_line_7',
1313
] as const;

0 commit comments

Comments
 (0)