@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,73 @@
|
|
|
1
|
+
import { config } from '~/src/config/index.js'
|
|
2
|
+
import { configureBlankiePlugin } from '~/src/server/plugins/blankie.js'
|
|
3
|
+
|
|
4
|
+
describe('Server Blankie Plugin', () => {
|
|
5
|
+
test('configuration default options are provided', () => {
|
|
6
|
+
config.set('googleAnalyticsTrackingId', '')
|
|
7
|
+
|
|
8
|
+
const { options } = configureBlankiePlugin()
|
|
9
|
+
|
|
10
|
+
expect(options).toEqual({
|
|
11
|
+
defaultSrc: ['self'],
|
|
12
|
+
fontSrc: ['self', 'data:'],
|
|
13
|
+
frameSrc: ['self', 'data:'],
|
|
14
|
+
connectSrc: ['self', 'https://test-uploader.cdp-int.defra.cloud'],
|
|
15
|
+
scriptSrc: ['self', 'strict-dynamic', 'unsafe-inline'],
|
|
16
|
+
styleSrc: ['self', 'unsafe-inline'],
|
|
17
|
+
imgSrc: ['self'],
|
|
18
|
+
generateNonces: true
|
|
19
|
+
})
|
|
20
|
+
})
|
|
21
|
+
|
|
22
|
+
test('configuration default and GA options are provided', () => {
|
|
23
|
+
config.set('googleAnalyticsTrackingId', '12345')
|
|
24
|
+
|
|
25
|
+
const { options } = configureBlankiePlugin()
|
|
26
|
+
|
|
27
|
+
expect(options).toEqual({
|
|
28
|
+
defaultSrc: ['self'],
|
|
29
|
+
fontSrc: ['self', 'data:'],
|
|
30
|
+
frameSrc: ['self', 'data:'],
|
|
31
|
+
connectSrc: [
|
|
32
|
+
'self',
|
|
33
|
+
'https://*.google-analytics.com',
|
|
34
|
+
'https://*.analytics.google.com',
|
|
35
|
+
'https://*.googletagmanager.com',
|
|
36
|
+
'https://test-uploader.cdp-int.defra.cloud'
|
|
37
|
+
],
|
|
38
|
+
scriptSrc: [
|
|
39
|
+
'self',
|
|
40
|
+
'strict-dynamic',
|
|
41
|
+
'unsafe-inline',
|
|
42
|
+
'https://*.googletagmanager.com'
|
|
43
|
+
],
|
|
44
|
+
styleSrc: ['self', 'unsafe-inline'],
|
|
45
|
+
imgSrc: [
|
|
46
|
+
'self',
|
|
47
|
+
'https://*.google-analytics.com',
|
|
48
|
+
'https://*.googletagmanager.com'
|
|
49
|
+
],
|
|
50
|
+
generateNonces: true
|
|
51
|
+
})
|
|
52
|
+
})
|
|
53
|
+
|
|
54
|
+
test('configuration includes uploaderUrl when provided', () => {
|
|
55
|
+
config.set('googleAnalyticsTrackingId', '')
|
|
56
|
+
config.set('uploaderUrl', 'https://some-random-uploader.example.com')
|
|
57
|
+
|
|
58
|
+
const { options } = configureBlankiePlugin()
|
|
59
|
+
|
|
60
|
+
expect(options?.connectSrc).toContain(
|
|
61
|
+
'https://some-random-uploader.example.com'
|
|
62
|
+
)
|
|
63
|
+
})
|
|
64
|
+
|
|
65
|
+
test('configuration does not include uploaderUrl when not provided', () => {
|
|
66
|
+
config.set('googleAnalyticsTrackingId', '')
|
|
67
|
+
config.set('uploaderUrl', '')
|
|
68
|
+
|
|
69
|
+
const { options } = configureBlankiePlugin()
|
|
70
|
+
|
|
71
|
+
expect(options?.connectSrc).toEqual(['self'])
|
|
72
|
+
})
|
|
73
|
+
})
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type ServerRegisterPluginObject } from '@hapi/hapi'
|
|
2
|
+
import Blankie from 'blankie'
|
|
3
|
+
|
|
4
|
+
import { config } from '~/src/config/index.js'
|
|
5
|
+
|
|
6
|
+
const googleAnalyticsOptions = {
|
|
7
|
+
scriptSrc: ['https://*.googletagmanager.com'],
|
|
8
|
+
imgSrc: ['https://*.google-analytics.com', 'https://*.googletagmanager.com'],
|
|
9
|
+
connectSrc: [
|
|
10
|
+
'https://*.google-analytics.com',
|
|
11
|
+
'https://*.analytics.google.com',
|
|
12
|
+
'https://*.googletagmanager.com'
|
|
13
|
+
]
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export const configureBlankiePlugin = (): ServerRegisterPluginObject<
|
|
17
|
+
Record<string, boolean | string | string[]>
|
|
18
|
+
> => {
|
|
19
|
+
const gaTrackingId = config.get('googleAnalyticsTrackingId')
|
|
20
|
+
const uploaderUrl = config.get('uploaderUrl')
|
|
21
|
+
|
|
22
|
+
/*
|
|
23
|
+
Note that unsafe-inline is a fallback for old browsers that don't support nonces. It will be ignored by modern browsers as the nonce is provided.
|
|
24
|
+
*/
|
|
25
|
+
return {
|
|
26
|
+
plugin: Blankie,
|
|
27
|
+
options: {
|
|
28
|
+
defaultSrc: ['self'],
|
|
29
|
+
fontSrc: ['self', 'data:'],
|
|
30
|
+
connectSrc: [
|
|
31
|
+
['self'],
|
|
32
|
+
gaTrackingId ? googleAnalyticsOptions.connectSrc : [],
|
|
33
|
+
uploaderUrl ? [uploaderUrl] : []
|
|
34
|
+
].flat(),
|
|
35
|
+
scriptSrc: [
|
|
36
|
+
['self', 'strict-dynamic', 'unsafe-inline'],
|
|
37
|
+
gaTrackingId ? googleAnalyticsOptions.scriptSrc : []
|
|
38
|
+
].flat(),
|
|
39
|
+
styleSrc: ['self', 'unsafe-inline'],
|
|
40
|
+
imgSrc: [
|
|
41
|
+
['self'],
|
|
42
|
+
gaTrackingId ? googleAnalyticsOptions.imgSrc : []
|
|
43
|
+
].flat(),
|
|
44
|
+
frameSrc: ['self', 'data:'],
|
|
45
|
+
generateNonces: true
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import crumb, { type RegisterOptions } from '@hapi/crumb'
|
|
2
|
+
import { type ServerRegisterPluginObject } from '@hapi/hapi'
|
|
3
|
+
|
|
4
|
+
import { config } from '~/src/config/index.js'
|
|
5
|
+
import { type RouteConfig } from '~/src/server/types.js'
|
|
6
|
+
|
|
7
|
+
export const configureCrumbPlugin = (
|
|
8
|
+
routeConfig?: RouteConfig
|
|
9
|
+
): ServerRegisterPluginObject<RegisterOptions> => {
|
|
10
|
+
return {
|
|
11
|
+
plugin: crumb,
|
|
12
|
+
options: {
|
|
13
|
+
logUnauthorized: true,
|
|
14
|
+
enforce: routeConfig?.enforceCsrf ?? config.get('enforceCsrf'),
|
|
15
|
+
cookieOptions: {
|
|
16
|
+
isSecure: config.get('isProduction')
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
# forms-engine
|
|
2
|
+
|
|
3
|
+
Form hapi-plugin
|
|
4
|
+
|
|
5
|
+
...
|
|
6
|
+
|
|
7
|
+
## Templates
|
|
8
|
+
|
|
9
|
+
The following elements support [LiquidJS templates](https://liquidjs.com/):
|
|
10
|
+
|
|
11
|
+
- Page **title**
|
|
12
|
+
- Form component **titles**
|
|
13
|
+
- Support for fieldset legend text or label text
|
|
14
|
+
- This includes when the title is used in **error messages**
|
|
15
|
+
- Html (guidance) component **content**
|
|
16
|
+
- Summary component **row** key title (check answers and repeater summary)
|
|
17
|
+
|
|
18
|
+
### Template data
|
|
19
|
+
|
|
20
|
+
The data the templates are evaluated against is the raw answers the user has provided up to the page they're currently on.
|
|
21
|
+
For example, given a YesNoField component called `TKsWbP`, the template `{{ TKsWbP }}` would render "true" or "false" depending on how the user answered the question.
|
|
22
|
+
|
|
23
|
+
The current FormContext is also available as `context` in the templates. This allows access to the full data including the path the user has taken in their journey and any miscellaneous data returned from `Page event`s in `context.data`.
|
|
24
|
+
|
|
25
|
+
### Liquid Filters
|
|
26
|
+
|
|
27
|
+
There are a number of `LiquidJS` filters available to you from within the templates:
|
|
28
|
+
|
|
29
|
+
- `page` - returns the page definition for the given path
|
|
30
|
+
- `field` - returns the component definition for the given name
|
|
31
|
+
- `href` - returns the page href for the given page path
|
|
32
|
+
- `answer` - returns the user's answer for a given component
|
|
33
|
+
- `evaluate` - evaluates and returns a Liquid template using the current context
|
|
34
|
+
|
|
35
|
+
### Examples
|
|
36
|
+
|
|
37
|
+
```json
|
|
38
|
+
"pages": [
|
|
39
|
+
{
|
|
40
|
+
"title": "What's your name?",
|
|
41
|
+
"path": "/full-name",
|
|
42
|
+
"components": [
|
|
43
|
+
{
|
|
44
|
+
"name": "WmHfSb",
|
|
45
|
+
"title": "What's your full name?",
|
|
46
|
+
"type": "TextField"
|
|
47
|
+
}
|
|
48
|
+
]
|
|
49
|
+
},
|
|
50
|
+
// This example shows how a component can use an answer to a previous question (What's your full name) in it's title
|
|
51
|
+
{
|
|
52
|
+
"title": "Are you in England?",
|
|
53
|
+
"path": "/are-you-in-england",
|
|
54
|
+
"components": [
|
|
55
|
+
{
|
|
56
|
+
"name": "TKsWbP",
|
|
57
|
+
"title": "Are you in England, {{ WmHfSb }}?",
|
|
58
|
+
"type": "YesNoField"
|
|
59
|
+
}
|
|
60
|
+
]
|
|
61
|
+
},
|
|
62
|
+
// This example shows how a Html (guidance) component can use the available filters to get the form definition and user answers and display them
|
|
63
|
+
{
|
|
64
|
+
"title": "Template example for {{ WmHfSb }}?",
|
|
65
|
+
"path": "/example",
|
|
66
|
+
"components": [
|
|
67
|
+
{
|
|
68
|
+
"title": "Html",
|
|
69
|
+
"type": "Html",
|
|
70
|
+
"content": "<p class=\"govuk-body\">
|
|
71
|
+
// Use Liquid's `assign` to create a variable that holds reference to the \"/are-you-in-england\" page
|
|
72
|
+
{%- assign inEngland = \"/are-you-in-england\" | page -%}
|
|
73
|
+
|
|
74
|
+
// Use the reference to `evaluate` the title
|
|
75
|
+
{{ inEngland.title | evaluate }}<br>
|
|
76
|
+
|
|
77
|
+
// Use the href filter to display the full page path
|
|
78
|
+
{{ \"/are-you-in-england\" | href }}<br>
|
|
79
|
+
|
|
80
|
+
// Use the `answer` filter to render the user provided answer to a question
|
|
81
|
+
{{ 'TKsWbP' | answer }}
|
|
82
|
+
</p>\n"
|
|
83
|
+
}
|
|
84
|
+
]
|
|
85
|
+
}
|
|
86
|
+
]
|
|
87
|
+
```
|
|
@@ -0,0 +1,294 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ComponentType,
|
|
3
|
+
type AutocompleteFieldComponent
|
|
4
|
+
} from '@defra/forms-model'
|
|
5
|
+
|
|
6
|
+
import { AutocompleteField } from '~/src/server/plugins/engine/components/AutocompleteField.js'
|
|
7
|
+
import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
|
|
8
|
+
import {
|
|
9
|
+
getAnswer,
|
|
10
|
+
type Field
|
|
11
|
+
} from '~/src/server/plugins/engine/components/helpers.js'
|
|
12
|
+
import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
|
|
13
|
+
import {
|
|
14
|
+
listNumber,
|
|
15
|
+
listNumberExamples,
|
|
16
|
+
listString,
|
|
17
|
+
listStringExamples
|
|
18
|
+
} from '~/test/fixtures/list.js'
|
|
19
|
+
import definition from '~/test/form/definitions/blank.js'
|
|
20
|
+
import { getFormData, getFormState } from '~/test/helpers/component-helpers.js'
|
|
21
|
+
|
|
22
|
+
describe.each([
|
|
23
|
+
{
|
|
24
|
+
component: {
|
|
25
|
+
title: 'String list',
|
|
26
|
+
name: 'myComponent',
|
|
27
|
+
type: ComponentType.AutocompleteField,
|
|
28
|
+
list: 'listString',
|
|
29
|
+
options: {}
|
|
30
|
+
} satisfies AutocompleteFieldComponent,
|
|
31
|
+
|
|
32
|
+
options: {
|
|
33
|
+
list: listString,
|
|
34
|
+
examples: listStringExamples,
|
|
35
|
+
allow: ['1', '2', '3', '4']
|
|
36
|
+
}
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
component: {
|
|
40
|
+
title: 'Number list',
|
|
41
|
+
name: 'myComponent',
|
|
42
|
+
type: ComponentType.AutocompleteField,
|
|
43
|
+
list: 'listNumber',
|
|
44
|
+
options: {}
|
|
45
|
+
} satisfies AutocompleteFieldComponent,
|
|
46
|
+
|
|
47
|
+
options: {
|
|
48
|
+
list: listNumber,
|
|
49
|
+
examples: listNumberExamples,
|
|
50
|
+
allow: [1, 2, 3, 4]
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
])('AutocompleteField: $component.title', ({ component: def, options }) => {
|
|
54
|
+
let model: FormModel
|
|
55
|
+
let collection: ComponentCollection
|
|
56
|
+
let field: Field
|
|
57
|
+
|
|
58
|
+
beforeEach(() => {
|
|
59
|
+
const updated = structuredClone(definition)
|
|
60
|
+
updated.lists = [options.list]
|
|
61
|
+
|
|
62
|
+
model = new FormModel(updated, {
|
|
63
|
+
basePath: 'test'
|
|
64
|
+
})
|
|
65
|
+
|
|
66
|
+
collection = new ComponentCollection([def], { model })
|
|
67
|
+
field = collection.fields[0]
|
|
68
|
+
})
|
|
69
|
+
|
|
70
|
+
describe('Defaults', () => {
|
|
71
|
+
describe('Schema', () => {
|
|
72
|
+
it('uses component title as label', () => {
|
|
73
|
+
const { formSchema } = collection
|
|
74
|
+
const { keys } = formSchema.describe()
|
|
75
|
+
|
|
76
|
+
expect(keys).toHaveProperty(
|
|
77
|
+
'myComponent',
|
|
78
|
+
expect.objectContaining({
|
|
79
|
+
flags: expect.objectContaining({ label: def.title })
|
|
80
|
+
})
|
|
81
|
+
)
|
|
82
|
+
})
|
|
83
|
+
|
|
84
|
+
it('uses component name as keys', () => {
|
|
85
|
+
const { formSchema } = collection
|
|
86
|
+
const { keys } = formSchema.describe()
|
|
87
|
+
|
|
88
|
+
expect(field.keys).toEqual(['myComponent'])
|
|
89
|
+
expect(field.collection).toBeUndefined()
|
|
90
|
+
|
|
91
|
+
for (const key of field.keys) {
|
|
92
|
+
expect(keys).toHaveProperty(key)
|
|
93
|
+
}
|
|
94
|
+
})
|
|
95
|
+
|
|
96
|
+
it('is required by default', () => {
|
|
97
|
+
const { formSchema } = collection
|
|
98
|
+
const { keys } = formSchema.describe()
|
|
99
|
+
|
|
100
|
+
expect(keys).toHaveProperty(
|
|
101
|
+
'myComponent',
|
|
102
|
+
expect.objectContaining({
|
|
103
|
+
flags: expect.objectContaining({
|
|
104
|
+
presence: 'required'
|
|
105
|
+
})
|
|
106
|
+
})
|
|
107
|
+
)
|
|
108
|
+
})
|
|
109
|
+
|
|
110
|
+
it('is optional when configured', () => {
|
|
111
|
+
const collectionOptional = new ComponentCollection(
|
|
112
|
+
[{ ...def, options: { required: false } }],
|
|
113
|
+
{ model }
|
|
114
|
+
)
|
|
115
|
+
|
|
116
|
+
const { formSchema } = collectionOptional
|
|
117
|
+
const { keys } = formSchema.describe()
|
|
118
|
+
|
|
119
|
+
expect(keys).toHaveProperty(
|
|
120
|
+
'myComponent',
|
|
121
|
+
expect.objectContaining({
|
|
122
|
+
allow: expect.arrayContaining([''])
|
|
123
|
+
})
|
|
124
|
+
)
|
|
125
|
+
|
|
126
|
+
const result = collectionOptional.validate(getFormData(''))
|
|
127
|
+
expect(result.errors).toBeUndefined()
|
|
128
|
+
})
|
|
129
|
+
|
|
130
|
+
it('is configured with autocomplete suggestions', () => {
|
|
131
|
+
const { formSchema } = collection
|
|
132
|
+
const { keys } = formSchema.describe()
|
|
133
|
+
|
|
134
|
+
expect(keys).toHaveProperty(
|
|
135
|
+
'myComponent',
|
|
136
|
+
expect.objectContaining({
|
|
137
|
+
allow: options.allow,
|
|
138
|
+
type: options.list.type
|
|
139
|
+
})
|
|
140
|
+
)
|
|
141
|
+
})
|
|
142
|
+
|
|
143
|
+
it.each([...options.allow])(
|
|
144
|
+
'accepts valid list item (value: %s)',
|
|
145
|
+
(value) => {
|
|
146
|
+
const result = collection.validate(getFormData(value))
|
|
147
|
+
expect(result.errors).toBeUndefined()
|
|
148
|
+
}
|
|
149
|
+
)
|
|
150
|
+
|
|
151
|
+
it('adds errors for empty value', () => {
|
|
152
|
+
const result = collection.validate(getFormData(''))
|
|
153
|
+
|
|
154
|
+
expect(result.errors).toEqual([
|
|
155
|
+
expect.objectContaining({
|
|
156
|
+
text: `Enter ${def.title.toLowerCase()}`
|
|
157
|
+
})
|
|
158
|
+
])
|
|
159
|
+
})
|
|
160
|
+
|
|
161
|
+
it('adds errors for invalid values', () => {
|
|
162
|
+
const result1 = collection.validate(getFormData('invalid'))
|
|
163
|
+
const result2 = collection.validate(
|
|
164
|
+
// @ts-expect-error - Allow invalid param for test
|
|
165
|
+
getFormData({ unknown: 'invalid' })
|
|
166
|
+
)
|
|
167
|
+
|
|
168
|
+
expect(result1.errors).toBeTruthy()
|
|
169
|
+
expect(result2.errors).toBeTruthy()
|
|
170
|
+
})
|
|
171
|
+
})
|
|
172
|
+
|
|
173
|
+
describe('State', () => {
|
|
174
|
+
it.each([...options.examples])('returns text from state', (item) => {
|
|
175
|
+
const state1 = getFormState(item.state)
|
|
176
|
+
const state2 = getFormState(null)
|
|
177
|
+
|
|
178
|
+
const answer1 = getAnswer(field, state1)
|
|
179
|
+
const answer2 = getAnswer(field, state2)
|
|
180
|
+
|
|
181
|
+
expect(answer1).toBe(item.text)
|
|
182
|
+
expect(answer2).toBe('')
|
|
183
|
+
})
|
|
184
|
+
|
|
185
|
+
it.each([...options.examples])('returns payload from state', (item) => {
|
|
186
|
+
const state1 = getFormState(item.state)
|
|
187
|
+
const state2 = getFormState(null)
|
|
188
|
+
|
|
189
|
+
const payload1 = field.getFormDataFromState(state1)
|
|
190
|
+
const payload2 = field.getFormDataFromState(state2)
|
|
191
|
+
|
|
192
|
+
expect(payload1).toEqual(getFormData(item.value))
|
|
193
|
+
expect(payload2).toEqual(getFormData())
|
|
194
|
+
})
|
|
195
|
+
|
|
196
|
+
it.each([...options.examples])('returns value from state', (item) => {
|
|
197
|
+
const state1 = getFormState(item.state)
|
|
198
|
+
const state2 = getFormState(null)
|
|
199
|
+
|
|
200
|
+
const value1 = field.getFormValueFromState(state1)
|
|
201
|
+
const value2 = field.getFormValueFromState(state2)
|
|
202
|
+
|
|
203
|
+
expect(value1).toBe(item.value)
|
|
204
|
+
expect(value2).toBeUndefined()
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
it.each([...options.examples])(
|
|
208
|
+
'returns context for conditions and form submission',
|
|
209
|
+
(item) => {
|
|
210
|
+
const state1 = getFormState(item.state)
|
|
211
|
+
const state2 = getFormState(null)
|
|
212
|
+
|
|
213
|
+
const value1 = field.getContextValueFromState(state1)
|
|
214
|
+
const value2 = field.getContextValueFromState(state2)
|
|
215
|
+
|
|
216
|
+
expect(value1).toEqual(item.value)
|
|
217
|
+
expect(value2).toBeNull()
|
|
218
|
+
}
|
|
219
|
+
)
|
|
220
|
+
|
|
221
|
+
it.each([...options.examples])('returns state from payload', (item) => {
|
|
222
|
+
const payload1 = getFormData(item.value)
|
|
223
|
+
const payload2 = getFormData()
|
|
224
|
+
|
|
225
|
+
const value1 = field.getStateFromValidForm(payload1)
|
|
226
|
+
const value2 = field.getStateFromValidForm(payload2)
|
|
227
|
+
|
|
228
|
+
expect(value1).toEqual(getFormState(item.state))
|
|
229
|
+
expect(value2).toEqual(getFormState(null))
|
|
230
|
+
})
|
|
231
|
+
})
|
|
232
|
+
|
|
233
|
+
describe('View model', () => {
|
|
234
|
+
it('sets Nunjucks component defaults', () => {
|
|
235
|
+
const item = options.examples[0]
|
|
236
|
+
|
|
237
|
+
const viewModel = field.getViewModel(getFormData(item.value))
|
|
238
|
+
|
|
239
|
+
expect(viewModel).toEqual(
|
|
240
|
+
expect.objectContaining({
|
|
241
|
+
label: { text: def.title },
|
|
242
|
+
name: 'myComponent',
|
|
243
|
+
id: 'myComponent',
|
|
244
|
+
value: item.value
|
|
245
|
+
})
|
|
246
|
+
)
|
|
247
|
+
})
|
|
248
|
+
|
|
249
|
+
it.each([...options.examples])(
|
|
250
|
+
'sets Nunjucks component autocomplete suggestions',
|
|
251
|
+
(item) => {
|
|
252
|
+
const viewModel = field.getViewModel(getFormData(item.value))
|
|
253
|
+
|
|
254
|
+
expect(viewModel.items?.[0]).toMatchObject({
|
|
255
|
+
value: '' // First item is always empty
|
|
256
|
+
})
|
|
257
|
+
|
|
258
|
+
expect(viewModel.items).toEqual(
|
|
259
|
+
expect.arrayContaining([
|
|
260
|
+
expect.objectContaining({
|
|
261
|
+
text: item.text,
|
|
262
|
+
value: item.value,
|
|
263
|
+
selected: true
|
|
264
|
+
})
|
|
265
|
+
])
|
|
266
|
+
)
|
|
267
|
+
}
|
|
268
|
+
)
|
|
269
|
+
})
|
|
270
|
+
|
|
271
|
+
describe('Autocomplete suggestions', () => {
|
|
272
|
+
it('returns autocomplete suggestions', () => {
|
|
273
|
+
expect(field).toMatchObject({
|
|
274
|
+
items: options.list.items
|
|
275
|
+
})
|
|
276
|
+
})
|
|
277
|
+
|
|
278
|
+
it('returns autocomplete suggestions matching type', () => {
|
|
279
|
+
expect(field).toMatchObject({
|
|
280
|
+
values: expect.arrayContaining([])
|
|
281
|
+
})
|
|
282
|
+
})
|
|
283
|
+
|
|
284
|
+
it('returns empty items when missing', () => {
|
|
285
|
+
const model = new FormModel(definition, {
|
|
286
|
+
basePath: 'test'
|
|
287
|
+
})
|
|
288
|
+
|
|
289
|
+
const { items } = new AutocompleteField(def, { model })
|
|
290
|
+
expect(items).toEqual([])
|
|
291
|
+
})
|
|
292
|
+
})
|
|
293
|
+
})
|
|
294
|
+
})
|
|
@@ -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
|
+
}
|