Skip to content

Commit 1a7e96b

Browse files
mark-r-bjssmark-r-bjss
committed
CCM-8420: remove unnecessary class
1 parent 037e46c commit 1a7e96b

File tree

8 files changed

+29
-77
lines changed

8 files changed

+29
-77
lines changed

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

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import {
1515
} from '@utils/form-actions';
1616
import { getAccessTokenServer } from '@utils/amplify-utils';
1717
import { mockDeep } from 'jest-mock-extended';
18-
import { IBackendClient } from 'nhs-notify-backend-client/src/types/backend-client';
18+
import { ITemplateClient } from 'nhs-notify-backend-client';
1919

20-
const mockedBackendClient = mockDeep<IBackendClient>();
20+
const mockedTemplateClient = mockDeep<ITemplateClient>();
2121
const authIdTokenServerMock = jest.mocked(getAccessTokenServer);
2222

2323
jest.mock('@utils/amplify-utils');
24-
jest.mock('nhs-notify-backend-client/src/backend-api-client', () => ({
25-
BackendClient: () => mockedBackendClient,
24+
jest.mock('nhs-notify-backend-client/src/template-api-client', () => ({
25+
TemplateClient: () => mockedTemplateClient,
2626
}));
2727

2828
describe('form-actions', () => {
@@ -43,7 +43,7 @@ describe('form-actions', () => {
4343
updatedAt: '2025-01-13T10:19:25.579Z',
4444
};
4545

46-
mockedBackendClient.templates.createTemplate.mockResolvedValueOnce({
46+
mockedTemplateClient.createTemplate.mockResolvedValueOnce({
4747
data: responseData,
4848
});
4949

@@ -56,15 +56,15 @@ describe('form-actions', () => {
5656

5757
const response = await createTemplate(createTemplateInput);
5858

59-
expect(mockedBackendClient.templates.createTemplate).toHaveBeenCalledWith(
59+
expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
6060
createTemplateInput
6161
);
6262

6363
expect(response).toEqual(responseData);
6464
});
6565

6666
test('createTemplate - should thrown error when saving unexpectedly fails', async () => {
67-
mockedBackendClient.templates.createTemplate.mockResolvedValueOnce({
67+
mockedTemplateClient.createTemplate.mockResolvedValueOnce({
6868
error: {
6969
code: 400,
7070
message: 'Bad request',
@@ -82,7 +82,7 @@ describe('form-actions', () => {
8282
'Failed to create new template'
8383
);
8484

85-
expect(mockedBackendClient.templates.createTemplate).toHaveBeenCalledWith(
85+
expect(mockedTemplateClient.createTemplate).toHaveBeenCalledWith(
8686
createTemplateInput
8787
);
8888
});
@@ -114,7 +114,7 @@ describe('form-actions', () => {
114114
updatedAt: '2025-01-13T10:19:25.579Z',
115115
};
116116

117-
mockedBackendClient.templates.updateTemplate.mockResolvedValueOnce({
117+
mockedTemplateClient.updateTemplate.mockResolvedValueOnce({
118118
data: responseData,
119119
});
120120

@@ -128,7 +128,7 @@ describe('form-actions', () => {
128128

129129
const response = await saveTemplate(updateTemplateInput);
130130

131-
expect(mockedBackendClient.templates.updateTemplate).toHaveBeenCalledWith(
131+
expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
132132
updateTemplateInput.id,
133133
updateTemplateInput
134134
);
@@ -137,7 +137,7 @@ describe('form-actions', () => {
137137
});
138138

139139
test('saveTemplate - should thrown error when saving unexpectedly fails', async () => {
140-
mockedBackendClient.templates.updateTemplate.mockResolvedValueOnce({
140+
mockedTemplateClient.updateTemplate.mockResolvedValueOnce({
141141
error: {
142142
code: 400,
143143
message: 'Bad request',
@@ -156,7 +156,7 @@ describe('form-actions', () => {
156156
'Failed to save template data'
157157
);
158158

159-
expect(mockedBackendClient.templates.updateTemplate).toHaveBeenCalledWith(
159+
expect(mockedTemplateClient.updateTemplate).toHaveBeenCalledWith(
160160
updateTemplateInput.id,
161161
updateTemplateInput
162162
);
@@ -190,21 +190,19 @@ describe('form-actions', () => {
190190
updatedAt: '2025-01-13T10:19:25.579Z',
191191
};
192192

193-
mockedBackendClient.templates.getTemplate.mockResolvedValueOnce({
193+
mockedTemplateClient.getTemplate.mockResolvedValueOnce({
194194
data: responseData,
195195
});
196196

197197
const response = await getTemplate('id');
198198

199-
expect(mockedBackendClient.templates.getTemplate).toHaveBeenCalledWith(
200-
'id'
201-
);
199+
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
202200

203201
expect(response).toEqual(responseData);
204202
});
205203

206204
test('getTemplate - should return undefined when no data', async () => {
207-
mockedBackendClient.templates.getTemplate.mockResolvedValueOnce({
205+
mockedTemplateClient.getTemplate.mockResolvedValueOnce({
208206
data: undefined,
209207
error: {
210208
code: 404,
@@ -214,9 +212,7 @@ describe('form-actions', () => {
214212

215213
const response = await getTemplate('id');
216214

217-
expect(mockedBackendClient.templates.getTemplate).toHaveBeenCalledWith(
218-
'id'
219-
);
215+
expect(mockedTemplateClient.getTemplate).toHaveBeenCalledWith('id');
220216

221217
expect(response).toEqual(undefined);
222218
});
@@ -241,19 +237,19 @@ describe('form-actions', () => {
241237
updatedAt: '2025-01-13T10:19:25.579Z',
242238
};
243239

244-
mockedBackendClient.templates.listTemplates.mockResolvedValueOnce({
240+
mockedTemplateClient.listTemplates.mockResolvedValueOnce({
245241
data: [responseData],
246242
});
247243

248244
const response = await getTemplates();
249245

250-
expect(mockedBackendClient.templates.listTemplates).toHaveBeenCalledWith();
246+
expect(mockedTemplateClient.listTemplates).toHaveBeenCalledWith();
251247

252248
expect(response).toEqual([responseData]);
253249
});
254250

255251
test('getTemplates - should return empty array when fetching unexpectedly fails', async () => {
256-
mockedBackendClient.templates.listTemplates.mockResolvedValueOnce({
252+
mockedTemplateClient.listTemplates.mockResolvedValueOnce({
257253
data: undefined,
258254
error: {
259255
code: 500,
@@ -311,7 +307,7 @@ describe('form-actions', () => {
311307
'10',
312308
];
313309

314-
mockedBackendClient.templates.listTemplates.mockResolvedValueOnce({
310+
mockedTemplateClient.listTemplates.mockResolvedValueOnce({
315311
data: templates,
316312
});
317313

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ import {
55
Template,
66
isTemplateValid,
77
} from 'nhs-notify-web-template-management-utils';
8-
import {
9-
BackendClient,
10-
CreateTemplate,
11-
TemplateDTO,
12-
} from 'nhs-notify-backend-client';
8+
import { CreateTemplate, TemplateDTO } from 'nhs-notify-backend-client';
139
import { logger } from 'nhs-notify-web-template-management-utils/logger';
10+
import { TemplateClient } from 'nhs-notify-backend-client/src/template-api-client';
1411

1512
export async function createTemplate(
1613
template: CreateTemplate
@@ -21,8 +18,7 @@ export async function createTemplate(
2118
throw new Error('Failed to get access token');
2219
}
2320

24-
const { data, error } =
25-
await BackendClient(token).templates.createTemplate(template);
21+
const { data, error } = await TemplateClient(token).createTemplate(template);
2622

2723
if (error) {
2824
logger.error('Failed to create template', { error });
@@ -39,7 +35,7 @@ export async function saveTemplate(template: Template): Promise<TemplateDTO> {
3935
throw new Error('Failed to get access token');
4036
}
4137

42-
const { data, error } = await BackendClient(token).templates.updateTemplate(
38+
const { data, error } = await TemplateClient(token).updateTemplate(
4339
template.id,
4440
template
4541
);
@@ -61,8 +57,7 @@ export async function getTemplate(
6157
throw new Error('Failed to get access token');
6258
}
6359

64-
const { data, error } =
65-
await BackendClient(token).templates.getTemplate(templateId);
60+
const { data, error } = await TemplateClient(token).getTemplate(templateId);
6661

6762
if (error) {
6863
logger.error('Failed to get template', { error });
@@ -78,7 +73,7 @@ export async function getTemplates(): Promise<TemplateDTO[]> {
7873
throw new Error('Failed to get access token');
7974
}
8075

81-
const { data, error } = await BackendClient(token).templates.listTemplates();
76+
const { data, error } = await TemplateClient(token).listTemplates();
8277

8378
if (error) {
8479
logger.error('Failed to get templates', { error });

‎lambdas/backend-client/src/__tests__/backend-api-client.test.ts‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎lambdas/backend-client/src/backend-api-client.ts‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎lambdas/backend-client/src/index.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ export * from './types/generated';
33
export * from './types/result';
44
export * from './types/template-client';
55
export * from './schemas/template-schema';
6-
export * from './backend-api-client';

‎lambdas/backend-client/src/template-api-client.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,5 @@ export class TemplateApiClient implements ITemplateClient {
8787
};
8888
}
8989
}
90+
91+
export const TemplateClient = (token: string) => new TemplateApiClient(token);

‎lambdas/backend-client/src/types/backend-client.ts‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"test:unit": "npm run test:unit --workspaces",
2020
"typecheck": "npm run typecheck --workspaces",
2121
"lint": "npm run lint --workspaces",
22+
"lint:fix": "npm run lint:fix --workspaces",
2223
"dev": "npm run dev --workspace frontend --if-present",
2324
"create-test-user": "tsx ./tests/accessibility/create-test-user.ts",
2425
"delete-test-user": "tsx ./tests/accessibility/delete-test-user.ts"

0 commit comments

Comments
 (0)