@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,229 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
2
|
+
import { FileUploadField } from '~/src/server/plugins/engine/components/FileUploadField.js'
|
|
3
|
+
import { type Field } from '~/src/server/plugins/engine/components/helpers.js'
|
|
4
|
+
import { FormModel } from '~/src/server/plugins/engine/models/index.js'
|
|
5
|
+
import {
|
|
6
|
+
type DetailItem,
|
|
7
|
+
type DetailItemField,
|
|
8
|
+
type DetailItemRepeat
|
|
9
|
+
} from '~/src/server/plugins/engine/models/types.js'
|
|
10
|
+
import { format } from '~/src/server/plugins/engine/outputFormatters/machine/v1.js'
|
|
11
|
+
import {
|
|
12
|
+
FileStatus,
|
|
13
|
+
UploadStatus,
|
|
14
|
+
type FileState
|
|
15
|
+
} from '~/src/server/plugins/engine/types.js'
|
|
16
|
+
import { FormStatus } from '~/src/server/routes/types.js'
|
|
17
|
+
import definition from '~/test/form/definitions/repeat-mixed.js'
|
|
18
|
+
|
|
19
|
+
const submitResponse = {
|
|
20
|
+
message: 'Submit completed',
|
|
21
|
+
result: {
|
|
22
|
+
files: {
|
|
23
|
+
main: '00000000-0000-0000-0000-000000000000',
|
|
24
|
+
repeaters: {
|
|
25
|
+
pizza: '11111111-1111-1111-1111-111111111111'
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const model = new FormModel(definition, {
|
|
32
|
+
basePath: 'test'
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
const formStatus = {
|
|
36
|
+
isPreview: false,
|
|
37
|
+
state: FormStatus.Live
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const dummyField: Field = {
|
|
41
|
+
getContextValueFromState: (_) => 'hello world'
|
|
42
|
+
} as Field
|
|
43
|
+
|
|
44
|
+
const testDetailItemField: DetailItemField = {
|
|
45
|
+
name: 'exampleField',
|
|
46
|
+
label: 'Example Field',
|
|
47
|
+
href: '/example-field',
|
|
48
|
+
title: 'Example Field Title',
|
|
49
|
+
field: dummyField,
|
|
50
|
+
value: 'Example Value'
|
|
51
|
+
} as DetailItemField
|
|
52
|
+
|
|
53
|
+
const testDetailItemField2: DetailItemField = {
|
|
54
|
+
name: 'exampleField2',
|
|
55
|
+
label: 'Example Field 2',
|
|
56
|
+
href: '/example-field 2',
|
|
57
|
+
title: 'Example Field 2 Title',
|
|
58
|
+
field: dummyField,
|
|
59
|
+
value: 'Example Value 2'
|
|
60
|
+
} as DetailItemField
|
|
61
|
+
|
|
62
|
+
const testDetailItemRepeat: DetailItemRepeat = {
|
|
63
|
+
name: 'exampleRepeat',
|
|
64
|
+
label: 'Example Repeat',
|
|
65
|
+
href: '/example-repeat',
|
|
66
|
+
title: 'Example Repeat Title',
|
|
67
|
+
value: 'Example Repeat Value',
|
|
68
|
+
subItems: [
|
|
69
|
+
[
|
|
70
|
+
{
|
|
71
|
+
name: 'subItem1_1',
|
|
72
|
+
label: 'Sub Item 1 1',
|
|
73
|
+
field: dummyField,
|
|
74
|
+
href: '/sub-item-1-1',
|
|
75
|
+
title: 'Sub Item 1 1 Title',
|
|
76
|
+
value: 'Sub Item 1 1 Value'
|
|
77
|
+
} as DetailItemField,
|
|
78
|
+
{
|
|
79
|
+
name: 'subItem1_2',
|
|
80
|
+
label: 'Sub Item 1 2',
|
|
81
|
+
field: dummyField,
|
|
82
|
+
href: '/sub-item-1-2',
|
|
83
|
+
title: 'Sub Item 1 2 Title',
|
|
84
|
+
value: 'Sub Item 1 2 Value'
|
|
85
|
+
} as DetailItemField
|
|
86
|
+
],
|
|
87
|
+
[
|
|
88
|
+
{
|
|
89
|
+
name: 'subItem2_1',
|
|
90
|
+
label: 'Sub Item 2 1',
|
|
91
|
+
field: dummyField,
|
|
92
|
+
href: '/sub-item-2 1',
|
|
93
|
+
title: 'Sub Item 2 1 Title',
|
|
94
|
+
value: 'Sub Item 2 1 Value'
|
|
95
|
+
} as DetailItemField
|
|
96
|
+
]
|
|
97
|
+
]
|
|
98
|
+
} as DetailItemRepeat
|
|
99
|
+
|
|
100
|
+
const testDetailItemRepeat2: DetailItemRepeat = {
|
|
101
|
+
name: 'exampleRepeat2',
|
|
102
|
+
label: 'Example Repeat 2',
|
|
103
|
+
href: '/example-repeat-2',
|
|
104
|
+
title: 'Example Repeat 2 Title',
|
|
105
|
+
value: 'Example Repeat 2 Value',
|
|
106
|
+
subItems: [
|
|
107
|
+
[
|
|
108
|
+
{
|
|
109
|
+
name: 'subItem1_1',
|
|
110
|
+
label: 'Sub Item 1 1',
|
|
111
|
+
field: dummyField,
|
|
112
|
+
href: '/sub-item-1-1',
|
|
113
|
+
title: 'Sub Item 1 1 Title',
|
|
114
|
+
value: 'Sub Item 1 1 Value'
|
|
115
|
+
} as DetailItemField
|
|
116
|
+
]
|
|
117
|
+
]
|
|
118
|
+
} as DetailItemRepeat
|
|
119
|
+
|
|
120
|
+
const fileState: FileState = {
|
|
121
|
+
uploadId: '123',
|
|
122
|
+
status: {
|
|
123
|
+
form: {
|
|
124
|
+
file: {
|
|
125
|
+
fileId: '123-456-789',
|
|
126
|
+
contentLength: 1,
|
|
127
|
+
filename: 'foobar.txt',
|
|
128
|
+
fileStatus: FileStatus.complete
|
|
129
|
+
}
|
|
130
|
+
},
|
|
131
|
+
uploadStatus: UploadStatus.ready,
|
|
132
|
+
numberOfRejectedFiles: 0,
|
|
133
|
+
metadata: {
|
|
134
|
+
retrievalKey: '123'
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
const fileState2: FileState = {
|
|
140
|
+
uploadId: '456',
|
|
141
|
+
status: {
|
|
142
|
+
form: {
|
|
143
|
+
file: {
|
|
144
|
+
fileId: '456-789-123',
|
|
145
|
+
contentLength: 1,
|
|
146
|
+
filename: 'bazbuzz.txt',
|
|
147
|
+
fileStatus: FileStatus.complete
|
|
148
|
+
}
|
|
149
|
+
},
|
|
150
|
+
uploadStatus: UploadStatus.ready,
|
|
151
|
+
numberOfRejectedFiles: 0,
|
|
152
|
+
metadata: {
|
|
153
|
+
retrievalKey: '123'
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
const testDetailItemFile1: DetailItemField = Object.create(
|
|
159
|
+
FileUploadField.prototype
|
|
160
|
+
)
|
|
161
|
+
Object.assign(testDetailItemFile1, {
|
|
162
|
+
name: 'exampleFile1',
|
|
163
|
+
label: 'Example Field',
|
|
164
|
+
href: '/example-field',
|
|
165
|
+
title: 'Example Field Title',
|
|
166
|
+
field: testDetailItemFile1,
|
|
167
|
+
value: 'Example Value',
|
|
168
|
+
state: {
|
|
169
|
+
exampleFile1: [fileState, fileState2]
|
|
170
|
+
}
|
|
171
|
+
})
|
|
172
|
+
|
|
173
|
+
const items: DetailItem[] = [
|
|
174
|
+
testDetailItemField,
|
|
175
|
+
testDetailItemField2,
|
|
176
|
+
testDetailItemRepeat,
|
|
177
|
+
testDetailItemRepeat2,
|
|
178
|
+
testDetailItemFile1
|
|
179
|
+
]
|
|
180
|
+
|
|
181
|
+
describe('getPersonalisation', () => {
|
|
182
|
+
it('should return the machine output', () => {
|
|
183
|
+
model.def = definition
|
|
184
|
+
|
|
185
|
+
const body = format(items, model, submitResponse, formStatus)
|
|
186
|
+
|
|
187
|
+
const parsedBody = JSON.parse(body)
|
|
188
|
+
|
|
189
|
+
const expectedData = {
|
|
190
|
+
main: {
|
|
191
|
+
exampleField: 'hello world',
|
|
192
|
+
exampleField2: 'hello world'
|
|
193
|
+
},
|
|
194
|
+
repeaters: {
|
|
195
|
+
exampleRepeat: [
|
|
196
|
+
{
|
|
197
|
+
subItem1_1: 'hello world',
|
|
198
|
+
subItem1_2: 'hello world'
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
subItem2_1: 'hello world'
|
|
202
|
+
}
|
|
203
|
+
],
|
|
204
|
+
exampleRepeat2: [
|
|
205
|
+
{
|
|
206
|
+
subItem1_1: 'hello world'
|
|
207
|
+
}
|
|
208
|
+
]
|
|
209
|
+
},
|
|
210
|
+
files: {
|
|
211
|
+
exampleFile1: [
|
|
212
|
+
{
|
|
213
|
+
fileId: '123-456-789',
|
|
214
|
+
userDownloadLink: 'https://forms-designer/file-download/123-456-789'
|
|
215
|
+
},
|
|
216
|
+
{
|
|
217
|
+
fileId: '456-789-123',
|
|
218
|
+
userDownloadLink: 'https://forms-designer/file-download/456-789-123'
|
|
219
|
+
}
|
|
220
|
+
]
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
expect(parsedBody.meta.schemaVersion).toBe('1')
|
|
225
|
+
expect(parsedBody.meta.timestamp).toBeDateString()
|
|
226
|
+
expect(parsedBody.meta.definition).toEqual(definition)
|
|
227
|
+
expect(parsedBody.data).toEqual(expectedData)
|
|
228
|
+
})
|
|
229
|
+
})
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { type SubmitResponsePayload } from '@defra/forms-model'
|
|
2
|
+
|
|
3
|
+
import { config } from '~/src/config/index.js'
|
|
4
|
+
import { getAnswer } from '~/src/server/plugins/engine/components/helpers.js'
|
|
5
|
+
import { FileUploadField } from '~/src/server/plugins/engine/components/index.js'
|
|
6
|
+
import { type checkFormStatus } from '~/src/server/plugins/engine/helpers.js'
|
|
7
|
+
import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
|
|
8
|
+
import {
|
|
9
|
+
type DetailItem,
|
|
10
|
+
type DetailItemField,
|
|
11
|
+
type DetailItemRepeat
|
|
12
|
+
} from '~/src/server/plugins/engine/models/types.js'
|
|
13
|
+
|
|
14
|
+
const designerUrl = config.get('designerUrl')
|
|
15
|
+
|
|
16
|
+
export function format(
|
|
17
|
+
items: DetailItem[],
|
|
18
|
+
model: FormModel,
|
|
19
|
+
_submitResponse: SubmitResponsePayload,
|
|
20
|
+
_formStatus: ReturnType<typeof checkFormStatus>
|
|
21
|
+
) {
|
|
22
|
+
const now = new Date()
|
|
23
|
+
|
|
24
|
+
const categorisedData = categoriseData(items)
|
|
25
|
+
|
|
26
|
+
const data = {
|
|
27
|
+
meta: {
|
|
28
|
+
schemaVersion: '1',
|
|
29
|
+
timestamp: now.toISOString(),
|
|
30
|
+
definition: model.def
|
|
31
|
+
},
|
|
32
|
+
data: categorisedData
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const body = JSON.stringify(data)
|
|
36
|
+
|
|
37
|
+
return body
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Categories the form submission data into the "main" body and "repeaters".
|
|
42
|
+
*
|
|
43
|
+
* {
|
|
44
|
+
* main: {
|
|
45
|
+
* componentName: 'componentValue',
|
|
46
|
+
* },
|
|
47
|
+
* repeaters: {
|
|
48
|
+
* repeaterName: [
|
|
49
|
+
* {
|
|
50
|
+
* componentName: 'componentValue'
|
|
51
|
+
* }
|
|
52
|
+
* ]
|
|
53
|
+
* },
|
|
54
|
+
* files: {
|
|
55
|
+
* fileComponentName: [
|
|
56
|
+
* {
|
|
57
|
+
* fileId: '123-456-789',
|
|
58
|
+
* link: 'https://forms-designer/file-download/123-456-789'
|
|
59
|
+
* }
|
|
60
|
+
* ]
|
|
61
|
+
* }
|
|
62
|
+
* }
|
|
63
|
+
*/
|
|
64
|
+
function categoriseData(items: DetailItem[]) {
|
|
65
|
+
const output: {
|
|
66
|
+
main: Record<string, string>
|
|
67
|
+
repeaters: Record<string, Record<string, string>[]>
|
|
68
|
+
files: Record<string, Record<string, string>[]>
|
|
69
|
+
} = { main: {}, repeaters: {}, files: {} }
|
|
70
|
+
|
|
71
|
+
items.forEach((item) => {
|
|
72
|
+
if ('subItems' in item) {
|
|
73
|
+
output.repeaters[item.name] = extractRepeaters(item)
|
|
74
|
+
} else if (isFileUploadFieldItem(item)) {
|
|
75
|
+
output.files[item.name] = extractFileUploads(item)
|
|
76
|
+
} else {
|
|
77
|
+
output.main[item.name] = getAnswer(item.field, item.state, {
|
|
78
|
+
format: 'data'
|
|
79
|
+
})
|
|
80
|
+
}
|
|
81
|
+
})
|
|
82
|
+
|
|
83
|
+
return output
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* Returns the "repeaters" section of the response body
|
|
88
|
+
* @param item - the repeater item
|
|
89
|
+
* @returns the repeater item
|
|
90
|
+
*/
|
|
91
|
+
function extractRepeaters(item: DetailItemRepeat) {
|
|
92
|
+
const repeaters: Record<string, string>[] = []
|
|
93
|
+
|
|
94
|
+
item.subItems.forEach((inputRepeaterItem) => {
|
|
95
|
+
const outputRepeaterItem: Record<string, string> = {}
|
|
96
|
+
|
|
97
|
+
inputRepeaterItem.forEach((repeaterComponent) => {
|
|
98
|
+
outputRepeaterItem[repeaterComponent.name] = getAnswer(
|
|
99
|
+
repeaterComponent.field,
|
|
100
|
+
repeaterComponent.state,
|
|
101
|
+
{
|
|
102
|
+
format: 'data'
|
|
103
|
+
}
|
|
104
|
+
)
|
|
105
|
+
})
|
|
106
|
+
|
|
107
|
+
repeaters.push(outputRepeaterItem)
|
|
108
|
+
})
|
|
109
|
+
|
|
110
|
+
return repeaters
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Returns the "files" section of the response body
|
|
115
|
+
* @param item - the file upload item in the form
|
|
116
|
+
* @returns the file upload data
|
|
117
|
+
*/
|
|
118
|
+
function extractFileUploads(item: FileUploadFieldDetailitem) {
|
|
119
|
+
const fileUploadState = item.field.getContextValueFromState(item.state) ?? []
|
|
120
|
+
|
|
121
|
+
return fileUploadState.map((fileId) => {
|
|
122
|
+
return {
|
|
123
|
+
fileId,
|
|
124
|
+
userDownloadLink: `${designerUrl}/file-download/${fileId}`
|
|
125
|
+
}
|
|
126
|
+
})
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
function isFileUploadFieldItem(
|
|
130
|
+
item: DetailItemField
|
|
131
|
+
): item is FileUploadFieldDetailitem {
|
|
132
|
+
return item.field instanceof FileUploadField
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* A detail item specifically for files
|
|
137
|
+
*/
|
|
138
|
+
type FileUploadFieldDetailitem = Omit<DetailItemField, 'field'> & {
|
|
139
|
+
field: FileUploadField
|
|
140
|
+
}
|
|
@@ -0,0 +1,229 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
2
|
+
import { FileUploadField } from '~/src/server/plugins/engine/components/FileUploadField.js'
|
|
3
|
+
import { type Field } from '~/src/server/plugins/engine/components/helpers.js'
|
|
4
|
+
import { FormModel } from '~/src/server/plugins/engine/models/index.js'
|
|
5
|
+
import {
|
|
6
|
+
type DetailItem,
|
|
7
|
+
type DetailItemField,
|
|
8
|
+
type DetailItemRepeat
|
|
9
|
+
} from '~/src/server/plugins/engine/models/types.js'
|
|
10
|
+
import { format } from '~/src/server/plugins/engine/outputFormatters/machine/v2.js'
|
|
11
|
+
import {
|
|
12
|
+
FileStatus,
|
|
13
|
+
UploadStatus,
|
|
14
|
+
type FileState
|
|
15
|
+
} from '~/src/server/plugins/engine/types.js'
|
|
16
|
+
import { FormStatus } from '~/src/server/routes/types.js'
|
|
17
|
+
import definition from '~/test/form/definitions/repeat-mixed.js'
|
|
18
|
+
|
|
19
|
+
const submitResponse = {
|
|
20
|
+
message: 'Submit completed',
|
|
21
|
+
result: {
|
|
22
|
+
files: {
|
|
23
|
+
main: '00000000-0000-0000-0000-000000000000',
|
|
24
|
+
repeaters: {
|
|
25
|
+
pizza: '11111111-1111-1111-1111-111111111111'
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
const model = new FormModel(definition, {
|
|
32
|
+
basePath: 'test'
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
const formStatus = {
|
|
36
|
+
isPreview: false,
|
|
37
|
+
state: FormStatus.Live
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const dummyField: Field = {
|
|
41
|
+
getFormValueFromState: (_) => 'hello world'
|
|
42
|
+
} as Field
|
|
43
|
+
|
|
44
|
+
const testDetailItemField: DetailItemField = {
|
|
45
|
+
name: 'exampleField',
|
|
46
|
+
label: 'Example Field',
|
|
47
|
+
href: '/example-field',
|
|
48
|
+
title: 'Example Field Title',
|
|
49
|
+
field: dummyField,
|
|
50
|
+
value: 'Example Value'
|
|
51
|
+
} as DetailItemField
|
|
52
|
+
|
|
53
|
+
const testDetailItemField2: DetailItemField = {
|
|
54
|
+
name: 'exampleField2',
|
|
55
|
+
label: 'Example Field 2',
|
|
56
|
+
href: '/example-field 2',
|
|
57
|
+
title: 'Example Field 2 Title',
|
|
58
|
+
field: dummyField,
|
|
59
|
+
value: 'Example Value 2'
|
|
60
|
+
} as DetailItemField
|
|
61
|
+
|
|
62
|
+
const testDetailItemRepeat: DetailItemRepeat = {
|
|
63
|
+
name: 'exampleRepeat',
|
|
64
|
+
label: 'Example Repeat',
|
|
65
|
+
href: '/example-repeat',
|
|
66
|
+
title: 'Example Repeat Title',
|
|
67
|
+
value: 'Example Repeat Value',
|
|
68
|
+
subItems: [
|
|
69
|
+
[
|
|
70
|
+
{
|
|
71
|
+
name: 'subItem1_1',
|
|
72
|
+
label: 'Sub Item 1 1',
|
|
73
|
+
field: dummyField,
|
|
74
|
+
href: '/sub-item-1-1',
|
|
75
|
+
title: 'Sub Item 1 1 Title',
|
|
76
|
+
value: 'Sub Item 1 1 Value'
|
|
77
|
+
} as DetailItemField,
|
|
78
|
+
{
|
|
79
|
+
name: 'subItem1_2',
|
|
80
|
+
label: 'Sub Item 1 2',
|
|
81
|
+
field: dummyField,
|
|
82
|
+
href: '/sub-item-1-2',
|
|
83
|
+
title: 'Sub Item 1 2 Title',
|
|
84
|
+
value: 'Sub Item 1 2 Value'
|
|
85
|
+
} as DetailItemField
|
|
86
|
+
],
|
|
87
|
+
[
|
|
88
|
+
{
|
|
89
|
+
name: 'subItem2_1',
|
|
90
|
+
label: 'Sub Item 2 1',
|
|
91
|
+
field: dummyField,
|
|
92
|
+
href: '/sub-item-2 1',
|
|
93
|
+
title: 'Sub Item 2 1 Title',
|
|
94
|
+
value: 'Sub Item 2 1 Value'
|
|
95
|
+
} as DetailItemField
|
|
96
|
+
]
|
|
97
|
+
]
|
|
98
|
+
} as DetailItemRepeat
|
|
99
|
+
|
|
100
|
+
const testDetailItemRepeat2: DetailItemRepeat = {
|
|
101
|
+
name: 'exampleRepeat2',
|
|
102
|
+
label: 'Example Repeat 2',
|
|
103
|
+
href: '/example-repeat-2',
|
|
104
|
+
title: 'Example Repeat 2 Title',
|
|
105
|
+
value: 'Example Repeat 2 Value',
|
|
106
|
+
subItems: [
|
|
107
|
+
[
|
|
108
|
+
{
|
|
109
|
+
name: 'subItem1_1',
|
|
110
|
+
label: 'Sub Item 1 1',
|
|
111
|
+
field: dummyField,
|
|
112
|
+
href: '/sub-item-1-1',
|
|
113
|
+
title: 'Sub Item 1 1 Title',
|
|
114
|
+
value: 'Sub Item 1 1 Value'
|
|
115
|
+
} as DetailItemField
|
|
116
|
+
]
|
|
117
|
+
]
|
|
118
|
+
} as DetailItemRepeat
|
|
119
|
+
|
|
120
|
+
const fileState: FileState = {
|
|
121
|
+
uploadId: '123',
|
|
122
|
+
status: {
|
|
123
|
+
form: {
|
|
124
|
+
file: {
|
|
125
|
+
fileId: '123-456-789',
|
|
126
|
+
contentLength: 1,
|
|
127
|
+
filename: 'foobar.txt',
|
|
128
|
+
fileStatus: FileStatus.complete
|
|
129
|
+
}
|
|
130
|
+
},
|
|
131
|
+
uploadStatus: UploadStatus.ready,
|
|
132
|
+
numberOfRejectedFiles: 0,
|
|
133
|
+
metadata: {
|
|
134
|
+
retrievalKey: '123'
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
const fileState2: FileState = {
|
|
140
|
+
uploadId: '456',
|
|
141
|
+
status: {
|
|
142
|
+
form: {
|
|
143
|
+
file: {
|
|
144
|
+
fileId: '456-789-123',
|
|
145
|
+
contentLength: 1,
|
|
146
|
+
filename: 'bazbuzz.txt',
|
|
147
|
+
fileStatus: FileStatus.complete
|
|
148
|
+
}
|
|
149
|
+
},
|
|
150
|
+
uploadStatus: UploadStatus.ready,
|
|
151
|
+
numberOfRejectedFiles: 0,
|
|
152
|
+
metadata: {
|
|
153
|
+
retrievalKey: '123'
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
const testDetailItemFile1: DetailItemField = Object.create(
|
|
159
|
+
FileUploadField.prototype
|
|
160
|
+
)
|
|
161
|
+
Object.assign(testDetailItemFile1, {
|
|
162
|
+
name: 'exampleFile1',
|
|
163
|
+
label: 'Example Field',
|
|
164
|
+
href: '/example-field',
|
|
165
|
+
title: 'Example Field Title',
|
|
166
|
+
field: testDetailItemFile1,
|
|
167
|
+
value: 'Example Value',
|
|
168
|
+
state: {
|
|
169
|
+
exampleFile1: [fileState, fileState2]
|
|
170
|
+
}
|
|
171
|
+
})
|
|
172
|
+
|
|
173
|
+
const items: DetailItem[] = [
|
|
174
|
+
testDetailItemField,
|
|
175
|
+
testDetailItemField2,
|
|
176
|
+
testDetailItemRepeat,
|
|
177
|
+
testDetailItemRepeat2,
|
|
178
|
+
testDetailItemFile1
|
|
179
|
+
]
|
|
180
|
+
|
|
181
|
+
describe('getPersonalisation', () => {
|
|
182
|
+
it('should return the machine output', () => {
|
|
183
|
+
model.def = definition
|
|
184
|
+
|
|
185
|
+
const body = format(items, model, submitResponse, formStatus)
|
|
186
|
+
|
|
187
|
+
const parsedBody = JSON.parse(body)
|
|
188
|
+
|
|
189
|
+
const expectedData = {
|
|
190
|
+
main: {
|
|
191
|
+
exampleField: 'hello world',
|
|
192
|
+
exampleField2: 'hello world'
|
|
193
|
+
},
|
|
194
|
+
repeaters: {
|
|
195
|
+
exampleRepeat: [
|
|
196
|
+
{
|
|
197
|
+
subItem1_1: 'hello world',
|
|
198
|
+
subItem1_2: 'hello world'
|
|
199
|
+
},
|
|
200
|
+
{
|
|
201
|
+
subItem2_1: 'hello world'
|
|
202
|
+
}
|
|
203
|
+
],
|
|
204
|
+
exampleRepeat2: [
|
|
205
|
+
{
|
|
206
|
+
subItem1_1: 'hello world'
|
|
207
|
+
}
|
|
208
|
+
]
|
|
209
|
+
},
|
|
210
|
+
files: {
|
|
211
|
+
exampleFile1: [
|
|
212
|
+
{
|
|
213
|
+
fileId: '123-456-789',
|
|
214
|
+
userDownloadLink: 'https://forms-designer/file-download/123-456-789'
|
|
215
|
+
},
|
|
216
|
+
{
|
|
217
|
+
fileId: '456-789-123',
|
|
218
|
+
userDownloadLink: 'https://forms-designer/file-download/456-789-123'
|
|
219
|
+
}
|
|
220
|
+
]
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
expect(parsedBody.meta.schemaVersion).toBe('2')
|
|
225
|
+
expect(parsedBody.meta.timestamp).toBeDateString()
|
|
226
|
+
expect(parsedBody.meta.definition).toEqual(definition)
|
|
227
|
+
expect(parsedBody.data).toEqual(expectedData)
|
|
228
|
+
})
|
|
229
|
+
})
|