Skip to content

Commit 436f7f8

Browse files
alexnuttallClareJonesBJSSharrim91
authored
CCM-8585 upload pdf API (#340)
Co-authored-by: ClareJonesBJSS <[email protected]> Co-authored-by: Michael Harrison <[email protected]>
1 parent 0bbc25a commit 436f7f8

File tree

82 files changed

+5138
-892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+5138
-892
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@
33
*/
44
import CreateLetterTemplatePage from '@app/create-letter-template/page';
55

6+
const OLD_ENV = { ...process.env };
7+
68
describe('CreateLetterTemplatePage', () => {
7-
beforeEach(jest.resetAllMocks);
9+
beforeEach(() => {
10+
jest.resetAllMocks();
11+
process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'true';
12+
});
13+
14+
afterAll(() => {
15+
process.env = OLD_ENV;
16+
});
817

918
it('should render CreateLetterTemplatePage', async () => {
1019
const page = await CreateLetterTemplatePage();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('EditEmailTemplatePage', () => {
6262
it('should render CreateEmailTemplatePage component when template is found', async () => {
6363
getTemplateMock.mockResolvedValueOnce(template);
6464

65-
const emailTemplate = {
65+
const emailTemplate: EmailTemplate = {
6666
...template,
6767
subject: 'subject',
6868
templateType: 'EMAIL' as const,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ describe('Preview letter form renders', () => {
4848
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
4949
virusScanStatus: 'PENDING',
5050
},
51+
testDataCsv: undefined,
5152
},
5253
})}
5354
/>

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

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -756,43 +756,6 @@ exports[`Preview letter form renders matches snapshot when navigating from manag
756756
</div>
757757
</div>
758758
</div>
759-
<div
760-
class="nhsuk-grid-row preview__row"
761-
>
762-
<div
763-
class="nhsuk-grid-column-one-third preview__col"
764-
>
765-
<div
766-
class="preview__col_heading"
767-
>
768-
Test personalisation file
769-
</div>
770-
</div>
771-
<div
772-
class="nhsuk-grid-column-two-thirds col"
773-
>
774-
<div
775-
class="container"
776-
>
777-
<svg
778-
class="icon"
779-
fill="none"
780-
height="26"
781-
viewBox="0 0 20 26"
782-
width="20"
783-
xmlns="http://www.w3.org/2000/svg"
784-
>
785-
<path
786-
d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
787-
fill="#4C6272"
788-
/>
789-
</svg>
790-
<p
791-
class="text"
792-
/>
793-
</div>
794-
</div>
795-
</div>
796759
</div>
797760
</div>
798761
<form

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ const manageTemplatesProps: {
3939
files: {
4040
pdfTemplate: {
4141
fileName: 'template.pdf',
42+
currentVersion: '8BAC',
43+
virusScanStatus: 'PASSED',
4244
},
4345
},
4446
},

‎frontend/src/__tests__/helpers.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ export const LETTER_TEMPLATE: TemplateDto = {
5757
files: {
5858
pdfTemplate: {
5959
fileName: 'template.pdf',
60+
currentVersion: '8ADED236B5AE',
61+
virusScanStatus: 'PASSED',
6062
},
6163
},
6264
name: 'name',

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ import {
1212
getTemplates,
1313
} from '@utils/form-actions';
1414
import { getAccessTokenServer } from '@utils/amplify-utils';
15-
import { mockDeep } from 'jest-mock-extended';
16-
import { ITemplateClient, TemplateDto } from 'nhs-notify-backend-client';
15+
import { TemplateDto } from 'nhs-notify-backend-client';
16+
import { templateClient } from 'nhs-notify-backend-client/src/template-api-client';
1717

18-
const mockedTemplateClient = mockDeep<ITemplateClient>();
18+
const mockedTemplateClient = jest.mocked(templateClient);
1919
const authIdTokenServerMock = jest.mocked(getAccessTokenServer);
2020

2121
jest.mock('@utils/amplify-utils');
22-
jest.mock('nhs-notify-backend-client/src/template-api-client', () => ({
23-
TemplateClient: () => mockedTemplateClient,
24-
}));
22+
jest.mock('nhs-notify-backend-client/src/template-api-client');
2523

2624
describe('form-actions', () => {
2725
beforeEach(() => {
@@ -53,7 +51,8 @@ describe('form-actions', () => {
5351
const response = await createTemplate(createTemplateInput);
5452

5553
expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
56-
createTemplateInput
54+
createTemplateInput,
55+
'token'
5756
);
5857

5958
expect(response).toEqual(responseData);
@@ -78,7 +77,8 @@ describe('form-actions', () => {
7877
);
7978

8079
expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
81-
createTemplateInput
80+
createTemplateInput,
81+
'token'
8282
);
8383
});
8484

@@ -126,7 +126,8 @@ describe('form-actions', () => {
126126

127127
expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
128128
updateTemplateInput.id,
129-
updateTemplateInput
129+
updateTemplateInput,
130+
'token'
130131
);
131132

132133
expect(response).toEqual(responseData);
@@ -156,7 +157,8 @@ describe('form-actions', () => {
156157

157158
expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
158159
updateTemplateInput.id,
159-
updateTemplateInput
160+
updateTemplateInput,
161+
'token'
160162
);
161163
});
162164

@@ -196,7 +198,10 @@ describe('form-actions', () => {
196198

197199
const response = await getTemplate('id');
198200

199-
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
201+
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith(
202+
'id',
203+
'token'
204+
);
200205

201206
expect(response).toEqual(responseData);
202207
});
@@ -212,7 +217,10 @@ describe('form-actions', () => {
212217

213218
const response = await getTemplate('id');
214219

215-
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
220+
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith(
221+
'id',
222+
'token'
223+
);
216224

217225
expect(response).toEqual(undefined);
218226
});
@@ -243,7 +251,7 @@ describe('form-actions', () => {
243251

244252
const response = await getTemplates();
245253

246-
expect(mockedTemplateClient.listTemplates).toHaveBeenCalledWith();
254+
expect(mockedTemplateClient.listTemplates).toHaveBeenCalledWith('token');
247255

248256
expect(response).toEqual([responseData]);
249257
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ export const EmailTemplateForm: FC<
139139
</div>
140140
<aside className='nhsuk-grid-column-one-third'>
141141
<Personalisation />
142-
<MessageFormatting template={'EMAIL'} />
143-
<ChannelGuidance template={'EMAIL'} />
142+
<MessageFormatting template='EMAIL' />
143+
<ChannelGuidance template='EMAIL' />
144144
</aside>
145145
</div>
146146
</NHSNotifyMain>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ export const NhsAppTemplateForm: FC<
116116
</div>
117117
<aside className='nhsuk-grid-column-one-third'>
118118
<Personalisation />
119-
<MessageFormatting template={'NHS_APP'} />
120-
<ChannelGuidance template={'NHS_APP'} />
119+
<MessageFormatting template='NHS_APP' />
120+
<ChannelGuidance template='NHS_APP' />
121121
</aside>
122122
</div>
123123
</NHSNotifyMain>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ export const SmsTemplateForm: FC<
134134
</div>
135135
<aside className='nhsuk-grid-column-one-third'>
136136
<Personalisation />
137-
<MessageFormatting template={'SMS'} />
138-
<ChannelGuidance template={'SMS'} />
137+
<MessageFormatting template='SMS' />
138+
<ChannelGuidance template='SMS' />
139139
</aside>
140140
</div>
141141
</NHSNotifyMain>

0 commit comments

Comments
 (0)