@defra/forms-engine-plugin 0.0.4 → 0.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.server/server/index.js +0 -4
- package/.server/server/index.js.map +1 -1
- package/.server/server/plugins/engine/helpers.js +3 -0
- package/.server/server/plugins/engine/helpers.js.map +1 -1
- package/.server/server/plugins/engine/index.js +27 -1
- package/.server/server/plugins/engine/index.js.map +1 -1
- package/.server/server/plugins/engine/pageControllers/FileUploadPageController.js +2 -4
- package/.server/server/plugins/engine/pageControllers/FileUploadPageController.js.map +1 -1
- package/.server/server/plugins/engine/pageControllers/QuestionPageController.js +4 -10
- package/.server/server/plugins/engine/pageControllers/QuestionPageController.js.map +1 -1
- package/.server/server/plugins/engine/pageControllers/StatusPageController.js +2 -3
- package/.server/server/plugins/engine/pageControllers/StatusPageController.js.map +1 -1
- package/.server/server/plugins/engine/pageControllers/SummaryPageController.js +2 -4
- package/.server/server/plugins/engine/pageControllers/SummaryPageController.js.map +1 -1
- package/.server/server/plugins/engine/plugin.js +65 -6
- package/.server/server/plugins/engine/plugin.js.map +1 -1
- package/.server/server/plugins/engine/types.js.map +1 -1
- package/.server/server/{views → plugins/engine/views}/components/service-banner/template.test.js +1 -1
- package/.server/server/plugins/engine/views/components/service-banner/template.test.js.map +1 -0
- package/.server/server/{views → plugins/engine/views}/components/tag-env/template.test.js +1 -1
- package/.server/server/plugins/engine/views/components/tag-env/template.test.js.map +1 -0
- package/.server/server/services/cacheService.js +5 -2
- package/.server/server/services/cacheService.js.map +1 -1
- package/.server/typings/hapi/index.d.js.map +1 -1
- package/README.md +215 -4
- package/package.json +3 -3
- package/src/client/javascripts/application.js +87 -0
- package/src/client/javascripts/file-upload.js +386 -0
- package/src/client/stylesheets/_code.scss +33 -0
- package/src/client/stylesheets/_govuk-frontend.scss +4 -0
- package/src/client/stylesheets/_prose.scss +56 -0
- package/src/client/stylesheets/_service-banner.scss +24 -0
- package/src/client/stylesheets/_summary-list.scss +28 -0
- package/src/client/stylesheets/_tag-env.scss +24 -0
- package/src/client/stylesheets/application.scss +14 -0
- package/src/common/cookies.js +58 -0
- package/src/common/cookies.test.js +23 -0
- package/src/common/types.js +5 -0
- package/src/config/index.ts +271 -0
- package/src/index.ts +31 -0
- package/src/server/common/helpers/logging/logger-options.test.ts +50 -0
- package/src/server/common/helpers/logging/logger-options.ts +46 -0
- package/src/server/common/helpers/logging/logger.ts +7 -0
- package/src/server/common/helpers/logging/request-logger.ts +9 -0
- package/src/server/common/helpers/logging/request-tracing.js +10 -0
- package/src/server/common/helpers/redis-client.js +70 -0
- package/src/server/constants.js +1 -0
- package/src/server/forms/README.md +10 -0
- package/src/server/forms/components.json +1015 -0
- package/src/server/forms/report-a-terrorist.json +270 -0
- package/src/server/forms/runner-components-test.json +365 -0
- package/src/server/forms/test.json +581 -0
- package/src/server/index.test.ts +582 -0
- package/src/server/index.ts +135 -0
- package/src/server/plugins/blankie.test.ts +73 -0
- package/src/server/plugins/blankie.ts +48 -0
- package/src/server/plugins/crumb.ts +20 -0
- package/src/server/plugins/engine/README.md +87 -0
- package/src/server/plugins/engine/components/AutocompleteField.test.ts +294 -0
- package/src/server/plugins/engine/components/AutocompleteField.ts +49 -0
- package/src/server/plugins/engine/components/CheckboxesField.test.ts +379 -0
- package/src/server/plugins/engine/components/CheckboxesField.ts +106 -0
- package/src/server/plugins/engine/components/ComponentBase.ts +97 -0
- package/src/server/plugins/engine/components/ComponentCollection.ts +278 -0
- package/src/server/plugins/engine/components/DatePartsField.test.ts +822 -0
- package/src/server/plugins/engine/components/DatePartsField.ts +264 -0
- package/src/server/plugins/engine/components/Details.test.ts +49 -0
- package/src/server/plugins/engine/components/Details.ts +30 -0
- package/src/server/plugins/engine/components/EmailAddressField.test.ts +395 -0
- package/src/server/plugins/engine/components/EmailAddressField.ts +55 -0
- package/src/server/plugins/engine/components/FileUploadField.test.ts +778 -0
- package/src/server/plugins/engine/components/FileUploadField.ts +262 -0
- package/src/server/plugins/engine/components/FormComponent.ts +249 -0
- package/src/server/plugins/engine/components/Html.test.ts +48 -0
- package/src/server/plugins/engine/components/Html.ts +29 -0
- package/src/server/plugins/engine/components/InsetText.test.ts +48 -0
- package/src/server/plugins/engine/components/InsetText.ts +27 -0
- package/src/server/plugins/engine/components/List.test.ts +76 -0
- package/src/server/plugins/engine/components/List.ts +72 -0
- package/src/server/plugins/engine/components/ListFormComponent.ts +140 -0
- package/src/server/plugins/engine/components/MonthYearField.test.ts +567 -0
- package/src/server/plugins/engine/components/MonthYearField.ts +222 -0
- package/src/server/plugins/engine/components/MultilineTextField.test.ts +558 -0
- package/src/server/plugins/engine/components/MultilineTextField.ts +138 -0
- package/src/server/plugins/engine/components/NumberField.test.ts +701 -0
- package/src/server/plugins/engine/components/NumberField.ts +163 -0
- package/src/server/plugins/engine/components/RadiosField.test.ts +288 -0
- package/src/server/plugins/engine/components/RadiosField.ts +24 -0
- package/src/server/plugins/engine/components/SelectField.test.ts +288 -0
- package/src/server/plugins/engine/components/SelectField.ts +47 -0
- package/src/server/plugins/engine/components/SelectionControlField.ts +43 -0
- package/src/server/plugins/engine/components/TelephoneNumberField.test.ts +356 -0
- package/src/server/plugins/engine/components/TelephoneNumberField.ts +67 -0
- package/src/server/plugins/engine/components/TextField.test.ts +489 -0
- package/src/server/plugins/engine/components/TextField.ts +96 -0
- package/src/server/plugins/engine/components/UkAddressField.test.ts +623 -0
- package/src/server/plugins/engine/components/UkAddressField.ts +172 -0
- package/src/server/plugins/engine/components/YesNoField.test.ts +248 -0
- package/src/server/plugins/engine/components/YesNoField.ts +31 -0
- package/src/server/plugins/engine/components/constants.ts +1 -0
- package/src/server/plugins/engine/components/helpers.ts +330 -0
- package/src/server/plugins/engine/components/index.ts +24 -0
- package/src/server/plugins/engine/components/types.ts +117 -0
- package/src/server/plugins/engine/configureEnginePlugin.ts +47 -0
- package/src/server/plugins/engine/helpers.test.ts +791 -0
- package/src/server/plugins/engine/helpers.ts +384 -0
- package/src/server/plugins/engine/index.ts +47 -0
- package/src/server/plugins/engine/models/FormModel.test.ts +42 -0
- package/src/server/plugins/engine/models/FormModel.ts +443 -0
- package/src/server/plugins/engine/models/RepeatingSummaryViewModel.ts +0 -0
- package/src/server/plugins/engine/models/Section.ts +0 -0
- package/src/server/plugins/engine/models/SummaryViewModel.test.ts +209 -0
- package/src/server/plugins/engine/models/SummaryViewModel.ts +220 -0
- package/src/server/plugins/engine/models/index.ts +2 -0
- package/src/server/plugins/engine/models/types.ts +114 -0
- package/src/server/plugins/engine/outputFormatters/human/v1.test.ts +143 -0
- package/src/server/plugins/engine/outputFormatters/human/v1.ts +73 -0
- package/src/server/plugins/engine/outputFormatters/index.test.ts +17 -0
- package/src/server/plugins/engine/outputFormatters/index.ts +44 -0
- package/src/server/plugins/engine/outputFormatters/machine/v1.test.ts +229 -0
- package/src/server/plugins/engine/outputFormatters/machine/v1.ts +140 -0
- package/src/server/plugins/engine/outputFormatters/machine/v2.test.ts +229 -0
- package/src/server/plugins/engine/outputFormatters/machine/v2.ts +153 -0
- package/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts +1116 -0
- package/src/server/plugins/engine/pageControllers/FileUploadPageController.ts +447 -0
- package/src/server/plugins/engine/pageControllers/PageController.test.ts +205 -0
- package/src/server/plugins/engine/pageControllers/PageController.ts +176 -0
- package/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts +1264 -0
- package/src/server/plugins/engine/pageControllers/QuestionPageController.ts +565 -0
- package/src/server/plugins/engine/pageControllers/README.md +28 -0
- package/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts +264 -0
- package/src/server/plugins/engine/pageControllers/RepeatPageController.ts +458 -0
- package/src/server/plugins/engine/pageControllers/StartPageController.ts +18 -0
- package/src/server/plugins/engine/pageControllers/StatusPageController.ts +51 -0
- package/src/server/plugins/engine/pageControllers/SummaryPageController.ts +262 -0
- package/src/server/plugins/engine/pageControllers/TerminalController.test.ts +28 -0
- package/src/server/plugins/engine/pageControllers/TerminalPageController.ts +19 -0
- package/src/server/plugins/engine/pageControllers/helpers.test.ts +198 -0
- package/src/server/plugins/engine/pageControllers/helpers.ts +101 -0
- package/src/server/plugins/engine/pageControllers/index.ts +10 -0
- package/src/server/plugins/engine/pageControllers/validationOptions.ts +89 -0
- package/src/server/plugins/engine/plugin.ts +753 -0
- package/src/server/plugins/engine/services/formSubmissionService.js +46 -0
- package/src/server/plugins/engine/services/formsService.js +46 -0
- package/src/server/plugins/engine/services/formsService.test.js +90 -0
- package/src/server/plugins/engine/services/index.js +3 -0
- package/src/server/plugins/engine/services/notifyService.test.ts +132 -0
- package/src/server/plugins/engine/services/notifyService.ts +64 -0
- package/src/server/plugins/engine/services/uploadService.js +60 -0
- package/src/server/plugins/engine/types.ts +317 -0
- package/src/server/plugins/engine/views/components/autocompletefield.html +5 -0
- package/src/server/plugins/engine/views/components/checkboxesfield.html +5 -0
- package/src/server/plugins/engine/views/components/datepartsfield.html +5 -0
- package/src/server/plugins/engine/views/components/debug/macro.njk +3 -0
- package/src/server/plugins/engine/views/components/debug/template.njk +13 -0
- package/src/server/plugins/engine/views/components/details.html +6 -0
- package/src/server/plugins/engine/views/components/emailaddressfield.html +5 -0
- package/src/server/plugins/engine/views/components/fileuploadfield-key.html +8 -0
- package/src/server/plugins/engine/views/components/fileuploadfield-value.html +3 -0
- package/src/server/plugins/engine/views/components/fileuploadfield.html +24 -0
- package/src/server/plugins/engine/views/components/html.html +3 -0
- package/src/server/plugins/engine/views/components/insettext.html +7 -0
- package/src/server/plugins/engine/views/components/list.html +36 -0
- package/src/server/plugins/engine/views/components/monthyearfield.html +5 -0
- package/src/server/plugins/engine/views/components/multilinetextfield.html +10 -0
- package/src/server/plugins/engine/views/components/numberfield.html +5 -0
- package/src/server/plugins/engine/views/components/radiosfield.html +5 -0
- package/src/server/plugins/engine/views/components/selectfield.html +5 -0
- package/src/server/plugins/engine/views/components/service-banner/macro.njk +3 -0
- package/src/server/plugins/engine/views/components/service-banner/template.njk +20 -0
- package/src/server/plugins/engine/views/components/service-banner/template.test.js +43 -0
- package/src/server/plugins/engine/views/components/tag-env/macro.njk +3 -0
- package/src/server/plugins/engine/views/components/tag-env/template.njk +30 -0
- package/src/server/plugins/engine/views/components/tag-env/template.test.js +66 -0
- package/src/server/plugins/engine/views/components/telephonenumberfield.html +5 -0
- package/src/server/plugins/engine/views/components/textfield.html +5 -0
- package/src/server/plugins/engine/views/components/ukaddressfield.html +25 -0
- package/src/server/plugins/engine/views/components/yesnofield.html +5 -0
- package/src/server/plugins/engine/views/confirmation.html +19 -0
- package/src/server/plugins/engine/views/file-upload.html +45 -0
- package/src/server/plugins/engine/views/index.html +39 -0
- package/src/server/plugins/engine/views/item-delete.html +56 -0
- package/src/server/plugins/engine/views/layout.html +199 -0
- package/src/server/plugins/engine/views/partials/components.html +6 -0
- package/src/server/plugins/engine/views/partials/conditional-components.html +3 -0
- package/src/server/plugins/engine/views/partials/debug.html +44 -0
- package/src/server/plugins/engine/views/partials/form.html +15 -0
- package/src/server/plugins/engine/views/partials/heading.html +16 -0
- package/src/server/plugins/engine/views/partials/preview-banner.html +32 -0
- package/src/server/plugins/engine/views/partials/preview-banner.test.js +122 -0
- package/src/server/plugins/engine/views/partials/warn-missing-notification-email.html +10 -0
- package/src/server/plugins/engine/views/repeat-list-summary.html +53 -0
- package/src/server/plugins/engine/views/summary.html +50 -0
- package/src/server/plugins/errorPages.ts +58 -0
- package/src/server/plugins/nunjucks/context.js +88 -0
- package/src/server/plugins/nunjucks/context.test.js +142 -0
- package/src/server/plugins/nunjucks/enviroment.test.js +201 -0
- package/src/server/plugins/nunjucks/environment.js +116 -0
- package/src/server/plugins/nunjucks/filters/answer.js +27 -0
- package/src/server/plugins/nunjucks/filters/answer.test.js +89 -0
- package/src/server/plugins/nunjucks/filters/evaluate.js +21 -0
- package/src/server/plugins/nunjucks/filters/field.js +28 -0
- package/src/server/plugins/nunjucks/filters/field.test.js +75 -0
- package/src/server/plugins/nunjucks/filters/highlight.js +11 -0
- package/src/server/plugins/nunjucks/filters/href.js +30 -0
- package/src/server/plugins/nunjucks/filters/href.test.js +80 -0
- package/src/server/plugins/nunjucks/filters/index.js +8 -0
- package/src/server/plugins/nunjucks/filters/inspect.js +15 -0
- package/src/server/plugins/nunjucks/filters/page.js +24 -0
- package/src/server/plugins/nunjucks/filters/page.test.js +65 -0
- package/src/server/plugins/nunjucks/index.js +3 -0
- package/src/server/plugins/nunjucks/plugin.js +40 -0
- package/src/server/plugins/nunjucks/render.js +42 -0
- package/src/server/plugins/nunjucks/types.js +40 -0
- package/src/server/plugins/pulse.ts +11 -0
- package/src/server/plugins/router.ts +201 -0
- package/src/server/plugins/session.ts +28 -0
- package/src/server/routes/health.js +13 -0
- package/src/server/routes/health.test.js +35 -0
- package/src/server/routes/index.test.ts +125 -0
- package/src/server/routes/index.ts +2 -0
- package/src/server/routes/public.ts +47 -0
- package/src/server/routes/types.ts +48 -0
- package/src/server/schemas/index.ts +34 -0
- package/src/server/secure-context.js +43 -0
- package/src/server/services/cacheService.test.ts +277 -0
- package/src/server/services/cacheService.ts +138 -0
- package/src/server/services/httpService.test.js +491 -0
- package/src/server/services/httpService.ts +50 -0
- package/src/server/services/index.ts +1 -0
- package/src/server/types.ts +54 -0
- package/src/server/utils/notify.test.ts +37 -0
- package/src/server/utils/notify.ts +50 -0
- package/src/server/utils/secure-context/get-trust-store-certs.js +11 -0
- package/src/server/utils/secure-context/get-trust-store-certs.test.js +19 -0
- package/src/server/utils/utils.js +24 -0
- package/src/server/utils/utils.test.js +54 -0
- package/src/server/views/404.html +16 -0
- package/src/server/views/500.html +19 -0
- package/src/server/views/help/accessibility-statement.html +58 -0
- package/src/server/views/help/cookie-preferences.html +57 -0
- package/src/server/views/help/cookies.html +71 -0
- package/src/server/views/help/get-support.html +37 -0
- package/src/server/views/help/privacy-notice.html +68 -0
- package/src/server/views/help/terms-and-conditions.html +83 -0
- package/src/typings/hapi/index.d.ts +87 -0
- package/src/typings/hapi-tracing/index.d.ts +6 -0
- package/src/typings/index.d.ts +3 -0
- package/src/typings/joi/index.d.ts +22 -0
- package/.server/server/views/components/service-banner/template.test.js.map +0 -1
- package/.server/server/views/components/tag-env/template.test.js.map +0 -1
- /package/.server/server/{views → plugins/engine/views}/components/debug/macro.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/components/debug/template.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/components/service-banner/macro.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/components/service-banner/template.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/components/tag-env/macro.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/components/tag-env/template.njk +0 -0
- /package/.server/server/{views → plugins/engine/views}/confirmation.html +0 -0
- /package/.server/server/{views → plugins/engine/views}/layout.html +0 -0
- /package/.server/server/{views → plugins/engine/views}/summary.html +0 -0
|
@@ -0,0 +1,489 @@
|
|
|
1
|
+
import { ComponentType, type TextFieldComponent } from '@defra/forms-model'
|
|
2
|
+
|
|
3
|
+
import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
|
|
4
|
+
import {
|
|
5
|
+
getAnswer,
|
|
6
|
+
type Field
|
|
7
|
+
} from '~/src/server/plugins/engine/components/helpers.js'
|
|
8
|
+
import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
|
|
9
|
+
import definition from '~/test/form/definitions/blank.js'
|
|
10
|
+
import { getFormData, getFormState } from '~/test/helpers/component-helpers.js'
|
|
11
|
+
|
|
12
|
+
describe('TextField', () => {
|
|
13
|
+
let model: FormModel
|
|
14
|
+
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
model = new FormModel(definition, {
|
|
17
|
+
basePath: 'test'
|
|
18
|
+
})
|
|
19
|
+
})
|
|
20
|
+
|
|
21
|
+
describe('Defaults', () => {
|
|
22
|
+
let def: TextFieldComponent
|
|
23
|
+
let collection: ComponentCollection
|
|
24
|
+
let field: Field
|
|
25
|
+
|
|
26
|
+
beforeEach(() => {
|
|
27
|
+
def = {
|
|
28
|
+
title: 'Example text field',
|
|
29
|
+
name: 'myComponent',
|
|
30
|
+
type: ComponentType.TextField,
|
|
31
|
+
options: {},
|
|
32
|
+
schema: {}
|
|
33
|
+
} satisfies TextFieldComponent
|
|
34
|
+
|
|
35
|
+
collection = new ComponentCollection([def], { model })
|
|
36
|
+
field = collection.fields[0]
|
|
37
|
+
})
|
|
38
|
+
|
|
39
|
+
describe('Schema', () => {
|
|
40
|
+
it('uses component title as label', () => {
|
|
41
|
+
const { formSchema } = collection
|
|
42
|
+
const { keys } = formSchema.describe()
|
|
43
|
+
|
|
44
|
+
expect(keys).toHaveProperty(
|
|
45
|
+
'myComponent',
|
|
46
|
+
expect.objectContaining({
|
|
47
|
+
flags: expect.objectContaining({
|
|
48
|
+
label: 'Example text field'
|
|
49
|
+
})
|
|
50
|
+
})
|
|
51
|
+
)
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
it('uses component name as keys', () => {
|
|
55
|
+
const { formSchema } = collection
|
|
56
|
+
const { keys } = formSchema.describe()
|
|
57
|
+
|
|
58
|
+
expect(field.keys).toEqual(['myComponent'])
|
|
59
|
+
expect(field.collection).toBeUndefined()
|
|
60
|
+
|
|
61
|
+
for (const key of field.keys) {
|
|
62
|
+
expect(keys).toHaveProperty(key)
|
|
63
|
+
}
|
|
64
|
+
})
|
|
65
|
+
|
|
66
|
+
it('is required by default', () => {
|
|
67
|
+
const { formSchema } = collection
|
|
68
|
+
const { keys } = formSchema.describe()
|
|
69
|
+
|
|
70
|
+
expect(keys).toHaveProperty(
|
|
71
|
+
'myComponent',
|
|
72
|
+
expect.objectContaining({
|
|
73
|
+
flags: expect.objectContaining({
|
|
74
|
+
presence: 'required'
|
|
75
|
+
})
|
|
76
|
+
})
|
|
77
|
+
)
|
|
78
|
+
})
|
|
79
|
+
|
|
80
|
+
it('is optional when configured', () => {
|
|
81
|
+
const collectionOptional = new ComponentCollection(
|
|
82
|
+
[{ ...def, options: { required: false } }],
|
|
83
|
+
{ model }
|
|
84
|
+
)
|
|
85
|
+
|
|
86
|
+
const { formSchema } = collectionOptional
|
|
87
|
+
const { keys } = formSchema.describe()
|
|
88
|
+
|
|
89
|
+
expect(keys).toHaveProperty(
|
|
90
|
+
'myComponent',
|
|
91
|
+
expect.objectContaining({ allow: [''] })
|
|
92
|
+
)
|
|
93
|
+
|
|
94
|
+
const result = collectionOptional.validate(getFormData(''))
|
|
95
|
+
expect(result.errors).toBeUndefined()
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
it('accepts valid values', () => {
|
|
99
|
+
const result1 = collection.validate(getFormData('Text'))
|
|
100
|
+
const result2 = collection.validate(getFormData('Text field'))
|
|
101
|
+
|
|
102
|
+
expect(result1.errors).toBeUndefined()
|
|
103
|
+
expect(result2.errors).toBeUndefined()
|
|
104
|
+
})
|
|
105
|
+
|
|
106
|
+
it('adds errors for empty value', () => {
|
|
107
|
+
const result = collection.validate(getFormData(''))
|
|
108
|
+
|
|
109
|
+
expect(result.errors).toEqual([
|
|
110
|
+
expect.objectContaining({
|
|
111
|
+
text: 'Enter example text field'
|
|
112
|
+
})
|
|
113
|
+
])
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('adds errors for invalid values', () => {
|
|
117
|
+
const result1 = collection.validate(getFormData(['invalid']))
|
|
118
|
+
const result2 = collection.validate(
|
|
119
|
+
// @ts-expect-error - Allow invalid param for test
|
|
120
|
+
getFormData({ unknown: 'invalid' })
|
|
121
|
+
)
|
|
122
|
+
|
|
123
|
+
expect(result1.errors).toBeTruthy()
|
|
124
|
+
expect(result2.errors).toBeTruthy()
|
|
125
|
+
})
|
|
126
|
+
})
|
|
127
|
+
|
|
128
|
+
describe('State', () => {
|
|
129
|
+
it('returns text from state', () => {
|
|
130
|
+
const state1 = getFormState('Text field')
|
|
131
|
+
const state2 = getFormState(null)
|
|
132
|
+
|
|
133
|
+
const answer1 = getAnswer(field, state1)
|
|
134
|
+
const answer2 = getAnswer(field, state2)
|
|
135
|
+
|
|
136
|
+
expect(answer1).toBe('Text field')
|
|
137
|
+
expect(answer2).toBe('')
|
|
138
|
+
})
|
|
139
|
+
|
|
140
|
+
it('returns payload from state', () => {
|
|
141
|
+
const state1 = getFormState('Text field')
|
|
142
|
+
const state2 = getFormState(null)
|
|
143
|
+
|
|
144
|
+
const payload1 = field.getFormDataFromState(state1)
|
|
145
|
+
const payload2 = field.getFormDataFromState(state2)
|
|
146
|
+
|
|
147
|
+
expect(payload1).toEqual(getFormData('Text field'))
|
|
148
|
+
expect(payload2).toEqual(getFormData())
|
|
149
|
+
})
|
|
150
|
+
|
|
151
|
+
it('returns value from state', () => {
|
|
152
|
+
const state1 = getFormState('Text field')
|
|
153
|
+
const state2 = getFormState(null)
|
|
154
|
+
|
|
155
|
+
const value1 = field.getFormValueFromState(state1)
|
|
156
|
+
const value2 = field.getFormValueFromState(state2)
|
|
157
|
+
|
|
158
|
+
expect(value1).toBe('Text field')
|
|
159
|
+
expect(value2).toBeUndefined()
|
|
160
|
+
})
|
|
161
|
+
|
|
162
|
+
it('returns context for conditions and form submission', () => {
|
|
163
|
+
const state1 = getFormState('Text field')
|
|
164
|
+
const state2 = getFormState(null)
|
|
165
|
+
|
|
166
|
+
const value1 = field.getContextValueFromState(state1)
|
|
167
|
+
const value2 = field.getContextValueFromState(state2)
|
|
168
|
+
|
|
169
|
+
expect(value1).toBe('Text field')
|
|
170
|
+
expect(value2).toBeNull()
|
|
171
|
+
})
|
|
172
|
+
|
|
173
|
+
it('returns state from payload', () => {
|
|
174
|
+
const payload1 = getFormData('Text field')
|
|
175
|
+
const payload2 = getFormData()
|
|
176
|
+
|
|
177
|
+
const value1 = field.getStateFromValidForm(payload1)
|
|
178
|
+
const value2 = field.getStateFromValidForm(payload2)
|
|
179
|
+
|
|
180
|
+
expect(value1).toEqual(getFormState('Text field'))
|
|
181
|
+
expect(value2).toEqual(getFormState(null))
|
|
182
|
+
})
|
|
183
|
+
})
|
|
184
|
+
|
|
185
|
+
describe('View model', () => {
|
|
186
|
+
it('sets Nunjucks component defaults', () => {
|
|
187
|
+
const viewModel = field.getViewModel(getFormData('Text field'))
|
|
188
|
+
|
|
189
|
+
expect(viewModel).toEqual(
|
|
190
|
+
expect.objectContaining({
|
|
191
|
+
label: { text: def.title },
|
|
192
|
+
name: 'myComponent',
|
|
193
|
+
id: 'myComponent',
|
|
194
|
+
value: 'Text field'
|
|
195
|
+
})
|
|
196
|
+
)
|
|
197
|
+
})
|
|
198
|
+
})
|
|
199
|
+
})
|
|
200
|
+
|
|
201
|
+
describe('Validation', () => {
|
|
202
|
+
describe.each([
|
|
203
|
+
{
|
|
204
|
+
description: 'Trim empty spaces',
|
|
205
|
+
component: {
|
|
206
|
+
title: 'Example text field',
|
|
207
|
+
name: 'myComponent',
|
|
208
|
+
type: ComponentType.TextField,
|
|
209
|
+
options: {},
|
|
210
|
+
schema: {}
|
|
211
|
+
} satisfies TextFieldComponent,
|
|
212
|
+
assertions: [
|
|
213
|
+
{
|
|
214
|
+
input: getFormData(' Leading spaces'),
|
|
215
|
+
output: { value: getFormData('Leading spaces') }
|
|
216
|
+
},
|
|
217
|
+
{
|
|
218
|
+
input: getFormData('Trailing spaces '),
|
|
219
|
+
output: { value: getFormData('Trailing spaces') }
|
|
220
|
+
},
|
|
221
|
+
{
|
|
222
|
+
input: getFormData(' Mixed spaces and new lines \n\n'),
|
|
223
|
+
output: { value: getFormData('Mixed spaces and new lines') }
|
|
224
|
+
}
|
|
225
|
+
]
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
description: 'Schema min and max',
|
|
229
|
+
component: {
|
|
230
|
+
title: 'Example text field',
|
|
231
|
+
name: 'myComponent',
|
|
232
|
+
type: ComponentType.TextField,
|
|
233
|
+
options: {},
|
|
234
|
+
schema: {
|
|
235
|
+
min: 5,
|
|
236
|
+
max: 8
|
|
237
|
+
}
|
|
238
|
+
} satisfies TextFieldComponent,
|
|
239
|
+
assertions: [
|
|
240
|
+
{
|
|
241
|
+
input: getFormData('Text'),
|
|
242
|
+
output: {
|
|
243
|
+
value: getFormData('Text'),
|
|
244
|
+
errors: [
|
|
245
|
+
expect.objectContaining({
|
|
246
|
+
text: 'Example text field must be 5 characters or more'
|
|
247
|
+
})
|
|
248
|
+
]
|
|
249
|
+
}
|
|
250
|
+
},
|
|
251
|
+
{
|
|
252
|
+
input: getFormData('Text field'),
|
|
253
|
+
output: {
|
|
254
|
+
value: getFormData('Text field'),
|
|
255
|
+
errors: [
|
|
256
|
+
expect.objectContaining({
|
|
257
|
+
text: 'Example text field must be 8 characters or less'
|
|
258
|
+
})
|
|
259
|
+
]
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
]
|
|
263
|
+
},
|
|
264
|
+
{
|
|
265
|
+
description: 'Schema length',
|
|
266
|
+
component: {
|
|
267
|
+
title: 'Example text field',
|
|
268
|
+
name: 'myComponent',
|
|
269
|
+
type: ComponentType.TextField,
|
|
270
|
+
options: {},
|
|
271
|
+
schema: {
|
|
272
|
+
length: 4
|
|
273
|
+
}
|
|
274
|
+
} satisfies TextFieldComponent,
|
|
275
|
+
assertions: [
|
|
276
|
+
{
|
|
277
|
+
input: getFormData('Text'),
|
|
278
|
+
output: { value: getFormData('Text') }
|
|
279
|
+
},
|
|
280
|
+
{
|
|
281
|
+
input: getFormData('Text field'),
|
|
282
|
+
output: {
|
|
283
|
+
value: getFormData('Text field'),
|
|
284
|
+
errors: [
|
|
285
|
+
expect.objectContaining({
|
|
286
|
+
text: 'Example text field length must be 4 characters long'
|
|
287
|
+
})
|
|
288
|
+
]
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
]
|
|
292
|
+
},
|
|
293
|
+
{
|
|
294
|
+
description: 'Schema regex',
|
|
295
|
+
component: {
|
|
296
|
+
title: 'Example text field',
|
|
297
|
+
name: 'myComponent',
|
|
298
|
+
type: ComponentType.TextField,
|
|
299
|
+
options: {},
|
|
300
|
+
schema: {
|
|
301
|
+
regex: '^[a-zA-Z]{1,2}\\d[a-zA-Z\\d]?\\s?\\d[a-zA-Z]{2}$'
|
|
302
|
+
}
|
|
303
|
+
} satisfies TextFieldComponent,
|
|
304
|
+
assertions: [
|
|
305
|
+
{
|
|
306
|
+
input: getFormData('SW1P'),
|
|
307
|
+
output: {
|
|
308
|
+
value: getFormData('SW1P'),
|
|
309
|
+
errors: [
|
|
310
|
+
expect.objectContaining({
|
|
311
|
+
text: 'Enter a valid example text field'
|
|
312
|
+
})
|
|
313
|
+
]
|
|
314
|
+
}
|
|
315
|
+
},
|
|
316
|
+
{
|
|
317
|
+
input: getFormData('SW1P 4DF'),
|
|
318
|
+
output: { value: getFormData('SW1P 4DF') }
|
|
319
|
+
}
|
|
320
|
+
]
|
|
321
|
+
},
|
|
322
|
+
{
|
|
323
|
+
description: 'Custom validation message',
|
|
324
|
+
component: {
|
|
325
|
+
title: 'Example text field',
|
|
326
|
+
name: 'myComponent',
|
|
327
|
+
type: ComponentType.TextField,
|
|
328
|
+
options: {
|
|
329
|
+
customValidationMessage: 'This is a custom error',
|
|
330
|
+
customValidationMessages: {
|
|
331
|
+
'any.required': 'This is not used',
|
|
332
|
+
'string.empty': 'This is not used',
|
|
333
|
+
'string.max': 'This is not used',
|
|
334
|
+
'string.min': 'This is not used'
|
|
335
|
+
}
|
|
336
|
+
},
|
|
337
|
+
schema: {
|
|
338
|
+
min: 5,
|
|
339
|
+
max: 8
|
|
340
|
+
}
|
|
341
|
+
} satisfies TextFieldComponent,
|
|
342
|
+
assertions: [
|
|
343
|
+
{
|
|
344
|
+
input: getFormData(),
|
|
345
|
+
output: {
|
|
346
|
+
value: getFormData(''),
|
|
347
|
+
errors: [
|
|
348
|
+
expect.objectContaining({
|
|
349
|
+
text: 'This is a custom error'
|
|
350
|
+
})
|
|
351
|
+
]
|
|
352
|
+
}
|
|
353
|
+
},
|
|
354
|
+
{
|
|
355
|
+
input: getFormData(''),
|
|
356
|
+
output: {
|
|
357
|
+
value: getFormData(''),
|
|
358
|
+
errors: [
|
|
359
|
+
expect.objectContaining({
|
|
360
|
+
text: 'This is a custom error'
|
|
361
|
+
})
|
|
362
|
+
]
|
|
363
|
+
}
|
|
364
|
+
},
|
|
365
|
+
{
|
|
366
|
+
input: getFormData('Text'),
|
|
367
|
+
output: {
|
|
368
|
+
value: getFormData('Text'),
|
|
369
|
+
errors: [
|
|
370
|
+
expect.objectContaining({
|
|
371
|
+
text: 'This is a custom error'
|
|
372
|
+
})
|
|
373
|
+
]
|
|
374
|
+
}
|
|
375
|
+
},
|
|
376
|
+
{
|
|
377
|
+
input: getFormData('Text field'),
|
|
378
|
+
output: {
|
|
379
|
+
value: getFormData('Text field'),
|
|
380
|
+
errors: [
|
|
381
|
+
expect.objectContaining({
|
|
382
|
+
text: 'This is a custom error'
|
|
383
|
+
})
|
|
384
|
+
]
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
]
|
|
388
|
+
},
|
|
389
|
+
{
|
|
390
|
+
description: 'Custom validation messages (multiple)',
|
|
391
|
+
component: {
|
|
392
|
+
title: 'Example text field',
|
|
393
|
+
name: 'myComponent',
|
|
394
|
+
type: ComponentType.TextField,
|
|
395
|
+
options: {
|
|
396
|
+
customValidationMessages: {
|
|
397
|
+
'any.required': 'This is a custom required error',
|
|
398
|
+
'string.empty': 'This is a custom empty string error',
|
|
399
|
+
'string.max': 'This is a custom max length error',
|
|
400
|
+
'string.min': 'This is a custom min length error'
|
|
401
|
+
}
|
|
402
|
+
},
|
|
403
|
+
schema: {
|
|
404
|
+
min: 5,
|
|
405
|
+
max: 8
|
|
406
|
+
}
|
|
407
|
+
} satisfies TextFieldComponent,
|
|
408
|
+
assertions: [
|
|
409
|
+
{
|
|
410
|
+
input: getFormData(),
|
|
411
|
+
output: {
|
|
412
|
+
value: getFormData(''),
|
|
413
|
+
errors: [
|
|
414
|
+
expect.objectContaining({
|
|
415
|
+
text: 'This is a custom required error'
|
|
416
|
+
})
|
|
417
|
+
]
|
|
418
|
+
}
|
|
419
|
+
},
|
|
420
|
+
{
|
|
421
|
+
input: getFormData(''),
|
|
422
|
+
output: {
|
|
423
|
+
value: getFormData(''),
|
|
424
|
+
errors: [
|
|
425
|
+
expect.objectContaining({
|
|
426
|
+
text: 'This is a custom empty string error'
|
|
427
|
+
})
|
|
428
|
+
]
|
|
429
|
+
}
|
|
430
|
+
},
|
|
431
|
+
{
|
|
432
|
+
input: getFormData('Text'),
|
|
433
|
+
output: {
|
|
434
|
+
value: getFormData('Text'),
|
|
435
|
+
errors: [
|
|
436
|
+
expect.objectContaining({
|
|
437
|
+
text: 'This is a custom min length error'
|
|
438
|
+
})
|
|
439
|
+
]
|
|
440
|
+
}
|
|
441
|
+
},
|
|
442
|
+
{
|
|
443
|
+
input: getFormData('Text field'),
|
|
444
|
+
output: {
|
|
445
|
+
value: getFormData('Text field'),
|
|
446
|
+
errors: [
|
|
447
|
+
expect.objectContaining({
|
|
448
|
+
text: 'This is a custom max length error'
|
|
449
|
+
})
|
|
450
|
+
]
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
]
|
|
454
|
+
},
|
|
455
|
+
{
|
|
456
|
+
description: 'Optional field',
|
|
457
|
+
component: {
|
|
458
|
+
title: 'Example text field',
|
|
459
|
+
name: 'myComponent',
|
|
460
|
+
type: ComponentType.TextField,
|
|
461
|
+
options: {
|
|
462
|
+
required: false
|
|
463
|
+
},
|
|
464
|
+
schema: {}
|
|
465
|
+
} satisfies TextFieldComponent,
|
|
466
|
+
assertions: [
|
|
467
|
+
{
|
|
468
|
+
input: getFormData(''),
|
|
469
|
+
output: { value: getFormData('') }
|
|
470
|
+
}
|
|
471
|
+
]
|
|
472
|
+
}
|
|
473
|
+
])('$description', ({ component: def, assertions }) => {
|
|
474
|
+
let collection: ComponentCollection
|
|
475
|
+
|
|
476
|
+
beforeEach(() => {
|
|
477
|
+
collection = new ComponentCollection([def], { model })
|
|
478
|
+
})
|
|
479
|
+
|
|
480
|
+
it.each([...assertions])(
|
|
481
|
+
'validates custom example',
|
|
482
|
+
({ input, output }) => {
|
|
483
|
+
const result = collection.validate(input)
|
|
484
|
+
expect(result).toEqual(output)
|
|
485
|
+
}
|
|
486
|
+
)
|
|
487
|
+
})
|
|
488
|
+
})
|
|
489
|
+
})
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type EmailAddressFieldComponent,
|
|
3
|
+
type TextFieldComponent
|
|
4
|
+
} from '@defra/forms-model'
|
|
5
|
+
import joi, { type StringSchema } from 'joi'
|
|
6
|
+
|
|
7
|
+
import {
|
|
8
|
+
FormComponent,
|
|
9
|
+
isFormValue
|
|
10
|
+
} from '~/src/server/plugins/engine/components/FormComponent.js'
|
|
11
|
+
import {
|
|
12
|
+
type FormState,
|
|
13
|
+
type FormStateValue,
|
|
14
|
+
type FormSubmissionState
|
|
15
|
+
} from '~/src/server/plugins/engine/types.js'
|
|
16
|
+
|
|
17
|
+
export class TextField extends FormComponent {
|
|
18
|
+
declare options:
|
|
19
|
+
| TextFieldComponent['options']
|
|
20
|
+
| EmailAddressFieldComponent['options']
|
|
21
|
+
|
|
22
|
+
declare schema: TextFieldComponent['schema']
|
|
23
|
+
|
|
24
|
+
declare formSchema: StringSchema
|
|
25
|
+
declare stateSchema: StringSchema
|
|
26
|
+
|
|
27
|
+
constructor(
|
|
28
|
+
def: TextFieldComponent | EmailAddressFieldComponent,
|
|
29
|
+
props: ConstructorParameters<typeof FormComponent>[1]
|
|
30
|
+
) {
|
|
31
|
+
super(def, props)
|
|
32
|
+
|
|
33
|
+
const { options, title } = def
|
|
34
|
+
const schema = 'schema' in def ? def.schema : {}
|
|
35
|
+
|
|
36
|
+
let formSchema = joi.string().trim().label(title).required()
|
|
37
|
+
|
|
38
|
+
if (options.required === false) {
|
|
39
|
+
formSchema = formSchema.allow('')
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
if (typeof schema.length !== 'number') {
|
|
43
|
+
if (typeof schema.max === 'number') {
|
|
44
|
+
formSchema = formSchema.max(schema.max)
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (typeof schema.min === 'number') {
|
|
48
|
+
formSchema = formSchema.min(schema.min)
|
|
49
|
+
}
|
|
50
|
+
} else {
|
|
51
|
+
formSchema = formSchema.length(schema.length)
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (schema.regex) {
|
|
55
|
+
const pattern = new RegExp(schema.regex)
|
|
56
|
+
formSchema = formSchema.pattern(pattern)
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
if (options.customValidationMessage) {
|
|
60
|
+
const message = options.customValidationMessage
|
|
61
|
+
|
|
62
|
+
formSchema = formSchema.messages({
|
|
63
|
+
'any.required': message,
|
|
64
|
+
'string.empty': message,
|
|
65
|
+
'string.max': message,
|
|
66
|
+
'string.min': message,
|
|
67
|
+
'string.length': message,
|
|
68
|
+
'string.pattern.base': message
|
|
69
|
+
})
|
|
70
|
+
} else if (options.customValidationMessages) {
|
|
71
|
+
formSchema = formSchema.messages(options.customValidationMessages)
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
this.formSchema = formSchema.default('')
|
|
75
|
+
this.stateSchema = formSchema.default(null).allow(null)
|
|
76
|
+
this.options = options
|
|
77
|
+
this.schema = schema
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
getFormValueFromState(state: FormSubmissionState) {
|
|
81
|
+
const { name } = this
|
|
82
|
+
return this.getFormValue(state[name])
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
getFormValue(value?: FormStateValue | FormState) {
|
|
86
|
+
return this.isValue(value) ? value : undefined
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
isValue(value?: FormStateValue | FormState): value is string {
|
|
90
|
+
return TextField.isText(value)
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
static isText(value?: FormStateValue | FormState): value is string {
|
|
94
|
+
return isFormValue(value) && typeof value === 'string'
|
|
95
|
+
}
|
|
96
|
+
}
|