Merge branch main into bugfix/CCM-7548_aria-labels-fix

Author: Ian-Hodges

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -0,0 +1,48 @@
+name: PR Destroy Environment
+
+on:
+  pull_request:
+    types: [closed]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  create-dynamic-environment:
+    name: Destroy Dynamic Environment
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger nhs-notify-internal dynamic environment destruction
+        shell: bash
+        run: |
+          set -x
+          this_repo_name=$(echo ${{ github.repository }} | cut -d'/' -f2)
+
+          DISPATCH_EVENT=$(jq -ncM \
+            --arg infraRepoName "${this_repo_name}" \
+            --arg releaseVersion "main" \
+            --arg targetEnvironment "pr${{ github.event.number }}" \
+            --arg targetAccountGroup "nhs-notify-template-management-dev" \
+            --arg targetComponent "branch" \
+            --arg terraformAction "destroy" \
+            '{ "ref": "main",
+              "inputs": {
+                "infraRepoName": $infraRepoName,
+                "releaseVersion", $releaseVersion,
+                "targetEnvironment", $targetEnvironment,
+                "targetAccountGroup", $targetAccountGroup,
+                "targetComponent", $targetComponent,
+                "terraformAction", $terraformAction,
+                "overrides", $overrides,
+              }
+            }')
+
+          curl --fail -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/dispatch-deploy-dynamic-env.yaml/dispatches \
+            -d "${DISPATCH_EVENT}"

.gitignore

@@ -81,3 +81,4 @@ tests/test-team/playwright/.cache/
 sandbox_cognito_auth_token.json
 
 frontend/public/testing
+.vscode/launch.json

frontend/amplify/data/resource.ts

@@ -5,7 +5,6 @@ enum TemplateType {
   NHS_APP = 'NHS_APP',
   SMS = 'SMS',
   EMAIL = 'EMAIL',
-  LETTER = 'LETTER',
 }
 
 enum TemplateStatus {
@@ -17,7 +16,6 @@ const templateTypes = [
   TemplateType.NHS_APP,
   TemplateType.SMS,
   TemplateType.EMAIL,
-  TemplateType.LETTER,
 ] as const;
 
 const templateStatuses = [

frontend/src/__tests__/app/choose-a-template-type/__snapshots__/page.test.tsx.snap

@@ -107,25 +107,6 @@ exports[`ChooseATemplateTypePage 1`] = `
                 Text message (SMS)
               </label>
             </div>
-            <div
-              class="nhsuk-radios__item"
-            >
-              <input
-                class="nhsuk-radios__input"
-                data-testid="LETTER-radio"
-                id="templateType-LETTER"
-                name="templateType"
-                type="radio"
-                value="LETTER"
-              />
-              <label
-                class="nhsuk-label nhsuk-radios__label"
-                for="templateType-LETTER"
-                id="templateType-LETTER--label"
-              >
-                Letter
-              </label>
-            </div>
           </div>
         </div>
       </fieldset>

frontend/src/__tests__/app/create-letter-template/__snapshots__/page.test.tsx.snap

@@ -55,7 +55,6 @@ describe('EditNhsAppTemplatePage', () => {
   const invalidTemplateTypes: TemplateType[] = [
     TemplateType.EMAIL,
     TemplateType.SMS,
-    TemplateType.LETTER,
   ];
 
   test.each(invalidTemplateTypes)(

frontend/src/__tests__/app/create-letter-template/page.test.tsx

@@ -3,11 +3,11 @@ import { render, screen } from '@testing-library/react';
 import ManageTemplatesPage from '@app/manage-templates/page';
 import content from '@content/content';
 import { getTemplates } from '@utils/form-actions';
-import { Template } from 'nhs-notify-web-template-management-utils/src/types';
 import {
+  Template,
   TemplateStatus,
   TemplateType,
-} from 'nhs-notify-web-template-management-utils/src/enum';
+} from 'nhs-notify-web-template-management-utils';
 
 const manageTemplatesContent = content.pages.manageTemplates;
 

frontend/src/__tests__/app/edit-nhs-app-template/page.test.tsx

@@ -54,12 +54,6 @@ describe('PreviewEmailTemplatePage', () => {
   });
 
   test.each([
-    {
-      templateType: TemplateType.LETTER,
-      name: 'template-name',
-      subject: 'template-subject-line',
-      message: 'template-message',
-    },
     {
       templateType: TemplateType.SMS,
       name: 'template-name',

frontend/src/__tests__/app/manage-templates/page.test.tsx

@@ -53,11 +53,6 @@ describe('PreviewNhsAppTemplatePage', () => {
   });
 
   test.each([
-    {
-      templateType: TemplateType.LETTER,
-      name: 'template-name',
-      message: 'template-message',
-    },
     {
       templateType: TemplateType.EMAIL,
       name: 'template-name',