Merge branch 'main' into CCM-9061_replaceTfsecTrivy

Author: aidenvaines-cgi

.github/CODEOWNERS

@@ -5,8 +5,6 @@
 /.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

.gitignore

@@ -33,6 +33,7 @@ node_modules
 
 # production
 /build
+dist
 
 # misc
 .DS_Store
@@ -61,6 +62,7 @@ reports
 tests/screenshots/*
 plugin-cache/
 
+# terraform
 *.terraform*
 terraform.tfstate
 terraform.tfstate.backup
@@ -84,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

.gitleaksignore

@@ -1,7 +1,9 @@
-# SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore
+# SEE: <https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore>
 
 cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
 87312c6a627a7b0420956d49187fd15b130df170:src/__tests__/components/molecules/LoginStatus.test.tsx:jwt:23
 37ca9f5670f4cd7d91869845ca27defbe6156bb9:src/__tests__/components/molecules/LoginStatus.test.tsx:jwt:23
 b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:15
 b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
+bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
+bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25

.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/jest.config.ts

@@ -22,6 +22,7 @@ const config: Config = {
   ...baseJestConfig,
 
   coveragePathIgnorePatterns: [
+    ...(baseJestConfig.coveragePathIgnorePatterns ?? []),
     '.types.ts',
     'layout.tsx',
     'container.tsx',

frontend/src/__tests__/components/atoms/CodeExample.test.tsx

@@ -0,0 +1,28 @@
+import { render } from '@testing-library/react';
+import CodeExample from '@atoms/CodeExample/CodeExample';
+
+describe('CodeExample component', () => {
+  it('renders component correctly', () => {
+    const container = render(
+      <CodeExample ariaId='test-id' ariaText='This is an example of markdown:'>
+        # A test example
+      </CodeExample>
+    );
+
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+
+  it('renders component correctly when optional class is provided', () => {
+    const container = render(
+      <CodeExample
+        ariaId='test-id'
+        ariaText='This is an example of markdown:'
+        codeClassName='test-class'
+      >
+        # A test example
+      </CodeExample>
+    );
+
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+});

frontend/src/__tests__/components/atoms/__snapshots__/CodeExample.test.tsx.snap

@@ -0,0 +1,34 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CodeExample component renders component correctly 1`] = `
+<DocumentFragment>
+  <span
+    class="nhsuk-u-visually-hidden"
+    id="test-id"
+  >
+    This is an example of markdown:
+  </span>
+  <code
+    aria-describedby="test-id"
+  >
+    # A test example
+  </code>
+</DocumentFragment>
+`;
+
+exports[`CodeExample component renders component correctly when optional class is provided 1`] = `
+<DocumentFragment>
+  <span
+    class="nhsuk-u-visually-hidden"
+    id="test-id"
+  >
+    This is an example of markdown:
+  </span>
+  <code
+    aria-describedby="test-id"
+    class="test-class"
+  >
+    # A test example
+  </code>
+</DocumentFragment>
+`;

frontend/src/__tests__/components/forms/DeleteTemplate/server-action.test.ts

@@ -4,7 +4,7 @@ import {
   deleteTemplateNoAction,
 } from '@forms/DeleteTemplate/server-action';
 import { NHSAppTemplate } from 'nhs-notify-web-template-management-utils';
-import { saveTemplate } from '@utils/form-actions';
+import { setTemplateToDeleted } from '@utils/form-actions';
 
 jest.mock('next/navigation');
 jest.mock('@utils/form-actions');
@@ -27,7 +27,7 @@ test('redirects', async () => {
 
 test('calls form action and redirects', async () => {
   const mockRedirect = jest.mocked(redirect);
-  const mockSaveTemplate = jest.mocked(saveTemplate);
+  const mockSetTemplateToDeleted = jest.mocked(setTemplateToDeleted);
 
   const mockTemplate: NHSAppTemplate = {
     id: 'template-id',
@@ -41,10 +41,7 @@ test('calls form action and redirects', async () => {
 
   await deleteTemplateYesAction(mockTemplate);
 
-  expect(mockSaveTemplate).toHaveBeenCalledWith({
-    ...mockTemplate,
-    templateStatus: 'DELETED',
-  });
+  expect(mockSetTemplateToDeleted).toHaveBeenCalledWith('template-id');
 
   expect(mockRedirect).toHaveBeenCalledWith(
     '/message-templates',