Skip to content

Commit 9365458

Browse files
CCM-8579: Switch from util types to api client types
1 parent 2925540 commit 9365458

File tree

58 files changed

+756
-447
lines changed

Some content is hidden

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

58 files changed

+756
-447
lines changed

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
"dependencies": {
2121
"@aws-amplify/adapter-nextjs": "^1.4.3",
2222
"@aws-amplify/ui-react": "^6.9.1",
23-
"clsx": "^2.1.1",
23+
"@aws-sdk/client-ses": "^3.637.0",
2424
"aws-amplify": "^6.12.3",
25+
"clsx": "^2.1.1",
2526
"date-fns": "^4.1.0",
2627
"jsonwebtoken": "^9.0.2",
2728
"jwt-decode": "^4.0.0",
2829
"markdown-it": "^13.0.1",
2930
"mimetext": "^3.0.24",
3031
"next": "^15.2.1",
3132
"next-client-cookies": "^2.0.1",
32-
"nhs-notify-backend-client": "*",
3333
"nhs-notify-web-template-management-utils": "*",
3434
"nhsuk-frontend": "^9.1.0",
3535
"nhsuk-react-components": "^5.0.0",

frontend/src/app/copy-template/[templateId]/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
import { redirect, RedirectType } from 'next/navigation';
44
import { CopyTemplate } from '@forms/CopyTemplate/CopyTemplate';
5-
import { PageProps, $Template } from 'nhs-notify-web-template-management-utils';
5+
import { PageProps } from 'nhs-notify-web-template-management-utils';
66
import { getTemplate } from '@utils/form-actions';
7-
import { zodValidate } from '@utils/validate-template';
7+
import { isTemplateDTOValid } from 'nhs-notify-backend-client';
88

99
const CopyTemplatePage = async (props: PageProps) => {
1010
const { templateId } = await props.params;
1111

1212
const template = await getTemplate(templateId);
1313

14-
const validatedTemplate = zodValidate($Template, template);
14+
const validatedTemplate = isTemplateDTOValid(template);
1515

1616
if (!validatedTemplate) {
1717
return redirect('/invalid-template', RedirectType.replace);

frontend/src/app/create-email-template/page.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
22
import {
3-
EmailTemplate,
4-
Draft,
5-
TemplateStatus,
3+
CreateEmailTemplate,
64
TemplateType,
75
} from 'nhs-notify-web-template-management-utils';
86

97
const CreateEmailTemplatePage = async () => {
10-
const initialState: Draft<EmailTemplate> = {
8+
const initialState: CreateEmailTemplate = {
119
templateType: TemplateType.EMAIL,
12-
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
1310
name: '',
1411
subject: '',
1512
message: '',

frontend/src/app/create-nhs-app-template/page.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
22
import {
3-
NHSAppTemplate,
4-
Draft,
53
TemplateType,
6-
TemplateStatus,
4+
CreateNHSAppTemplate,
75
} from 'nhs-notify-web-template-management-utils';
86

97
const CreateNHSAppTemplatePage = async () => {
10-
const initialState: Draft<NHSAppTemplate> = {
8+
const initialState: CreateNHSAppTemplate = {
119
templateType: TemplateType.NHS_APP,
12-
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
1310
name: '',
1411
message: '',
1512
};

frontend/src/app/create-text-message-template/page.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
22
import {
3-
SMSTemplate,
4-
Draft,
53
TemplateType,
6-
TemplateStatus,
4+
CreateSMSTemplate,
75
} from 'nhs-notify-web-template-management-utils';
86

97
const CreateSMSTemplatePage = async () => {
10-
const initialState: Draft<SMSTemplate> = {
8+
const initialState: CreateSMSTemplate = {
119
templateType: TemplateType.SMS,
12-
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
1310
name: '',
1411
message: '',
1512
};

frontend/src/app/delete-template/[templateId]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import {
44
PageProps,
55
TemplateStatus,
6+
validateNonSubmittedTemplate,
67
} from 'nhs-notify-web-template-management-utils';
78
import { getTemplate } from '@utils/form-actions';
89
import { redirect, RedirectType } from 'next/navigation';
910
import { DeleteTemplate } from '@forms/DeleteTemplate/DeleteTemplate';
10-
import { validateNonSubmittedTemplate } from '@utils/validate-template';
1111

1212
const DeleteTemplatePage = async (props: PageProps) => {
1313
const { templateId } = await props.params;

frontend/src/app/edit-email-template/[templateId]/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
2-
import { PageProps } from 'nhs-notify-web-template-management-utils';
2+
import {
3+
PageProps,
4+
validateEmailTemplate,
5+
} from 'nhs-notify-web-template-management-utils';
36
import { getTemplate } from '@utils/form-actions';
47
import { redirect, RedirectType } from 'next/navigation';
5-
import { validateEmailTemplate } from '@utils/validate-template';
68

79
const CreateEmailTemplatePage = async (props: PageProps) => {
810
const { templateId } = await props.params;

frontend/src/app/edit-nhs-app-template/[templateId]/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use server';
22

33
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
4-
import { PageProps } from 'nhs-notify-web-template-management-utils';
4+
import {
5+
PageProps,
6+
validateNHSAppTemplate,
7+
} from 'nhs-notify-web-template-management-utils';
58
import { getTemplate } from '@utils/form-actions';
69
import { redirect, RedirectType } from 'next/navigation';
7-
import { validateNHSAppTemplate } from '@utils/validate-template';
810

911
const CreateNhsAppTemplatePage = async (props: PageProps) => {
1012
const { templateId } = await props.params;

frontend/src/app/edit-text-message-template/[templateId]/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use server';
22

33
import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
4-
import { PageProps } from 'nhs-notify-web-template-management-utils';
4+
import {
5+
PageProps,
6+
validateSMSTemplate,
7+
} from 'nhs-notify-web-template-management-utils';
58
import { getTemplate } from '@utils/form-actions';
69
import { redirect, RedirectType } from 'next/navigation';
7-
import { validateSMSTemplate } from '@utils/validate-template';
810

911
const CreateSmsTemplatePage = async (props: PageProps) => {
1012
const { templateId } = await props.params;

frontend/src/app/email-template-submitted/[templateId]/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
'use server';
22

33
import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
4-
import { TemplateSubmittedPageProps } from 'nhs-notify-web-template-management-utils';
4+
import {
5+
TemplateSubmittedPageProps,
6+
validateSubmittedEmailTemplate,
7+
} from 'nhs-notify-web-template-management-utils';
58
import { getTemplate } from '@utils/form-actions';
69
import { redirect, RedirectType } from 'next/navigation';
7-
import { validateSubmittedEmailTemplate } from '@utils/validate-template';
810

911
const EmailTemplateSubmittedPage = async (
1012
props: TemplateSubmittedPageProps

0 commit comments

Comments
 (0)