Skip to content

Commit 51ac88c

Browse files
bhansell1bhansell1
committed
Merge branch 'main' of https://github.com/NHSDigital/nhs-notify-web-template-management into feature/CCM-11459_edit-button
2 parents cbdde7d + f7a29f0 commit 51ac88c

File tree

14 files changed

+766
-176
lines changed

14 files changed

+766
-176
lines changed

‎frontend/src/__tests__/components/forms/PreviewEmailTemplate/__snapshots__/PreviewEmailTemplate.test.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ exports[`Preview email form renders Routing feature flag - Disabled Client-side
105105
class="nhsuk-summary-list__value"
106106
>
107107
<strong
108-
class="nhsuk-tag"
108+
class="nhsuk-tag nhsuk-tag--green"
109109
data-test-id="status-tag-not-yet-submitted"
110110
>
111-
Not yet submitted
111+
Draft
112112
</strong>
113113
</dd>
114114
</div>
@@ -383,10 +383,10 @@ exports[`Preview email form renders Routing feature flag - Disabled matches erro
383383
class="nhsuk-summary-list__value"
384384
>
385385
<strong
386-
class="nhsuk-tag"
386+
class="nhsuk-tag nhsuk-tag--green"
387387
data-test-id="status-tag-not-yet-submitted"
388388
>
389-
Not yet submitted
389+
Draft
390390
</strong>
391391
</dd>
392392
</div>
@@ -641,10 +641,10 @@ exports[`Preview email form renders matches snapshot when navigating from edit s
641641
class="nhsuk-summary-list__value"
642642
>
643643
<strong
644-
class="nhsuk-tag"
644+
class="nhsuk-tag nhsuk-tag--green"
645645
data-test-id="status-tag-not-yet-submitted"
646646
>
647-
Not yet submitted
647+
Draft
648648
</strong>
649649
</dd>
650650
</div>
@@ -887,10 +887,10 @@ exports[`Preview email form renders matches snapshot when navigating from edit s
887887
class="nhsuk-summary-list__value"
888888
>
889889
<strong
890-
class="nhsuk-tag"
890+
class="nhsuk-tag nhsuk-tag--green"
891891
data-test-id="status-tag-not-yet-submitted"
892892
>
893-
Not yet submitted
893+
Draft
894894
</strong>
895895
</dd>
896896
</div>
@@ -1052,10 +1052,10 @@ exports[`Preview email form renders matches snapshot when navigating from manage
10521052
class="nhsuk-summary-list__value"
10531053
>
10541054
<strong
1055-
class="nhsuk-tag"
1055+
class="nhsuk-tag nhsuk-tag--green"
10561056
data-test-id="status-tag-not-yet-submitted"
10571057
>
1058-
Not yet submitted
1058+
Draft
10591059
</strong>
10601060
</dd>
10611061
</div>
@@ -1293,10 +1293,10 @@ exports[`Preview email form renders matches snapshot when navigating from manage
12931293
class="nhsuk-summary-list__value"
12941294
>
12951295
<strong
1296-
class="nhsuk-tag"
1296+
class="nhsuk-tag nhsuk-tag--green"
12971297
data-test-id="status-tag-not-yet-submitted"
12981298
>
1299-
Not yet submitted
1299+
Draft
13001300
</strong>
13011301
</dd>
13021302
</div>

‎frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/__snapshots__/PreviewNHSAppTemplate.test.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ exports[`Preview nhs app form renders Routing feature flag - Disabled Client-sid
105105
class="nhsuk-summary-list__value"
106106
>
107107
<strong
108-
class="nhsuk-tag"
108+
class="nhsuk-tag nhsuk-tag--green"
109109
data-test-id="status-tag-not-yet-submitted"
110110
>
111-
Not yet submitted
111+
Draft
112112
</strong>
113113
</dd>
114114
</div>
@@ -358,10 +358,10 @@ exports[`Preview nhs app form renders Routing feature flag - Disabled matches er
358358
class="nhsuk-summary-list__value"
359359
>
360360
<strong
361-
class="nhsuk-tag"
361+
class="nhsuk-tag nhsuk-tag--green"
362362
data-test-id="status-tag-not-yet-submitted"
363363
>
364-
Not yet submitted
364+
Draft
365365
</strong>
366366
</dd>
367367
</div>
@@ -591,10 +591,10 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
591591
class="nhsuk-summary-list__value"
592592
>
593593
<strong
594-
class="nhsuk-tag"
594+
class="nhsuk-tag nhsuk-tag--green"
595595
data-test-id="status-tag-not-yet-submitted"
596596
>
597-
Not yet submitted
597+
Draft
598598
</strong>
599599
</dd>
600600
</div>
@@ -812,10 +812,10 @@ exports[`Preview nhs app form renders matches snapshot when navigating from edit
812812
class="nhsuk-summary-list__value"
813813
>
814814
<strong
815-
class="nhsuk-tag"
815+
class="nhsuk-tag nhsuk-tag--green"
816816
data-test-id="status-tag-not-yet-submitted"
817817
>
818-
Not yet submitted
818+
Draft
819819
</strong>
820820
</dd>
821821
</div>
@@ -952,10 +952,10 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
952952
class="nhsuk-summary-list__value"
953953
>
954954
<strong
955-
class="nhsuk-tag"
955+
class="nhsuk-tag nhsuk-tag--green"
956956
data-test-id="status-tag-not-yet-submitted"
957957
>
958-
Not yet submitted
958+
Draft
959959
</strong>
960960
</dd>
961961
</div>
@@ -1092,10 +1092,10 @@ exports[`Preview nhs app form renders matches snapshot when navigating from mana
10921092
class="nhsuk-summary-list__value"
10931093
>
10941094
<strong
1095-
class="nhsuk-tag"
1095+
class="nhsuk-tag nhsuk-tag--green"
10961096
data-test-id="status-tag-not-yet-submitted"
10971097
>
1098-
Not yet submitted
1098+
Draft
10991099
</strong>
11001100
</dd>
11011101
</div>

‎frontend/src/__tests__/components/forms/PreviewSMSTemplate/__snapshots__/PreviewSMSTemplate.test.tsx.snap‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ exports[`Review sms form renders Routing feature flag - Disabled Client-side val
105105
class="nhsuk-summary-list__value"
106106
>
107107
<strong
108-
class="nhsuk-tag"
108+
class="nhsuk-tag nhsuk-tag--green"
109109
data-test-id="status-tag-not-yet-submitted"
110110
>
111-
Not yet submitted
111+
Draft
112112
</strong>
113113
</dd>
114114
</div>
@@ -358,10 +358,10 @@ exports[`Review sms form renders Routing feature flag - Disabled matches error s
358358
class="nhsuk-summary-list__value"
359359
>
360360
<strong
361-
class="nhsuk-tag"
361+
class="nhsuk-tag nhsuk-tag--green"
362362
data-test-id="status-tag-not-yet-submitted"
363363
>
364-
Not yet submitted
364+
Draft
365365
</strong>
366366
</dd>
367367
</div>
@@ -591,10 +591,10 @@ exports[`Review sms form renders matches snapshot when navigating from edit scre
591591
class="nhsuk-summary-list__value"
592592
>
593593
<strong
594-
class="nhsuk-tag"
594+
class="nhsuk-tag nhsuk-tag--green"
595595
data-test-id="status-tag-not-yet-submitted"
596596
>
597-
Not yet submitted
597+
Draft
598598
</strong>
599599
</dd>
600600
</div>
@@ -812,10 +812,10 @@ exports[`Review sms form renders matches snapshot when navigating from edit scre
812812
class="nhsuk-summary-list__value"
813813
>
814814
<strong
815-
class="nhsuk-tag"
815+
class="nhsuk-tag nhsuk-tag--green"
816816
data-test-id="status-tag-not-yet-submitted"
817817
>
818-
Not yet submitted
818+
Draft
819819
</strong>
820820
</dd>
821821
</div>
@@ -952,10 +952,10 @@ exports[`Review sms form renders matches snapshot when navigating from manage te
952952
class="nhsuk-summary-list__value"
953953
>
954954
<strong
955-
class="nhsuk-tag"
955+
class="nhsuk-tag nhsuk-tag--green"
956956
data-test-id="status-tag-not-yet-submitted"
957957
>
958-
Not yet submitted
958+
Draft
959959
</strong>
960960
</dd>
961961
</div>
@@ -1168,10 +1168,10 @@ exports[`Review sms form renders matches snapshot when navigating from manage te
11681168
class="nhsuk-summary-list__value"
11691169
>
11701170
<strong
1171-
class="nhsuk-tag"
1171+
class="nhsuk-tag nhsuk-tag--green"
11721172
data-test-id="status-tag-not-yet-submitted"
11731173
>
1174-
Not yet submitted
1174+
Draft
11751175
</strong>
11761176
</dd>
11771177
</div>

‎frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,23 @@ const messageTemplatesProps: {
3434
name: 'Template 3',
3535
createdAt: '2021-02-01T00:00:00.000Z',
3636
letterType: 'x0',
37+
language: 'en',
38+
updatedAt: '2021-02-01T00:00:00.000Z',
39+
files: {
40+
pdfTemplate: {
41+
fileName: 'template.pdf',
42+
currentVersion: '8BAC',
43+
virusScanStatus: 'PASSED',
44+
},
45+
},
46+
},
47+
{
48+
id: '4',
49+
templateType: 'LETTER',
50+
templateStatus: 'NOT_YET_SUBMITTED',
51+
name: 'Template 4',
52+
createdAt: '2021-02-01T00:00:00.000Z',
53+
letterType: 'x0',
3754
language: 'fr',
3855
updatedAt: '2021-02-01T00:00:00.000Z',
3956
files: {

‎frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,30 @@ describe('PreviewTemplateDetailsLetter', () => {
201201

202202
expect(container.asFragment()).toMatchSnapshot();
203203
});
204+
205+
it('if status is NOT_YET_SUBMITTED, then Not yet submitted is displayed', () => {
206+
const container = render(
207+
<PreviewTemplateDetailsLetter
208+
template={{
209+
id: 'template-id',
210+
name: 'Example letter',
211+
templateStatus: 'NOT_YET_SUBMITTED',
212+
templateType: 'LETTER',
213+
letterType: 'x0',
214+
language: 'en',
215+
files: {
216+
pdfTemplate: {
217+
fileName: 'file.pdf',
218+
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
219+
virusScanStatus: 'PASSED',
220+
},
221+
},
222+
createdAt: '2025-01-13T10:19:25.579Z',
223+
updatedAt: '2025-01-13T10:19:25.579Z',
224+
}}
225+
/>
226+
);
227+
228+
expect(container.asFragment()).toMatchSnapshot();
229+
});
204230
});

0 commit comments

Comments
 (0)