Skip to content

Commit 6480d8f

Browse files
harrim91harrim91
committed
Merge branch 'main' into feature/CCM-12744-routing-config-optimistic-locking
2 parents e674448 + 91152c4 commit 6480d8f

File tree

219 files changed

+12528
-2105
lines changed

Some content is hidden

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

219 files changed

+12528
-2105
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,7 @@ lambdas/backend-api/src/email/email-template.json
9393
# vscode
9494
.vscode/settings.local.json
9595

96+
# github
97+
.github/copilot-instructions.md
98+
9699
test-runs

‎frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
102102
class="nhsuk-u-margin-bottom-2"
103103
data-testid="template-name-NHSAPP"
104104
>
105-
name
105+
app template name
106106
</p>
107107
<ul
108108
class="channel-template-actions"
@@ -111,7 +111,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
111111
<a
112112
class="nhsuk-link nhsuk-link--no-visited-state"
113113
data-testid="change-template-link-NHSAPP"
114-
href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34"
114+
href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
115115
>
116116
Change
117117
<span
@@ -283,7 +283,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
283283
class="nhsuk-u-margin-bottom-2"
284284
data-testid="template-name-SMS"
285285
>
286-
name
286+
sms template name
287287
</p>
288288
<ul
289289
class="channel-template-actions"
@@ -292,7 +292,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
292292
<a
293293
class="nhsuk-link nhsuk-link--no-visited-state"
294294
data-testid="change-template-link-SMS"
295-
href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34"
295+
href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
296296
>
297297
Change
298298
<span
@@ -467,7 +467,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
467467
<a
468468
class="nhsuk-link nhsuk-link--no-visited-state"
469469
data-testid="choose-template-link-EMAIL"
470-
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34"
470+
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
471471
>
472472
Choose
473473
<span
@@ -602,7 +602,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
602602
class="nhsuk-u-margin-bottom-2"
603603
data-testid="template-name-LETTER"
604604
>
605-
name
605+
letter template name
606606
</p>
607607
<ul
608608
class="channel-template-actions"
@@ -611,7 +611,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
611611
<a
612612
class="nhsuk-link nhsuk-link--no-visited-state"
613613
data-testid="change-template-link-LETTER"
614-
href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
614+
href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
615615
>
616616
Change
617617
<span

‎frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap‎

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`ChooseEmailTemplate page renders Email template selection 1`] = `
4+
<DocumentFragment>
5+
<main
6+
class="nhsuk-main-wrapper"
7+
id="maincontent"
8+
role="main"
9+
>
10+
<div
11+
class="nhsuk-grid-row"
12+
>
13+
<div
14+
class="nhsuk-grid-column-full"
15+
>
16+
<span
17+
class="nhsuk-caption-l"
18+
>
19+
Autumn Campaign Plan
20+
</span>
21+
<h1
22+
class="nhsuk-heading-l"
23+
>
24+
Choose an email template
25+
</h1>
26+
<form
27+
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().')"
28+
>
29+
<input
30+
name="form-id"
31+
readonly=""
32+
type="hidden"
33+
value="choose-channel-template"
34+
/>
35+
<input
36+
name="csrf_token"
37+
readonly=""
38+
type="hidden"
39+
value="no_token"
40+
/>
41+
<input
42+
name="lockNumber"
43+
readonly=""
44+
type="hidden"
45+
value="42"
46+
/>
47+
<dl
48+
class="nhsuk-summary-list"
49+
data-testid="previous-selection-summary"
50+
>
51+
<div
52+
class="nhsuk-summary-list__row"
53+
>
54+
<dt
55+
class="nhsuk-summary-list__key"
56+
>
57+
Previously selected template
58+
</dt>
59+
<dd
60+
class="nhsuk-summary-list__value"
61+
>
62+
email template name
63+
</dd>
64+
</div>
65+
</dl>
66+
<div
67+
class="nhsuk-grid-row"
68+
>
69+
<div
70+
class="nhsuk-grid-column-full"
71+
>
72+
<div
73+
class="nhsuk-hint"
74+
>
75+
Choose one option
76+
</div>
77+
<div
78+
class="nhsuk-form-group"
79+
>
80+
<div
81+
class="nhsuk-radios"
82+
id="channelTemplate"
83+
>
84+
<table
85+
class="nhsuk-table-responsive"
86+
data-testid="channel-templates-table"
87+
id="channel-templates-table"
88+
>
89+
<thead
90+
class="nhsuk-table__head"
91+
role="rowgroup"
92+
>
93+
<tr
94+
class="nhsuk-table__row"
95+
>
96+
<th
97+
class="nhsuk-table__header"
98+
data-testid="channel-templates-table-header-template-select"
99+
scope="col"
100+
>
101+
Select
102+
</th>
103+
<th
104+
class="nhsuk-table__header"
105+
data-testid="channel-templates-table-header-template-name"
106+
scope="col"
107+
>
108+
Name
109+
</th>
110+
<th
111+
class="nhsuk-table__header"
112+
data-testid="channel-templates-table-header-template-type"
113+
scope="col"
114+
>
115+
Type
116+
</th>
117+
<th
118+
class="nhsuk-table__header"
119+
data-testid="channel-templates-table-header-template-last-edited"
120+
scope="col"
121+
>
122+
Last edited
123+
</th>
124+
<th
125+
class="nhsuk-table__header"
126+
data-testid="channel-templates-table-header-template-action"
127+
scope="col"
128+
/>
129+
</tr>
130+
</thead>
131+
<tbody
132+
class="nhsuk-table__body"
133+
>
134+
<tr
135+
class="nhsuk-table__row"
136+
>
137+
<td
138+
class="nhsuk-table__cell"
139+
role="cell"
140+
>
141+
<span
142+
aria-hidden="true"
143+
class="nhsuk-table-responsive__heading"
144+
>
145+
Select
146+
</span>
147+
<div
148+
class="nhsuk-radios__item"
149+
>
150+
<input
151+
checked=""
152+
class="nhsuk-radios__input"
153+
data-testid="email-template-id-radio"
154+
id="channelTemplate-email-template-id"
155+
name="channelTemplate"
156+
type="radio"
157+
value="email-template-id"
158+
/>
159+
<label
160+
class="nhsuk-label nhsuk-radios__label"
161+
for="channelTemplate-email-template-id"
162+
id="channelTemplate-email-template-id--label"
163+
>
164+
165+
</label>
166+
</div>
167+
</td>
168+
<td
169+
class="nhsuk-table__cell"
170+
role="cell"
171+
>
172+
<span
173+
aria-hidden="true"
174+
class="nhsuk-table-responsive__heading"
175+
>
176+
Name
177+
</span>
178+
email template name
179+
</td>
180+
<td
181+
class="nhsuk-table__cell"
182+
role="cell"
183+
>
184+
<span
185+
aria-hidden="true"
186+
class="nhsuk-table-responsive__heading"
187+
>
188+
Type
189+
</span>
190+
Email
191+
</td>
192+
<td
193+
class="nhsuk-table__cell"
194+
role="cell"
195+
>
196+
<span
197+
aria-hidden="true"
198+
class="nhsuk-table-responsive__heading"
199+
>
200+
Last edited
201+
</span>
202+
13th Jan 2025
203+
<br />
204+
10:19
205+
</td>
206+
<td
207+
class="nhsuk-table__cell"
208+
role="cell"
209+
>
210+
<span
211+
aria-hidden="true"
212+
class="nhsuk-table-responsive__heading"
213+
>
214+
215+
</span>
216+
<div
217+
class="actionLinksWrapper"
218+
>
219+
<a
220+
aria-label="Preview"
221+
data-testid="email-template-id-preview-link"
222+
href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/email-template-id"
223+
id="preview-template-link-0"
224+
>
225+
Preview
226+
</a>
227+
</div>
228+
</td>
229+
</tr>
230+
</tbody>
231+
</table>
232+
</div>
233+
</div>
234+
</div>
235+
</div>
236+
<div
237+
class="nhsuk-form-group"
238+
data-testid="channel-template-actions"
239+
>
240+
<button
241+
aria-disabled="false"
242+
class="nhsuk-button"
243+
data-testid="submit-button"
244+
id="channel-template-submit-button"
245+
type="submit"
246+
>
247+
Save and continue
248+
</button>
249+
<a
250+
class="nhsuk-u-font-size-19 inline-block nhsuk-u-margin-left-3 nhsuk-u-padding-top-3"
251+
href="/message-plans/choose-templates/fbb81055-79b9-4759-ac07-d191ae57be34"
252+
>
253+
Go back
254+
</a>
255+
</div>
256+
</form>
257+
</div>
258+
</div>
259+
</main>
260+
</DocumentFragment>
261+
`;

0 commit comments

Comments
 (0)