Merge remote-tracking branch 'origin' into fix/CCM-8868_action_buttons_positioning

Author: m-salaudeen

.github/actions/normalize-branch-name/action.yaml

@@ -2,11 +2,17 @@ name: "Normalize branch name"
 description: "Normalize branch name"
 outputs:
   normalized_branch_name:
+    description: 10 character branch identifier (0000-branch)
     value: ${{ steps.normalize_branch_name.outputs.normalized_branch_name }}
 runs:
   using: "composite"
   steps:
     - id: normalize_branch_name
       shell: bash
-      run: echo "normalized_branch_name=$(sed -e 's/[^a-zA-Z0-9-]//g' <<< $(git rev-parse --abbrev-ref HEAD) | tr '[:upper:]' '[:lower:]' | head -c 25)" >> $GITHUB_OUTPUT
-
+      run: |
+        branch=$(git rev-parse --abbrev-ref HEAD)
+        stripped=$(echo $branch | sed -e 's/[^a-zA-Z0-9-]//g' | tr '[:upper:]' '[:lower:]')
+        starting_from_jira_ref=$(echo $stripped | sed -n 's/.*\([0-9]\{4,\}.*\)/\1/p')
+        with_fallback=${starting_from_jira_ref:-$stripped}
+        chopped=$(echo $with_fallback | head -c 10)
+        echo "normalized_branch_name=$chopped" >> $GITHUB_OUTPUT

frontend/next.config.js

@@ -24,7 +24,7 @@ const nextConfig = (phase) => {
 
     experimental: {
       serverActions: {
-        allowedOrigins: [domain, domain.replace('templates', 'web-gateway')],
+        allowedOrigins: ['**.nhsnotify.national.nhs.uk', 'notify.nhs.uk'],
       },
     },
 

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

@@ -3,8 +3,17 @@
  */
 import CreateLetterTemplatePage from '@app/create-letter-template/page';
 
+const OLD_ENV = { ...process.env };
+
 describe('CreateLetterTemplatePage', () => {
-  beforeEach(jest.resetAllMocks);
+  beforeEach(() => {
+    jest.resetAllMocks();
+    process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'true';
+  });
+
+  afterAll(() => {
+    process.env = OLD_ENV;
+  });
 
   it('should render CreateLetterTemplatePage', async () => {
     const page = await CreateLetterTemplatePage();

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

@@ -62,7 +62,7 @@ describe('EditEmailTemplatePage', () => {
   it('should render CreateEmailTemplatePage component when template is found', async () => {
     getTemplateMock.mockResolvedValueOnce(template);
 
-    const emailTemplate = {
+    const emailTemplate: EmailTemplate = {
       ...template,
       subject: 'subject',
       templateType: 'EMAIL' as const,

frontend/src/__tests__/components/forms/PreviewLetterTemplate/PreviewLetterTemplate.test.tsx

@@ -48,6 +48,7 @@ describe('Preview letter form renders', () => {
               currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
               virusScanStatus: 'PENDING',
             },
+            testDataCsv: undefined,
           },
         })}
       />

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

@@ -756,43 +756,6 @@ exports[`Preview letter form renders matches snapshot when navigating from manag
                 </div>
               </div>
             </div>
-            <div
-              class="nhsuk-grid-row preview__row"
-            >
-              <div
-                class="nhsuk-grid-column-one-third preview__col"
-              >
-                <div
-                  class="preview__col_heading"
-                >
-                  Test personalisation file
-                </div>
-              </div>
-              <div
-                class="nhsuk-grid-column-two-thirds col"
-              >
-                <div
-                  class="container"
-                >
-                  <svg
-                    class="icon"
-                    fill="none"
-                    height="26"
-                    viewBox="0 0 20 26"
-                    width="20"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                      fill="#4C6272"
-                    />
-                  </svg>
-                  <p
-                    class="text"
-                  />
-                </div>
-              </div>
-            </div>
           </div>
         </div>
         <form

frontend/src/__tests__/components/molecules/ManageTemplates.test.tsx

@@ -39,6 +39,8 @@ const manageTemplatesProps: {
       files: {
         pdfTemplate: {
           fileName: 'template.pdf',
+          currentVersion: '8BAC',
+          virusScanStatus: 'PASSED',
         },
       },
     },

frontend/src/__tests__/helpers.ts

@@ -57,6 +57,8 @@ export const LETTER_TEMPLATE: TemplateDto = {
   files: {
     pdfTemplate: {
       fileName: 'template.pdf',
+      currentVersion: '8ADED236B5AE',
+      virusScanStatus: 'PASSED',
     },
   },
   name: 'name',

frontend/src/__tests__/utils/form-actions.test.ts

@@ -12,16 +12,14 @@ import {
   getTemplates,
 } from '@utils/form-actions';
 import { getAccessTokenServer } from '@utils/amplify-utils';
-import { mockDeep } from 'jest-mock-extended';
-import { ITemplateClient, TemplateDto } from 'nhs-notify-backend-client';
+import { TemplateDto } from 'nhs-notify-backend-client';
+import { templateClient } from 'nhs-notify-backend-client/src/template-api-client';
 
-const mockedTemplateClient = mockDeep<ITemplateClient>();
+const mockedTemplateClient = jest.mocked(templateClient);
 const authIdTokenServerMock = jest.mocked(getAccessTokenServer);
 
 jest.mock('@utils/amplify-utils');
-jest.mock('nhs-notify-backend-client/src/template-api-client', () => ({
-  TemplateClient: () => mockedTemplateClient,
-}));
+jest.mock('nhs-notify-backend-client/src/template-api-client');
 
 describe('form-actions', () => {
   beforeEach(() => {
@@ -53,7 +51,8 @@ describe('form-actions', () => {
     const response = await createTemplate(createTemplateInput);
 
     expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
-      createTemplateInput
+      createTemplateInput,
+      'token'
     );
 
     expect(response).toEqual(responseData);
@@ -78,7 +77,8 @@ describe('form-actions', () => {
     );
 
     expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
-      createTemplateInput
+      createTemplateInput,
+      'token'
     );
   });
 
@@ -126,7 +126,8 @@ describe('form-actions', () => {
 
     expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
       updateTemplateInput.id,
-      updateTemplateInput
+      updateTemplateInput,
+      'token'
     );
 
     expect(response).toEqual(responseData);
@@ -156,7 +157,8 @@ describe('form-actions', () => {
 
     expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
       updateTemplateInput.id,
-      updateTemplateInput
+      updateTemplateInput,
+      'token'
     );
   });
 
@@ -196,7 +198,10 @@ describe('form-actions', () => {
 
     const response = await getTemplate('id');
 
-    expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
+    expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith(
+      'id',
+      'token'
+    );
 
     expect(response).toEqual(responseData);
   });
@@ -212,7 +217,10 @@ describe('form-actions', () => {
 
     const response = await getTemplate('id');
 
-    expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
+    expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith(
+      'id',
+      'token'
+    );
 
     expect(response).toEqual(undefined);
   });
@@ -243,7 +251,7 @@ describe('form-actions', () => {
 
     const response = await getTemplates();
 
-    expect(mockedTemplateClient.listTemplates).toHaveBeenCalledWith();
+    expect(mockedTemplateClient.listTemplates).toHaveBeenCalledWith('token');
 
     expect(response).toEqual([responseData]);
   });

frontend/src/components/forms/EmailTemplateForm/EmailTemplateForm.tsx

@@ -139,8 +139,8 @@ export const EmailTemplateForm: FC<
           </div>
           <aside className='nhsuk-grid-column-one-third'>
             <Personalisation />
-            <MessageFormatting template={'EMAIL'} />
-            <ChannelGuidance template={'EMAIL'} />
+            <MessageFormatting template='EMAIL' />
+            <ChannelGuidance template='EMAIL' />
           </aside>
         </div>
       </NHSNotifyMain>