Skip to content

Commit 0c58a89

Browse files
Merge pull request #181 from NHSDigital/feature/CCM-5630_ui-changes-template-status
CCM-5630: Implement template status
2 parents 7a7be81 + 85fb18d commit 0c58a89

File tree

76 files changed

+1702
-1366
lines changed

Some content is hidden

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

76 files changed

+1702
-1366
lines changed

amplify/data/resource.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,27 @@ enum TemplateType {
88
LETTER = 'LETTER',
99
}
1010

11+
enum TemplateStatus {
12+
NOT_YET_SUBMITTED = 'NOT_YET_SUBMITTED',
13+
SUBMITTED = 'SUBMITTED',
14+
}
15+
1116
const templateTypes = [
1217
TemplateType.NHS_APP,
1318
TemplateType.SMS,
1419
TemplateType.EMAIL,
1520
TemplateType.LETTER,
1621
] as const;
1722

23+
const templateStatuses = [
24+
TemplateStatus.NOT_YET_SUBMITTED,
25+
TemplateStatus.SUBMITTED,
26+
] as const;
27+
1828
const TemplateStorageModel = {
1929
id: a.string().required(),
2030
templateType: a.ref('TemplateType').required(),
31+
templateStatus: a.ref('TemplateStatus').required(),
2132
version: a.integer().required(),
2233
name: a.string().required(),
2334
subject: a.string(),
@@ -32,6 +43,7 @@ const authPermission = (allow: any) =>
3243

3344
const schema = a.schema({
3445
TemplateType: a.enum(templateTypes),
46+
TemplateStatus: a.enum(templateStatuses),
3547
TemplateStorage: a.model(TemplateStorageModel).authorization(authPermission),
3648
sendEmail: a
3749
.query()

src/__tests__/app/create-email-template/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exports[`CreateEmailTemplatePage should render CreateEmailTemplatePage 1`] = `
77
"message": "",
88
"name": "",
99
"subject": "",
10+
"templateStatus": "NOT_YET_SUBMITTED",
1011
"templateType": "EMAIL",
1112
"version": 1,
1213
}

src/__tests__/app/create-nhs-app-template/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`CreateNHSAppTemplatePage should render CreateNHSAppTemplatePage 1`] = `
66
{
77
"message": "",
88
"name": "",
9+
"templateStatus": "NOT_YET_SUBMITTED",
910
"templateType": "NHS_APP",
1011
"version": 1,
1112
}

src/__tests__/app/create-text-message-template/__snapshots__/page.test.tsx.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`CreateSMSTemplatePage should render CreateSMSTemplatePage 1`] = `
66
{
77
"message": "",
88
"name": "",
9+
"templateStatus": "NOT_YET_SUBMITTED",
910
"templateType": "SMS",
1011
"version": 1,
1112
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import EditEmailTemplatePage from '@app/edit-email-template/[templateId]/page';
55
import { getTemplate } from '@utils/form-actions';
66
import { EmailTemplate } from '@utils/types';
7-
import { TemplateType } from '@utils/enum';
7+
import { TemplateStatus, TemplateType } from '@utils/enum';
88
import { redirect } from 'next/navigation';
99
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
1010

@@ -19,6 +19,7 @@ const initialState: EmailTemplate = {
1919
id: 'template-id',
2020
version: 1,
2121
templateType: TemplateType.EMAIL,
22+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
2223
name: 'name',
2324
subject: 'subject',
2425
message: 'message',

src/__tests__/app/edit-nhs-app-template/page.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @jest-environment node
33
*/
44
import { redirect } from 'next/navigation';
5-
import { TemplateType } from '@utils/enum';
5+
import { TemplateType, TemplateStatus } from '@utils/enum';
66
import { getTemplate } from '@utils/form-actions';
77
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
88
import EditNhsAppTemplatePage from '@app/edit-nhs-app-template/[templateId]/page';
@@ -23,6 +23,7 @@ describe('EditNhsAppTemplatePage', () => {
2323
id: 'template-id',
2424
version: 1,
2525
templateType: TemplateType.NHS_APP,
26+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
2627
name: 'name',
2728
message: 'message',
2829
};
@@ -61,6 +62,7 @@ describe('EditNhsAppTemplatePage', () => {
6162
id: 'template-id',
6263
version: 1,
6364
templateType,
65+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
6466
name: 'name',
6567
message: 'message',
6668
});

src/__tests__/app/edit-text-message-template/page.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import EditSmsTemplatePage from '@app/edit-text-message-template/[templateId]/page';
55
import { getTemplate } from '@utils/form-actions';
66
import { SMSTemplate } from '@utils/types';
7-
import { TemplateType } from '@utils/enum';
7+
import { TemplateType, TemplateStatus } from '@utils/enum';
88
import { redirect } from 'next/navigation';
99
import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
1010

@@ -19,6 +19,7 @@ const initialState: SMSTemplate = {
1919
id: 'template-id',
2020
version: 1,
2121
templateType: TemplateType.SMS,
22+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
2223
name: '',
2324
message: '',
2425
};

src/__tests__/app/email-template-submitted/page.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import nav from 'next/navigation';
22
import EmailTemplateSubmittedPage from '@app/email-template-submitted/[templateId]/page';
33
import { render } from '@testing-library/react';
44
import { getTemplate } from '@utils/form-actions';
5-
import { TemplateType } from '@utils/enum';
5+
import { TemplateType, TemplateStatus } from '@utils/enum';
66

77
jest.mock('@utils/form-actions', () => ({
88
getTemplate: jest.fn().mockImplementation((templateId: string) => {
@@ -11,6 +11,7 @@ jest.mock('@utils/form-actions', () => ({
1111
id: 'template-id',
1212
version: 1,
1313
templateType: TemplateType.EMAIL,
14+
templateStatus: TemplateStatus.SUBMITTED,
1415
name: 'template-name',
1516
subject: 'template-subject',
1617
message: 'template-message',

src/__tests__/app/nhs-app-template-submitted/page.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import nav from 'next/navigation';
22
import NhsAppTemplateSubmittedPage from '@app/nhs-app-template-submitted/[templateId]/page';
33
import { render } from '@testing-library/react';
44
import { getTemplate } from '@utils/form-actions';
5-
import { TemplateType } from '@utils/enum';
5+
import { TemplateStatus, TemplateType } from '@utils/enum';
66

77
jest.mock('@utils/form-actions', () => ({
88
getTemplate: jest.fn().mockImplementation((templateId: string) => {
@@ -11,6 +11,7 @@ jest.mock('@utils/form-actions', () => ({
1111
id: 'template-id',
1212
version: 1,
1313
templateType: TemplateType.NHS_APP,
14+
templateStatus: TemplateStatus.SUBMITTED,
1415
name: 'template-name',
1516
message: 'template-message',
1617
};

src/__tests__/app/preview-email-template/page.test.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import PreviewEmailTemplatePage from '@app/preview-email-template/[templateId]/page';
22
import { ReviewEmailTemplate } from '@forms/ReviewEmailTemplate';
33
import { EmailTemplate } from '@utils/types';
4-
import { TemplateType } from '@utils/enum';
4+
import { TemplateType, TemplateStatus } from '@utils/enum';
55
import { redirect } from 'next/navigation';
66
import { getTemplate } from '@utils/form-actions';
77

@@ -21,6 +21,7 @@ describe('PreviewEmailTemplatePage', () => {
2121
id: 'template-id',
2222
version: 1,
2323
templateType: TemplateType.EMAIL,
24+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
2425
name: 'template-name',
2526
subject: 'template-subject-line',
2627
message: 'template-message',
@@ -95,6 +96,7 @@ describe('PreviewEmailTemplatePage', () => {
9596
async (value) => {
9697
getTemplateMock.mockResolvedValueOnce({
9798
id: 'template-id',
99+
templateStatus: TemplateStatus.NOT_YET_SUBMITTED,
98100
version: 1,
99101
...value,
100102
});

0 commit comments

Comments
 (0)