@defra/forms-engine-plugin 0.0.4 → 0.0.5
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/package.json +3 -2
- 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 +140 -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 +379 -0
- package/src/server/plugins/engine/index.ts +7 -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 +1108 -0
- package/src/server/plugins/engine/pageControllers/FileUploadPageController.ts +446 -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 +561 -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 +50 -0
- package/src/server/plugins/engine/pageControllers/SummaryPageController.ts +261 -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 +673 -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 +315 -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/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/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/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/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/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 +276 -0
- package/src/server/services/cacheService.ts +131 -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/components/debug/macro.njk +3 -0
- package/src/server/views/components/debug/template.njk +13 -0
- package/src/server/views/components/service-banner/macro.njk +3 -0
- package/src/server/views/components/service-banner/template.njk +20 -0
- package/src/server/views/components/service-banner/template.test.js +43 -0
- package/src/server/views/components/tag-env/macro.njk +3 -0
- package/src/server/views/components/tag-env/template.njk +30 -0
- package/src/server/views/components/tag-env/template.test.js +66 -0
- package/src/server/views/confirmation.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/server/views/layout.html +199 -0
- package/src/server/views/summary.html +50 -0
- package/src/typings/hapi/index.d.ts +95 -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
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { type AutocompleteFieldComponent } from '@defra/forms-model'
|
|
2
|
+
|
|
3
|
+
import { SelectField } from '~/src/server/plugins/engine/components/SelectField.js'
|
|
4
|
+
import { messageTemplate } from '~/src/server/plugins/engine/pageControllers/validationOptions.js'
|
|
5
|
+
import {
|
|
6
|
+
type FormPayload,
|
|
7
|
+
type FormSubmissionError
|
|
8
|
+
} from '~/src/server/plugins/engine/types.js'
|
|
9
|
+
|
|
10
|
+
export class AutocompleteField extends SelectField {
|
|
11
|
+
declare options: AutocompleteFieldComponent['options']
|
|
12
|
+
|
|
13
|
+
constructor(
|
|
14
|
+
def: AutocompleteFieldComponent,
|
|
15
|
+
props: ConstructorParameters<typeof SelectField>[1]
|
|
16
|
+
) {
|
|
17
|
+
super(def, props)
|
|
18
|
+
|
|
19
|
+
const { options } = def
|
|
20
|
+
let { formSchema } = this
|
|
21
|
+
|
|
22
|
+
if (options.required !== false) {
|
|
23
|
+
const messages = options.customValidationMessages
|
|
24
|
+
|
|
25
|
+
formSchema = formSchema.messages({
|
|
26
|
+
'any.only': messages?.['any.only'] ?? messageTemplate.required,
|
|
27
|
+
'any.required': messages?.['any.required'] ?? messageTemplate.required
|
|
28
|
+
})
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
this.options = options
|
|
32
|
+
this.formSchema = formSchema
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
getViewModel(payload: FormPayload, errors?: FormSubmissionError[]) {
|
|
36
|
+
const viewModel = super.getViewModel(payload, errors)
|
|
37
|
+
let { formGroup } = viewModel
|
|
38
|
+
|
|
39
|
+
formGroup ??= {}
|
|
40
|
+
formGroup.attributes = {
|
|
41
|
+
'data-module': 'govuk-accessible-autocomplete'
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return {
|
|
45
|
+
...viewModel,
|
|
46
|
+
formGroup
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
@@ -0,0 +1,379 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ComponentType,
|
|
3
|
+
type CheckboxesFieldComponent
|
|
4
|
+
} from '@defra/forms-model'
|
|
5
|
+
import { outdent } from 'outdent'
|
|
6
|
+
|
|
7
|
+
import { CheckboxesField } from '~/src/server/plugins/engine/components/CheckboxesField.js'
|
|
8
|
+
import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
|
|
9
|
+
import {
|
|
10
|
+
getAnswer,
|
|
11
|
+
type Field
|
|
12
|
+
} from '~/src/server/plugins/engine/components/helpers.js'
|
|
13
|
+
import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
|
|
14
|
+
import {
|
|
15
|
+
listNumber,
|
|
16
|
+
listNumberExamples,
|
|
17
|
+
listString,
|
|
18
|
+
listStringExamples
|
|
19
|
+
} from '~/test/fixtures/list.js'
|
|
20
|
+
import definition from '~/test/form/definitions/blank.js'
|
|
21
|
+
import { getFormData, getFormState } from '~/test/helpers/component-helpers.js'
|
|
22
|
+
|
|
23
|
+
describe.each([
|
|
24
|
+
{
|
|
25
|
+
component: {
|
|
26
|
+
title: 'String list',
|
|
27
|
+
name: 'myComponent',
|
|
28
|
+
type: ComponentType.CheckboxesField,
|
|
29
|
+
list: 'listString',
|
|
30
|
+
options: {}
|
|
31
|
+
} satisfies CheckboxesFieldComponent,
|
|
32
|
+
|
|
33
|
+
options: {
|
|
34
|
+
list: listString,
|
|
35
|
+
examples: listStringExamples,
|
|
36
|
+
allow: ['1', '2', '3', '4'],
|
|
37
|
+
deny: ['5', '6', '7', '8']
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
component: {
|
|
42
|
+
title: 'Number list',
|
|
43
|
+
name: 'myComponent',
|
|
44
|
+
type: ComponentType.CheckboxesField,
|
|
45
|
+
list: 'listNumber',
|
|
46
|
+
options: {}
|
|
47
|
+
} satisfies CheckboxesFieldComponent,
|
|
48
|
+
|
|
49
|
+
options: {
|
|
50
|
+
list: listNumber,
|
|
51
|
+
examples: listNumberExamples,
|
|
52
|
+
allow: [1, 2, 3, 4],
|
|
53
|
+
deny: [5, 6, 7, 8]
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
])('CheckboxesField: $component.title', ({ component: def, options }) => {
|
|
57
|
+
const updated = structuredClone(definition)
|
|
58
|
+
updated.lists = [options.list]
|
|
59
|
+
|
|
60
|
+
let model: FormModel
|
|
61
|
+
let collection: ComponentCollection
|
|
62
|
+
let field: Field
|
|
63
|
+
|
|
64
|
+
beforeEach(() => {
|
|
65
|
+
model = new FormModel(updated, {
|
|
66
|
+
basePath: 'test'
|
|
67
|
+
})
|
|
68
|
+
|
|
69
|
+
collection = new ComponentCollection([def], { model })
|
|
70
|
+
field = collection.fields[0]
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
describe('Defaults', () => {
|
|
74
|
+
describe('Schema', () => {
|
|
75
|
+
it('uses component title as label', () => {
|
|
76
|
+
const { formSchema } = collection
|
|
77
|
+
const { keys } = formSchema.describe()
|
|
78
|
+
|
|
79
|
+
expect(keys).toHaveProperty(
|
|
80
|
+
'myComponent',
|
|
81
|
+
expect.objectContaining({
|
|
82
|
+
flags: expect.objectContaining({ label: def.title })
|
|
83
|
+
})
|
|
84
|
+
)
|
|
85
|
+
})
|
|
86
|
+
|
|
87
|
+
it('uses component name as keys', () => {
|
|
88
|
+
const { formSchema } = collection
|
|
89
|
+
const { keys } = formSchema.describe()
|
|
90
|
+
|
|
91
|
+
expect(field.keys).toEqual(['myComponent'])
|
|
92
|
+
expect(field.collection).toBeUndefined()
|
|
93
|
+
|
|
94
|
+
for (const key of field.keys) {
|
|
95
|
+
expect(keys).toHaveProperty(key)
|
|
96
|
+
}
|
|
97
|
+
})
|
|
98
|
+
|
|
99
|
+
it('is required by default', () => {
|
|
100
|
+
const { formSchema } = collection
|
|
101
|
+
const { keys } = formSchema.describe()
|
|
102
|
+
|
|
103
|
+
expect(keys).toHaveProperty(
|
|
104
|
+
'myComponent',
|
|
105
|
+
expect.objectContaining({
|
|
106
|
+
flags: expect.objectContaining({
|
|
107
|
+
presence: 'required'
|
|
108
|
+
})
|
|
109
|
+
})
|
|
110
|
+
)
|
|
111
|
+
})
|
|
112
|
+
|
|
113
|
+
it('is optional when configured', () => {
|
|
114
|
+
const collectionOptional = new ComponentCollection(
|
|
115
|
+
[{ ...def, options: { required: false } }],
|
|
116
|
+
{ model }
|
|
117
|
+
)
|
|
118
|
+
|
|
119
|
+
const { formSchema } = collectionOptional
|
|
120
|
+
const { keys } = formSchema.describe()
|
|
121
|
+
|
|
122
|
+
expect(keys).toHaveProperty(
|
|
123
|
+
'myComponent',
|
|
124
|
+
expect.objectContaining({
|
|
125
|
+
flags: expect.objectContaining({
|
|
126
|
+
presence: 'optional'
|
|
127
|
+
})
|
|
128
|
+
})
|
|
129
|
+
)
|
|
130
|
+
|
|
131
|
+
const result = collectionOptional.validate(getFormData())
|
|
132
|
+
expect(result.errors).toBeUndefined()
|
|
133
|
+
})
|
|
134
|
+
|
|
135
|
+
it('is configured for single values', () => {
|
|
136
|
+
const { formSchema } = collection
|
|
137
|
+
const { keys } = formSchema.describe()
|
|
138
|
+
|
|
139
|
+
expect(keys).toHaveProperty(
|
|
140
|
+
'myComponent',
|
|
141
|
+
expect.objectContaining({
|
|
142
|
+
flags: expect.objectContaining({
|
|
143
|
+
single: true
|
|
144
|
+
})
|
|
145
|
+
})
|
|
146
|
+
)
|
|
147
|
+
})
|
|
148
|
+
|
|
149
|
+
it('is configured with checkbox items', () => {
|
|
150
|
+
const { formSchema } = collection
|
|
151
|
+
const { keys } = formSchema.describe()
|
|
152
|
+
|
|
153
|
+
expect(keys).toHaveProperty(
|
|
154
|
+
'myComponent',
|
|
155
|
+
expect.objectContaining({
|
|
156
|
+
items: [
|
|
157
|
+
{
|
|
158
|
+
allow: options.allow,
|
|
159
|
+
flags: {
|
|
160
|
+
label: def.title,
|
|
161
|
+
only: true
|
|
162
|
+
},
|
|
163
|
+
type: options.list.type
|
|
164
|
+
}
|
|
165
|
+
]
|
|
166
|
+
})
|
|
167
|
+
)
|
|
168
|
+
})
|
|
169
|
+
|
|
170
|
+
it('adds errors for empty value', () => {
|
|
171
|
+
const result = collection.validate(getFormData())
|
|
172
|
+
|
|
173
|
+
expect(result.errors).toEqual([
|
|
174
|
+
expect.objectContaining({
|
|
175
|
+
text: `Select ${def.title.toLowerCase()}`
|
|
176
|
+
})
|
|
177
|
+
])
|
|
178
|
+
})
|
|
179
|
+
|
|
180
|
+
it.each([...options.allow])(
|
|
181
|
+
'accepts valid checkbox single item',
|
|
182
|
+
(value) => {
|
|
183
|
+
const result = collection.validate(getFormData(value))
|
|
184
|
+
expect(result.errors).toBeUndefined()
|
|
185
|
+
}
|
|
186
|
+
)
|
|
187
|
+
|
|
188
|
+
it.each([...options.allow])(
|
|
189
|
+
'accepts valid checkbox array item',
|
|
190
|
+
(value) => {
|
|
191
|
+
const result = collection.validate(getFormData([value]))
|
|
192
|
+
expect(result.errors).toBeUndefined()
|
|
193
|
+
}
|
|
194
|
+
)
|
|
195
|
+
|
|
196
|
+
it.each([...options.deny])(
|
|
197
|
+
'rejects invalid checkbox single item',
|
|
198
|
+
(value) => {
|
|
199
|
+
const result = collection.validate(getFormData(value))
|
|
200
|
+
|
|
201
|
+
expect(result.errors).toEqual([
|
|
202
|
+
expect.objectContaining({
|
|
203
|
+
text: `Select ${def.title.toLowerCase()}`
|
|
204
|
+
})
|
|
205
|
+
])
|
|
206
|
+
}
|
|
207
|
+
)
|
|
208
|
+
|
|
209
|
+
it.each([...options.deny])(
|
|
210
|
+
'rejects invalid checkbox array item',
|
|
211
|
+
(value) => {
|
|
212
|
+
const result = collection.validate(getFormData([value]))
|
|
213
|
+
|
|
214
|
+
expect(result.errors).toEqual([
|
|
215
|
+
expect.objectContaining({
|
|
216
|
+
text: `Select ${def.title.toLowerCase()}`
|
|
217
|
+
})
|
|
218
|
+
])
|
|
219
|
+
}
|
|
220
|
+
)
|
|
221
|
+
|
|
222
|
+
it('adds errors for invalid values', () => {
|
|
223
|
+
const result1 = collection.validate(getFormData('invalid'))
|
|
224
|
+
const result2 = collection.validate(
|
|
225
|
+
getFormData(['invalid1', 'invalid2'])
|
|
226
|
+
)
|
|
227
|
+
|
|
228
|
+
const result3 = collection.validate(
|
|
229
|
+
// @ts-expect-error - Allow invalid param for test
|
|
230
|
+
getFormData({ unknown: 'invalid' })
|
|
231
|
+
)
|
|
232
|
+
|
|
233
|
+
expect(result1.errors).toBeTruthy()
|
|
234
|
+
expect(result2.errors).toBeTruthy()
|
|
235
|
+
expect(result3.errors).toBeTruthy()
|
|
236
|
+
})
|
|
237
|
+
})
|
|
238
|
+
|
|
239
|
+
describe('State', () => {
|
|
240
|
+
it.each([...options.examples])(
|
|
241
|
+
'returns text from state (single)',
|
|
242
|
+
(item) => {
|
|
243
|
+
const state1 = getFormState([item.state])
|
|
244
|
+
const state2 = getFormState(null)
|
|
245
|
+
|
|
246
|
+
const answer1 = getAnswer(field, state1)
|
|
247
|
+
const answer2 = getAnswer(field, state2)
|
|
248
|
+
|
|
249
|
+
expect(answer1).toBe(outdent`
|
|
250
|
+
<ul>
|
|
251
|
+
<li>${item.text}</li>
|
|
252
|
+
</ul>
|
|
253
|
+
`)
|
|
254
|
+
|
|
255
|
+
expect(answer2).toBe('')
|
|
256
|
+
}
|
|
257
|
+
)
|
|
258
|
+
|
|
259
|
+
it('returns text from state (multiple)', () => {
|
|
260
|
+
const item1 = options.examples[0]
|
|
261
|
+
const item2 = options.examples[2]
|
|
262
|
+
|
|
263
|
+
const state = getFormState([item1.state, item2.state])
|
|
264
|
+
const answer = getAnswer(field, state)
|
|
265
|
+
|
|
266
|
+
expect(answer).toBe(outdent`
|
|
267
|
+
<ul>
|
|
268
|
+
<li>${item1.text}</li>
|
|
269
|
+
<li>${item2.text}</li>
|
|
270
|
+
</ul>
|
|
271
|
+
`)
|
|
272
|
+
})
|
|
273
|
+
|
|
274
|
+
it.each([...options.examples])('returns payload from state', (item) => {
|
|
275
|
+
const state1 = getFormState([item.state])
|
|
276
|
+
const state2 = getFormState(null)
|
|
277
|
+
|
|
278
|
+
const payload1 = field.getFormDataFromState(state1)
|
|
279
|
+
const payload2 = field.getFormDataFromState(state2)
|
|
280
|
+
|
|
281
|
+
expect(payload1).toEqual(getFormData([item.value]))
|
|
282
|
+
expect(payload2).toEqual(getFormData())
|
|
283
|
+
})
|
|
284
|
+
|
|
285
|
+
it.each([...options.examples])('returns value from state', (item) => {
|
|
286
|
+
const state1 = getFormState([item.state])
|
|
287
|
+
const state2 = getFormState(null)
|
|
288
|
+
|
|
289
|
+
const value1 = field.getFormValueFromState(state1)
|
|
290
|
+
const value2 = field.getFormValueFromState(state2)
|
|
291
|
+
|
|
292
|
+
expect(value1).toEqual([item.value])
|
|
293
|
+
expect(value2).toBeUndefined()
|
|
294
|
+
})
|
|
295
|
+
|
|
296
|
+
it.each([...options.examples])(
|
|
297
|
+
'returns context for conditions and form submission',
|
|
298
|
+
(item) => {
|
|
299
|
+
const state1 = getFormState([item.state])
|
|
300
|
+
const state2 = getFormState(null)
|
|
301
|
+
|
|
302
|
+
const value1 = field.getContextValueFromState(state1)
|
|
303
|
+
const value2 = field.getContextValueFromState(state2)
|
|
304
|
+
|
|
305
|
+
expect(value1).toEqual([item.state])
|
|
306
|
+
expect(value2).toEqual([])
|
|
307
|
+
}
|
|
308
|
+
)
|
|
309
|
+
|
|
310
|
+
it.each([...options.examples])('returns state from payload', (item) => {
|
|
311
|
+
const payload1 = getFormData([item.value])
|
|
312
|
+
const payload2 = getFormData()
|
|
313
|
+
|
|
314
|
+
const value1 = field.getStateFromValidForm(payload1)
|
|
315
|
+
const value2 = field.getStateFromValidForm(payload2)
|
|
316
|
+
|
|
317
|
+
expect(value1).toEqual(getFormState([item.state]))
|
|
318
|
+
expect(value2).toEqual(getFormState(null))
|
|
319
|
+
})
|
|
320
|
+
})
|
|
321
|
+
|
|
322
|
+
describe('View model', () => {
|
|
323
|
+
it('sets Nunjucks component defaults', () => {
|
|
324
|
+
const item = options.examples[0]
|
|
325
|
+
|
|
326
|
+
const viewModel = field.getViewModel(getFormData([item.value]))
|
|
327
|
+
|
|
328
|
+
expect(viewModel).toEqual(
|
|
329
|
+
expect.objectContaining({
|
|
330
|
+
label: { text: def.title },
|
|
331
|
+
name: 'myComponent',
|
|
332
|
+
id: 'myComponent',
|
|
333
|
+
value: [item.value]
|
|
334
|
+
})
|
|
335
|
+
)
|
|
336
|
+
})
|
|
337
|
+
|
|
338
|
+
it.each([...options.examples])(
|
|
339
|
+
'sets Nunjucks component checkbox items',
|
|
340
|
+
(item) => {
|
|
341
|
+
const viewModel = field.getViewModel(getFormData([item.value]))
|
|
342
|
+
|
|
343
|
+
expect(viewModel.items?.[0]).not.toMatchObject({
|
|
344
|
+
value: '' // First item is never empty
|
|
345
|
+
})
|
|
346
|
+
|
|
347
|
+
expect(viewModel.items).toEqual(
|
|
348
|
+
expect.arrayContaining([
|
|
349
|
+
expect.objectContaining({
|
|
350
|
+
text: item.text,
|
|
351
|
+
value: item.value,
|
|
352
|
+
checked: true
|
|
353
|
+
})
|
|
354
|
+
])
|
|
355
|
+
)
|
|
356
|
+
}
|
|
357
|
+
)
|
|
358
|
+
})
|
|
359
|
+
|
|
360
|
+
describe('Checkbox items', () => {
|
|
361
|
+
it('returns checkbox items', () => {
|
|
362
|
+
expect(field).toHaveProperty('items', options.list.items)
|
|
363
|
+
})
|
|
364
|
+
|
|
365
|
+
it('returns checkbox items matching type', () => {
|
|
366
|
+
expect(field).toHaveProperty('values', expect.arrayContaining([]))
|
|
367
|
+
})
|
|
368
|
+
|
|
369
|
+
it('returns empty items when missing', () => {
|
|
370
|
+
const model = new FormModel(definition, {
|
|
371
|
+
basePath: 'test'
|
|
372
|
+
})
|
|
373
|
+
|
|
374
|
+
const { items } = new CheckboxesField(def, { model })
|
|
375
|
+
expect(items).toEqual([])
|
|
376
|
+
})
|
|
377
|
+
})
|
|
378
|
+
})
|
|
379
|
+
})
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { type CheckboxesFieldComponent, type Item } from '@defra/forms-model'
|
|
2
|
+
import joi, { type ArraySchema } from 'joi'
|
|
3
|
+
|
|
4
|
+
import { isFormValue } from '~/src/server/plugins/engine/components/FormComponent.js'
|
|
5
|
+
import { SelectionControlField } from '~/src/server/plugins/engine/components/SelectionControlField.js'
|
|
6
|
+
import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
|
|
7
|
+
import { type QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js'
|
|
8
|
+
import {
|
|
9
|
+
type FormState,
|
|
10
|
+
type FormStateValue,
|
|
11
|
+
type FormSubmissionState
|
|
12
|
+
} from '~/src/server/plugins/engine/types.js'
|
|
13
|
+
|
|
14
|
+
export class CheckboxesField extends SelectionControlField {
|
|
15
|
+
declare options: CheckboxesFieldComponent['options']
|
|
16
|
+
declare formSchema: ArraySchema<string> | ArraySchema<number>
|
|
17
|
+
declare stateSchema: ArraySchema<string> | ArraySchema<number>
|
|
18
|
+
|
|
19
|
+
constructor(
|
|
20
|
+
def: CheckboxesFieldComponent,
|
|
21
|
+
props: ConstructorParameters<typeof SelectionControlField>[1]
|
|
22
|
+
) {
|
|
23
|
+
super(def, props)
|
|
24
|
+
|
|
25
|
+
const { listType: type } = this
|
|
26
|
+
const { options, title } = def
|
|
27
|
+
|
|
28
|
+
let formSchema =
|
|
29
|
+
type === 'string' ? joi.array<string>() : joi.array<number>()
|
|
30
|
+
|
|
31
|
+
const itemsSchema = joi[type]()
|
|
32
|
+
.valid(...this.values)
|
|
33
|
+
.label(title)
|
|
34
|
+
|
|
35
|
+
formSchema = formSchema.items(itemsSchema).single().label(title).required()
|
|
36
|
+
|
|
37
|
+
if (options.required === false) {
|
|
38
|
+
formSchema = formSchema.optional()
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
this.formSchema = formSchema.default([])
|
|
42
|
+
this.stateSchema = formSchema.default(null).allow(null)
|
|
43
|
+
this.options = options
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
getFormValueFromState(state: FormSubmissionState) {
|
|
47
|
+
const { items, name } = this
|
|
48
|
+
|
|
49
|
+
// State checkbox values
|
|
50
|
+
const values = this.getFormValue(state[name]) ?? []
|
|
51
|
+
|
|
52
|
+
// Map (or discard) state values to item values
|
|
53
|
+
const selected = items
|
|
54
|
+
.filter((item) => values.includes(item.value))
|
|
55
|
+
.map((item) => item.value)
|
|
56
|
+
|
|
57
|
+
return selected.length ? selected : undefined
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
getFormValue(value?: FormStateValue | FormState) {
|
|
61
|
+
return this.isValue(value) ? value : undefined
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
getDisplayStringFromState(state: FormSubmissionState) {
|
|
65
|
+
const { items } = this
|
|
66
|
+
|
|
67
|
+
// Selected checkbox values
|
|
68
|
+
const selected = this.getFormValueFromState(state) ?? []
|
|
69
|
+
|
|
70
|
+
// Map selected values to text
|
|
71
|
+
return items
|
|
72
|
+
.filter((item) => selected.includes(item.value))
|
|
73
|
+
.map((item) => item.text)
|
|
74
|
+
.join(', ')
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
getContextValueFromState(state: FormSubmissionState) {
|
|
78
|
+
const values = this.getFormValueFromState(state)
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* For evaluation context purposes, optional {@link CheckboxesField}
|
|
82
|
+
* with an undefined value (i.e. nothing selected) should default to [].
|
|
83
|
+
* This way conditions are not evaluated against `undefined` which throws errors.
|
|
84
|
+
* Currently these errors are caught and the evaluation returns default `false`.
|
|
85
|
+
* @see {@link QuestionPageController.getNextPath} for `undefined` return value
|
|
86
|
+
* @see {@link FormModel.makeCondition} for try/catch block with default `false`
|
|
87
|
+
* For negative conditions this is a problem because E.g.
|
|
88
|
+
* The condition: 'selectedchecks' does not contain 'someval'
|
|
89
|
+
* should return true IF 'selectedchecks' is undefined, not throw and return false.
|
|
90
|
+
*/
|
|
91
|
+
return values ?? []
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
isValue(value?: FormStateValue | FormState): value is Item['value'][] {
|
|
95
|
+
if (!Array.isArray(value)) {
|
|
96
|
+
return false
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
// Skip checks when empty
|
|
100
|
+
if (!value.length) {
|
|
101
|
+
return true
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
return value.every(isFormValue)
|
|
105
|
+
}
|
|
106
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { isConditionalType, type ComponentDef } from '@defra/forms-model'
|
|
2
|
+
import joi, {
|
|
3
|
+
type ArraySchema,
|
|
4
|
+
type BooleanSchema,
|
|
5
|
+
type DateSchema,
|
|
6
|
+
type NumberSchema,
|
|
7
|
+
type ObjectSchema,
|
|
8
|
+
type StringSchema
|
|
9
|
+
} from 'joi'
|
|
10
|
+
|
|
11
|
+
import { type ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
|
|
12
|
+
import { type Component } from '~/src/server/plugins/engine/components/helpers.js'
|
|
13
|
+
import { type ViewModel } from '~/src/server/plugins/engine/components/types.js'
|
|
14
|
+
import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
|
|
15
|
+
import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers.js'
|
|
16
|
+
|
|
17
|
+
export class ComponentBase {
|
|
18
|
+
page?: PageControllerClass
|
|
19
|
+
parent: Component | undefined
|
|
20
|
+
collection: ComponentCollection | undefined
|
|
21
|
+
|
|
22
|
+
type: ComponentDef['type']
|
|
23
|
+
name: ComponentDef['name']
|
|
24
|
+
title: ComponentDef['title']
|
|
25
|
+
schema?: Extract<ComponentDef, { schema: object }>['schema']
|
|
26
|
+
options?: Extract<ComponentDef, { options: object }>['options']
|
|
27
|
+
|
|
28
|
+
isFormComponent = false
|
|
29
|
+
model: FormModel
|
|
30
|
+
|
|
31
|
+
/** joi schemas based on a component defined in the form JSON. This validates a user's answer and is generated from {@link ComponentDef} */
|
|
32
|
+
formSchema: ComponentSchema = joi.string()
|
|
33
|
+
stateSchema: ComponentSchema = joi.string()
|
|
34
|
+
|
|
35
|
+
constructor(
|
|
36
|
+
def: ComponentDef,
|
|
37
|
+
props: {
|
|
38
|
+
page?: PageControllerClass
|
|
39
|
+
parent?: Component
|
|
40
|
+
model: FormModel
|
|
41
|
+
}
|
|
42
|
+
) {
|
|
43
|
+
this.type = def.type
|
|
44
|
+
this.name = def.name
|
|
45
|
+
this.title = def.title
|
|
46
|
+
|
|
47
|
+
if ('schema' in def) {
|
|
48
|
+
this.schema = def.schema
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
if ('options' in def) {
|
|
52
|
+
this.options = def.options
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
this.page = props.page
|
|
56
|
+
this.parent = props.parent
|
|
57
|
+
this.model = props.model
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
get viewModel() {
|
|
61
|
+
const { options, type } = this
|
|
62
|
+
|
|
63
|
+
const viewModel: ViewModel = {
|
|
64
|
+
attributes: {}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (!options) {
|
|
68
|
+
return viewModel
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if ('autocomplete' in options) {
|
|
72
|
+
viewModel.attributes.autocomplete = options.autocomplete
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
if ('classes' in options) {
|
|
76
|
+
viewModel.classes = options.classes
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
if ('condition' in options && isConditionalType(type)) {
|
|
80
|
+
viewModel.condition = options.condition
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
return viewModel
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export type ComponentSchema =
|
|
88
|
+
| ArraySchema<string>
|
|
89
|
+
| ArraySchema<number>
|
|
90
|
+
| ArraySchema<boolean>
|
|
91
|
+
| ArraySchema<object>
|
|
92
|
+
| BooleanSchema<string>
|
|
93
|
+
| DateSchema
|
|
94
|
+
| NumberSchema<string>
|
|
95
|
+
| NumberSchema
|
|
96
|
+
| ObjectSchema
|
|
97
|
+
| StringSchema
|