CCM-8585 upload pdf API

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>

frontend/src/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.tsx

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

frontend/src/components/forms/SmsTemplateForm/SmsTemplateForm.tsx

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

frontend/src/middleware.ts

@@ -11,7 +11,7 @@ const protectedPaths = [
   /^\/create-letter-template$/,
   /^\/delete-template\/[^/]+$/,
   /^\/edit-email-template\/[^/]+$/,
-  /^\/edit-nhs-app-template/,
+  /^\/edit-nhs-app-template\/[^/]+$/,
   /^\/edit-text-message-template\/[^/]+$/,
   /^\/email-template-submitted\/[^/]+$/,
   /^\/invalid-template$/,

frontend/src/utils/form-actions.ts

@@ -8,7 +8,7 @@ import {
   ValidatedTemplateDto,
 } from 'nhs-notify-backend-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
-import { TemplateClient } from 'nhs-notify-backend-client/src/template-api-client';
+import { templateClient } from 'nhs-notify-backend-client/src/template-api-client';
 
 export async function createTemplate(
   template: CreateTemplate
@@ -19,7 +19,7 @@ export async function createTemplate(
     throw new Error('Failed to get access token');
   }
 
-  const { data, error } = await TemplateClient(token).createTemplate(template);
+  const { data, error } = await templateClient.createTemplate(template, token);
 
   if (error) {
     logger.error('Failed to create template', { error });
@@ -38,9 +38,10 @@ export async function saveTemplate(
     throw new Error('Failed to get access token');
   }
 
-  const { data, error } = await TemplateClient(token).updateTemplate(
+  const { data, error } = await templateClient.updateTemplate(
     template.id,
-    template
+    template,
+    token
   );
 
   if (error) {
@@ -60,7 +61,7 @@ export async function getTemplate(
     throw new Error('Failed to get access token');
   }
 
-  const { data, error } = await TemplateClient(token).getTemplate(templateId);
+  const { data, error } = await templateClient.getTemplate(templateId, token);
 
   if (error) {
     logger.error('Failed to get template', { error });
@@ -76,7 +77,7 @@ export async function getTemplates(): Promise<TemplateDto[]> {
     throw new Error('Failed to get access token');
   }
 
-  const { data, error } = await TemplateClient(token).listTemplates();
+  const { data, error } = await templateClient.listTemplates(token);
 
   if (error) {
     logger.error('Failed to get templates', { error });

infrastructure/terraform/components/acct/variables.tf

@@ -87,4 +87,3 @@ variable "support_sandbox_environments" {
   description = "Does this account support dev sandbox environments?"
   default     = false
 }
-

infrastructure/terraform/components/sandbox/pre.sh

@@ -1,4 +1,3 @@
-
-npm ci
+if [ -z "$SKIP_SANDBOX_INSTALL" ]; then npm ci; fi
 
 npm run generate-dependencies --workspaces --if-present

infrastructure/terraform/modules/backend-api/README.md

@@ -30,6 +30,7 @@ No requirements.
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | ../lambda-function | n/a |
 | <a name="module_build_template_client"></a> [build\_template\_client](#module\_build\_template\_client) | ../typescript-build-zip | n/a |
 | <a name="module_build_template_lambda"></a> [build\_template\_lambda](#module\_build\_template\_lambda) | ../typescript-build-zip | n/a |
+| <a name="module_create_letter_template_lambda"></a> [create\_letter\_template\_lambda](#module\_create\_letter\_template\_lambda) | ../lambda-function | n/a |
 | <a name="module_create_template_lambda"></a> [create\_template\_lambda](#module\_create\_template\_lambda) | ../lambda-function | n/a |
 | <a name="module_get_template_lambda"></a> [get\_template\_lambda](#module\_get\_template\_lambda) | ../lambda-function | n/a |
 | <a name="module_list_template_lambda"></a> [list\_template\_lambda](#module\_list\_template\_lambda) | ../lambda-function | n/a |

infrastructure/terraform/modules/backend-api/api_gateway_rest_api_main.tf

@@ -3,4 +3,6 @@ resource "aws_api_gateway_rest_api" "main" {
   body                         = local.openapi_spec
   description                  = "Templates API"
   disable_execute_api_endpoint = false
+
+  binary_media_types = [ "multipart/form-data" ]
 }

infrastructure/terraform/modules/backend-api/iam_role_api_gateway_execution_role.tf

@@ -50,6 +50,7 @@ data "aws_iam_policy_document" "api_gateway_execution_policy" {
     resources = [
       module.authorizer_lambda.function_arn,
       module.create_template_lambda.function_arn,
+      module.create_letter_template_lambda.function_arn,
       module.update_template_lambda.function_arn,
       module.get_template_lambda.function_arn,
       module.list_template_lambda.function_arn

infrastructure/terraform/modules/backend-api/locals.tf

@@ -4,21 +4,23 @@ locals {
   lambdas_source_code_dir = abspath("${path.module}/../../../../lambdas")
 
   openapi_spec = templatefile("${path.module}/spec.tmpl.json", {
-    AWS_REGION              = var.region
-    APIG_EXECUTION_ROLE_ARN = aws_iam_role.api_gateway_execution_role.arn
-    AUTHORIZER_LAMBDA_ARN   = module.authorizer_lambda.function_arn
-    CREATE_LAMBDA_ARN       = module.create_template_lambda.function_arn
-    UPDATE_LAMBDA_ARN       = module.update_template_lambda.function_arn
-    GET_LAMBDA_ARN          = module.get_template_lambda.function_arn
-    LIST_LAMBDA_ARN         = module.list_template_lambda.function_arn
+    AWS_REGION               = var.region
+    APIG_EXECUTION_ROLE_ARN  = aws_iam_role.api_gateway_execution_role.arn
+    AUTHORIZER_LAMBDA_ARN    = module.authorizer_lambda.function_arn
+    CREATE_LAMBDA_ARN        = module.create_template_lambda.function_arn
+    CREATE_LETTER_LAMBDA_ARN = module.create_letter_template_lambda.function_arn
+    UPDATE_LAMBDA_ARN        = module.update_template_lambda.function_arn
+    GET_LAMBDA_ARN           = module.get_template_lambda.function_arn
+    LIST_LAMBDA_ARN          = module.list_template_lambda.function_arn
   })
 
   backend_lambda_entrypoints = {
-    create_template = "src/templates/api/create.ts"
-    get_template    = "src/templates/api/get.ts"
-    update_template = "src/templates/api/update.ts"
-    list_template   = "src/templates/api/list.ts"
-    template_client = "src/index.ts"
+    create_template        = "src/templates/create.ts"
+    create_letter_template = "src/templates/create-letter.ts"
+    get_template           = "src/templates/get.ts"
+    update_template        = "src/templates/update.ts"
+    list_template          = "src/templates/list.ts"
+    template_client        = "src/index.ts"
   }
 
   dynamodb_kms_key_arn = var.dynamodb_kms_key_arn == "" ? aws_kms_key.dynamo[0].arn : var.dynamodb_kms_key_arn

infrastructure/terraform/modules/backend-api/module_build_template_lambda.tf

@@ -4,6 +4,7 @@ module "build_template_lambda" {
   source_code_dir = "${local.lambdas_source_code_dir}/backend-api"
   entrypoints = [
     local.backend_lambda_entrypoints.create_template,
+    local.backend_lambda_entrypoints.create_letter_template,
     local.backend_lambda_entrypoints.get_template,
     local.backend_lambda_entrypoints.update_template,
     local.backend_lambda_entrypoints.list_template,