Skip to content

Commit 6ec0025

Browse files
chris-elliott-nhsdchris-elliott-nhsd
committed
CCM-13415: Add custom textarea component
1 parent 38e7a67 commit 6ec0025

File tree

12 files changed

+460
-73
lines changed

12 files changed

+460
-73
lines changed

‎frontend/src/__tests__/components/forms/EmailTemplateForm/EmailTemplateForm.test.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
EmailTemplate,
66
} from 'nhs-notify-web-template-management-utils';
77
import { EmailTemplateForm } from '@forms/EmailTemplateForm/EmailTemplateForm';
8+
import { ErrorCodes } from '@utils/error-codes';
89

910
jest.mock('@utils/amplify-utils');
1011

@@ -80,7 +81,10 @@ test('renders page with multiple errors', () => {
8081
fieldErrors: {
8182
emailTemplateName: ['Template name error'],
8283
emailTemplateSubjectLine: ['Template subject line error'],
83-
emailTemplateMessage: ['Template message error'],
84+
emailTemplateMessage: [
85+
'Template message error',
86+
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
87+
],
8488
},
8589
},
8690
name: '',

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

Lines changed: 104 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ exports[`Client-side validation triggers 1`] = `
150150
<textarea
151151
autocomplete="off"
152152
class="nhsuk-textarea"
153-
data-testid="emailTemplateMessage-input"
154153
id="emailTemplateMessage"
155154
name="emailTemplateMessage"
156155
rows="12"
@@ -887,7 +886,6 @@ exports[`renders page one error 1`] = `
887886
<textarea
888887
autocomplete="off"
889888
class="nhsuk-textarea"
890-
data-testid="emailTemplateMessage-input"
891889
id="emailTemplateMessage"
892890
name="emailTemplateMessage"
893891
rows="12"
@@ -1482,6 +1480,61 @@ exports[`renders page with multiple errors 1`] = `
14821480
Template message error
14831481
</a>
14841482
</li>
1483+
<li>
1484+
<a
1485+
href="#emailTemplateMessage"
1486+
>
1487+
<div
1488+
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
1489+
>
1490+
You cannot use the following custom personalisation fields in your message:
1491+
</div>
1492+
<ul
1493+
class="nhsuk-list nhsuk-list--bullet"
1494+
>
1495+
<li
1496+
class="nhsuk-u-margin-bottom-0"
1497+
>
1498+
date
1499+
</li>
1500+
<li
1501+
class="nhsuk-u-margin-bottom-0"
1502+
>
1503+
address_line_1
1504+
</li>
1505+
<li
1506+
class="nhsuk-u-margin-bottom-0"
1507+
>
1508+
address_line_2
1509+
</li>
1510+
<li
1511+
class="nhsuk-u-margin-bottom-0"
1512+
>
1513+
address_line_3
1514+
</li>
1515+
<li
1516+
class="nhsuk-u-margin-bottom-0"
1517+
>
1518+
address_line_4
1519+
</li>
1520+
<li
1521+
class="nhsuk-u-margin-bottom-0"
1522+
>
1523+
address_line_5
1524+
</li>
1525+
<li
1526+
class="nhsuk-u-margin-bottom-0"
1527+
>
1528+
address_line_6
1529+
</li>
1530+
<li
1531+
class="nhsuk-u-margin-bottom-0"
1532+
>
1533+
address_line_7
1534+
</li>
1535+
</ul>
1536+
</a>
1537+
</li>
14851538
</ul>
14861539
</div>
14871540
<h1
@@ -1655,12 +1708,60 @@ exports[`renders page with multiple errors 1`] = `
16551708
Error:
16561709
</span>
16571710
Template message error
1711+
<div
1712+
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
1713+
>
1714+
You cannot use the following custom personalisation fields in your message:
1715+
</div>
1716+
<ul
1717+
class="nhsuk-list nhsuk-list--bullet"
1718+
>
1719+
<li
1720+
class="nhsuk-u-margin-bottom-0"
1721+
>
1722+
date
1723+
</li>
1724+
<li
1725+
class="nhsuk-u-margin-bottom-0"
1726+
>
1727+
address_line_1
1728+
</li>
1729+
<li
1730+
class="nhsuk-u-margin-bottom-0"
1731+
>
1732+
address_line_2
1733+
</li>
1734+
<li
1735+
class="nhsuk-u-margin-bottom-0"
1736+
>
1737+
address_line_3
1738+
</li>
1739+
<li
1740+
class="nhsuk-u-margin-bottom-0"
1741+
>
1742+
address_line_4
1743+
</li>
1744+
<li
1745+
class="nhsuk-u-margin-bottom-0"
1746+
>
1747+
address_line_5
1748+
</li>
1749+
<li
1750+
class="nhsuk-u-margin-bottom-0"
1751+
>
1752+
address_line_6
1753+
</li>
1754+
<li
1755+
class="nhsuk-u-margin-bottom-0"
1756+
>
1757+
address_line_7
1758+
</li>
1759+
</ul>
16581760
</span>
16591761
<textarea
16601762
aria-describedby="emailTemplateMessage--error-message"
16611763
autocomplete="off"
16621764
class="nhsuk-textarea nhsuk-textarea--error"
1663-
data-testid="emailTemplateMessage-input"
16641765
id="emailTemplateMessage"
16651766
name="emailTemplateMessage"
16661767
rows="12"
@@ -2358,7 +2459,6 @@ exports[`renders page with preloaded field values 1`] = `
23582459
<textarea
23592460
autocomplete="off"
23602461
class="nhsuk-textarea"
2361-
data-testid="emailTemplateMessage-input"
23622462
id="emailTemplateMessage"
23632463
name="emailTemplateMessage"
23642464
rows="12"
@@ -3051,7 +3151,6 @@ exports[`renders page without back link for initial state with id - edit mode 1`
30513151
<textarea
30523152
autocomplete="off"
30533153
class="nhsuk-textarea"
3054-
data-testid="emailTemplateMessage-input"
30553154
id="emailTemplateMessage"
30563155
name="emailTemplateMessage"
30573156
rows="12"

‎frontend/src/__tests__/components/forms/NhsAppTemplateForm/NhsAppTemplateForm.test.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
TemplateFormState,
77
} from 'nhs-notify-web-template-management-utils';
88
import { NhsAppTemplateForm } from '@forms/NhsAppTemplateForm/NhsAppTemplateForm';
9+
import { ErrorCodes } from '@utils/error-codes';
910

1011
jest.mock('@utils/amplify-utils');
1112

@@ -104,7 +105,10 @@ test('renders page with multiple errors', () => {
104105
formErrors: [],
105106
fieldErrors: {
106107
nhsAppTemplateName: ['Template name error'],
107-
nhsAppTemplateMessage: ['Template message error'],
108+
nhsAppTemplateMessage: [
109+
'Template message error',
110+
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
111+
],
108112
},
109113
},
110114
name: '',

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

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,6 +2124,61 @@ exports[`renders page with multiple errors 1`] = `
21242124
Template message error
21252125
</a>
21262126
</li>
2127+
<li>
2128+
<a
2129+
href="#nhsAppTemplateMessage"
2130+
>
2131+
<div
2132+
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
2133+
>
2134+
You cannot use the following custom personalisation fields in your message:
2135+
</div>
2136+
<ul
2137+
class="nhsuk-list nhsuk-list--bullet"
2138+
>
2139+
<li
2140+
class="nhsuk-u-margin-bottom-0"
2141+
>
2142+
date
2143+
</li>
2144+
<li
2145+
class="nhsuk-u-margin-bottom-0"
2146+
>
2147+
address_line_1
2148+
</li>
2149+
<li
2150+
class="nhsuk-u-margin-bottom-0"
2151+
>
2152+
address_line_2
2153+
</li>
2154+
<li
2155+
class="nhsuk-u-margin-bottom-0"
2156+
>
2157+
address_line_3
2158+
</li>
2159+
<li
2160+
class="nhsuk-u-margin-bottom-0"
2161+
>
2162+
address_line_4
2163+
</li>
2164+
<li
2165+
class="nhsuk-u-margin-bottom-0"
2166+
>
2167+
address_line_5
2168+
</li>
2169+
<li
2170+
class="nhsuk-u-margin-bottom-0"
2171+
>
2172+
address_line_6
2173+
</li>
2174+
<li
2175+
class="nhsuk-u-margin-bottom-0"
2176+
>
2177+
address_line_7
2178+
</li>
2179+
</ul>
2180+
</a>
2181+
</li>
21272182
</ul>
21282183
</div>
21292184
<h1
@@ -2261,6 +2316,55 @@ exports[`renders page with multiple errors 1`] = `
22612316
Error:
22622317
</span>
22632318
Template message error
2319+
<div
2320+
class="nhsuk-u-margin-top-1 nhsuk-u-margin-bottom-4"
2321+
>
2322+
You cannot use the following custom personalisation fields in your message:
2323+
</div>
2324+
<ul
2325+
class="nhsuk-list nhsuk-list--bullet"
2326+
>
2327+
<li
2328+
class="nhsuk-u-margin-bottom-0"
2329+
>
2330+
date
2331+
</li>
2332+
<li
2333+
class="nhsuk-u-margin-bottom-0"
2334+
>
2335+
address_line_1
2336+
</li>
2337+
<li
2338+
class="nhsuk-u-margin-bottom-0"
2339+
>
2340+
address_line_2
2341+
</li>
2342+
<li
2343+
class="nhsuk-u-margin-bottom-0"
2344+
>
2345+
address_line_3
2346+
</li>
2347+
<li
2348+
class="nhsuk-u-margin-bottom-0"
2349+
>
2350+
address_line_4
2351+
</li>
2352+
<li
2353+
class="nhsuk-u-margin-bottom-0"
2354+
>
2355+
address_line_5
2356+
</li>
2357+
<li
2358+
class="nhsuk-u-margin-bottom-0"
2359+
>
2360+
address_line_6
2361+
</li>
2362+
<li
2363+
class="nhsuk-u-margin-bottom-0"
2364+
>
2365+
address_line_7
2366+
</li>
2367+
</ul>
22642368
</span>
22652369
<textarea
22662370
aria-describedby="nhsAppTemplateMessage--error-message"

‎frontend/src/__tests__/components/forms/SmsTemplateForm/SmsTemplateForm.test.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
CreateUpdateSMSTemplate,
88
} from 'nhs-notify-web-template-management-utils';
99
import { SmsTemplateForm } from '@forms/SmsTemplateForm/SmsTemplateForm';
10+
import { ErrorCodes } from '@utils/error-codes';
1011

1112
jest.mock('react', () => {
1213
const originalModule = jest.requireActual('react');
@@ -80,7 +81,10 @@ describe('CreateSmsTemplate component', () => {
8081
formErrors: [],
8182
fieldErrors: {
8283
smsTemplateName: ['Template name error'],
83-
smsTemplateMessage: ['Template message error'],
84+
smsTemplateMessage: [
85+
'Template message error',
86+
ErrorCodes.MESSAGE_CONTAINS_INVALID_PERSONALISATION_FIELD_NAME,
87+
],
8488
},
8589
},
8690
id: 'template-id',

0 commit comments

Comments
 (0)