+
+
+
+
+
+ Autumn Campaign Plan
+
+
+
+ | + Select + | ++ Name + | ++ Type + | ++ Last edited + | ++ |
|---|---|---|---|---|
|
+
+
+
+
+
+ |
+ + + authoring letter template name + | ++ + Standard letter + | +
+
+ 13th Jan 2025
+ + 10:19 + |
+ + + + Preview + + | +
+ file.pdf +
- app content + +
+ file.csv
- -+ a.pdf +
++ b.pdf +
+- This template cannot be edited because it has been submitted. -
If you want to change a submitted or live template, you must create a new template to replace it.
@@ -145,7 +266,7 @@ exports[`PreviewSubmittedTemplate component routing = false should render app me- email content + app content
@@ -315,7 +411,7 @@ exports[`PreviewSubmittedTemplate component routing = false should render email `; -exports[`PreviewSubmittedTemplate component routing = false should render letter 1`] = ` +exports[`PreviewSubmittedTemplate component routing = false should render authoring letter 1`] = `- file.csv -
-- a.pdf -
-- b.pdf -
-- SMS content + email content
@@ -726,7 +796,7 @@ exports[`PreviewSubmittedTemplate component routing = false should render sms 1` `; -exports[`PreviewSubmittedTemplate component routing = true should render app message 1`] = ` +exports[`PreviewSubmittedTemplate component routing = false should render sms 1`] = `- You cannot edit or delete this template because it's used in a message plan that's in production. -
-- - Copy this template - - to create a draft with the same content. -
-- app content + SMS content
@@ -872,6 +921,12 @@ exports[`PreviewSubmittedTemplate component routing = true should render app mes+ This template cannot be edited because it has been submitted. +
++ If you want to change a submitted or live template, you must create a new template to replace it. +
`;
-exports[`PreviewSubmittedTemplate component routing = true should render email 1`] = `
+exports[`PreviewSubmittedTemplate component routing = true should render PDF letter 1`] = `
- You cannot edit or delete this template because it's used in a message plan that's in production. -
-- - Copy this template - - to create a draft with the same content. + You cannot delete this template because it's used in a message plan that's in production.
+ file.pdf +
- email content + +
+ file.csv
- -+
+ a.pdf +
++ b.pdf +
+
`;
-exports[`PreviewSubmittedTemplate component routing = true should render letter 1`] = `
+exports[`PreviewSubmittedTemplate component routing = true should render app message 1`] = `
- You cannot delete this template because it's used in a message plan that's in production.
+ You cannot edit or delete this template because it's used in a message plan that's in production.
+
+
+ Copy this template
+
+ to create a draft with the same content.
- file.pdf
+
+ app content
+ You cannot delete this template because it's used in a message plan that's in production.
+
- a.pdf
-
- b.pdf
-
+ You cannot edit or delete this template because it's used in a message plan that's in production.
+
+
+ Copy this template
+
+ to create a draft with the same content.
+
+ email content
+
+
+ Edit name
+
+ for Authoring Letter
+
+
+
+
+ Edit name
+
+ for Authoring Letter
+
+
+
- file.pdf
+
+ app content
- file.pdf
-
- app content
-
- template.pdf
+
+ message
- message
+
+
+ template.pdf
+
+ Edit name
+
+ for test-template-letter
+
+
+
+
+ Edit name
+
+ for test-template-letter
+
+
+
+
+ Edit name
+
+ for test-template-letter
+
+
+
+
+ {actions.editName}
+
+ {' '}
+ for {template.name}
+
+
+
- {backLinkText}
+ {backLinkText}
+
+ {backLinkText}
- Type
+ Template type
+
+
+
+
+
+
+
+
+
+ Message
+
-
-
+
+
+
+
+
+ Template
+
+
+
+ Example authoring letter
+
+
+
+ Locked
+
+
+
+
-
+
+
+
+
-
+ Standard letter
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Template
+
+
+
+ Example Email template
+
+
+
+ Locked
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1429,7 +1868,7 @@ exports[`PreviewSubmittedTemplate component routing = true should render sms 1`]
+
+
+ Subject
+
+
+ email subject
+
+
+
+ Message
+
+
+
+
+ Template
+
+
+
+ Authoring Letter
+
+
+
+
+
+`;
+
+exports[`PreviewTemplateDetailsAuthoringLetter snapshots matches snapshot with hideEditActions 1`] = `
+
+
+ Template
+
+
+
+ Authoring Letter
+
+
+
+
+
+
+ Template
+
+
+
+ Authoring Letter
+
+
+
+
+
- Type
+ Template type
- Example letter
+ Example template
- Type
+ Template type
- Not yet submitted
+ Draft
+
+
@@ -248,7 +868,7 @@ exports[`PreviewTemplateDetailsLetter if status is NOT_YET_SUBMITTED, then Not y
+ Message
+
-
-
- Example letter
+ PDF Letter
- Type
+ Template type
@@ -361,7 +981,7 @@ exports[`PreviewTemplateDetailsLetter if status is PROOF_AVAILABLE, but no proof
- Example letter
+ PDF Letter
- Type
+ Template type
+
+
+ );
+}
+
+function PreviewAuthoringLetterTemplate({
+ template,
+}: Readonly<{ template: AuthoringLetterTemplate }>) {
+ const {
+ backLinkText,
+ links,
+ validationError,
+ validationErrorAction,
+ virusScanError,
+ virusScanErrorAction,
+ } = content.components.previewLetterTemplate;
+
+ const errors: string[] = [];
+ if (template.templateStatus === 'VIRUS_SCAN_FAILED') {
+ errors.push(virusScanError, virusScanErrorAction);
+ }
+
+ if (template.templateStatus === 'VALIDATION_FAILED') {
+ errors.push(validationError, validationErrorAction);
+ }
+
+ return (
+ <>
+
+
-
- Template
-
-
-
- Example template
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Example template
+ PDF Letter
- Type
+ Template type
-
- Template
-
-
-
- Example template
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Message
-
-
-
-
- Type
+ Template type
+
+
+
- letter-template-id
+ app-template-id
- Type
+ Template type
+
+
@@ -496,7 +667,7 @@ exports[`PreviewTemplateFromMessagePlan renders Letter template preview with the
Go back
@@ -506,12 +677,12 @@ exports[`PreviewTemplateFromMessagePlan renders Letter template preview with the
+ Message
+
-
-
- app-template-id
+ letter-template-id
- Type
+ Template type
-
-
@@ -614,7 +788,7 @@ exports[`PreviewTemplateFromMessagePlan renders NHS App template preview with th
Go back
@@ -686,7 +860,7 @@ exports[`PreviewTemplateFromMessagePlan renders SMS template preview with the co
- Message
-
+ Template file
-
+
+
+
+
+
+ Template
+
+
+
+ test-template-letter
+
+
+
+
+
+
+
+
+
+
+
+
+ There is a problem
+
+
+
+
+
+ Template
+
+
+
+ test-template-letter
+
+
+
+
+
+
+
+
+
+
+
+
+ There is a problem
+
+
+
+
+
+ Template
+
+
+
+ test-template-letter
+
+
+
+
+
+
{previewComponent({
template: initialState,
+ hideEditActions: true,
})}
{!routing && (
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/ActionLink.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/ActionLink.tsx
new file mode 100644
index 000000000..78661c5a7
--- /dev/null
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/ActionLink.tsx
@@ -0,0 +1,39 @@
+'use client';
+
+import { SummaryList } from 'nhsuk-react-components';
+import Link from 'next/link';
+
+export type ActionLinkProps = {
+ href: string;
+ label: string;
+ visuallyHiddenText: string;
+ hidden?: boolean;
+ testId?: string;
+ external?: boolean;
+};
+
+export function ActionLink({
+ href,
+ label,
+ visuallyHiddenText,
+ hidden,
+ testId,
+ external,
+}: ActionLinkProps) {
+ if (hidden) {
+ return ;
+ }
+
+ const externalProps = external
+ ? { target: '_blank', rel: 'noopener noreferrer' }
+ : {};
+
+ return (
+
+
- {proofFilenames.map((file) => (
-
-
+ {proofFilenames.map((file) => (
+
+
+
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index 0ea068e0d..9208ffafb 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -537,6 +537,13 @@ const previewLetterTemplate = {
'After you submit your template, our service team will send you a proof by email instead.',
text3: 'This email will tell you what to do next.',
},
+ links: {
+ messageTemplates: '/message-templates',
+ submitLetterTemplate:
+ '{{basePath}}/submit-letter-template/{{templateId}}?lockNumber={{lockNumber}}',
+ requestProofOfTemplate:
+ '{{basePath}}/request-proof-of-template/{{templateId}}?lockNumber={{lockNumber}}',
+ },
};
const previewNHSAppTemplate = {
@@ -602,8 +609,34 @@ const previewTemplateDetails = {
campaignId: 'Campaign',
templateProofFiles: 'Template proof files',
templateStatus: 'Status',
- templateType: 'Type',
+ templateType: 'Template type',
examplePersonalisationFile: 'Example personalisation file',
+ letterType: 'Letter type',
+ sidesCount: 'Number of sides',
+ totalPages: 'Total pages',
+ sheets: 'Sheets',
+ printingAndPostage: 'Printing and postage',
+ },
+ actions: {
+ editName: 'Edit name',
+ edit: 'Edit',
+ learnMore: 'Learn more',
+ },
+ visuallyHidden: {
+ campaign: 'campaign',
+ sheets: 'about sheets',
+ printingAndPostage: 'printing and postage',
+ status: 'about status',
+ },
+ externalLinks: {
+ lettersPricing: 'https://notify.nhs.uk/pricing-and-commercial/letters',
+ templateStatuses:
+ 'https://notify.nhs.uk/templates/what-template-statuses-mean',
+ },
+ links: {
+ editTemplateName: '/edit-template-name/{{templateId}}',
+ editTemplateCampaign: '/edit-template-campaign/{{templateId}}',
+ choosePrintingAndPostage: '/choose-printing-and-postage/{{templateId}}',
},
previewTemplateStatusFootnote,
headerCaption: 'Template',
diff --git a/frontend/src/styles/app.scss b/frontend/src/styles/app.scss
index 7df9fb88e..57c31e281 100644
--- a/frontend/src/styles/app.scss
+++ b/frontend/src/styles/app.scss
@@ -141,3 +141,8 @@ a.nhsuk-link--no-visited-state {
.fit-content {
width: fit-content;
}
+
+.missing-value {
+ background-color: var(--nhsuk-pale-yellow-colour);
+ box-shadow: inset 0 0 0 3px var(--nhsuk-yellow-colour);
+}
diff --git a/infrastructure/terraform/modules/backend-api/spec.tmpl.json b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
index e6d1c7c57..504c2b3ac 100644
--- a/infrastructure/terraform/modules/backend-api/spec.tmpl.json
+++ b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
@@ -22,7 +22,6 @@
}
},
"required": [
- "letterVariantId",
"letterVersion",
"sidesCount"
],
diff --git a/lambdas/backend-client/src/__tests__/schemas/template.test.ts b/lambdas/backend-client/src/__tests__/schemas/template.test.ts
index 0dc14499c..97d2a60a4 100644
--- a/lambdas/backend-client/src/__tests__/schemas/template.test.ts
+++ b/lambdas/backend-client/src/__tests__/schemas/template.test.ts
@@ -329,7 +329,6 @@ describe('Template schemas', () => {
expect(result.success).toBe(false);
expect(result.error?.flatten().fieldErrors).toEqual(
expect.objectContaining({
- letterVariantId: expect.any(Array),
sidesCount: expect.any(Array),
})
);
diff --git a/lambdas/backend-client/src/schemas/template.ts b/lambdas/backend-client/src/schemas/template.ts
index b16e2d49e..e58f4d378 100644
--- a/lambdas/backend-client/src/schemas/template.ts
+++ b/lambdas/backend-client/src/schemas/template.ts
@@ -114,7 +114,7 @@ export const $AuthoringLetterProperties =
schemaFor
+ {errors.length > 0 && (
+