Merge branch 'main' into feature/CCM-11473_locked-template-status

Author: harrim91

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

@@ -14,6 +14,31 @@ exports[`Choose template page Client-side validation triggers 1`] = `
     id="maincontent"
     role="main"
   >
+    <div
+      aria-labelledby="error-summary-title"
+      class="nhsuk-error-summary"
+      role="alert"
+      tabindex="-1"
+    >
+      <h2
+        class="nhsuk-error-summary__title"
+        data-testid="error-summary"
+        id="error-summary-title"
+      >
+        There is a problem
+      </h2>
+      <ul
+        class="nhsuk-list nhsuk-error-summary__list"
+      >
+        <li>
+          <a
+            href="#templateType"
+          >
+            Select a template type
+          </a>
+        </li>
+      </ul>
+    </div>
     <div
       class="nhsuk-grid-row"
     >
@@ -25,31 +50,6 @@ exports[`Choose template page Client-side validation triggers 1`] = `
         >
           Copy 'undefined'
         </h1>
-        <div
-          aria-labelledby="error-summary-title"
-          class="nhsuk-error-summary"
-          role="alert"
-          tabindex="-1"
-        >
-          <h2
-            class="nhsuk-error-summary__title"
-            data-testid="error-summary"
-            id="error-summary-title"
-          >
-            There is a problem
-          </h2>
-          <ul
-            class="nhsuk-list nhsuk-error-summary__list"
-          >
-            <li>
-              <a
-                href="#templateType"
-              >
-                Select a template type
-              </a>
-            </li>
-          </ul>
-        </div>
         <form
           action="/action"
         >
@@ -193,6 +193,31 @@ exports[`Choose template page renders error component 1`] = `
     id="maincontent"
     role="main"
   >
+    <div
+      aria-labelledby="error-summary-title"
+      class="nhsuk-error-summary"
+      role="alert"
+      tabindex="-1"
+    >
+      <h2
+        class="nhsuk-error-summary__title"
+        data-testid="error-summary"
+        id="error-summary-title"
+      >
+        There is a problem
+      </h2>
+      <ul
+        class="nhsuk-list nhsuk-error-summary__list"
+      >
+        <li>
+          <a
+            href="#page"
+          >
+            Component error message
+          </a>
+        </li>
+      </ul>
+    </div>
     <div
       class="nhsuk-grid-row"
     >
@@ -204,31 +229,6 @@ exports[`Choose template page renders error component 1`] = `
         >
           Copy 'undefined'
         </h1>
-        <div
-          aria-labelledby="error-summary-title"
-          class="nhsuk-error-summary"
-          role="alert"
-          tabindex="-1"
-        >
-          <h2
-            class="nhsuk-error-summary__title"
-            data-testid="error-summary"
-            id="error-summary-title"
-          >
-            There is a problem
-          </h2>
-          <ul
-            class="nhsuk-list nhsuk-error-summary__list"
-          >
-            <li>
-              <a
-                href="#page"
-              >
-                Component error message
-              </a>
-            </li>
-          </ul>
-        </div>
         <form
           action="/action"
         >

frontend/src/components/forms/CopyTemplate/CopyTemplate.tsx

@@ -48,10 +48,10 @@ export const CopyTemplate = ({ template }: CopyTemplate) => {
         <NotifyBackLink>{backLinkText}</NotifyBackLink>
       </Link>
       <NHSNotifyMain>
+        <NhsNotifyErrorSummary errorState={errorState} />
         <div className='nhsuk-grid-row'>
           <div className='nhsuk-grid-column-two-thirds'>
             <h1 className='nhsuk-heading-xl'>{fullPageHeading}</h1>
-            <NhsNotifyErrorSummary errorState={errorState} />
             <NHSNotifyRadioButtonForm
               formId='choose-a-template-type'
               radiosId='templateType'