From 0f43daaa2bfd4ad8a0b21de078718c436ad20c6f Mon Sep 17 00:00:00 2001
From: bhansell1 <ben.hansell1@nhs.net>
Date: Tue, 21 Apr 2026 10:37:32 +0100
Subject: [PATCH 01/11] CCM-16455: add warning to highlight a user cannot not
 edit mp

---
 .../__snapshots__/page.test.tsx.snap          |  93 ++++++++----
 .../__snapshots__/MessagePlan.test.tsx.snap   | 135 ++++++++++++++----
 .../forms/MessagePlanForm/MessagePlanForm.tsx |  51 ++++---
 frontend/src/content/content.ts               |   5 +
 4 files changed, 210 insertions(+), 74 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
index 53032162a..97e010834 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
@@ -152,22 +152,41 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
             <div
               class="nhsuk-form-group nhsuk-u-margin-bottom-6"
             >
+              <label
+                class="nhsuk-label nhsuk-label--s"
+                for="campaignId"
+              >
+                Campaign
+              </label>
               <div
-                class="nhsuk-form-group nhsuk-form-group--error"
+                class="nhsuk-hint"
               >
-                <label
-                  class="nhsuk-label nhsuk-label--s"
-                  for="campaignId"
-                  id="campaignId--label"
-                >
-                  Campaign
-                </label>
-                <div
-                  class="nhsuk-hint"
-                  id="campaignId--hint"
+                Choose which campaign this message plan will link to
+              </div>
+              <div
+                class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+              >
+                <h3
+                  class="nhsuk-warning-callout__label"
                 >
-                  Choose which campaign this message plan will link to
-                </div>
+                  <span
+                    role="text"
+                  >
+                    <span
+                      class="nhsuk-u-visually-hidden"
+                    >
+                      Important: 
+                    </span>
+                    Important
+                  </span>
+                </h3>
+                <p>
+                  You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+                </p>
+              </div>
+              <div
+                class="nhsuk-form-group nhsuk-form-group--error"
+              >
                 <span
                   class="nhsuk-error-message"
                   id="campaignId--error-message"
@@ -180,7 +199,7 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   Campaign Id Error
                 </span>
                 <select
-                  aria-describedby="campaignId--hint campaignId--error-message"
+                  aria-describedby="campaignId--error-message"
                   class="nhsuk-select nhsuk-select--error"
                   data-testid="campaign-id-field"
                   id="campaignId"
@@ -343,24 +362,42 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
             <div
               class="nhsuk-form-group nhsuk-u-margin-bottom-6"
             >
+              <label
+                class="nhsuk-label nhsuk-label--s"
+                for="campaignId"
+              >
+                Campaign
+              </label>
               <div
-                class="nhsuk-form-group"
+                class="nhsuk-hint"
               >
-                <label
-                  class="nhsuk-label nhsuk-label--s"
-                  for="campaignId"
-                  id="campaignId--label"
-                >
-                  Campaign
-                </label>
-                <div
-                  class="nhsuk-hint"
-                  id="campaignId--hint"
+                Choose which campaign this message plan will link to
+              </div>
+              <div
+                class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+              >
+                <h3
+                  class="nhsuk-warning-callout__label"
                 >
-                  Choose which campaign this message plan will link to
-                </div>
+                  <span
+                    role="text"
+                  >
+                    <span
+                      class="nhsuk-u-visually-hidden"
+                    >
+                      Important: 
+                    </span>
+                    Important
+                  </span>
+                </h3>
+                <p>
+                  You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+                </p>
+              </div>
+              <div
+                class="nhsuk-form-group"
+              >
                 <select
-                  aria-describedby="campaignId--hint"
                   class="nhsuk-select"
                   data-testid="campaign-id-field"
                   id="campaignId"
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index aa719cbc6..6d4060faa 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -101,22 +101,41 @@ exports[`renders errors 1`] = `
     <div
       class="nhsuk-form-group nhsuk-u-margin-bottom-6"
     >
+      <label
+        class="nhsuk-label nhsuk-label--s"
+        for="campaignId"
+      >
+        Campaign
+      </label>
       <div
-        class="nhsuk-form-group nhsuk-form-group--error"
+        class="nhsuk-hint"
       >
-        <label
-          class="nhsuk-label nhsuk-label--s"
-          for="campaignId"
-          id="campaignId--label"
-        >
-          Campaign
-        </label>
-        <div
-          class="nhsuk-hint"
-          id="campaignId--hint"
+        Choose which campaign this message plan will link to
+      </div>
+      <div
+        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+      >
+        <h3
+          class="nhsuk-warning-callout__label"
         >
-          Choose which campaign this message plan will link to
-        </div>
+          <span
+            role="text"
+          >
+            <span
+              class="nhsuk-u-visually-hidden"
+            >
+              Important: 
+            </span>
+            Important
+          </span>
+        </h3>
+        <p>
+          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+        </p>
+      </div>
+      <div
+        class="nhsuk-form-group nhsuk-form-group--error"
+      >
         <span
           class="nhsuk-error-message"
           id="campaignId--error-message"
@@ -129,7 +148,7 @@ exports[`renders errors 1`] = `
           CampaignId error
         </span>
         <select
-          aria-describedby="campaignId--hint campaignId--error-message"
+          aria-describedby="campaignId--error-message"
           class="nhsuk-select nhsuk-select--error"
           data-testid="campaign-id-field"
           id="campaignId"
@@ -274,6 +293,27 @@ exports[`renders form with children 1`] = `
       >
         This message plan will link to your only campaign:
       </div>
+      <div
+        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+      >
+        <h3
+          class="nhsuk-warning-callout__label"
+        >
+          <span
+            role="text"
+          >
+            <span
+              class="nhsuk-u-visually-hidden"
+            >
+              Important: 
+            </span>
+            Important
+          </span>
+        </h3>
+        <p>
+          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+        </p>
+      </div>
       <input
         name="campaignId"
         readonly=""
@@ -403,24 +443,42 @@ exports[`renders form with select for multiple campaign ids 1`] = `
     <div
       class="nhsuk-form-group nhsuk-u-margin-bottom-6"
     >
+      <label
+        class="nhsuk-label nhsuk-label--s"
+        for="campaignId"
+      >
+        Campaign
+      </label>
       <div
-        class="nhsuk-form-group"
+        class="nhsuk-hint"
       >
-        <label
-          class="nhsuk-label nhsuk-label--s"
-          for="campaignId"
-          id="campaignId--label"
-        >
-          Campaign
-        </label>
-        <div
-          class="nhsuk-hint"
-          id="campaignId--hint"
+        Choose which campaign this message plan will link to
+      </div>
+      <div
+        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+      >
+        <h3
+          class="nhsuk-warning-callout__label"
         >
-          Choose which campaign this message plan will link to
-        </div>
+          <span
+            role="text"
+          >
+            <span
+              class="nhsuk-u-visually-hidden"
+            >
+              Important: 
+            </span>
+            Important
+          </span>
+        </h3>
+        <p>
+          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+        </p>
+      </div>
+      <div
+        class="nhsuk-form-group"
+      >
         <select
-          aria-describedby="campaignId--hint"
           class="nhsuk-select"
           data-testid="campaign-id-field"
           id="campaignId"
@@ -565,6 +623,27 @@ exports[`renders form with single campaign id displayed 1`] = `
       >
         This message plan will link to your only campaign:
       </div>
+      <div
+        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+      >
+        <h3
+          class="nhsuk-warning-callout__label"
+        >
+          <span
+            role="text"
+          >
+            <span
+              class="nhsuk-u-visually-hidden"
+            >
+              Important: 
+            </span>
+            Important
+          </span>
+        </h3>
+        <p>
+          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+        </p>
+      </div>
       <input
         name="campaignId"
         readonly=""
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index c4ae2dabd..8b238f6a5 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -9,6 +9,7 @@ import {
   Label,
   Select,
   TextInput,
+  WarningCallout,
 } from 'nhsuk-react-components';
 import type { RoutingConfig } from 'nhs-notify-web-template-management-types';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
@@ -20,6 +21,15 @@ import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
 
 const formContent = content.components.messagePlanForm;
 
+const campaignWarningCallout = (
+  <WarningCallout className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'>
+    <WarningCallout.Label>
+      {formContent.fields.campaignId.warningCallout.heading}
+    </WarningCallout.Label>
+    <p>{formContent.fields.campaignId.warningCallout.content}</p>
+  </WarningCallout>
+);
+
 export function MessagePlanForm({
   backLink,
   campaignIds,
@@ -80,6 +90,7 @@ export function MessagePlanForm({
                 {formContent.fields.campaignId.label}
               </Label>
               <HintText>{formContent.fields.campaignId.hintSingle}</HintText>
+              {campaignWarningCallout}
               <input
                 type='hidden'
                 name='campaignId'
@@ -89,24 +100,28 @@ export function MessagePlanForm({
               <p data-testid='single-campaign-id'>{campaignIds[0]}</p>
             </>
           ) : (
-            <Select
-              id='campaignId'
-              name='campaignId'
-              label={formContent.fields.campaignId.label}
-              labelProps={{ size: 's' }}
-              hint={formContent.fields.campaignId.hintMulti}
-              defaultValue={campaignId}
-              onChange={handleCampaignIdChange}
-              error={campaignIdError}
-              data-testid='campaign-id-field'
-            >
-              <Select.Option />
-              {campaignIds.map((id) => (
-                <Select.Option key={id} value={id}>
-                  {id}
-                </Select.Option>
-              ))}
-            </Select>
+            <>
+              <Label htmlFor='campaignId' size='s'>
+                {formContent.fields.campaignId.label}
+              </Label>
+              <HintText>{formContent.fields.campaignId.hintMulti}</HintText>
+              {campaignWarningCallout}
+              <Select
+                id='campaignId'
+                name='campaignId'
+                defaultValue={campaignId}
+                onChange={handleCampaignIdChange}
+                error={campaignIdError}
+                data-testid='campaign-id-field'
+              >
+                <Select.Option />
+                {campaignIds.map((id) => (
+                  <Select.Option key={id} value={id}>
+                    {id}
+                  </Select.Option>
+                ))}
+              </Select>
+            </>
           )}
         </div>
       )}
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index 321f22b6f..8bb2a1d5a 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -1965,6 +1965,11 @@ const messagePlanForm = {
       label: 'Campaign',
       hintSingle: 'This message plan will link to your only campaign:',
       hintMulti: 'Choose which campaign this message plan will link to',
+      warningCallout: {
+        heading: 'Important',
+        content:
+          'You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.',
+      },
     },
   },
   submitButton: 'Save and continue',

From 7d994999483d36018881effb4a64715fc2a0b990 Mon Sep 17 00:00:00 2001
From: bhansell1 <ben.hansell1@nhs.net>
Date: Tue, 21 Apr 2026 12:03:58 +0100
Subject: [PATCH 02/11] CCM-16455: do not show banner when single campaign

---
 .../__snapshots__/MessagePlan.test.tsx.snap   | 42 -------------------
 .../forms/MessagePlanForm/MessagePlanForm.tsx | 17 +++-----
 2 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index 6d4060faa..b64e4c74d 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -293,27 +293,6 @@ exports[`renders form with children 1`] = `
       >
         This message plan will link to your only campaign:
       </div>
-      <div
-        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
-      >
-        <h3
-          class="nhsuk-warning-callout__label"
-        >
-          <span
-            role="text"
-          >
-            <span
-              class="nhsuk-u-visually-hidden"
-            >
-              Important: 
-            </span>
-            Important
-          </span>
-        </h3>
-        <p>
-          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-        </p>
-      </div>
       <input
         name="campaignId"
         readonly=""
@@ -623,27 +602,6 @@ exports[`renders form with single campaign id displayed 1`] = `
       >
         This message plan will link to your only campaign:
       </div>
-      <div
-        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
-      >
-        <h3
-          class="nhsuk-warning-callout__label"
-        >
-          <span
-            role="text"
-          >
-            <span
-              class="nhsuk-u-visually-hidden"
-            >
-              Important: 
-            </span>
-            Important
-          </span>
-        </h3>
-        <p>
-          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-        </p>
-      </div>
       <input
         name="campaignId"
         readonly=""
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index 8b238f6a5..810c35a27 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -21,15 +21,6 @@ import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
 
 const formContent = content.components.messagePlanForm;
 
-const campaignWarningCallout = (
-  <WarningCallout className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'>
-    <WarningCallout.Label>
-      {formContent.fields.campaignId.warningCallout.heading}
-    </WarningCallout.Label>
-    <p>{formContent.fields.campaignId.warningCallout.content}</p>
-  </WarningCallout>
-);
-
 export function MessagePlanForm({
   backLink,
   campaignIds,
@@ -90,7 +81,6 @@ export function MessagePlanForm({
                 {formContent.fields.campaignId.label}
               </Label>
               <HintText>{formContent.fields.campaignId.hintSingle}</HintText>
-              {campaignWarningCallout}
               <input
                 type='hidden'
                 name='campaignId'
@@ -105,7 +95,12 @@ export function MessagePlanForm({
                 {formContent.fields.campaignId.label}
               </Label>
               <HintText>{formContent.fields.campaignId.hintMulti}</HintText>
-              {campaignWarningCallout}
+              <WarningCallout className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'>
+                <WarningCallout.Label>
+                  {formContent.fields.campaignId.warningCallout.heading}
+                </WarningCallout.Label>
+                <p>{formContent.fields.campaignId.warningCallout.content}</p>
+              </WarningCallout>
               <Select
                 id='campaignId'
                 name='campaignId'

From b925cd643d8a52f27d8516728d58c304bce7e1f8 Mon Sep 17 00:00:00 2001
From: bhansell1 <ben.hansell1@nhs.net>
Date: Tue, 21 Apr 2026 12:33:28 +0100
Subject: [PATCH 03/11] lockfile

---
 package-lock.json | 260 +++++++++++++++++++++++++++++-----------------
 1 file changed, 167 insertions(+), 93 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 740d5befa..7deb0e6b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2192,51 +2192,68 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login": {
+      "version": "3.972.29",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.29.tgz",
+      "integrity": "sha512-OGOslTbOlxXexKMqhxCEbBQbUIfuhGxU5UXw3Fm56ypXHvrXH4aTt/xb5Y884LOoteP1QST1lVZzHfcTnWhiPQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/nested-clients": "^3.996.19",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/shared-ini-file-loader": "^4.4.8",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
-      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
+      "version": "3.973.27",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.27.tgz",
+      "integrity": "sha512-CUZ5m8hwMCH6OYI4Li/WgMfIEx10Q2PLI9Y3XOUTPGZJ53aZ0007jCv+X/ywsaERyKPdw5MRZWk877roQksQ4A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/xml-builder": "^3.972.17",
+        "@smithy/core": "^3.23.14",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/signature-v4": "^5.3.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-base64": "^4.3.2",
+        "@smithy/util-middleware": "^4.2.13",
+        "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.9.tgz",
+      "integrity": "sha512-je5vRdNw4SkuTnmRbFZLdye4sQ0faLt8kwka5wnnSU30q1mHO4X+idGEJOOE+Tn1ME7Oryn05xxkDvIb3UaLaQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-location-constraint": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.10.tgz",
-      "integrity": "sha512-rI3NZvJcEvjoD0+0PI0iUAwlPw2IlSlhyvgBK/3WkKJQE/YiKFedd9dMN2lVacdNxPNhxL/jzQaKQdrGtQagjQ==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.9.tgz",
+      "integrity": "sha512-HsVgDrruhqI28RkaXALm8grJ7Agc1wF6Et0xh6pom8NdO2VdO/SD9U/tPwUjewwK/pVoka+EShBxyCvgsPCtog==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.8",
@@ -2247,66 +2264,110 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-location-constraint/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.10.tgz",
+      "integrity": "sha512-RVQQbq5orQ/GHUnXvqEOj2HHPBJm+mM+ySwZKS5UaLBwra5ugRtiH09PLUoOZRl7a1YzaOzXSuGbn9iD5j60WQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws/lambda-invoke-store": "^0.2.2",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
-      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.972.29",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.29.tgz",
+      "integrity": "sha512-f/sIRzuTfEjg6NsbMYvye2VsmnQoNgntntleQyx5uGacUYzszbfIlO3GcI6G6daWUmTm0IDZc11qMHWwF0o0mQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/util-endpoints": "^3.996.6",
+        "@smithy/core": "^3.23.14",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-retry": "^4.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
+      "version": "3.996.19",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.19.tgz",
+      "integrity": "sha512-uFkmCDXvmQYLanlYdOFS0+MQWkrj9wPMt/ZCc/0J0fjPim6F5jBVBmEomvGY/j77ILW6GTPwN22Jc174Mhkw6Q==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.1",
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/middleware-host-header": "^3.972.9",
+        "@aws-sdk/middleware-logger": "^3.972.9",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.10",
+        "@aws-sdk/middleware-user-agent": "^3.972.29",
+        "@aws-sdk/region-config-resolver": "^3.972.11",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/util-endpoints": "^3.996.6",
+        "@aws-sdk/util-user-agent-browser": "^3.972.9",
+        "@aws-sdk/util-user-agent-node": "^3.973.15",
+        "@smithy/config-resolver": "^4.4.14",
+        "@smithy/core": "^3.23.14",
+        "@smithy/fetch-http-handler": "^5.3.16",
+        "@smithy/hash-node": "^4.2.13",
+        "@smithy/invalid-dependency": "^4.2.13",
+        "@smithy/middleware-content-length": "^4.2.13",
+        "@smithy/middleware-endpoint": "^4.4.29",
+        "@smithy/middleware-retry": "^4.5.0",
+        "@smithy/middleware-serde": "^4.2.17",
+        "@smithy/middleware-stack": "^4.2.13",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/node-http-handler": "^4.5.2",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
+        "@smithy/util-base64": "^4.3.2",
+        "@smithy/util-body-length-browser": "^4.2.2",
+        "@smithy/util-body-length-node": "^4.2.3",
+        "@smithy/util-defaults-mode-browser": "^4.3.45",
+        "@smithy/util-defaults-mode-node": "^4.2.49",
+        "@smithy/util-endpoints": "^3.3.4",
+        "@smithy/util-middleware": "^4.2.13",
+        "@smithy/util-retry": "^4.3.0",
+        "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-recursion-detection": {
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
       "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
-      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.11.tgz",
+      "integrity": "sha512-6Q8B1dcx6BBqUTY1Mc/eROKA0FImEEY5VPSd6AGPEUf0ErjExz4snVqa9kNJSoVDV1rKaNf3qrWojgcKW+SdDg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/config-resolver": "^4.4.14",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/types": {
+      "version": "3.973.7",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.7.tgz",
+      "integrity": "sha512-reXRwoJ6CfChoqAsBszUYajAF8Z2LRE+CRcKocvFSMpIiLOtYU3aJ9trmn6VVPAzbbY5LXF+FfmUslbXk1SYFg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.14.1",
@@ -2316,69 +2377,70 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.972.32",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.32.tgz",
-      "integrity": "sha512-dc2O2x0V5pGJhmdQYQveUIFtMZsur7GrGuSgoKM4oQJuEcfvwnJ3sj+ip6WnxR5l6TrX5zkl4KgcgswOy3wAzQ==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.996.6",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.6.tgz",
+      "integrity": "sha512-2nUQ+2ih7CShuKHpGSIYvvAIOHy52dOZguYG36zptBukhw6iFwcvGfG0tes0oZFWQqEWvgZe9HLWaNlvXGdOrg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.974.3",
-        "@aws-sdk/types": "^3.973.8",
-        "@aws-sdk/util-arn-parser": "^3.972.3",
-        "@smithy/core": "^3.23.16",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/signature-v4": "^5.3.14",
-        "@smithy/smithy-client": "^4.12.12",
-        "@smithy/types": "^4.14.1",
-        "@smithy/util-config-provider": "^4.2.2",
-        "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-stream": "^4.5.24",
-        "@smithy/util-utf8": "^4.2.2",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
+        "@smithy/util-endpoints": "^3.3.4",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/types": {
-      "version": "3.973.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
-      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-browser": {
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.9.tgz",
+      "integrity": "sha512-sn/LMzTbGjYqCCF24390WxPd6hkpoSptiUn5DzVp4cD71yqw+yGEGm1YCxyEoPXyc8qciM8UzLJcZBFslxo5Uw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
+        "bowser": "^2.11.0",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-sqs": {
-      "version": "3.972.20",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sqs/-/middleware-sdk-sqs-3.972.20.tgz",
-      "integrity": "sha512-yt0w5FKyH8Or7OT/Bp3fDRAtI4/f6uaaRKnW9TmU9qv8c1HFh43C9nQYZ26IcyRm+tYFdrB65yNTav/YThu36A==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
+      "version": "3.973.15",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.15.tgz",
+      "integrity": "sha512-fYn3s9PtKdgQkczGZCFMgkNEe8aq1JCVbnRqjqN9RSVW43xn2RV9xdcZ3z01a48Jpkuh/xCmBKJxdLOo4Ozg7w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/smithy-client": "^4.12.11",
-        "@smithy/types": "^4.14.1",
-        "@smithy/util-hex-encoding": "^4.2.2",
-        "@smithy/util-utf8": "^4.2.2",
+        "@aws-sdk/middleware-user-agent": "^3.972.29",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-config-provider": "^4.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "aws-crt": ">=1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws-crt": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@aws-sdk/middleware-ssec": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.972.10.tgz",
-      "integrity": "sha512-Gli9A0u8EVVb+5bFDGS/QbSVg28w/wpEidg1ggVcSj65BDTdGR6punsOcVjqdiu1i42WHWo51MCvARPIIz9juw==",
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
+      "version": "3.972.17",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.17.tgz",
+      "integrity": "sha512-Ra7hjqAZf1OXRRMueB13qex7mFJRDK/pgCvdSFemXBT8KCGnQDPoKzHY1SjN+TjJVmnpSF14W5tJ1vDamFu+Gg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/types": "^4.14.1",
+        "@smithy/types": "^4.14.0",
+        "fast-xml-parser": "5.5.8",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -2601,10 +2663,10 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/token-providers": {
-      "version": "3.1034.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1034.0.tgz",
-      "integrity": "sha512-8E+KGcD4ET0H9FXJ2/ZWbfFnQNYEkTZZYJxAs1lkdJlve1AYuqaydInIFfvNgoz5GbYtzbK8/ugsSMu5wPm6kA==",
+    "node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.911.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.911.0.tgz",
+      "integrity": "sha512-rY3LvGvgY/UI0nmt5f4DRzjEh8135A2TeHcva1bgOmVfOI4vkkGfA20sNRqerOkSO6hPbkxJapO50UJHFzmmyA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/core": "^3.974.3",
@@ -2645,10 +2707,10 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@aws-sdk/util-arn-parser": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
-      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.911.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.911.0.tgz",
+      "integrity": "sha512-O1c5F1pbEImgEe3Vr8j1gpWu69UXWj3nN3vvLGh77hcrG5dZ8I27tSP5RN4Labm8Dnji/6ia+vqSYpN8w6KN5A==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -2672,6 +2734,18 @@
         "@aws-sdk/client-dynamodb": "^3.995.0"
       }
     },
+    "node_modules/@aws-sdk/util-arn-parser": {
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
+      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@aws-sdk/util-endpoints": {
       "version": "3.910.0",
       "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.910.0.tgz",

From 860fd202ad0b0f0e809f3ac6efea96e83b84bb88 Mon Sep 17 00:00:00 2001
From: bhansell1 <ben.hansell1@nhs.net>
Date: Wed, 22 Apr 2026 09:20:22 +0100
Subject: [PATCH 04/11] lockfile

---
 package-lock.json | 441 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 441 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 7deb0e6b4..af40aefa2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1848,6 +1848,7 @@
       "integrity": "sha512-UwdbJbOrgnOxZbshaNZ4DzX35h5wQd33MNYTGzWhN3ORG9lG9KQbDX6l6tDJSAdaGTktJoZPSritmUoW1rYkRA==",
       "license": "Apache-2.0",
       "dependencies": {
+<<<<<<< HEAD
         "@aws-sdk/core": "^3.974.3",
         "@aws-sdk/credential-provider-env": "^3.972.29",
         "@aws-sdk/credential-provider-http": "^3.972.31",
@@ -1855,6 +1856,33 @@
         "@aws-sdk/credential-provider-process": "^3.972.29",
         "@aws-sdk/credential-provider-sso": "^3.972.33",
         "@aws-sdk/credential-provider-web-identity": "^3.972.33",
+=======
+        "@aws-sdk/core": "3.911.0",
+        "@aws-sdk/credential-provider-env": "3.911.0",
+        "@aws-sdk/credential-provider-http": "3.911.0",
+        "@aws-sdk/credential-provider-process": "3.911.0",
+        "@aws-sdk/credential-provider-sso": "3.911.0",
+        "@aws-sdk/credential-provider-web-identity": "3.911.0",
+        "@aws-sdk/nested-clients": "3.911.0",
+        "@aws-sdk/types": "3.910.0",
+        "@smithy/credential-provider-imds": "^4.2.2",
+        "@smithy/property-provider": "^4.2.2",
+        "@smithy/shared-ini-file-loader": "^4.3.2",
+        "@smithy/types": "^4.7.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login": {
+      "version": "3.972.33",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.33.tgz",
+      "integrity": "sha512-WyZuPVoDM1HGNl41eVg8HSSXIB+FGkuuK63GhDbh4TMdfWU03AciWvF/QqOVWvJtWVYaLddANJ+aUklVr2ieuw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "^3.974.3",
+>>>>>>> 54ab5db8 (lockfile)
         "@aws-sdk/nested-clients": "^3.997.1",
         "@aws-sdk/types": "^3.973.8",
         "@smithy/credential-provider-imds": "^4.2.14",
@@ -1867,10 +1895,17 @@
         "node": ">=20.0.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": {
       "version": "3.973.8",
       "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
       "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
+=======
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
+      "version": "3.974.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.3.tgz",
+      "integrity": "sha512-W3aJJm2clu8OmsrwMOMnfof13O6LGnbknnZIQeSRbxjqKah2nVvkjbUBBZVhWrt08KC69H7WsINTdrxC/2SXQw==",
+>>>>>>> 54ab5db8 (lockfile)
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.14.1",
@@ -1889,9 +1924,170 @@
         "@aws-sdk/core": "^3.974.3",
         "@aws-sdk/nested-clients": "^3.997.1",
         "@aws-sdk/types": "^3.973.8",
+<<<<<<< HEAD
         "@smithy/property-provider": "^4.2.14",
         "@smithy/protocol-http": "^5.3.14",
         "@smithy/shared-ini-file-loader": "^4.4.9",
+=======
+        "@aws-sdk/xml-builder": "^3.972.18",
+        "@smithy/core": "^3.23.16",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/property-provider": "^4.2.14",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/signature-v4": "^5.3.14",
+        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/types": "^4.14.1",
+        "@smithy/util-base64": "^4.3.2",
+        "@smithy/util-middleware": "^4.2.14",
+        "@smithy/util-retry": "^4.3.3",
+        "@smithy/util-utf8": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
+      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/types": "^4.14.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
+      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/types": "^4.14.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.972.11",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
+      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@aws/lambda-invoke-store": "^0.2.2",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/types": "^4.14.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
+      "version": "3.972.33",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.33.tgz",
+      "integrity": "sha512-mqtT3Fo7xanWMk2SbAcKLGGI/q1GHWNrExBj7cnWP2W2mkTMheXB4ntJvwPZ1UxPrQobrsv2dWFXmaOJeSOiDg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "^3.974.3",
+        "@aws-sdk/types": "^3.973.8",
+        "@aws-sdk/util-endpoints": "^3.996.8",
+        "@smithy/core": "^3.23.16",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/types": "^4.14.1",
+        "@smithy/util-retry": "^4.3.3",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
+      "version": "3.997.1",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.1.tgz",
+      "integrity": "sha512-Afc9hc2WZs3X4Jb8dnxyuYiZsLoWRO51roTCRf497gPnAKN2WRdXANu1vaVCTzwnDMOYFXb/cYv4ZSjxqAqcKA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "^3.974.3",
+        "@aws-sdk/middleware-host-header": "^3.972.10",
+        "@aws-sdk/middleware-logger": "^3.972.10",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
+        "@aws-sdk/middleware-user-agent": "^3.972.33",
+        "@aws-sdk/region-config-resolver": "^3.972.13",
+        "@aws-sdk/signature-v4-multi-region": "^3.996.20",
+        "@aws-sdk/types": "^3.973.8",
+        "@aws-sdk/util-endpoints": "^3.996.8",
+        "@aws-sdk/util-user-agent-browser": "^3.972.10",
+        "@aws-sdk/util-user-agent-node": "^3.973.19",
+        "@smithy/config-resolver": "^4.4.17",
+        "@smithy/core": "^3.23.16",
+        "@smithy/fetch-http-handler": "^5.3.17",
+        "@smithy/hash-node": "^4.2.14",
+        "@smithy/invalid-dependency": "^4.2.14",
+        "@smithy/middleware-content-length": "^4.2.14",
+        "@smithy/middleware-endpoint": "^4.4.31",
+        "@smithy/middleware-retry": "^4.5.4",
+        "@smithy/middleware-serde": "^4.2.19",
+        "@smithy/middleware-stack": "^4.2.14",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/node-http-handler": "^4.6.0",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/types": "^4.14.1",
+        "@smithy/url-parser": "^4.2.14",
+        "@smithy/util-base64": "^4.3.2",
+        "@smithy/util-body-length-browser": "^4.2.2",
+        "@smithy/util-body-length-node": "^4.2.3",
+        "@smithy/util-defaults-mode-browser": "^4.3.48",
+        "@smithy/util-defaults-mode-node": "^4.2.53",
+        "@smithy/util-endpoints": "^3.4.2",
+        "@smithy/util-middleware": "^4.2.14",
+        "@smithy/util-retry": "^4.3.3",
+        "@smithy/util-utf8": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
+      "version": "3.972.13",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.13.tgz",
+      "integrity": "sha512-CvJ2ZIjK/jVD/lbOpowBVElJyC1YxLTIJ13yM0AEo0t2v7swOzGjSA6lJGH+DwZXQhcjUjoYwc8bVYCX5MDr1A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/config-resolver": "^4.4.17",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/types": "^4.14.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/signature-v4-multi-region": {
+      "version": "3.996.20",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.20.tgz",
+      "integrity": "sha512-MEj6DhEcaO8RgVtFCJ+xpCQnZC3Iesr09avdY75qkMQfckQULu447IegK7Rs1MCGerVBfKnJQ4q+pQq9hI5lng==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/middleware-sdk-s3": "^3.972.32",
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/signature-v4": "^5.3.14",
+>>>>>>> 54ab5db8 (lockfile)
         "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
@@ -1912,6 +2108,105 @@
         "node": ">=20.0.0"
       }
     },
+<<<<<<< HEAD
+=======
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.996.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.8.tgz",
+      "integrity": "sha512-oOZHcRDihk5iEe5V25NVWg45b3qEA8OpHWVdU/XQh8Zj4heVPAJqWvMphQnU7LkufmUo10EpvFPZuQMiFLJK3g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/types": "^4.14.1",
+        "@smithy/url-parser": "^4.2.14",
+        "@smithy/util-endpoints": "^3.4.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-browser": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.10.tgz",
+      "integrity": "sha512-FAzqXvfEssGdSIz8ejatan0bOdx1qefBWKF/gWmVBXIP1HkS7v/wjjaqrAGGKvyihrXTXW00/2/1nTJtxpXz7g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/types": "^4.14.1",
+        "bowser": "^2.11.0",
+        "tslib": "^2.6.2"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
+      "version": "3.973.19",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.19.tgz",
+      "integrity": "sha512-ZAfHjpzdbrzkAftC139JoYGfXzDh5HY+AxRzw8pGJ8cULsf+l721sKAMK8mV5NvRETaW/BwghSwQhGgoNgrxMw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/middleware-user-agent": "^3.972.33",
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/types": "^4.14.1",
+        "@smithy/util-config-provider": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "aws-crt": ">=1.0.0"
+      },
+      "peerDependenciesMeta": {
+        "aws-crt": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
+      "version": "3.972.18",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.18.tgz",
+      "integrity": "sha512-BMDNVG1ETXRhl1tnisQiYBef3RShJ1kfZA7x7afivTFMLirfHNTb6U71K569HNXhSXbQZsweHvSDZ6euBw8hPA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.14.1",
+        "fast-xml-parser": "5.5.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws/lambda-invoke-store": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.4.tgz",
+      "integrity": "sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/credential-provider-login/node_modules/fast-xml-parser": {
+      "version": "5.5.6",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz",
+      "integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.1.3",
+        "strnum": "^2.1.2"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+>>>>>>> 54ab5db8 (lockfile)
     "node_modules/@aws-sdk/credential-provider-node": {
       "version": "3.972.34",
       "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.34.tgz",
@@ -2447,7 +2742,153 @@
         "node": ">=20.0.0"
       }
     },
+<<<<<<< HEAD
     "node_modules/@aws-sdk/middleware-ssec/node_modules/@aws-sdk/types": {
+=======
+    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/fast-xml-parser": {
+      "version": "5.5.6",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz",
+      "integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "fast-xml-builder": "^1.1.4",
+        "path-expression-matcher": "^1.1.3",
+        "strnum": "^2.1.2"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.910.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.910.0.tgz",
+      "integrity": "sha512-F9Lqeu80/aTM6S/izZ8RtwSmjfhWjIuxX61LX+/9mxJyEkgaECRxv0chsLQsLHJumkGnXRy/eIyMLBhcTPF5vg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "3.910.0",
+        "@smithy/protocol-http": "^5.3.2",
+        "@smithy/types": "^4.7.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-location-constraint": {
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.9.tgz",
+      "integrity": "sha512-TyfOi2XNdOZpNKeTJwRUsVAGa+14nkyMb2VVGG+eDgcWG/ed6+NUo72N3hT6QJioxym80NSinErD+LBRF0Ir1w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-location-constraint/node_modules/@aws-sdk/types": {
+      "version": "3.973.7",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.7.tgz",
+      "integrity": "sha512-reXRwoJ6CfChoqAsBszUYajAF8Z2LRE+CRcKocvFSMpIiLOtYU3aJ9trmn6VVPAzbbY5LXF+FfmUslbXk1SYFg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.14.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.910.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.910.0.tgz",
+      "integrity": "sha512-3LJyyfs1USvRuRDla1pGlzGRtXJBXD1zC9F+eE9Iz/V5nkmhyv52A017CvKWmYoR0DM9dzjLyPOI0BSSppEaTw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "3.910.0",
+        "@smithy/types": "^4.7.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-recursion-detection": {
+      "version": "3.910.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.910.0.tgz",
+      "integrity": "sha512-m/oLz0EoCy+WoIVBnXRXJ4AtGpdl0kPE7U+VH9TsuUzHgxY1Re/176Q1HWLBRVlz4gr++lNsgsMWEC+VnAwMpw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "3.910.0",
+        "@aws/lambda-invoke-store": "^0.0.1",
+        "@smithy/protocol-http": "^5.3.2",
+        "@smithy/types": "^4.7.1",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-sdk-s3": {
+      "version": "3.972.32",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.32.tgz",
+      "integrity": "sha512-dc2O2x0V5pGJhmdQYQveUIFtMZsur7GrGuSgoKM4oQJuEcfvwnJ3sj+ip6WnxR5l6TrX5zkl4KgcgswOy3wAzQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/core": "^3.974.3",
+        "@aws-sdk/types": "^3.973.8",
+        "@aws-sdk/util-arn-parser": "^3.972.3",
+        "@smithy/core": "^3.23.16",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/signature-v4": "^5.3.14",
+        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/types": "^4.14.1",
+        "@smithy/util-config-provider": "^4.2.2",
+        "@smithy/util-middleware": "^4.2.14",
+        "@smithy/util-stream": "^4.5.24",
+        "@smithy/util-utf8": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/core": {
+      "version": "3.974.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.3.tgz",
+      "integrity": "sha512-W3aJJm2clu8OmsrwMOMnfof13O6LGnbknnZIQeSRbxjqKah2nVvkjbUBBZVhWrt08KC69H7WsINTdrxC/2SXQw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@aws-sdk/xml-builder": "^3.972.18",
+        "@smithy/core": "^3.23.16",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/property-provider": "^4.2.14",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/signature-v4": "^5.3.14",
+        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/types": "^4.14.1",
+        "@smithy/util-base64": "^4.3.2",
+        "@smithy/util-middleware": "^4.2.14",
+        "@smithy/util-retry": "^4.3.3",
+        "@smithy/util-utf8": "^4.2.2",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/types": {
+>>>>>>> 54ab5db8 (lockfile)
       "version": "3.973.8",
       "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
       "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",

From e9724323992251f2169857121b87dc59b1180011 Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Fri, 24 Apr 2026 09:58:58 +0100
Subject: [PATCH 05/11] Update campaign id error styling, update tests

---
 .../__snapshots__/page.test.tsx.snap          | 123 ++++++------
 .../forms/MessagePlan/MessagePlan.test.tsx    |   6 +
 .../__snapshots__/MessagePlan.test.tsx.snap   | 136 ++++++-------
 .../forms/MessagePlanForm/MessagePlanForm.tsx |  46 +++--
 .../pages/routing/create-message-plan-page.ts |   4 +
 .../pages/template-mgmt-base-page.ts          |   1 -
 ...ate-message-plan.routing-component.spec.ts | 180 ++++++++++--------
 7 files changed, 259 insertions(+), 237 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
index 97e010834..e9a258547 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
@@ -152,41 +152,42 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
             <div
               class="nhsuk-form-group nhsuk-u-margin-bottom-6"
             >
-              <label
-                class="nhsuk-label nhsuk-label--s"
-                for="campaignId"
-              >
-                Campaign
-              </label>
-              <div
-                class="nhsuk-hint"
-              >
-                Choose which campaign this message plan will link to
-              </div>
               <div
-                class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+                class="nhsuk-form-group nhsuk-form-group--error"
               >
-                <h3
-                  class="nhsuk-warning-callout__label"
+                <label
+                  class="nhsuk-label nhsuk-label--s"
+                  for="campaignId"
                 >
-                  <span
-                    role="text"
+                  Campaign
+                </label>
+                <div
+                  class="nhsuk-hint"
+                >
+                  Choose which campaign this message plan will link to
+                </div>
+                <div
+                  class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+                  data-testid="campaign-warning-callout"
+                >
+                  <h3
+                    class="nhsuk-warning-callout__label"
                   >
                     <span
-                      class="nhsuk-u-visually-hidden"
+                      role="text"
                     >
-                      Important: 
+                      <span
+                        class="nhsuk-u-visually-hidden"
+                      >
+                        Important: 
+                      </span>
+                      Important
                     </span>
-                    Important
-                  </span>
-                </h3>
-                <p>
-                  You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-                </p>
-              </div>
-              <div
-                class="nhsuk-form-group nhsuk-form-group--error"
-              >
+                  </h3>
+                  <p>
+                    You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+                  </p>
+                </div>
                 <span
                   class="nhsuk-error-message"
                   id="campaignId--error-message"
@@ -199,15 +200,12 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   Campaign Id Error
                 </span>
                 <select
-                  aria-describedby="campaignId--error-message"
                   class="nhsuk-select nhsuk-select--error"
                   data-testid="campaign-id-field"
                   id="campaignId"
                   name="campaignId"
                 >
-                  <option
-                    selected=""
-                  />
+                  <option />
                   <option
                     value="campaign-1"
                   >
@@ -362,50 +360,49 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
             <div
               class="nhsuk-form-group nhsuk-u-margin-bottom-6"
             >
-              <label
-                class="nhsuk-label nhsuk-label--s"
-                for="campaignId"
-              >
-                Campaign
-              </label>
-              <div
-                class="nhsuk-hint"
-              >
-                Choose which campaign this message plan will link to
-              </div>
               <div
-                class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+                class="nhsuk-form-group"
               >
-                <h3
-                  class="nhsuk-warning-callout__label"
+                <label
+                  class="nhsuk-label nhsuk-label--s"
+                  for="campaignId"
                 >
-                  <span
-                    role="text"
+                  Campaign
+                </label>
+                <div
+                  class="nhsuk-hint"
+                >
+                  Choose which campaign this message plan will link to
+                </div>
+                <div
+                  class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+                  data-testid="campaign-warning-callout"
+                >
+                  <h3
+                    class="nhsuk-warning-callout__label"
                   >
                     <span
-                      class="nhsuk-u-visually-hidden"
+                      role="text"
                     >
-                      Important: 
+                      <span
+                        class="nhsuk-u-visually-hidden"
+                      >
+                        Important: 
+                      </span>
+                      Important
                     </span>
-                    Important
-                  </span>
-                </h3>
-                <p>
-                  You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-                </p>
-              </div>
-              <div
-                class="nhsuk-form-group"
-              >
+                  </h3>
+                  <p>
+                    You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+                  </p>
+                </div>
                 <select
                   class="nhsuk-select"
                   data-testid="campaign-id-field"
                   id="campaignId"
                   name="campaignId"
                 >
-                  <option
-                    selected=""
-                  />
+                  <option />
                   <option
                     value="campaign-1"
                   >
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx b/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
index f8fb6288d..b3ca954fb 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
+++ b/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
@@ -25,7 +25,10 @@ test('renders form with single campaign id displayed', () => {
       campaignIds={['campaign-id']}
     />
   );
+  const warningCallout = screen.queryByTestId('campaign-warning-callout');
+
   expect(container.asFragment()).toMatchSnapshot();
+  expect(warningCallout).not.toBeInTheDocument();
 });
 
 test('renders form with select for multiple campaign ids', () => {
@@ -38,7 +41,10 @@ test('renders form with select for multiple campaign ids', () => {
       campaignIds={['campaign-1', 'campaign-2']}
     />
   );
+  const warningCallout = screen.queryByTestId('campaign-warning-callout');
+
   expect(container.asFragment()).toMatchSnapshot();
+  expect(warningCallout).toBeInTheDocument();
 });
 
 test('renders form with children', () => {
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index b64e4c74d..14b0d550d 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -101,62 +101,49 @@ exports[`renders errors 1`] = `
     <div
       class="nhsuk-form-group nhsuk-u-margin-bottom-6"
     >
-      <label
-        class="nhsuk-label nhsuk-label--s"
-        for="campaignId"
-      >
-        Campaign
-      </label>
-      <div
-        class="nhsuk-hint"
-      >
-        Choose which campaign this message plan will link to
-      </div>
       <div
-        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+        class="nhsuk-form-group"
       >
-        <h3
-          class="nhsuk-warning-callout__label"
+        <label
+          class="nhsuk-label nhsuk-label--s"
+          for="campaignId"
         >
-          <span
-            role="text"
+          Campaign
+        </label>
+        <div
+          class="nhsuk-hint"
+        >
+          Choose which campaign this message plan will link to
+        </div>
+        <div
+          class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+          data-testid="campaign-warning-callout"
+        >
+          <h3
+            class="nhsuk-warning-callout__label"
           >
             <span
-              class="nhsuk-u-visually-hidden"
+              role="text"
             >
-              Important: 
+              <span
+                class="nhsuk-u-visually-hidden"
+              >
+                Important: 
+              </span>
+              Important
             </span>
-            Important
-          </span>
-        </h3>
-        <p>
-          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-        </p>
-      </div>
-      <div
-        class="nhsuk-form-group nhsuk-form-group--error"
-      >
-        <span
-          class="nhsuk-error-message"
-          id="campaignId--error-message"
-        >
-          <span
-            class="nhsuk-u-visually-hidden"
-          >
-            Error: 
-          </span>
-          CampaignId error
-        </span>
+          </h3>
+          <p>
+            You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+          </p>
+        </div>
         <select
-          aria-describedby="campaignId--error-message"
-          class="nhsuk-select nhsuk-select--error"
+          class="nhsuk-select"
           data-testid="campaign-id-field"
           id="campaignId"
           name="campaignId"
         >
-          <option
-            selected=""
-          />
+          <option />
           <option
             value="campaign-id"
           >
@@ -422,50 +409,49 @@ exports[`renders form with select for multiple campaign ids 1`] = `
     <div
       class="nhsuk-form-group nhsuk-u-margin-bottom-6"
     >
-      <label
-        class="nhsuk-label nhsuk-label--s"
-        for="campaignId"
-      >
-        Campaign
-      </label>
-      <div
-        class="nhsuk-hint"
-      >
-        Choose which campaign this message plan will link to
-      </div>
       <div
-        class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+        class="nhsuk-form-group"
       >
-        <h3
-          class="nhsuk-warning-callout__label"
+        <label
+          class="nhsuk-label nhsuk-label--s"
+          for="campaignId"
         >
-          <span
-            role="text"
+          Campaign
+        </label>
+        <div
+          class="nhsuk-hint"
+        >
+          Choose which campaign this message plan will link to
+        </div>
+        <div
+          class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
+          data-testid="campaign-warning-callout"
+        >
+          <h3
+            class="nhsuk-warning-callout__label"
           >
             <span
-              class="nhsuk-u-visually-hidden"
+              role="text"
             >
-              Important: 
+              <span
+                class="nhsuk-u-visually-hidden"
+              >
+                Important: 
+              </span>
+              Important
             </span>
-            Important
-          </span>
-        </h3>
-        <p>
-          You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
-        </p>
-      </div>
-      <div
-        class="nhsuk-form-group"
-      >
+          </h3>
+          <p>
+            You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
+          </p>
+        </div>
         <select
           class="nhsuk-select"
           data-testid="campaign-id-field"
           id="campaignId"
           name="campaignId"
         >
-          <option
-            selected=""
-          />
+          <option />
           <option
             value="campaign-1"
           >
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index 810c35a27..3d289403f 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -1,23 +1,23 @@
 'use client';
 
-import { PropsWithChildren } from 'react';
+import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
+import * as NHSNotifyForm from '@atoms/NHSNotifyForm';
+import content from '@content/content';
+import { useTextInput } from '@hooks/use-text-input.hook';
+import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
+import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
+import { useNHSNotifyForm } from '@providers/form-provider';
 import classNames from 'classnames';
 import Link from 'next/link';
+import type { RoutingConfig } from 'nhs-notify-web-template-management-types';
 import {
   Details,
   HintText,
   Label,
-  Select,
   TextInput,
   WarningCallout,
 } from 'nhsuk-react-components';
-import type { RoutingConfig } from 'nhs-notify-web-template-management-types';
-import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
-import content from '@content/content';
-import { useTextInput } from '@hooks/use-text-input.hook';
-import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
-import { useNHSNotifyForm } from '@providers/form-provider';
-import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
+import { PropsWithChildren } from 'react';
 
 const formContent = content.components.messagePlanForm;
 
@@ -36,12 +36,11 @@ export function MessagePlanForm({
   const [name, handleNameChange] = useTextInput<HTMLInputElement>(
     initialState.name
   );
-  const [campaignId, handleCampaignIdChange] = useTextInput<HTMLSelectElement>(
+  const [_, handleCampaignIdChange] = useTextInput<HTMLSelectElement>(
     initialState.campaignId
   );
 
   const nameError = state.errorState?.fieldErrors?.name?.join(',');
-  const campaignIdError = state.errorState?.fieldErrors?.campaignId?.join(',');
 
   return (
     <NHSNotifyFormWrapper formId='message-plan' action={action}>
@@ -90,33 +89,38 @@ export function MessagePlanForm({
               <p data-testid='single-campaign-id'>{campaignIds[0]}</p>
             </>
           ) : (
-            <>
+            <NHSNotifyForm.FormGroup htmlFor='campaignId'>
               <Label htmlFor='campaignId' size='s'>
                 {formContent.fields.campaignId.label}
               </Label>
               <HintText>{formContent.fields.campaignId.hintMulti}</HintText>
-              <WarningCallout className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'>
+              <WarningCallout
+                className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'
+                data-testid='campaign-warning-callout'
+              >
                 <WarningCallout.Label>
                   {formContent.fields.campaignId.warningCallout.heading}
                 </WarningCallout.Label>
                 <p>{formContent.fields.campaignId.warningCallout.content}</p>
               </WarningCallout>
-              <Select
+              <NHSNotifyForm.ErrorMessage
+                htmlFor='campaignId'
+                id='campaignId--error-message'
+              />
+              <NHSNotifyForm.Select
                 id='campaignId'
                 name='campaignId'
-                defaultValue={campaignId}
                 onChange={handleCampaignIdChange}
-                error={campaignIdError}
                 data-testid='campaign-id-field'
               >
-                <Select.Option />
+                <option />
                 {campaignIds.map((id) => (
-                  <Select.Option key={id} value={id}>
+                  <option key={id} value={id}>
                     {id}
-                  </Select.Option>
+                  </option>
                 ))}
-              </Select>
-            </>
+              </NHSNotifyForm.Select>
+            </NHSNotifyForm.FormGroup>
           )}
         </div>
       )}
diff --git a/tests/test-team/pages/routing/create-message-plan-page.ts b/tests/test-team/pages/routing/create-message-plan-page.ts
index dcdc5a7d8..e9cdd6248 100644
--- a/tests/test-team/pages/routing/create-message-plan-page.ts
+++ b/tests/test-team/pages/routing/create-message-plan-page.ts
@@ -16,6 +16,8 @@ export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePage {
 
   readonly singleCampaignIdElement: Locator;
 
+  readonly warningCalloutElement: Locator;
+
   constructor(page: Page) {
     super(page);
     this.submitButton = page.getByTestId('submit-button');
@@ -26,6 +28,8 @@ export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePage {
     this.nameFieldError = page.locator('#name--error-message');
 
     this.campaignIdFieldError = page.locator('#campaignId--error-message');
+
+    this.warningCalloutElement = page.getByTestId('campaign-warning-callout');
   }
 
   async clickSubmit() {
diff --git a/tests/test-team/pages/template-mgmt-base-page.ts b/tests/test-team/pages/template-mgmt-base-page.ts
index 2acc216a1..5e9c6c698 100644
--- a/tests/test-team/pages/template-mgmt-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-base-page.ts
@@ -44,7 +44,6 @@ export abstract class TemplateMgmtBasePage {
 
   constructor(page: Page) {
     this.page = page;
-
     this.header = page.getByTestId('page-header');
     this.headerLogoLink = page.getByTestId('header-logo-service-link');
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
index 23e35b057..f38883a7e 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
@@ -40,9 +40,9 @@ test.afterAll(async () => {
 
 test.describe('Create Message Plan Page', () => {
   test.describe('with a valid message order', () => {
-    const messageOrder = 'NHSAPP';
-
     test.describe('single campaign client', () => {
+      const messageOrder = 'NHSAPP';
+
       test('creates a message plan and redirects to the edit message plan page for the created message plan', async ({
         page,
       }) => {
@@ -101,115 +101,141 @@ test.describe('Create Message Plan Page', () => {
           'Error: Message plan name too long'
         );
       });
-    });
-  });
 
-  test.describe('client has multiple campaigns', () => {
-    test.use({ storageState: { cookies: [], origins: [] } });
+      test('displays no warning callout', async ({ page }) => {
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
+
+        await createMessagePlanPage.loadPage();
 
-    test.beforeEach(async ({ page }) => {
-      await loginAsUser(userWithMultipleCampaigns, page);
+        await expect(
+          createMessagePlanPage.warningCalloutElement
+        ).not.toBeAttached();
+      });
     });
 
-    test('creates a message plan and redirects to the edit message plan page for the created message plan', async ({
-      page,
-    }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-        page
-      ).setSearchParam('messageOrder', 'NHSAPP');
+    test.describe('client has multiple campaigns', () => {
+      test.use({ storageState: { cookies: [], origins: [] } });
 
-      await createMessagePlanPage.loadPage();
+      test.beforeEach(async ({ page }) => {
+        await loginAsUser(userWithMultipleCampaigns, page);
+      });
 
-      await createMessagePlanPage.nameField.fill('My Message Plan');
+      test('creates a message plan and redirects to the edit message plan page for the created message plan', async ({
+        page,
+      }) => {
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', 'NHSAPP');
 
-      await expect(createMessagePlanPage.singleCampaignIdElement).toHaveCount(
-        0
-      );
+        await createMessagePlanPage.loadPage();
 
-      await createMessagePlanPage.campaignIdSelector.selectOption(
-        userWithMultipleCampaigns.campaignIds?.at(0) as string
-      );
+        await createMessagePlanPage.nameField.fill('My Message Plan');
 
-      await createMessagePlanPage.clickSubmit();
+        await expect(createMessagePlanPage.singleCampaignIdElement).toHaveCount(
+          0
+        );
 
-      await expect(page).toHaveURL(editMessagePlanRegexp);
+        await createMessagePlanPage.campaignIdSelector.selectOption(
+          userWithMultipleCampaigns.campaignIds?.at(0) as string
+        );
 
-      const urlParts = page.url().match(editMessagePlanRegexp);
+        await createMessagePlanPage.clickSubmit();
 
-      routingConfigStorageHelper.addAdHocKey({
-        id: urlParts![1],
-        clientId: userWithMultipleCampaigns.clientId,
-      });
-    });
+        await expect(page).toHaveURL(editMessagePlanRegexp);
 
-    test('displays error if campaign id is not selected', async ({ page }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-        page
-      ).setSearchParam('messageOrder', 'NHSAPP');
+        const urlParts = page.url().match(editMessagePlanRegexp);
 
-      await createMessagePlanPage.loadPage();
+        routingConfigStorageHelper.addAdHocKey({
+          id: urlParts![1],
+          clientId: userWithMultipleCampaigns.clientId,
+        });
+      });
 
-      await createMessagePlanPage.nameField.fill('My Message Plan');
+      test('displays error if campaign id is not selected', async ({
+        page,
+      }) => {
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', 'NHSAPP');
 
-      await createMessagePlanPage.clickSubmit();
+        await createMessagePlanPage.loadPage();
 
-      await expect(createMessagePlanPage.campaignIdFieldError).toHaveText(
-        'Error: Select a campaign'
-      );
-    });
-  });
+        await createMessagePlanPage.nameField.fill('My Message Plan');
 
-  test.describe('client has no campaign id', () => {
-    test.use({ storageState: { cookies: [], origins: [] } });
+        await createMessagePlanPage.clickSubmit();
 
-    test.beforeEach(async ({ page }) => {
-      await loginAsUser(userWithoutCampaignId, page);
-    });
+        await expect(createMessagePlanPage.campaignIdFieldError).toHaveText(
+          'Error: Select a campaign'
+        );
+      });
 
-    test('redirects to invalid config page', async ({ baseURL, page }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-        page
-      ).setSearchParam('messageOrder', 'NHSAPP');
+      test('displays edit campaign warning callout', async ({ page }) => {
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', 'NHSAPP');
 
-      await createMessagePlanPage.loadPage();
+        await createMessagePlanPage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/campaign-id-required`
-      );
+        await expect(
+          createMessagePlanPage.warningCalloutElement
+        ).toBeAttached();
+      });
     });
-  });
 
-  for (const { messageOrder } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
-    test.describe(`with the messageOrder query parameter set to ${messageOrder}`, () => {
-      test('common page tests', async ({ page, baseURL }) => {
+    test.describe('client has no campaign id', () => {
+      test.use({ storageState: { cookies: [], origins: [] } });
+
+      test.beforeEach(async ({ page }) => {
+        await loginAsUser(userWithoutCampaignId, page);
+      });
+
+      test('redirects to invalid config page', async ({ baseURL, page }) => {
         const createMessagePlanPage = new RoutingCreateMessagePlanPage(
           page
-        ).setSearchParam('messageOrder', messageOrder);
+        ).setSearchParam('messageOrder', 'NHSAPP');
 
         await createMessagePlanPage.loadPage();
 
         await expect(page).toHaveURL(
-          `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(messageOrder)}`
+          `${baseURL}/templates/message-plans/campaign-id-required`
         );
-        await expect(createMessagePlanPage.pageHeading).toHaveText(
-          'Create a message plan'
-        );
-
-        const props = {
-          page: createMessagePlanPage,
-          baseURL,
-          expectedUrl: 'templates/message-plans/choose-message-order',
-        };
-
-        await assertSkipToMainContent(props);
-        await assertHeaderLogoLink(props);
-        await assertFooterLinks(props);
-        await assertSignOutLink(props);
-        await assertBackLinkTopNotPresent(props);
-        await assertAndClickBackLinkBottom(props);
       });
     });
 
+    for (const { messageOrder } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
+      test.describe(`with the messageOrder query parameter set to ${messageOrder}`, () => {
+        test('common page tests', async ({ page, baseURL }) => {
+          const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+            page
+          ).setSearchParam('messageOrder', messageOrder);
+
+          await createMessagePlanPage.loadPage();
+
+          await expect(page).toHaveURL(
+            `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(messageOrder)}`
+          );
+          await expect(createMessagePlanPage.pageHeading).toHaveText(
+            'Create a message plan'
+          );
+
+          const props = {
+            page: createMessagePlanPage,
+            baseURL,
+            expectedUrl: 'templates/message-plans/choose-message-order',
+          };
+
+          await assertSkipToMainContent(props);
+          await assertHeaderLogoLink(props);
+          await assertFooterLinks(props);
+          await assertSignOutLink(props);
+          await assertBackLinkTopNotPresent(props);
+          await assertAndClickBackLinkBottom(props);
+        });
+      });
+  });
+
   test.describe('with no messageOrder query parameter set', () => {
     test('redirects to message order page', async ({ page, baseURL }) => {
       const createMessagePlanPage = new RoutingCreateMessagePlanPage(page);

From a67ecb6f1130160f327d4364432c83c5ffabeaea Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Fri, 24 Apr 2026 10:13:28 +0100
Subject: [PATCH 06/11] Update lockfile from main

---
 package-lock.json | 691 ++++++----------------------------------------
 1 file changed, 88 insertions(+), 603 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index af40aefa2..740d5befa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1848,7 +1848,6 @@
       "integrity": "sha512-UwdbJbOrgnOxZbshaNZ4DzX35h5wQd33MNYTGzWhN3ORG9lG9KQbDX6l6tDJSAdaGTktJoZPSritmUoW1rYkRA==",
       "license": "Apache-2.0",
       "dependencies": {
-<<<<<<< HEAD
         "@aws-sdk/core": "^3.974.3",
         "@aws-sdk/credential-provider-env": "^3.972.29",
         "@aws-sdk/credential-provider-http": "^3.972.31",
@@ -1856,33 +1855,6 @@
         "@aws-sdk/credential-provider-process": "^3.972.29",
         "@aws-sdk/credential-provider-sso": "^3.972.33",
         "@aws-sdk/credential-provider-web-identity": "^3.972.33",
-=======
-        "@aws-sdk/core": "3.911.0",
-        "@aws-sdk/credential-provider-env": "3.911.0",
-        "@aws-sdk/credential-provider-http": "3.911.0",
-        "@aws-sdk/credential-provider-process": "3.911.0",
-        "@aws-sdk/credential-provider-sso": "3.911.0",
-        "@aws-sdk/credential-provider-web-identity": "3.911.0",
-        "@aws-sdk/nested-clients": "3.911.0",
-        "@aws-sdk/types": "3.910.0",
-        "@smithy/credential-provider-imds": "^4.2.2",
-        "@smithy/property-provider": "^4.2.2",
-        "@smithy/shared-ini-file-loader": "^4.3.2",
-        "@smithy/types": "^4.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.33",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.33.tgz",
-      "integrity": "sha512-WyZuPVoDM1HGNl41eVg8HSSXIB+FGkuuK63GhDbh4TMdfWU03AciWvF/QqOVWvJtWVYaLddANJ+aUklVr2ieuw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.974.3",
->>>>>>> 54ab5db8 (lockfile)
         "@aws-sdk/nested-clients": "^3.997.1",
         "@aws-sdk/types": "^3.973.8",
         "@smithy/credential-provider-imds": "^4.2.14",
@@ -1895,17 +1867,10 @@
         "node": ">=20.0.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": {
       "version": "3.973.8",
       "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
       "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
-=======
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.974.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.3.tgz",
-      "integrity": "sha512-W3aJJm2clu8OmsrwMOMnfof13O6LGnbknnZIQeSRbxjqKah2nVvkjbUBBZVhWrt08KC69H7WsINTdrxC/2SXQw==",
->>>>>>> 54ab5db8 (lockfile)
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.14.1",
@@ -1924,170 +1889,9 @@
         "@aws-sdk/core": "^3.974.3",
         "@aws-sdk/nested-clients": "^3.997.1",
         "@aws-sdk/types": "^3.973.8",
-<<<<<<< HEAD
         "@smithy/property-provider": "^4.2.14",
         "@smithy/protocol-http": "^5.3.14",
         "@smithy/shared-ini-file-loader": "^4.4.9",
-=======
-        "@aws-sdk/xml-builder": "^3.972.18",
-        "@smithy/core": "^3.23.16",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/property-provider": "^4.2.14",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/signature-v4": "^5.3.14",
-        "@smithy/smithy-client": "^4.12.12",
-        "@smithy/types": "^4.14.1",
-        "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-retry": "^4.3.3",
-        "@smithy/util-utf8": "^4.2.2",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
-      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/types": "^4.14.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
-      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/types": "^4.14.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
-      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/types": "^4.14.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.33",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.33.tgz",
-      "integrity": "sha512-mqtT3Fo7xanWMk2SbAcKLGGI/q1GHWNrExBj7cnWP2W2mkTMheXB4ntJvwPZ1UxPrQobrsv2dWFXmaOJeSOiDg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.974.3",
-        "@aws-sdk/types": "^3.973.8",
-        "@aws-sdk/util-endpoints": "^3.996.8",
-        "@smithy/core": "^3.23.16",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/types": "^4.14.1",
-        "@smithy/util-retry": "^4.3.3",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.997.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.1.tgz",
-      "integrity": "sha512-Afc9hc2WZs3X4Jb8dnxyuYiZsLoWRO51roTCRf497gPnAKN2WRdXANu1vaVCTzwnDMOYFXb/cYv4ZSjxqAqcKA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.974.3",
-        "@aws-sdk/middleware-host-header": "^3.972.10",
-        "@aws-sdk/middleware-logger": "^3.972.10",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.11",
-        "@aws-sdk/middleware-user-agent": "^3.972.33",
-        "@aws-sdk/region-config-resolver": "^3.972.13",
-        "@aws-sdk/signature-v4-multi-region": "^3.996.20",
-        "@aws-sdk/types": "^3.973.8",
-        "@aws-sdk/util-endpoints": "^3.996.8",
-        "@aws-sdk/util-user-agent-browser": "^3.972.10",
-        "@aws-sdk/util-user-agent-node": "^3.973.19",
-        "@smithy/config-resolver": "^4.4.17",
-        "@smithy/core": "^3.23.16",
-        "@smithy/fetch-http-handler": "^5.3.17",
-        "@smithy/hash-node": "^4.2.14",
-        "@smithy/invalid-dependency": "^4.2.14",
-        "@smithy/middleware-content-length": "^4.2.14",
-        "@smithy/middleware-endpoint": "^4.4.31",
-        "@smithy/middleware-retry": "^4.5.4",
-        "@smithy/middleware-serde": "^4.2.19",
-        "@smithy/middleware-stack": "^4.2.14",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/node-http-handler": "^4.6.0",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/smithy-client": "^4.12.12",
-        "@smithy/types": "^4.14.1",
-        "@smithy/url-parser": "^4.2.14",
-        "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-body-length-browser": "^4.2.2",
-        "@smithy/util-body-length-node": "^4.2.3",
-        "@smithy/util-defaults-mode-browser": "^4.3.48",
-        "@smithy/util-defaults-mode-node": "^4.2.53",
-        "@smithy/util-endpoints": "^3.4.2",
-        "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-retry": "^4.3.3",
-        "@smithy/util-utf8": "^4.2.2",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.13.tgz",
-      "integrity": "sha512-CvJ2ZIjK/jVD/lbOpowBVElJyC1YxLTIJ13yM0AEo0t2v7swOzGjSA6lJGH+DwZXQhcjUjoYwc8bVYCX5MDr1A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/config-resolver": "^4.4.17",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/types": "^4.14.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/signature-v4-multi-region": {
-      "version": "3.996.20",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.20.tgz",
-      "integrity": "sha512-MEj6DhEcaO8RgVtFCJ+xpCQnZC3Iesr09avdY75qkMQfckQULu447IegK7Rs1MCGerVBfKnJQ4q+pQq9hI5lng==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/middleware-sdk-s3": "^3.972.32",
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/signature-v4": "^5.3.14",
->>>>>>> 54ab5db8 (lockfile)
         "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
@@ -2108,105 +1912,6 @@
         "node": ">=20.0.0"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.996.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.8.tgz",
-      "integrity": "sha512-oOZHcRDihk5iEe5V25NVWg45b3qEA8OpHWVdU/XQh8Zj4heVPAJqWvMphQnU7LkufmUo10EpvFPZuQMiFLJK3g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/types": "^4.14.1",
-        "@smithy/url-parser": "^4.2.14",
-        "@smithy/util-endpoints": "^3.4.2",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.10.tgz",
-      "integrity": "sha512-FAzqXvfEssGdSIz8ejatan0bOdx1qefBWKF/gWmVBXIP1HkS7v/wjjaqrAGGKvyihrXTXW00/2/1nTJtxpXz7g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/types": "^4.14.1",
-        "bowser": "^2.11.0",
-        "tslib": "^2.6.2"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.19",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.19.tgz",
-      "integrity": "sha512-ZAfHjpzdbrzkAftC139JoYGfXzDh5HY+AxRzw8pGJ8cULsf+l721sKAMK8mV5NvRETaW/BwghSwQhGgoNgrxMw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.33",
-        "@aws-sdk/types": "^3.973.8",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/types": "^4.14.1",
-        "@smithy/util-config-provider": "^4.2.2",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      },
-      "peerDependencies": {
-        "aws-crt": ">=1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "aws-crt": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.18",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.18.tgz",
-      "integrity": "sha512-BMDNVG1ETXRhl1tnisQiYBef3RShJ1kfZA7x7afivTFMLirfHNTb6U71K569HNXhSXbQZsweHvSDZ6euBw8hPA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.14.1",
-        "fast-xml-parser": "5.5.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws/lambda-invoke-store": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.4.tgz",
-      "integrity": "sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/fast-xml-parser": {
-      "version": "5.5.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz",
-      "integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "fast-xml-builder": "^1.1.4",
-        "path-expression-matcher": "^1.1.3",
-        "strnum": "^2.1.2"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
->>>>>>> 54ab5db8 (lockfile)
     "node_modules/@aws-sdk/credential-provider-node": {
       "version": "3.972.34",
       "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.34.tgz",
@@ -2487,68 +2192,51 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.29",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.29.tgz",
-      "integrity": "sha512-OGOslTbOlxXexKMqhxCEbBQbUIfuhGxU5UXw3Fm56ypXHvrXH4aTt/xb5Y884LOoteP1QST1lVZzHfcTnWhiPQ==",
+    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.27",
-        "@aws-sdk/nested-clients": "^3.996.19",
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/property-provider": "^4.2.13",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/shared-ini-file-loader": "^4.4.8",
-        "@smithy/types": "^4.14.0",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.973.27",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.27.tgz",
-      "integrity": "sha512-CUZ5m8hwMCH6OYI4Li/WgMfIEx10Q2PLI9Y3XOUTPGZJ53aZ0007jCv+X/ywsaERyKPdw5MRZWk877roQksQ4A==",
+    "node_modules/@aws-sdk/middleware-host-header": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz",
+      "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@aws-sdk/xml-builder": "^3.972.17",
-        "@smithy/core": "^3.23.14",
-        "@smithy/node-config-provider": "^4.3.13",
-        "@smithy/property-provider": "^4.2.13",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/signature-v4": "^5.3.13",
-        "@smithy/smithy-client": "^4.12.9",
-        "@smithy/types": "^4.14.0",
-        "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-middleware": "^4.2.13",
-        "@smithy/util-utf8": "^4.2.2",
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.9.tgz",
-      "integrity": "sha512-je5vRdNw4SkuTnmRbFZLdye4sQ0faLt8kwka5wnnSU30q1mHO4X+idGEJOOE+Tn1ME7Oryn05xxkDvIb3UaLaQ==",
+    "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/types": "^4.14.0",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.9.tgz",
-      "integrity": "sha512-HsVgDrruhqI28RkaXALm8grJ7Agc1wF6Et0xh6pom8NdO2VdO/SD9U/tPwUjewwK/pVoka+EShBxyCvgsPCtog==",
+    "node_modules/@aws-sdk/middleware-location-constraint": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.10.tgz",
+      "integrity": "sha512-rI3NZvJcEvjoD0+0PI0iUAwlPw2IlSlhyvgBK/3WkKJQE/YiKFedd9dMN2lVacdNxPNhxL/jzQaKQdrGtQagjQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.8",
@@ -2559,112 +2247,55 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.10.tgz",
-      "integrity": "sha512-RVQQbq5orQ/GHUnXvqEOj2HHPBJm+mM+ySwZKS5UaLBwra5ugRtiH09PLUoOZRl7a1YzaOzXSuGbn9iD5j60WQ==",
+    "node_modules/@aws-sdk/middleware-location-constraint/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/types": "^4.14.0",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.29",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.29.tgz",
-      "integrity": "sha512-f/sIRzuTfEjg6NsbMYvye2VsmnQoNgntntleQyx5uGacUYzszbfIlO3GcI6G6daWUmTm0IDZc11qMHWwF0o0mQ==",
+    "node_modules/@aws-sdk/middleware-logger": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz",
+      "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.27",
-        "@aws-sdk/types": "^3.973.7",
-        "@aws-sdk/util-endpoints": "^3.996.6",
-        "@smithy/core": "^3.23.14",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/types": "^4.14.0",
-        "@smithy/util-retry": "^4.3.0",
+        "@aws-sdk/types": "^3.973.8",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.19",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.19.tgz",
-      "integrity": "sha512-uFkmCDXvmQYLanlYdOFS0+MQWkrj9wPMt/ZCc/0J0fjPim6F5jBVBmEomvGY/j77ILW6GTPwN22Jc174Mhkw6Q==",
+    "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.27",
-        "@aws-sdk/middleware-host-header": "^3.972.9",
-        "@aws-sdk/middleware-logger": "^3.972.9",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.10",
-        "@aws-sdk/middleware-user-agent": "^3.972.29",
-        "@aws-sdk/region-config-resolver": "^3.972.11",
-        "@aws-sdk/types": "^3.973.7",
-        "@aws-sdk/util-endpoints": "^3.996.6",
-        "@aws-sdk/util-user-agent-browser": "^3.972.9",
-        "@aws-sdk/util-user-agent-node": "^3.973.15",
-        "@smithy/config-resolver": "^4.4.14",
-        "@smithy/core": "^3.23.14",
-        "@smithy/fetch-http-handler": "^5.3.16",
-        "@smithy/hash-node": "^4.2.13",
-        "@smithy/invalid-dependency": "^4.2.13",
-        "@smithy/middleware-content-length": "^4.2.13",
-        "@smithy/middleware-endpoint": "^4.4.29",
-        "@smithy/middleware-retry": "^4.5.0",
-        "@smithy/middleware-serde": "^4.2.17",
-        "@smithy/middleware-stack": "^4.2.13",
-        "@smithy/node-config-provider": "^4.3.13",
-        "@smithy/node-http-handler": "^4.5.2",
-        "@smithy/protocol-http": "^5.3.13",
-        "@smithy/smithy-client": "^4.12.9",
-        "@smithy/types": "^4.14.0",
-        "@smithy/url-parser": "^4.2.13",
-        "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-body-length-browser": "^4.2.2",
-        "@smithy/util-body-length-node": "^4.2.3",
-        "@smithy/util-defaults-mode-browser": "^4.3.45",
-        "@smithy/util-defaults-mode-node": "^4.2.49",
-        "@smithy/util-endpoints": "^3.3.4",
-        "@smithy/util-middleware": "^4.2.13",
-        "@smithy/util-retry": "^4.3.0",
-        "@smithy/util-utf8": "^4.2.2",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
+    "node_modules/@aws-sdk/middleware-recursion-detection": {
       "version": "3.972.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.11.tgz",
-      "integrity": "sha512-6Q8B1dcx6BBqUTY1Mc/eROKA0FImEEY5VPSd6AGPEUf0ErjExz4snVqa9kNJSoVDV1rKaNf3qrWojgcKW+SdDg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/config-resolver": "^4.4.14",
-        "@smithy/node-config-provider": "^4.3.13",
-        "@smithy/types": "^4.14.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/types": {
-      "version": "3.973.7",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.7.tgz",
-      "integrity": "sha512-reXRwoJ6CfChoqAsBszUYajAF8Z2LRE+CRcKocvFSMpIiLOtYU3aJ9trmn6VVPAzbbY5LXF+FfmUslbXk1SYFg==",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz",
+      "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==",
       "license": "Apache-2.0",
       "dependencies": {
+        "@aws-sdk/types": "^3.973.8",
+        "@aws/lambda-invoke-store": "^0.2.2",
+        "@smithy/protocol-http": "^5.3.14",
         "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
@@ -2672,189 +2303,67 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.996.6",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.6.tgz",
-      "integrity": "sha512-2nUQ+2ih7CShuKHpGSIYvvAIOHy52dOZguYG36zptBukhw6iFwcvGfG0tes0oZFWQqEWvgZe9HLWaNlvXGdOrg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/types": "^4.14.0",
-        "@smithy/url-parser": "^4.2.13",
-        "@smithy/util-endpoints": "^3.3.4",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.9.tgz",
-      "integrity": "sha512-sn/LMzTbGjYqCCF24390WxPd6hkpoSptiUn5DzVp4cD71yqw+yGEGm1YCxyEoPXyc8qciM8UzLJcZBFslxo5Uw==",
+    "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/types": "^4.14.0",
-        "bowser": "^2.11.0",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.15",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.15.tgz",
-      "integrity": "sha512-fYn3s9PtKdgQkczGZCFMgkNEe8aq1JCVbnRqjqN9RSVW43xn2RV9xdcZ3z01a48Jpkuh/xCmBKJxdLOo4Ozg7w==",
+    "node_modules/@aws-sdk/middleware-sdk-s3": {
+      "version": "3.972.32",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.32.tgz",
+      "integrity": "sha512-dc2O2x0V5pGJhmdQYQveUIFtMZsur7GrGuSgoKM4oQJuEcfvwnJ3sj+ip6WnxR5l6TrX5zkl4KgcgswOy3wAzQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.29",
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/node-config-provider": "^4.3.13",
-        "@smithy/types": "^4.14.0",
+        "@aws-sdk/core": "^3.974.3",
+        "@aws-sdk/types": "^3.973.8",
+        "@aws-sdk/util-arn-parser": "^3.972.3",
+        "@smithy/core": "^3.23.16",
+        "@smithy/node-config-provider": "^4.3.14",
+        "@smithy/protocol-http": "^5.3.14",
+        "@smithy/signature-v4": "^5.3.14",
+        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/types": "^4.14.1",
         "@smithy/util-config-provider": "^4.2.2",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      },
-      "peerDependencies": {
-        "aws-crt": ">=1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "aws-crt": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.17",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.17.tgz",
-      "integrity": "sha512-Ra7hjqAZf1OXRRMueB13qex7mFJRDK/pgCvdSFemXBT8KCGnQDPoKzHY1SjN+TjJVmnpSF14W5tJ1vDamFu+Gg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.14.0",
-        "fast-xml-parser": "5.5.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-<<<<<<< HEAD
-    "node_modules/@aws-sdk/middleware-ssec/node_modules/@aws-sdk/types": {
-=======
-    "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/fast-xml-parser": {
-      "version": "5.5.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.6.tgz",
-      "integrity": "sha512-3+fdZyBRVg29n4rXP0joHthhcHdPUHaIC16cuyyd1iLsuaO6Vea36MPrxgAzbZna8lhvZeRL8Bc9GP56/J9xEw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "fast-xml-builder": "^1.1.4",
-        "path-expression-matcher": "^1.1.3",
-        "strnum": "^2.1.2"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.910.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.910.0.tgz",
-      "integrity": "sha512-F9Lqeu80/aTM6S/izZ8RtwSmjfhWjIuxX61LX+/9mxJyEkgaECRxv0chsLQsLHJumkGnXRy/eIyMLBhcTPF5vg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "3.910.0",
-        "@smithy/protocol-http": "^5.3.2",
-        "@smithy/types": "^4.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-location-constraint": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.972.9.tgz",
-      "integrity": "sha512-TyfOi2XNdOZpNKeTJwRUsVAGa+14nkyMb2VVGG+eDgcWG/ed6+NUo72N3hT6QJioxym80NSinErD+LBRF0Ir1w==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.7",
-        "@smithy/types": "^4.14.0",
+        "@smithy/util-middleware": "^4.2.14",
+        "@smithy/util-stream": "^4.5.24",
+        "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-location-constraint/node_modules/@aws-sdk/types": {
-      "version": "3.973.7",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.7.tgz",
-      "integrity": "sha512-reXRwoJ6CfChoqAsBszUYajAF8Z2LRE+CRcKocvFSMpIiLOtYU3aJ9trmn6VVPAzbbY5LXF+FfmUslbXk1SYFg==",
+    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/types": {
+      "version": "3.973.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
+      "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.14.0",
+        "@smithy/types": "^4.14.1",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.910.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.910.0.tgz",
-      "integrity": "sha512-3LJyyfs1USvRuRDla1pGlzGRtXJBXD1zC9F+eE9Iz/V5nkmhyv52A017CvKWmYoR0DM9dzjLyPOI0BSSppEaTw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "3.910.0",
-        "@smithy/types": "^4.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.910.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.910.0.tgz",
-      "integrity": "sha512-m/oLz0EoCy+WoIVBnXRXJ4AtGpdl0kPE7U+VH9TsuUzHgxY1Re/176Q1HWLBRVlz4gr++lNsgsMWEC+VnAwMpw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "3.910.0",
-        "@aws/lambda-invoke-store": "^0.0.1",
-        "@smithy/protocol-http": "^5.3.2",
-        "@smithy/types": "^4.7.1",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.972.32",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.32.tgz",
-      "integrity": "sha512-dc2O2x0V5pGJhmdQYQveUIFtMZsur7GrGuSgoKM4oQJuEcfvwnJ3sj+ip6WnxR5l6TrX5zkl4KgcgswOy3wAzQ==",
+    "node_modules/@aws-sdk/middleware-sdk-sqs": {
+      "version": "3.972.20",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sqs/-/middleware-sdk-sqs-3.972.20.tgz",
+      "integrity": "sha512-yt0w5FKyH8Or7OT/Bp3fDRAtI4/f6uaaRKnW9TmU9qv8c1HFh43C9nQYZ26IcyRm+tYFdrB65yNTav/YThu36A==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.974.3",
         "@aws-sdk/types": "^3.973.8",
-        "@aws-sdk/util-arn-parser": "^3.972.3",
-        "@smithy/core": "^3.23.16",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/signature-v4": "^5.3.14",
-        "@smithy/smithy-client": "^4.12.12",
+        "@smithy/smithy-client": "^4.12.11",
         "@smithy/types": "^4.14.1",
-        "@smithy/util-config-provider": "^4.2.2",
-        "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-stream": "^4.5.24",
+        "@smithy/util-hex-encoding": "^4.2.2",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -2862,33 +2371,21 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/core": {
-      "version": "3.974.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.3.tgz",
-      "integrity": "sha512-W3aJJm2clu8OmsrwMOMnfof13O6LGnbknnZIQeSRbxjqKah2nVvkjbUBBZVhWrt08KC69H7WsINTdrxC/2SXQw==",
+    "node_modules/@aws-sdk/middleware-ssec": {
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.972.10.tgz",
+      "integrity": "sha512-Gli9A0u8EVVb+5bFDGS/QbSVg28w/wpEidg1ggVcSj65BDTdGR6punsOcVjqdiu1i42WHWo51MCvARPIIz9juw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.8",
-        "@aws-sdk/xml-builder": "^3.972.18",
-        "@smithy/core": "^3.23.16",
-        "@smithy/node-config-provider": "^4.3.14",
-        "@smithy/property-provider": "^4.2.14",
-        "@smithy/protocol-http": "^5.3.14",
-        "@smithy/signature-v4": "^5.3.14",
-        "@smithy/smithy-client": "^4.12.12",
         "@smithy/types": "^4.14.1",
-        "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-middleware": "^4.2.14",
-        "@smithy/util-retry": "^4.3.3",
-        "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/types": {
->>>>>>> 54ab5db8 (lockfile)
+    "node_modules/@aws-sdk/middleware-ssec/node_modules/@aws-sdk/types": {
       "version": "3.973.8",
       "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz",
       "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==",
@@ -3104,10 +2601,10 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.911.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.911.0.tgz",
-      "integrity": "sha512-rY3LvGvgY/UI0nmt5f4DRzjEh8135A2TeHcva1bgOmVfOI4vkkGfA20sNRqerOkSO6hPbkxJapO50UJHFzmmyA==",
+    "node_modules/@aws-sdk/token-providers": {
+      "version": "3.1034.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1034.0.tgz",
+      "integrity": "sha512-8E+KGcD4ET0H9FXJ2/ZWbfFnQNYEkTZZYJxAs1lkdJlve1AYuqaydInIFfvNgoz5GbYtzbK8/ugsSMu5wPm6kA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/core": "^3.974.3",
@@ -3148,10 +2645,10 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@aws-sdk/token-providers": {
-      "version": "3.911.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.911.0.tgz",
-      "integrity": "sha512-O1c5F1pbEImgEe3Vr8j1gpWu69UXWj3nN3vvLGh77hcrG5dZ8I27tSP5RN4Labm8Dnji/6ia+vqSYpN8w6KN5A==",
+    "node_modules/@aws-sdk/util-arn-parser": {
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
+      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -3175,18 +2672,6 @@
         "@aws-sdk/client-dynamodb": "^3.995.0"
       }
     },
-    "node_modules/@aws-sdk/util-arn-parser": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz",
-      "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
     "node_modules/@aws-sdk/util-endpoints": {
       "version": "3.910.0",
       "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.910.0.tgz",

From e939f21af43c042c038b5d2233469e08eaf22610 Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Fri, 24 Apr 2026 10:55:30 +0100
Subject: [PATCH 07/11] Update campaign id aria attributes

---
 .../create-message-plan/__snapshots__/page.test.tsx.snap  | 8 ++++++++
 .../MessagePlan/__snapshots__/MessagePlan.test.tsx.snap   | 8 ++++++++
 .../components/forms/MessagePlanForm/MessagePlanForm.tsx  | 8 ++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
index e9a258547..d3e0fca6d 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
@@ -158,11 +158,13 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                 <label
                   class="nhsuk-label nhsuk-label--s"
                   for="campaignId"
+                  id="campaignId--label"
                 >
                   Campaign
                 </label>
                 <div
                   class="nhsuk-hint"
+                  id="campaignId--hint"
                 >
                   Choose which campaign this message plan will link to
                 </div>
@@ -200,6 +202,8 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   Campaign Id Error
                 </span>
                 <select
+                  aria-describedby="campaignId--hint campaignId--error-message"
+                  aria-labelledby="campaignId--label"
                   class="nhsuk-select nhsuk-select--error"
                   data-testid="campaign-id-field"
                   id="campaignId"
@@ -366,11 +370,13 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
                 <label
                   class="nhsuk-label nhsuk-label--s"
                   for="campaignId"
+                  id="campaignId--label"
                 >
                   Campaign
                 </label>
                 <div
                   class="nhsuk-hint"
+                  id="campaignId--hint"
                 >
                   Choose which campaign this message plan will link to
                 </div>
@@ -397,6 +403,8 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
                   </p>
                 </div>
                 <select
+                  aria-describedby="campaignId--hint campaignId--error-message"
+                  aria-labelledby="campaignId--label"
                   class="nhsuk-select"
                   data-testid="campaign-id-field"
                   id="campaignId"
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index 14b0d550d..038343bef 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -107,11 +107,13 @@ exports[`renders errors 1`] = `
         <label
           class="nhsuk-label nhsuk-label--s"
           for="campaignId"
+          id="campaignId--label"
         >
           Campaign
         </label>
         <div
           class="nhsuk-hint"
+          id="campaignId--hint"
         >
           Choose which campaign this message plan will link to
         </div>
@@ -138,6 +140,8 @@ exports[`renders errors 1`] = `
           </p>
         </div>
         <select
+          aria-describedby="campaignId--hint campaignId--error-message"
+          aria-labelledby="campaignId--label"
           class="nhsuk-select"
           data-testid="campaign-id-field"
           id="campaignId"
@@ -415,11 +419,13 @@ exports[`renders form with select for multiple campaign ids 1`] = `
         <label
           class="nhsuk-label nhsuk-label--s"
           for="campaignId"
+          id="campaignId--label"
         >
           Campaign
         </label>
         <div
           class="nhsuk-hint"
+          id="campaignId--hint"
         >
           Choose which campaign this message plan will link to
         </div>
@@ -446,6 +452,8 @@ exports[`renders form with select for multiple campaign ids 1`] = `
           </p>
         </div>
         <select
+          aria-describedby="campaignId--hint campaignId--error-message"
+          aria-labelledby="campaignId--label"
           class="nhsuk-select"
           data-testid="campaign-id-field"
           id="campaignId"
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index 3d289403f..d75701d82 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -90,10 +90,12 @@ export function MessagePlanForm({
             </>
           ) : (
             <NHSNotifyForm.FormGroup htmlFor='campaignId'>
-              <Label htmlFor='campaignId' size='s'>
+              <Label htmlFor='campaignId' id='campaignId--label' size='s'>
                 {formContent.fields.campaignId.label}
               </Label>
-              <HintText>{formContent.fields.campaignId.hintMulti}</HintText>
+              <HintText id='campaignId--hint'>
+                {formContent.fields.campaignId.hintMulti}
+              </HintText>
               <WarningCallout
                 className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'
                 data-testid='campaign-warning-callout'
@@ -112,6 +114,8 @@ export function MessagePlanForm({
                 name='campaignId'
                 onChange={handleCampaignIdChange}
                 data-testid='campaign-id-field'
+                aria-describedby='campaignId--hint campaignId--error-message'
+                aria-labelledby='campaignId--label'
               >
                 <option />
                 {campaignIds.map((id) => (

From 1ce61b411e0bde9c40afd04640458bd6f75ebae6 Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Fri, 24 Apr 2026 11:59:39 +0100
Subject: [PATCH 08/11] Remove unused campaign id state

---
 .../src/components/forms/MessagePlanForm/MessagePlanForm.tsx  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index d75701d82..146c0084c 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -36,9 +36,6 @@ export function MessagePlanForm({
   const [name, handleNameChange] = useTextInput<HTMLInputElement>(
     initialState.name
   );
-  const [_, handleCampaignIdChange] = useTextInput<HTMLSelectElement>(
-    initialState.campaignId
-  );
 
   const nameError = state.errorState?.fieldErrors?.name?.join(',');
 
@@ -112,7 +109,6 @@ export function MessagePlanForm({
               <NHSNotifyForm.Select
                 id='campaignId'
                 name='campaignId'
-                onChange={handleCampaignIdChange}
                 data-testid='campaign-id-field'
                 aria-describedby='campaignId--hint campaignId--error-message'
                 aria-labelledby='campaignId--label'

From eb48072a6c8d3e1531ece41be6a79e6c400a45cb Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Fri, 24 Apr 2026 12:27:40 +0100
Subject: [PATCH 09/11] Consolidate warning assertions into existing tests

---
 ...ate-message-plan.routing-component.spec.ts | 102 ++++++++----------
 1 file changed, 44 insertions(+), 58 deletions(-)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
index f38883a7e..0cbf7f143 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
@@ -40,9 +40,9 @@ test.afterAll(async () => {
 
 test.describe('Create Message Plan Page', () => {
   test.describe('with a valid message order', () => {
-    test.describe('single campaign client', () => {
-      const messageOrder = 'NHSAPP';
+    const messageOrder = 'NHSAPP';
 
+    test.describe('single campaign client', () => {
       test('creates a message plan and redirects to the edit message plan page for the created message plan', async ({
         page,
       }) => {
@@ -60,6 +60,11 @@ test.describe('Create Message Plan Page', () => {
 
         await expect(createMessagePlanPage.campaignIdSelector).toHaveCount(0);
 
+        await expect(
+          createMessagePlanPage.warningCalloutElement,
+          'No warning callout is displayed'
+        ).not.toBeAttached();
+
         await createMessagePlanPage.clickSubmit();
 
         await expect(page).toHaveURL(editMessagePlanRegexp);
@@ -101,18 +106,6 @@ test.describe('Create Message Plan Page', () => {
           'Error: Message plan name too long'
         );
       });
-
-      test('displays no warning callout', async ({ page }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-          page
-        ).setSearchParam('messageOrder', messageOrder);
-
-        await createMessagePlanPage.loadPage();
-
-        await expect(
-          createMessagePlanPage.warningCalloutElement
-        ).not.toBeAttached();
-      });
     });
 
     test.describe('client has multiple campaigns', () => {
@@ -127,7 +120,7 @@ test.describe('Create Message Plan Page', () => {
       }) => {
         const createMessagePlanPage = new RoutingCreateMessagePlanPage(
           page
-        ).setSearchParam('messageOrder', 'NHSAPP');
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -141,6 +134,11 @@ test.describe('Create Message Plan Page', () => {
           userWithMultipleCampaigns.campaignIds?.at(0) as string
         );
 
+        await expect(
+          createMessagePlanPage.warningCalloutElement,
+          'Warning callout is displayed'
+        ).toBeAttached();
+
         await createMessagePlanPage.clickSubmit();
 
         await expect(page).toHaveURL(editMessagePlanRegexp);
@@ -158,7 +156,7 @@ test.describe('Create Message Plan Page', () => {
       }) => {
         const createMessagePlanPage = new RoutingCreateMessagePlanPage(
           page
-        ).setSearchParam('messageOrder', 'NHSAPP');
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -170,18 +168,6 @@ test.describe('Create Message Plan Page', () => {
           'Error: Select a campaign'
         );
       });
-
-      test('displays edit campaign warning callout', async ({ page }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-          page
-        ).setSearchParam('messageOrder', 'NHSAPP');
-
-        await createMessagePlanPage.loadPage();
-
-        await expect(
-          createMessagePlanPage.warningCalloutElement
-        ).toBeAttached();
-      });
     });
 
     test.describe('client has no campaign id', () => {
@@ -203,38 +189,38 @@ test.describe('Create Message Plan Page', () => {
         );
       });
     });
+  });
 
-    for (const { messageOrder } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
-      test.describe(`with the messageOrder query parameter set to ${messageOrder}`, () => {
-        test('common page tests', async ({ page, baseURL }) => {
-          const createMessagePlanPage = new RoutingCreateMessagePlanPage(
-            page
-          ).setSearchParam('messageOrder', messageOrder);
-
-          await createMessagePlanPage.loadPage();
-
-          await expect(page).toHaveURL(
-            `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(messageOrder)}`
-          );
-          await expect(createMessagePlanPage.pageHeading).toHaveText(
-            'Create a message plan'
-          );
-
-          const props = {
-            page: createMessagePlanPage,
-            baseURL,
-            expectedUrl: 'templates/message-plans/choose-message-order',
-          };
-
-          await assertSkipToMainContent(props);
-          await assertHeaderLogoLink(props);
-          await assertFooterLinks(props);
-          await assertSignOutLink(props);
-          await assertBackLinkTopNotPresent(props);
-          await assertAndClickBackLinkBottom(props);
-        });
+  for (const { messageOrder } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
+    test.describe(`with the messageOrder query parameter set to ${messageOrder}`, () => {
+      test('common page tests', async ({ page, baseURL }) => {
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
+
+        await createMessagePlanPage.loadPage();
+
+        await expect(page).toHaveURL(
+          `${baseURL}/templates/message-plans/create-message-plan?messageOrder=${encodeURIComponent(messageOrder)}`
+        );
+        await expect(createMessagePlanPage.pageHeading).toHaveText(
+          'Create a message plan'
+        );
+
+        const props = {
+          page: createMessagePlanPage,
+          baseURL,
+          expectedUrl: 'templates/message-plans/choose-message-order',
+        };
+
+        await assertSkipToMainContent(props);
+        await assertHeaderLogoLink(props);
+        await assertFooterLinks(props);
+        await assertSignOutLink(props);
+        await assertBackLinkTopNotPresent(props);
+        await assertAndClickBackLinkBottom(props);
       });
-  });
+    });
 
   test.describe('with no messageOrder query parameter set', () => {
     test('redirects to message order page', async ({ page, baseURL }) => {

From 852f364de4ff3e8a114a14c944394d6850ef28f9 Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Mon, 27 Apr 2026 15:05:07 +0100
Subject: [PATCH 10/11] Update callout heading level, update mocked context

---
 .../__snapshots__/page.test.tsx.snap          |   8 +-
 .../forms/MessagePlan/MessagePlan.test.tsx    | 248 +++++++++---------
 .../__snapshots__/MessagePlan.test.tsx.snap   |  31 ++-
 .../forms/MessagePlanForm/MessagePlanForm.tsx |   2 +-
 4 files changed, 151 insertions(+), 138 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
index d3e0fca6d..821fb2528 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
                   data-testid="campaign-warning-callout"
                 >
-                  <h3
+                  <h2
                     class="nhsuk-warning-callout__label"
                   >
                     <span
@@ -185,7 +185,7 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                       </span>
                       Important
                     </span>
-                  </h3>
+                  </h2>
                   <p>
                     You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
                   </p>
@@ -384,7 +384,7 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
                   class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
                   data-testid="campaign-warning-callout"
                 >
-                  <h3
+                  <h2
                     class="nhsuk-warning-callout__label"
                   >
                     <span
@@ -397,7 +397,7 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
                       </span>
                       Important
                     </span>
-                  </h3>
+                  </h2>
                   <p>
                     You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
                   </p>
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx b/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
index b3ca954fb..9994a1ba2 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
+++ b/frontend/src/__tests__/components/forms/MessagePlan/MessagePlan.test.tsx
@@ -6,158 +6,160 @@ import { verifyFormCsrfToken } from '@utils/csrf-utils';
 
 jest.mock('@providers/form-provider');
 const mockAction = jest.fn();
-jest.mocked(useNHSNotifyForm).mockReturnValue([{}, mockAction, false]);
 
 jest.mock('@utils/csrf-utils');
 jest.mocked(verifyFormCsrfToken).mockResolvedValue(true);
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
+describe('Message plan form', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.mocked(useNHSNotifyForm).mockReturnValue([{}, mockAction, false]);
+  });
 
-test('renders form with single campaign id displayed', () => {
-  const container = render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-id']}
-    />
-  );
-  const warningCallout = screen.queryByTestId('campaign-warning-callout');
-
-  expect(container.asFragment()).toMatchSnapshot();
-  expect(warningCallout).not.toBeInTheDocument();
-});
+  test('renders form with single campaign id displayed', () => {
+    const container = render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-id']}
+      />
+    );
+    const warningCallout = screen.queryByTestId('campaign-warning-callout');
+
+    expect(container.asFragment()).toMatchSnapshot();
+    expect(warningCallout).not.toBeInTheDocument();
+  });
 
-test('renders form with select for multiple campaign ids', () => {
-  const container = render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-1', 'campaign-2']}
-    />
-  );
-  const warningCallout = screen.queryByTestId('campaign-warning-callout');
-
-  expect(container.asFragment()).toMatchSnapshot();
-  expect(warningCallout).toBeInTheDocument();
-});
+  test('renders form with select for multiple campaign ids', () => {
+    const container = render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-1', 'campaign-2']}
+      />
+    );
+    const warningCallout = screen.queryByTestId('campaign-warning-callout');
+
+    expect(container.asFragment()).toMatchSnapshot();
+    expect(warningCallout).toBeInTheDocument();
+  });
 
-test('renders form with children', () => {
-  const container = render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-id']}
-    >
-      <input type='hidden' name='messagePlanId' value='abc-123' />
-    </MessagePlanForm>
-  );
-  expect(container.asFragment()).toMatchSnapshot();
-});
+  test('renders form with children', () => {
+    const container = render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-id']}
+      >
+        <input type='hidden' name='messagePlanId' value='abc-123' />
+      </MessagePlanForm>
+    );
+    expect(container.asFragment()).toMatchSnapshot();
+  });
 
-test('renders errors', async () => {
-  jest.mocked(useNHSNotifyForm).mockReturnValueOnce([
-    {
-      errorState: {
-        fieldErrors: {
-          name: ['Name error'],
-          campaignId: ['CampaignId error'],
+  test('renders errors', async () => {
+    jest.mocked(useNHSNotifyForm).mockReturnValue([
+      {
+        errorState: {
+          fieldErrors: {
+            name: ['Name error'],
+            campaignId: ['CampaignId error'],
+          },
         },
       },
-    },
-    jest.fn(),
-    false,
-  ]);
-
-  const container = render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-id', 'campaign-2']}
-    />
-  );
-
-  expect(container.asFragment()).toMatchSnapshot();
-});
+      jest.fn(),
+      false,
+    ]);
+
+    const container = render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-id', 'campaign-2']}
+      />
+    );
+
+    expect(container.asFragment()).toMatchSnapshot();
+  });
 
-test('invokes the action with the form data when the form is submitted - single campaign id', async () => {
-  const user = userEvent.setup();
+  test('invokes the action with the form data when the form is submitted - single campaign id', async () => {
+    const user = userEvent.setup();
 
-  render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-id']}
-    >
-      <input type='hidden' name='messageOrder' value='NHSAPP' />
-    </MessagePlanForm>
-  );
+    render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-id']}
+      >
+        <input type='hidden' name='messageOrder' value='NHSAPP' />
+      </MessagePlanForm>
+    );
 
-  await user.click(screen.getByTestId('name-field'));
+    await user.click(screen.getByTestId('name-field'));
 
-  await user.keyboard('My Message Plan');
+    await user.keyboard('My Message Plan');
 
-  await user.click(screen.getByTestId('submit-button'));
+    await user.click(screen.getByTestId('submit-button'));
 
-  expect(mockAction).toHaveBeenCalledTimes(1);
+    expect(mockAction).toHaveBeenCalledTimes(1);
 
-  expect(mockAction).toHaveBeenLastCalledWith(expect.any(FormData));
+    expect(mockAction).toHaveBeenLastCalledWith(expect.any(FormData));
 
-  const formData = mockAction.mock.lastCall?.at(0) as FormData;
+    const formData = mockAction.mock.lastCall?.at(0) as FormData;
 
-  expect(Object.fromEntries(formData.entries())).toMatchObject({
-    campaignId: 'campaign-id',
-    messageOrder: 'NHSAPP',
-    name: 'My Message Plan',
+    expect(Object.fromEntries(formData.entries())).toMatchObject({
+      campaignId: 'campaign-id',
+      messageOrder: 'NHSAPP',
+      name: 'My Message Plan',
+    });
   });
-});
 
-test('invokes the action with the form data when the form is submitted - multiple campaign id', async () => {
-  const user = userEvent.setup();
+  test('invokes the action with the form data when the form is submitted - multiple campaign id', async () => {
+    const user = userEvent.setup();
 
-  render(
-    <MessagePlanForm
-      backLink={{
-        href: '/message-plans/choose-message-order',
-        text: 'Go back',
-      }}
-      campaignIds={['campaign-id', 'campaign-id-2']}
-    >
-      <input type='hidden' name='messagePlanId' value='abc-123' />
-    </MessagePlanForm>
-  );
+    render(
+      <MessagePlanForm
+        backLink={{
+          href: '/message-plans/choose-message-order',
+          text: 'Go back',
+        }}
+        campaignIds={['campaign-id', 'campaign-id-2']}
+      >
+        <input type='hidden' name='messagePlanId' value='abc-123' />
+      </MessagePlanForm>
+    );
 
-  await user.click(screen.getByTestId('name-field'));
+    await user.click(screen.getByTestId('name-field'));
 
-  await user.keyboard('My Message Plan');
+    await user.keyboard('My Message Plan');
 
-  await user.selectOptions(
-    screen.getByTestId('campaign-id-field'),
-    'campaign-id-2'
-  );
+    await user.selectOptions(
+      screen.getByTestId('campaign-id-field'),
+      'campaign-id-2'
+    );
 
-  await user.click(screen.getByTestId('submit-button'));
+    await user.click(screen.getByTestId('submit-button'));
 
-  expect(mockAction).toHaveBeenCalledTimes(1);
+    expect(mockAction).toHaveBeenCalledTimes(1);
 
-  expect(mockAction).toHaveBeenLastCalledWith(expect.any(FormData));
+    expect(mockAction).toHaveBeenLastCalledWith(expect.any(FormData));
 
-  const formData = mockAction.mock.lastCall?.at(0) as FormData;
+    const formData = mockAction.mock.lastCall?.at(0) as FormData;
 
-  expect(Object.fromEntries(formData.entries())).toMatchObject({
-    campaignId: 'campaign-id-2',
-    messagePlanId: 'abc-123',
-    name: 'My Message Plan',
+    expect(Object.fromEntries(formData.entries())).toMatchObject({
+      campaignId: 'campaign-id-2',
+      messagePlanId: 'abc-123',
+      name: 'My Message Plan',
+    });
   });
 });
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index 038343bef..30042cb14 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`renders errors 1`] = `
+exports[`Message plan form renders errors 1`] = `
 <DocumentFragment>
   <form
     action="javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')"
@@ -102,7 +102,7 @@ exports[`renders errors 1`] = `
       class="nhsuk-form-group nhsuk-u-margin-bottom-6"
     >
       <div
-        class="nhsuk-form-group"
+        class="nhsuk-form-group nhsuk-form-group--error"
       >
         <label
           class="nhsuk-label nhsuk-label--s"
@@ -121,7 +121,7 @@ exports[`renders errors 1`] = `
           class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
           data-testid="campaign-warning-callout"
         >
-          <h3
+          <h2
             class="nhsuk-warning-callout__label"
           >
             <span
@@ -134,15 +134,26 @@ exports[`renders errors 1`] = `
               </span>
               Important
             </span>
-          </h3>
+          </h2>
           <p>
             You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
           </p>
         </div>
+        <span
+          class="nhsuk-error-message"
+          id="campaignId--error-message"
+        >
+          <span
+            class="nhsuk-u-visually-hidden"
+          >
+            Error: 
+          </span>
+          CampaignId error
+        </span>
         <select
           aria-describedby="campaignId--hint campaignId--error-message"
           aria-labelledby="campaignId--label"
-          class="nhsuk-select"
+          class="nhsuk-select nhsuk-select--error"
           data-testid="campaign-id-field"
           id="campaignId"
           name="campaignId"
@@ -184,7 +195,7 @@ exports[`renders errors 1`] = `
 </DocumentFragment>
 `;
 
-exports[`renders form with children 1`] = `
+exports[`Message plan form renders form with children 1`] = `
 <DocumentFragment>
   <form
     action="javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')"
@@ -324,7 +335,7 @@ exports[`renders form with children 1`] = `
 </DocumentFragment>
 `;
 
-exports[`renders form with select for multiple campaign ids 1`] = `
+exports[`Message plan form renders form with select for multiple campaign ids 1`] = `
 <DocumentFragment>
   <form
     action="javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')"
@@ -433,7 +444,7 @@ exports[`renders form with select for multiple campaign ids 1`] = `
           class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
           data-testid="campaign-warning-callout"
         >
-          <h3
+          <h2
             class="nhsuk-warning-callout__label"
           >
             <span
@@ -446,7 +457,7 @@ exports[`renders form with select for multiple campaign ids 1`] = `
               </span>
               Important
             </span>
-          </h3>
+          </h2>
           <p>
             You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
           </p>
@@ -496,7 +507,7 @@ exports[`renders form with select for multiple campaign ids 1`] = `
 </DocumentFragment>
 `;
 
-exports[`renders form with single campaign id displayed 1`] = `
+exports[`Message plan form renders form with single campaign id displayed 1`] = `
 <DocumentFragment>
   <form
     action="javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')"
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index 146c0084c..3de17f42b 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -97,7 +97,7 @@ export function MessagePlanForm({
                 className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'
                 data-testid='campaign-warning-callout'
               >
-                <WarningCallout.Label>
+                <WarningCallout.Label headingLevel='h2'>
                   {formContent.fields.campaignId.warningCallout.heading}
                 </WarningCallout.Label>
                 <p>{formContent.fields.campaignId.warningCallout.content}</p>

From 6b262e83a13d39bfcd88602c9ed01d3768c22428 Mon Sep 17 00:00:00 2001
From: andykay-nhs <andy.kay@nhs.net>
Date: Tue, 28 Apr 2026 10:31:41 +0100
Subject: [PATCH 11/11] Change warning callout label heading to div

---
 .../__snapshots__/page.test.tsx.snap          | 46 +++++++------------
 .../__snapshots__/MessagePlan.test.tsx.snap   | 46 +++++++------------
 .../forms/MessagePlanForm/MessagePlanForm.tsx | 10 ++--
 3 files changed, 38 insertions(+), 64 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
index 821fb2528..5b07cb308 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/__snapshots__/page.test.tsx.snap
@@ -172,21 +172,14 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
                   data-testid="campaign-warning-callout"
                 >
-                  <h2
-                    class="nhsuk-warning-callout__label"
+                  <div
+                    class="nhsuk-warning-callout__label nhsuk-heading-m"
+                  >
+                    Important
+                  </div>
+                  <p
+                    id="campaignId--warning"
                   >
-                    <span
-                      role="text"
-                    >
-                      <span
-                        class="nhsuk-u-visually-hidden"
-                      >
-                        Important: 
-                      </span>
-                      Important
-                    </span>
-                  </h2>
-                  <p>
                     You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
                   </p>
                 </div>
@@ -202,7 +195,7 @@ exports[`CreateMessagePlanPage on submit it invokes the server action and render
                   Campaign Id Error
                 </span>
                 <select
-                  aria-describedby="campaignId--hint campaignId--error-message"
+                  aria-describedby="campaignId--hint campaignId--error-message campaignId--warning"
                   aria-labelledby="campaignId--label"
                   class="nhsuk-select nhsuk-select--error"
                   data-testid="campaign-id-field"
@@ -384,26 +377,19 @@ exports[`CreateMessagePlanPage renders the page 1`] = `
                   class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
                   data-testid="campaign-warning-callout"
                 >
-                  <h2
-                    class="nhsuk-warning-callout__label"
+                  <div
+                    class="nhsuk-warning-callout__label nhsuk-heading-m"
+                  >
+                    Important
+                  </div>
+                  <p
+                    id="campaignId--warning"
                   >
-                    <span
-                      role="text"
-                    >
-                      <span
-                        class="nhsuk-u-visually-hidden"
-                      >
-                        Important: 
-                      </span>
-                      Important
-                    </span>
-                  </h2>
-                  <p>
                     You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
                   </p>
                 </div>
                 <select
-                  aria-describedby="campaignId--hint campaignId--error-message"
+                  aria-describedby="campaignId--hint campaignId--error-message campaignId--warning"
                   aria-labelledby="campaignId--label"
                   class="nhsuk-select"
                   data-testid="campaign-id-field"
diff --git a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
index 30042cb14..330a02f34 100644
--- a/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/MessagePlan/__snapshots__/MessagePlan.test.tsx.snap
@@ -121,21 +121,14 @@ exports[`Message plan form renders errors 1`] = `
           class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
           data-testid="campaign-warning-callout"
         >
-          <h2
-            class="nhsuk-warning-callout__label"
+          <div
+            class="nhsuk-warning-callout__label nhsuk-heading-m"
+          >
+            Important
+          </div>
+          <p
+            id="campaignId--warning"
           >
-            <span
-              role="text"
-            >
-              <span
-                class="nhsuk-u-visually-hidden"
-              >
-                Important: 
-              </span>
-              Important
-            </span>
-          </h2>
-          <p>
             You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
           </p>
         </div>
@@ -151,7 +144,7 @@ exports[`Message plan form renders errors 1`] = `
           CampaignId error
         </span>
         <select
-          aria-describedby="campaignId--hint campaignId--error-message"
+          aria-describedby="campaignId--hint campaignId--error-message campaignId--warning"
           aria-labelledby="campaignId--label"
           class="nhsuk-select nhsuk-select--error"
           data-testid="campaign-id-field"
@@ -444,26 +437,19 @@ exports[`Message plan form renders form with select for multiple campaign ids 1`
           class="nhsuk-warning-callout nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5"
           data-testid="campaign-warning-callout"
         >
-          <h2
-            class="nhsuk-warning-callout__label"
+          <div
+            class="nhsuk-warning-callout__label nhsuk-heading-m"
+          >
+            Important
+          </div>
+          <p
+            id="campaignId--warning"
           >
-            <span
-              role="text"
-            >
-              <span
-                class="nhsuk-u-visually-hidden"
-              >
-                Important: 
-              </span>
-              Important
-            </span>
-          </h2>
-          <p>
             You cannot edit the campaign after you create a message plan. If you need to link to a different campaign later, create a new message plan.
           </p>
         </div>
         <select
-          aria-describedby="campaignId--hint campaignId--error-message"
+          aria-describedby="campaignId--hint campaignId--error-message campaignId--warning"
           aria-labelledby="campaignId--label"
           class="nhsuk-select"
           data-testid="campaign-id-field"
diff --git a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
index 3de17f42b..cb6953bd0 100644
--- a/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
+++ b/frontend/src/components/forms/MessagePlanForm/MessagePlanForm.tsx
@@ -97,10 +97,12 @@ export function MessagePlanForm({
                 className='nhsuk-u-margin-bottom-5 nhsuk-u-margin-top-5'
                 data-testid='campaign-warning-callout'
               >
-                <WarningCallout.Label headingLevel='h2'>
+                <div className='nhsuk-warning-callout__label nhsuk-heading-m'>
                   {formContent.fields.campaignId.warningCallout.heading}
-                </WarningCallout.Label>
-                <p>{formContent.fields.campaignId.warningCallout.content}</p>
+                </div>
+                <p id='campaignId--warning'>
+                  {formContent.fields.campaignId.warningCallout.content}
+                </p>
               </WarningCallout>
               <NHSNotifyForm.ErrorMessage
                 htmlFor='campaignId'
@@ -110,7 +112,7 @@ export function MessagePlanForm({
                 id='campaignId'
                 name='campaignId'
                 data-testid='campaign-id-field'
-                aria-describedby='campaignId--hint campaignId--error-message'
+                aria-describedby='campaignId--hint campaignId--error-message campaignId--warning'
                 aria-labelledby='campaignId--label'
               >
                 <option />