Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
c8dbf32
CCM-14190: letter variants
harrim91 Feb 24, 2026
e38a3a0
CCM-14190: test storage helper
harrim91 Feb 25, 2026
a6b04b2
CCM-14190: test context helper
harrim91 Feb 26, 2026
c90f13a
CCM-14190: npm audit fix
harrim91 Feb 26, 2026
02f3688
CCM-14190: add patch api tests
harrim91 Feb 26, 2026
5ac8aae
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Feb 27, 2026
181311f
CCM-14190: audit fix
harrim91 Feb 27, 2026
1ffe6b1
CCM-14190: playwright tests
harrim91 Feb 27, 2026
fb638d3
CCM-14190: final api test
harrim91 Feb 27, 2026
dc40a10
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Feb 27, 2026
909c112
CCM-14190: fix
harrim91 Feb 27, 2026
deeaa2d
Merge commit '45bdb8ec1c73b54f15964e7dd383b6e3fbe4ed26' into feature/…
ClareJonesBJSS Mar 3, 2026
0aee81e
Merge commit 'dec3fdbba72fe7a2790e1f63b5c570aaf9929446' into feature/…
ClareJonesBJSS Mar 3, 2026
a797fb5
Code review comments
ClareJonesBJSS Mar 3, 2026
b26b9d7
Merge fixes
ClareJonesBJSS Mar 3, 2026
1e4a927
AuthoringLetterPatch -> LetterPatch
ClareJonesBJSS Mar 3, 2026
c64769d
nits
ClareJonesBJSS Mar 3, 2026
75a7429
Standardise nhs-notify-backend-client imports
ClareJonesBJSS Mar 3, 2026
6f43c8d
CCM-14190: Flag missing p&p object
ClareJonesBJSS Mar 4, 2026
0f02c30
package lock
ClareJonesBJSS Mar 5, 2026
74cc84f
Merge commit 'a8b7c7d04f0eee1e5e01a7681205dbcc75e9511b' into feature/…
ClareJonesBJSS Mar 5, 2026
9c7b249
Merge commit '36e4ac0fff9a1da777626b6bb9173cd04ded9387' into feature/…
ClareJonesBJSS Mar 5, 2026
3d852c5
Poll letter variant GSIs to hopefully fix flaky acceptance tests
ClareJonesBJSS Mar 5, 2026
94f59ce
Merge commit '6e2fec6320e4171fbb2909236f8be9609a4b93bb' into feature/…
ClareJonesBJSS Mar 5, 2026
9b960a4
Fix accessibility tests
ClareJonesBJSS Mar 5, 2026
7f1474b
Check client feature flag before template validity
ClareJonesBJSS Mar 5, 2026
bacfc73
Trivy
ClareJonesBJSS Mar 5, 2026
51b14e7
Accessibility locknumber and coverage
ClareJonesBJSS Mar 6, 2026
b43835b
Temp 0 cache to confirm if its actually the issue
ClareJonesBJSS Mar 6, 2026
ebda10d
Revert "Temp 0 cache to confirm if its actually the issue"
ClareJonesBJSS Mar 6, 2026
92ff3c5
Don't delete global variants
ClareJonesBJSS Mar 6, 2026
885d235
CCM-14190: lockfile
harrim91 Mar 9, 2026
e081d41
CCM-14190: feedback
harrim91 Mar 9, 2026
325ec8e
CCM-14190: prevent creation of adhoc global variants in tests
harrim91 Mar 9, 2026
0516298
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Mar 9, 2026
87fd386
CCM-14190: lockfile
harrim91 Mar 10, 2026
1d10b89
CCM-14190: lambda module version bump
harrim91 Mar 10, 2026
741c034
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Mar 10, 2026
3f2f532
CCM-14190: regenerate types
harrim91 Mar 10, 2026
6bab8b4
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Mar 11, 2026
eb283b1
CCM-14190: add missing aria attribute
harrim91 Mar 11, 2026
bb10002
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Mar 12, 2026
2f4f16e
init
alexnuttall Mar 13, 2026
7f7d232
skeleton page
alexnuttall Mar 13, 2026
9141f7c
tests
alexnuttall Mar 13, 2026
5e4b5e9
fix details header
alexnuttall Mar 13, 2026
df51e17
undo changes to detailheader
alexnuttall Mar 14, 2026
479deec
Merge branch 'feature/CCM-14190_choose-printing-and-postage' into fea…
alexnuttall Mar 16, 2026
bc6c6cf
add variant name to table
alexnuttall Mar 16, 2026
b23b473
fetch and validate against variant
alexnuttall Mar 16, 2026
95a8693
post merge fixes
alexnuttall Mar 16, 2026
898fd6a
wip
alexnuttall Mar 16, 2026
eed22b6
api tests
alexnuttall Mar 16, 2026
9ee5fe7
api test passing
alexnuttall Mar 16, 2026
cae752b
error responses
alexnuttall Mar 16, 2026
f3e71cd
update tests
alexnuttall Mar 16, 2026
853b3c9
sheet display test
alexnuttall Mar 16, 2026
8ae0256
accessibility test
alexnuttall Mar 17, 2026
9ab95b3
unit test fix
alexnuttall Mar 17, 2026
a0c6e3f
page snap
alexnuttall Mar 17, 2026
be188a6
url util
alexnuttall Mar 17, 2026
065f979
Merge remote-tracking branch 'origin/main' into feature/CCM-14190_cho…
alexnuttall Mar 17, 2026
a872083
post merge fix
alexnuttall Mar 17, 2026
4f288d2
Merge branch 'feature/CCM-14190_choose-printing-and-postage' into fea…
alexnuttall Mar 17, 2026
47937ad
post merge fix
alexnuttall Mar 17, 2026
6ce3a61
component test fix
alexnuttall Mar 18, 2026
290b1c5
cleanup
alexnuttall Mar 18, 2026
5dcb415
open link in new tab
alexnuttall Mar 18, 2026
4c25d7c
approve button test id
alexnuttall Mar 18, 2026
c156e49
disable sonar
alexnuttall Mar 18, 2026
2e18040
template client tests
alexnuttall Mar 18, 2026
bb8029b
Merge branch 'main' into feature/CCM-14190_choose-printing-and-postage
harrim91 Mar 18, 2026
1213af9
Merge branch 'feature/CCM-14190_choose-printing-and-postage' into fea…
alexnuttall Mar 18, 2026
ab97d54
add curl command
alexnuttall Mar 18, 2026
235fc36
test for open in new tab link
alexnuttall Mar 18, 2026
b3f97a1
component test for sheet count
alexnuttall Mar 18, 2026
795154a
set status explicityly in a11y render setup
alexnuttall Mar 18, 2026
8e2a60a
component test assertions on learn more links
alexnuttall Mar 18, 2026
07089cd
api test for deletion
alexnuttall Mar 19, 2026
f658ab7
lockfile
alexnuttall Mar 19, 2026
4d32079
use accessible role selector in component test
alexnuttall Mar 19, 2026
d4416be
Merge commit '65e216cb68653c8484df2c35d5c4c9ac44a004fa' into feature/…
ClareJonesBJSS Mar 25, 2026
a9518da
missing encodeURIs
ClareJonesBJSS Mar 25, 2026
571a755
Accessibility test failed merge
ClareJonesBJSS Mar 25, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewEmailTemplateFromMessagePlan page renders Email template preview
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
email template name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewLargePrintLetterTemplateFromMessagePlan page renders large print
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
large print letter template name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewNhsAppTemplateFromMessagePlan page renders NHS App template prev
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
app template name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewOtherLanguageLetterTemplateFromMessagePlan page renders foreign
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
French letter template
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewStandardEnglishLetterTemplateFromMessagePlan page renders letter
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
letter template name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ exports[`PreviewTextMessageTemplateFromMessagePlan page renders SMS template pre
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
sms template name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
authoring letter template name
Expand Down Expand Up @@ -222,6 +221,8 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
<a
class="nhsuk-body"
href="https://notify.nhs.uk/using-nhs-notify/personalisation"
rel="noopener noreferrer"
target="_blank"
>
Learn more about personalising your letters (opens in a new tab).
</a>
Expand Down Expand Up @@ -627,7 +628,6 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
authoring letter template name
Expand Down Expand Up @@ -778,6 +778,8 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
<a
class="nhsuk-body"
href="https://notify.nhs.uk/using-nhs-notify/personalisation"
rel="noopener noreferrer"
target="_blank"
>
Learn more about personalising your letters (opens in a new tab).
</a>
Expand Down Expand Up @@ -1176,7 +1178,6 @@ exports[`valid PDF letter template matches snapshot 1`] = `
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
letter template name
Expand Down Expand Up @@ -1339,7 +1340,6 @@ exports[`valid authoring letter template matches snapshot 1`] = `
Template
</span>
<h1
class="preview__heading"
data-testid="preview-message__heading"
>
authoring letter template name
Expand Down Expand Up @@ -1563,6 +1563,8 @@ exports[`valid authoring letter template matches snapshot 1`] = `
<a
class="nhsuk-body"
href="https://notify.nhs.uk/using-nhs-notify/personalisation"
rel="noopener noreferrer"
target="_blank"
>
Learn more about personalising your letters (opens in a new tab).
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('submitAuthoringLetterAction', () => {
await submitAuthoringLetterAction({}, formData);

expect(redirectMock).toHaveBeenCalledWith(
'/submit-letter-template/template-123?lockNumber=1'
'/review-and-approve-letter-template/template-123?lockNumber=1'
);
});

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`valid authoring letter template matches snapshot 1`] = `
<DocumentFragment>
<div
class="nhsuk-width-container"
>
<main
class="nhsuk-main-wrapper"
id="maincontent"
role="main"
>
<div
class="nhsuk-u-reading-width"
>
<span
class="nhsuk-caption-l"
>
Step 2 of 2
</span>
<h1
data-testid="preview-message__heading"
>
Review and approve 'authoring letter template name'
</h1>
</div>
<div
class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
>
<dl
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
>
<div
class="nhsuk-summary-list__row"
>
<dt
class="nhsuk-summary-list__key"
>
Template ID
</dt>
<dd
class="nhsuk-summary-list__value monospace-font"
data-testid="preview-template-id"
>
authoring-letter-template-id
</dd>
<dd
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row"
>
<dt
class="nhsuk-summary-list__key"
>
Template type
</dt>
<dd
class="nhsuk-summary-list__value"
>
Standard letter
</dd>
<dd
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row missing-value"
id="campaign-id"
>
<dt
class="nhsuk-summary-list__key"
>
Campaign
</dt>
<dd
class="nhsuk-summary-list__value"
/>
<dd
aria-hidden="true"
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row"
>
<dt
class="nhsuk-summary-list__key"
>
Total pages
</dt>
<dd
class="nhsuk-summary-list__value"
>
2
</dd>
<dd
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row"
>
<dt
class="nhsuk-summary-list__key"
>
Sheets
</dt>
<dd
class="nhsuk-summary-list__value"
>
1
</dd>
<dd
aria-hidden="true"
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row"
id="printing-and-postage"
>
<dt
class="nhsuk-summary-list__key"
>
Printing and postage
</dt>
<dd
class="nhsuk-summary-list__value"
>
Standard C5
</dd>
<dd
aria-hidden="true"
class="nhsuk-summary-list__actions"
/>
</div>
<div
class="nhsuk-summary-list__row"
>
<dt
class="nhsuk-summary-list__key"
>
Status
</dt>
<dd
class="nhsuk-summary-list__value"
>
<strong
class="nhsuk-tag nhsuk-tag--yellow"
data-status="not-yet-submitted"
data-testid="status-tag"
>
Approval needed
</strong>
</dd>
<dd
aria-hidden="true"
class="nhsuk-summary-list__actions"
/>
</div>
</dl>
</div>
<h2
class="nhsuk-heading-m"
>
Short example preview
</h2>
<iframe
aria-label="PDF preview of letter template with short example personalisation data"
class="iframe nhsuk-u-margin-bottom-6"
src="/templates/files/client-123/renders/authoring-letter-template-id/short-form.pdf"
title="Letter preview - short examples"
/>
<h2
class="nhsuk-heading-m"
>
Long example preview
</h2>
<iframe
aria-label="PDF preview of letter template with long example personalisation data"
class="iframe nhsuk-u-margin-bottom-6"
src="/templates/files/client-123/renders/authoring-letter-template-id/long-form.pdf"
title="Letter preview - long examples"
/>
<form
action="javascript:throw new Error('A React form was unexpectedly submitted. If you called form.submit() manually, consider using form.requestSubmit() instead. If you\\'re trying to use event.stopPropagation() in a submit event handler, consider also calling event.preventDefault().')"
>
<input
name="form-id"
readonly=""
type="hidden"
value="review-and-approve-letter"
/>
<input
name="csrf_token"
readonly=""
type="hidden"
value="no_token"
/>
<input
name="templateId"
type="hidden"
value="authoring-letter-template-id"
/>
<input
name="lockNumber"
type="hidden"
value="1"
/>
<div
class="nhsuk-form-group"
>
<button
aria-disabled="false"
class="nhsuk-button"
type="submit"
>
Approve letter template
</button>
<a
aria-disabled="false"
class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-left-3"
data-testid="back-link-bottom"
draggable="false"
href="/templates/get-ready-to-approve-letter-template/authoring-letter-template-id"
id="go-back-button"
role="button"
>
Go back
</a>
</div>
</form>
</main>
</div>
</DocumentFragment>
`;
Loading
Loading