CCM-13415: Content changes

Author: chris-elliott-nhsd

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

@@ -108,7 +108,7 @@ describe('CreateEmailTemplate server actions', () => {
         formErrors: [],
         fieldErrors: {
           emailTemplateMessage: [
-            'Template message contains invalid personalisation fields',
+            'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7',
           ],
         },
       },

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

@@ -110,7 +110,7 @@ describe('CreateNHSAppTemplate server actions', () => {
         formErrors: [],
         fieldErrors: {
           nhsAppTemplateMessage: [
-            'Template message contains invalid personalisation fields',
+            'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7',
           ],
         },
       },

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

@@ -104,7 +104,7 @@ describe('CreateSmsTemplate server actions', () => {
         formErrors: [],
         fieldErrors: {
           smsTemplateMessage: [
-            'Template message contains invalid personalisation fields',
+            'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7',
           ],
         },
       },

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

@@ -40,7 +40,7 @@ export const $EmailTemplateFormSchema = z.object({
           templateMessage.includes(`((${personalisationFieldName}))`)
         ),
       {
-        message: form.emailTemplateMessage.error.invalidPersonalisation,
+        message: `${form.emailTemplateMessage.error.invalidPersonalisation} ${INVALID_PERSONALISATION_FIELDS.join(', ')}`,
       }
     ),
 });

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

@@ -57,7 +57,7 @@ export const $CreateNhsAppTemplateSchema = z.object({
           templateMessage.includes(`((${personalisationFieldName}))`)
         ),
       {
-        message: form.nhsAppTemplateMessage.error.invalidPersonalisation,
+        message: `${form.nhsAppTemplateMessage.error.invalidPersonalisation} ${INVALID_PERSONALISATION_FIELDS.join(', ')}`,
       }
     ),
 });

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

@@ -37,7 +37,7 @@ export const $CreateSmsTemplateSchema = z.object({
           templateMessage.includes(`((${personalisationFieldName}))`)
         ),
       {
-        message: form.smsTemplateMessage.error.invalidPersonalisation,
+        message: `${form.smsTemplateMessage.error.invalidPersonalisation} ${INVALID_PERSONALISATION_FIELDS.join(', ')}`,
       }
     ),
 });

frontend/src/content/content.ts

@@ -13,7 +13,7 @@ const enterATemplateMessage = 'Enter a template message';
 const templateMessageTooLong = 'Template message too long';
 const templateMessageHasInsecureLink = 'URLs must start with https://';
 const templateMessageContainsInvalidPersonalisation =
-  'Template message contains invalid personalisation fields';
+  'You cannot use the following custom personalisation fields in your message:';
 const selectAnOption = 'Select an option';
 
 const header = {

tests/test-team/template-mgmt-component-tests/email/template-mgmt-create-email-page.component.spec.ts

@@ -376,7 +376,7 @@ test.describe('Create Email message template Page', () => {
       page,
     }) => {
       const errorMessage =
-        'Template message contains invalid personalisation fields';
+        'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7';
 
       const createEmailTemplatePage = new TemplateMgmtCreateEmailPage(page);
 

tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-create-nhs-app-template-page.component.spec.ts

@@ -195,7 +195,9 @@ test.describe('Create NHS App Template Page', () => {
 
     await expect(
       page.locator('ul[class="nhsuk-list nhsuk-error-summary__list"] > li')
-    ).toHaveText(['Template message contains invalid personalisation fields']);
+    ).toHaveText([
+      'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7',
+    ]);
   });
 
   test('Validate error messages on the create NHS App message template page with angle brackets in linked url', async ({

tests/test-team/template-mgmt-component-tests/sms/template-mgmt-create-sms-page.component.spec.ts

@@ -343,7 +343,7 @@ test.describe('Create SMS message template Page', () => {
       page,
     }) => {
       const errorMessage =
-        'Template message contains invalid personalisation fields';
+        'You cannot use the following custom personalisation fields in your message: date, address_line_1, address_line_2, address_line_3, address_line_4, address_line_5, address_line_6, address_line_7';
 
       const createSmsTemplatePage = new TemplateMgmtCreateSmsPage(page);