Merge branch 'main' into feature/CCM-8873-accessibility-markdown-examples-hidden-text

Author: nicki-nhs

frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/__snapshots__/LetterTemplateForm.test.tsx.snap

@@ -225,7 +225,7 @@ exports[`Client-side validation triggers 1`] = `
               for="letterTemplateLanguage"
               id="letterTemplateLanguage--label"
             >
-              Additional language
+              Letter language
             </label>
             <div
               class="nhsuk-hint"
@@ -726,7 +726,7 @@ exports[`renders page one error 1`] = `
               for="letterTemplateLanguage"
               id="letterTemplateLanguage--label"
             >
-              Additional language
+              Letter language
             </label>
             <div
               class="nhsuk-hint"
@@ -1235,7 +1235,7 @@ exports[`renders page with multiple errors 1`] = `
               for="letterTemplateLanguage"
               id="letterTemplateLanguage--label"
             >
-              Additional language
+              Letter language
             </label>
             <div
               class="nhsuk-hint"
@@ -1689,7 +1689,7 @@ exports[`renders page with preloaded field values 1`] = `
               for="letterTemplateLanguage"
               id="letterTemplateLanguage--label"
             >
-              Additional language
+              Letter language
             </label>
             <div
               class="nhsuk-hint"

frontend/src/__tests__/components/molecules/__snapshots__/TemplateSubmitted.test.tsx.snap

@@ -43,30 +43,13 @@ exports[`TemplateSubmitted component should render 1`] = `
         >
           template-id
         </p>
-        <h2
+        <h3
           class="nhsuk-u-margin-top-5"
         >
           What you need to do next
-        </h2>
-        <h3>
-          If you're currently onboarding
-        </h3>
-        <p>
-          Tell your onboarding manager once you've submitted all your templates.
-        </p>
-        <h3>
-          If you've already onboarded
         </h3>
         <p>
-          Once you've submitted all your templates 
-          <a
-            href="https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5"
-            id="servicenow-link"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            raise a request with the service desk (opens in a new tab).
-          </a>
+          Tell an onboarding manager once you've submitted all your templates.
         </p>
         <hr
           class="nhsuk-section-break--visible"

frontend/src/components/molecules/TemplateSubmitted/TemplateSubmitted.tsx

@@ -4,10 +4,7 @@ import Link from 'next/link';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import content from '@content/content';
 
-type TemplateSubmittedProps = {
-  templateId: string;
-  templateName: string;
-};
+type TemplateSubmittedProps = { templateId: string; templateName: string };
 
 export const TemplateSubmitted = ({
   templateId,
@@ -19,11 +16,7 @@ export const TemplateSubmitted = ({
     templateNameHeading,
     templateIdHeading,
     doNextHeading,
-    notLiveHeading,
-    notLiveText,
-    liveHeading,
-    liveLinkText,
-    liveText,
+    doNextText,
   } = content.components.templateSubmitted;
 
   return (
@@ -46,21 +39,8 @@ export const TemplateSubmitted = ({
             {templateIdHeading}
           </h2>
           <p id='template-id'>{templateId}</p>
-          <h2 className='nhsuk-u-margin-top-5'>{doNextHeading}</h2>
-          <h3>{notLiveHeading}</h3>
-          <p>{notLiveText}</p>
-          <h3>{liveHeading}</h3>
-          <p>
-            {liveText}{' '}
-            <Link
-              id='servicenow-link'
-              href='https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5'
-              target='_blank'
-              rel='noopener noreferrer'
-            >
-              {liveLinkText}
-            </Link>
-          </p>
+          <h3 className='nhsuk-u-margin-top-5'>{doNextHeading}</h3>
+          <p>{doNextText}</p>
           <hr className='nhsuk-section-break--visible' />
           <p>
             <Link id='go-back-link' href='/message-templates'>

frontend/src/content/content.ts

@@ -461,7 +461,7 @@ const templateFormLetter = {
   templateNameHintText: 'This will not be visible to recipients.',
   templateTypeLabelText: 'Letter type',
   templateTypeHintText: 'Choose the type of letter template you are uploading',
-  templateLanguageLabelText: 'Additional language',
+  templateLanguageLabelText: 'Letter language',
   templateLanguageHintText: 'Choose the language of this letter template',
   templatePdfLabelText: 'Letter template PDF',
   templatePdfHintText:
@@ -520,12 +520,8 @@ const templateSubmitted = {
   templateNameHeading: 'Template name',
   templateIdHeading: 'Template ID',
   doNextHeading: 'What you need to do next',
-  notLiveHeading: "If you're currently onboarding",
-  notLiveText:
-    "Tell your onboarding manager once you've submitted all your templates.",
-  liveHeading: "If you've already onboarded",
-  liveText: "Once you've submitted all your templates",
-  liveLinkText: 'raise a request with the service desk (opens in a new tab).',
+  doNextText:
+    "Tell an onboarding manager once you've submitted all your templates.",
   backLinkText: backToAllTemplates,
 };
 

frontend/src/domain/errors/coded.error.ts

@@ -8,8 +8,6 @@ export abstract class TemplateMgmtTemplateSubmittedBasePage extends TemplateMgmt
 
   public readonly createAnotherTemplateLink: Locator;
 
-  public readonly serviceNowLink: Locator;
-
   public readonly goBackLink: Locator;
 
   constructor(page: Page) {
@@ -19,7 +17,6 @@ export abstract class TemplateMgmtTemplateSubmittedBasePage extends TemplateMgmt
     this.createAnotherTemplateLink = page.locator(
       '[id="create-another-template"]'
     );
-    this.serviceNowLink = page.locator('[id="servicenow-link"]');
     this.goBackLink = page.locator('#go-back-link');
   }
 

frontend/src/domain/errors/db-operation.error.ts

@@ -103,11 +103,6 @@ test.describe('Template Submitted Page', () => {
       await expect(templateSubmittedPage.templateIdText).toHaveText(
         templates[channelIdentifier].id
       );
-
-      await expect(templateSubmittedPage.serviceNowLink).toHaveAttribute(
-        'href',
-        'https://nhsdigitallive.service-now.com/nhs_digital?id=sc_cat_item&sys_id=6208dbce1be759102eee65b9bd4bcbf5'
-      );
     });
 
     // eslint-disable-next-line no-loop-func