Merge branch 'main' into feature/CCM-11163_routing-config-api-get-endpoints

Author: harrim91

.github/workflows/stage-1-commit.yaml

@@ -149,7 +149,7 @@ jobs:
   trivy:
     name: "Trivy Scan"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 10
     needs: detect-terraform-changes
     if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
     steps:

.github/workflows/stage-2-test.yaml

@@ -198,26 +198,26 @@ jobs:
           name: code-coverage-report
           path: .reports/lcov.info
 
-  perform-static-analysis:
-    name: "Perform static analysis"
-    needs: [test-unit, merge-coverage]
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-    timeout-minutes: 5
-    steps:
-      - name: "Checkout code"
-        uses: actions/[email protected]
-        with:
-          fetch-depth: 0 # Full history is needed to improving relevancy of reporting
-      - name: "Download coverage report for SONAR"
-        uses: actions/download-artifact@v5
-        with:
-          name: code-coverage-report
-      - name: "Perform static analysis"
-        uses: ./.github/actions/perform-static-analysis
-        with:
-          sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
-          sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
-          sonar_token: "${{ secrets.SONAR_TOKEN }}"
+  # perform-static-analysis:
+  #   name: "Perform static analysis"
+  #   needs: [test-unit, merge-coverage]
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     id-token: write
+  #     contents: read
+  #   timeout-minutes: 5
+  #   steps:
+  #     - name: "Checkout code"
+  #       uses: actions/[email protected]
+  #       with:
+  #         fetch-depth: 0 # Full history is needed to improving relevancy of reporting
+  #     - name: "Download coverage report for SONAR"
+  #       uses: actions/download-artifact@v5
+  #       with:
+  #         name: code-coverage-report
+  #     - name: "Perform static analysis"
+  #       uses: ./.github/actions/perform-static-analysis
+  #       with:
+  #         sonar_organisation_key: "${{ vars.SONAR_ORGANISATION_KEY }}"
+  #         sonar_project_key: "${{ vars.SONAR_PROJECT_KEY }}"
+  #         sonar_token: "${{ secrets.SONAR_TOKEN }}"

.gitleaksignore

@@ -7,3 +7,4 @@ 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
+306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92

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

@@ -1,9 +1,35 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage 1`] = `
+exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignId field when campaignIds is not available 1`] = `
 <LetterTemplateForm
+  campaignIds={
+    [
+      "campaign-id",
+    ]
+  }
+  initialState={
+    {
+      "campaignId": "campaign-id",
+      "language": "en",
+      "letterType": "x0",
+      "name": "",
+      "templateType": "LETTER",
+    }
+  }
+/>
+`;
+
+exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignIds field when available 1`] = `
+<LetterTemplateForm
+  campaignIds={
+    [
+      "campaign-id",
+      "other-campaign-id",
+    ]
+  }
   initialState={
     {
+      "campaignId": "",
       "language": "en",
       "letterType": "x0",
       "name": "",

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

@@ -23,7 +23,7 @@ describe('UploadLetterTemplatePage', () => {
     jest.resetAllMocks();
   });
 
-  it('should render UploadLetterTemplatePage', async () => {
+  it('should check client ID and campaign ID', async () => {
     mockGetSessionServer.mockResolvedValueOnce({
       accessToken: 'mocktoken',
       clientId: 'client1',
@@ -35,28 +35,67 @@ describe('UploadLetterTemplatePage', () => {
       },
     });
 
+    await UploadLetterTemplatePage();
+
+    expect(mockGetSessionServer).toHaveBeenCalled();
+    expect(mockFetchClient).toHaveBeenCalled();
+  });
+
+  it('should render UploadLetterTemplatePage with campaignIds field when available', async () => {
+    mockGetSessionServer.mockResolvedValueOnce({
+      accessToken: 'mocktoken',
+      clientId: 'client1',
+    });
+    mockFetchClient.mockResolvedValueOnce({
+      data: {
+        campaignIds: ['campaign-id', 'other-campaign-id'],
+        campaignId: 'campaign-id',
+        features: {},
+      },
+    });
+
     const page = await UploadLetterTemplatePage();
 
     expect(await generateMetadata()).toEqual({ title: pageTitle });
     expect(page).toMatchSnapshot();
   });
 
-  it('should check client ID and campaign ID', async () => {
+  it('should render UploadLetterTemplatePage with campaignId field when campaignIds is not available', async () => {
     mockGetSessionServer.mockResolvedValueOnce({
       accessToken: 'mocktoken',
       clientId: 'client1',
     });
     mockFetchClient.mockResolvedValueOnce({
       data: {
-        campaignId: 'campaign2',
+        campaignIds: undefined,
+        campaignId: 'campaign-id',
         features: {},
       },
     });
 
+    const page = await UploadLetterTemplatePage();
+
+    expect(await generateMetadata()).toEqual({ title: pageTitle });
+    expect(page).toMatchSnapshot();
+  });
+
+  it('should redirect to error page when client configuration is not present', async () => {
+    const mockRedirect = jest.mocked(redirect);
+
+    mockGetSessionServer.mockResolvedValueOnce({
+      accessToken: 'mocktoken',
+      clientId: 'client-id',
+    });
+    mockFetchClient.mockResolvedValueOnce({
+      data: null,
+    });
+
     await UploadLetterTemplatePage();
 
-    expect(mockGetSessionServer).toHaveBeenCalled();
-    expect(mockFetchClient).toHaveBeenCalled();
+    expect(mockRedirect).toHaveBeenCalledWith(
+      '/upload-letter-template/client-id-and-campaign-id-required',
+      RedirectType.replace
+    );
   });
 
   it('should redirect to error page when client ID is not present', async () => {
@@ -81,7 +120,30 @@ describe('UploadLetterTemplatePage', () => {
     );
   });
 
-  it('should redirect to error page when campaign ID is not present', async () => {
+  it('should redirect to error page when campaignIds is present and empty', async () => {
+    const mockRedirect = jest.mocked(redirect);
+
+    mockGetSessionServer.mockResolvedValueOnce({
+      accessToken: 'mocktoken',
+      clientId: 'client2',
+    });
+    mockFetchClient.mockResolvedValueOnce({
+      data: {
+        campaignIds: [],
+        campaignId: 'campaign-id',
+        features: {},
+      },
+    });
+
+    await UploadLetterTemplatePage();
+
+    expect(mockRedirect).toHaveBeenCalledWith(
+      '/upload-letter-template/client-id-and-campaign-id-required',
+      RedirectType.replace
+    );
+  });
+
+  it('should redirect to error page when neither campaignIds nor campaignId is present', async () => {
     const mockRedirect = jest.mocked(redirect);
 
     mockGetSessionServer.mockResolvedValueOnce({
@@ -90,6 +152,7 @@ describe('UploadLetterTemplatePage', () => {
     });
     mockFetchClient.mockResolvedValueOnce({
       data: {
+        campaignIds: undefined,
         campaignId: undefined,
         features: {},
       },

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

@@ -68,6 +68,28 @@ describe('CreateEmailTemplate server actions', () => {
     });
   });
 
+  it('create-email-template - should return response when when template message contains insecure url', async () => {
+    const response = await processFormActions(
+      initialState,
+      getMockFormData({
+        'form-id': 'create-email-template',
+        emailTemplateName: 'template-name',
+        emailTemplateSubjectLine: 'template-subject-line',
+        emailTemplateMessage: '**a message linking to http://www.example.com**',
+      })
+    );
+
+    expect(response).toEqual({
+      ...initialState,
+      errorState: {
+        formErrors: [],
+        fieldErrors: {
+          emailTemplateMessage: ['URLs must start with https://'],
+        },
+      },
+    });
+  });
+
   test('should save the template and redirect', async () => {
     saveTemplateMock.mockResolvedValue({
       ...initialState,

…orm.test.tsx/LetterTemplateForm.test.tsx …TemplateForm/LetterTemplateForm.test.tsxfrontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx renamed to frontend/src/__tests__/components/forms/LetterTemplateForm/LetterTemplateForm.test.tsx frontend/src/__tests__/components/forms/LetterTemplateForm.test.tsx/LetterTemplateForm.test.tsx renamed to frontend/src/__tests__/components/forms/LetterTemplateForm/LetterTemplateForm.test.tsx

@@ -2,7 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { mockDeep } from 'jest-mock-extended';
 import {
   TemplateFormState,
-  LetterTemplate,
+  UploadLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { LetterTemplateForm } from '@forms/LetterTemplateForm/LetterTemplateForm';
 
@@ -26,12 +26,30 @@ jest.mock('react', () => {
 test('renders page with preloaded field values', () => {
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: undefined,
         name: 'template-name',
         letterType: 'x1',
         language: 'ar',
       })}
+      campaignIds={['campaign-id']}
+    />
+  );
+  expect(container.asFragment()).toMatchSnapshot();
+});
+
+test('renders page with multiple campaign ids', () => {
+  const container = render(
+    <LetterTemplateForm
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
+        errorState: undefined,
+        name: 'template-name',
+        letterType: 'x1',
+        language: 'ar',
+      })}
+      campaignIds={['campaign-id', 'other-campaign-id']}
     />
   );
   expect(container.asFragment()).toMatchSnapshot();
@@ -43,12 +61,14 @@ test('shows right-to-left language warning when language changes', () => {
 
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: undefined,
         name: 'template-name',
         letterType: 'x1',
         language: initialLanguage,
       })}
+      campaignIds={['campaign-id']}
     />
   );
 
@@ -68,12 +88,14 @@ test('hides right-to-left language warning when language changes', () => {
 
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: undefined,
         name: 'template-name',
         letterType: 'x1',
         language: initialLanguage,
       })}
+      campaignIds={['campaign-id']}
     />
   );
 
@@ -90,7 +112,8 @@ test('hides right-to-left language warning when language changes', () => {
 test('renders page one error', () => {
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: {
           formErrors: [],
           fieldErrors: {
@@ -101,6 +124,7 @@ test('renders page one error', () => {
         letterType: 'x0',
         language: 'en',
       })}
+      campaignIds={['campaign-id']}
     />
   );
   expect(container.asFragment()).toMatchSnapshot();
@@ -109,7 +133,8 @@ test('renders page one error', () => {
 test('renders page with multiple errors', () => {
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: {
           formErrors: [],
           fieldErrors: {
@@ -124,6 +149,7 @@ test('renders page with multiple errors', () => {
         letterType: undefined,
         language: undefined,
       })}
+      campaignIds={['campaign-id']}
     />
   );
   expect(container.asFragment()).toMatchSnapshot();
@@ -132,12 +158,14 @@ test('renders page with multiple errors', () => {
 test('Client-side validation triggers', () => {
   const container = render(
     <LetterTemplateForm
-      initialState={mockDeep<TemplateFormState<LetterTemplate>>({
+      initialState={mockDeep<TemplateFormState<UploadLetterTemplate>>({
+        campaignId: 'campaign-id',
         errorState: undefined,
         name: undefined,
         letterType: undefined,
         language: undefined,
       })}
+      campaignIds={['campaign-id']}
     />
   );
   const submitButton = screen.getByTestId('submit-button');