Merge branch 'main' into feature/CCM-8574-letter-file-validation

Author: harrim91

.github/CODEOWNERS

@@ -1,16 +1,17 @@
 # NHS Notify Code Owners
 
-*                         @NHSDigital/nhs-notify-web-template-management
+*                           @NHSDigital/nhs-notify-web-template-management
 
-/.github/                 @NHSDigital/nhs-notify-web-template-management-admins
-*.code-workspace          @NHSDigital/nhs-notify-web-template-management-admins
-/docs/                    @NHSDigital/nhs-notify-web-template-management
-/docs/testing/            @NHSDigital/nhs-notify-web-template-management-testers
-/tests/test-team/         @NHSDigital/nhs-notify-web-template-management-testers
+/.github/                   @NHSDigital/nhs-notify-web-template-management-admins
+*.code-workspace            @NHSDigital/nhs-notify-web-template-management-admins
+/docs/                      @NHSDigital/nhs-notify-web-template-management
+/docs/testing/              @NHSDigital/nhs-notify-web-template-management-testers
+/tests/test-team/           @NHSDigital/nhs-notify-web-template-management-testers
+/infrastructure/terraform/  @NHSDigital/nhs-notify-platform
 
 # Codeowners must be final check
-/.github/CODEOWNERS       @NHSDigital/nhs-notify-code-owners
-/CODEOWNERS               @NHSDigital/nhs-notify-code-owners
+/.github/CODEOWNERS         @NHSDigital/nhs-notify-code-owners
+/CODEOWNERS                 @NHSDigital/nhs-notify-code-owners
 
 
 # Each NHS Notify repository should have clear code owners set.

.gitignore

@@ -62,6 +62,7 @@ reports
 tests/screenshots/*
 plugin-cache/
 
+# terraform
 *.terraform*
 terraform.tfstate
 terraform.tfstate.backup
@@ -85,3 +86,6 @@ tests/test-team/playwright-report/
 tests/test-team/blob-report/
 tests/test-team/playwright/.cache/
 lambdas/backend-api/src/email/email-template.json
+
+# vscode
+.vscode/settings.local.json

.vscode/settings.json

@@ -1,11 +1,13 @@
 {
   "markdownlint.config": {
     "MD013": false,
-    "MD024": { "siblings_only": true },
+    "MD024": {
+      "siblings_only": true
+    },
     "MD033": false
   },
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
-  "eslint.codeActionsOnSave.mode": "problems"
+  "eslint.codeActionsOnSave.mode": "problems",
 }

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

@@ -7,7 +7,7 @@ exports[`ChooseATemplateTypePage - LETTER option is hidden when feature flag is
   >
     <a
       class="nhsuk-back-link__link"
-      href="/templates/manage-templates"
+      href="/templates/message-templates"
     >
       <svg
         aria-hidden="true"
@@ -165,7 +165,7 @@ exports[`ChooseATemplateTypePage 1`] = `
   >
     <a
       class="nhsuk-back-link__link"
-      href="/templates/manage-templates"
+      href="/templates/message-templates"
     >
       <svg
         aria-hidden="true"

frontend/src/__tests__/app/create-and-submit-templates/__snapshots__/page.test.tsx.snap

@@ -64,7 +64,7 @@ exports[`matches the snapshot 1`] = `
           aria-disabled="false"
           class="nhsuk-button"
           draggable="false"
-          href="/templates/manage-templates"
+          href="/templates/message-templates"
           role="button"
         >
           Start now

frontend/src/__tests__/app/delete-template/page.test.tsx

@@ -77,7 +77,7 @@ describe('PreviewEmailTemplatePage', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
-  test('should redirect to manage-templates when template is already deleted', async () => {
+  test('should redirect to message-templates when template is already deleted', async () => {
     getTemplateMock.mockResolvedValueOnce({
       id: 'template-id',
       templateStatus: 'DELETED',
@@ -94,6 +94,6 @@ describe('PreviewEmailTemplatePage', () => {
       }),
     });
 
-    expect(redirectMock).toHaveBeenCalledWith('/manage-templates', 'push');
+    expect(redirectMock).toHaveBeenCalledWith('/message-templates', 'push');
   });
 });

…sts__/app/manage-templates/page.test.tsx …ts__/app/message-templates/page.test.tsxfrontend/src/__tests__/app/manage-templates/page.test.tsx renamed to frontend/src/__tests__/app/message-templates/page.test.tsx frontend/src/__tests__/app/manage-templates/page.test.tsx renamed to frontend/src/__tests__/app/message-templates/page.test.tsx

@@ -1,13 +1,13 @@
 import '@testing-library/jest-dom';
 import { render, screen } from '@testing-library/react';
-import ManageTemplatesPage, {
+import MessageTemplatesPage, {
   generateMetadata,
-} from '@app/manage-templates/page';
+} from '@app/message-templates/page';
 import content from '@content/content';
 import { getTemplates } from '@utils/form-actions';
 import { TemplateDto } from 'nhs-notify-backend-client';
 
-const manageTemplatesContent = content.pages.manageTemplates;
+const messageTemplatesContent = content.pages.messageTemplates;
 
 const mockTemplates: TemplateDto[] = [
   {
@@ -23,43 +23,43 @@ const mockTemplates: TemplateDto[] = [
 
 jest.mock('@utils/form-actions');
 
-describe('ManageTemplatesPage', () => {
+describe('MessageTemplatesPage', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
   test('renders the page without templates', async () => {
-    render(await ManageTemplatesPage());
+    render(await MessageTemplatesPage());
 
     expect(await generateMetadata()).toEqual({
-      title: manageTemplatesContent.pageTitle,
+      title: messageTemplatesContent.pageTitle,
     });
     expect(screen.getByTestId('page-content-wrapper')).toBeInTheDocument();
     expect(screen.getByTestId('page-heading')).toBeInTheDocument();
     expect(screen.getByRole('button')).toBeInTheDocument();
     expect(screen.getByRole('button')).toHaveAttribute(
       'href',
-      manageTemplatesContent.createTemplateButton.url
+      messageTemplatesContent.createTemplateButton.url
     );
     expect(screen.getByRole('button')).toHaveTextContent(
-      manageTemplatesContent.createTemplateButton.text
+      messageTemplatesContent.createTemplateButton.text
     );
 
     expect(screen.getByTestId('no-templates-available')).toBeInTheDocument();
   });
 
   test('renders the page with templates', async () => {
     jest.mocked(getTemplates).mockResolvedValue(mockTemplates);
-    render(await ManageTemplatesPage());
+    render(await MessageTemplatesPage());
 
     expect(screen.getByTestId('page-content-wrapper')).toBeInTheDocument();
     expect(screen.getByTestId('page-heading')).toBeInTheDocument();
     expect(screen.getByRole('button')).toBeInTheDocument();
     expect(screen.getByRole('button')).toHaveAttribute(
       'href',
-      manageTemplatesContent.createTemplateButton.url
+      messageTemplatesContent.createTemplateButton.url
     );
     expect(screen.getByRole('button')).toHaveTextContent(
-      manageTemplatesContent.createTemplateButton.text
+      messageTemplatesContent.createTemplateButton.text
     );
 
     expect(screen.getByTestId('manage-template-table')).toBeInTheDocument();

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

@@ -2,16 +2,15 @@
  * @jest-environment node
  */
 import PreviewLetterTemplatePage from '@app/preview-letter-template/[templateId]/page';
-import { PreviewLetterTemplate } from '@forms/PreviewLetterTemplate/PreviewLetterTemplate';
 import { type LetterTemplate } from 'nhs-notify-web-template-management-utils';
 import { redirect } from 'next/navigation';
 import { getTemplate } from '@utils/form-actions';
 import { Language, LetterType, TemplateDto } from 'nhs-notify-backend-client';
 import { EMAIL_TEMPLATE, NHS_APP_TEMPLATE, SMS_TEMPLATE } from '../../helpers';
+import { PreviewLetterTemplate } from '@organisms/PreviewLetterTemplate/PreviewLetterTemplate';
 
 jest.mock('@utils/form-actions');
 jest.mock('next/navigation');
-jest.mock('@forms/PreviewLetterTemplate/PreviewLetterTemplate');
 
 const redirectMock = jest.mocked(redirect);
 const getTemplateMock = jest.mocked(getTemplate);
@@ -59,9 +58,7 @@ describe('PreviewLetterTemplatePage', () => {
       }),
     });
 
-    expect(page).toEqual(
-      <PreviewLetterTemplate initialState={letterTemplate} />
-    );
+    expect(page).toEqual(<PreviewLetterTemplate template={letterTemplate} />);
   });
 
   it('should redirect to invalid-template when no template is found', async () => {

…w-submitted-email-template/page.test.tsx …w-submitted-email-template/page.test.tsxfrontend/src/__tests__/app/view-submitted-email-template/page.test.tsx renamed to frontend/src/__tests__/app/preview-submitted-email-template/page.test.tsx frontend/src/__tests__/app/view-submitted-email-template/page.test.tsx renamed to frontend/src/__tests__/app/preview-submitted-email-template/page.test.tsx

@@ -3,7 +3,7 @@
  */
 import ViewSubmittedEmailTemplatePage, {
   generateMetadata,
-} from '@app/view-submitted-email-template/[templateId]/page';
+} from '@app/preview-submitted-email-template/[templateId]/page';
 import { ViewEmailTemplate } from '@molecules/ViewEmailTemplate/ViewEmailTemplate';
 import { EmailTemplate } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';

…submitted-nhs-app-template/page.test.tsx …submitted-nhs-app-template/page.test.tsxfrontend/src/__tests__/app/view-submitted-nhs-app-template/page.test.tsx renamed to frontend/src/__tests__/app/preview-submitted-nhs-app-template/page.test.tsx frontend/src/__tests__/app/view-submitted-nhs-app-template/page.test.tsx renamed to frontend/src/__tests__/app/preview-submitted-nhs-app-template/page.test.tsx

@@ -3,7 +3,7 @@
  */
 import ViewSubmittedNHSAppTemplatePage, {
   generateMetadata,
-} from '@app/view-submitted-nhs-app-template/[templateId]/page';
+} from '@app/preview-submitted-nhs-app-template/[templateId]/page';
 import { ViewNHSAppTemplate } from '@molecules/ViewNHSAppTemplate/ViewNHSAppTemplate';
 import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';