@defra/forms-engine-plugin 4.7.2 → 4.7.3
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/client/javascripts/geospatial-map.d.ts +6 -6
- package/.server/client/javascripts/geospatial-map.js +3 -3
- package/.server/client/javascripts/location-map.d.ts +1 -1
- package/.server/client/javascripts/location-map.js +1 -1
- package/.server/client/javascripts/map.d.ts +1 -1
- package/.server/client/javascripts/map.js +1 -1
- package/.server/client/javascripts/shared.d.ts +7 -7
- package/.server/server/index.d.ts +1 -1
- package/.server/server/plugins/crumb.d.ts +1 -1
- package/.server/server/plugins/engine/beta/form-context.d.ts +6 -6
- package/.server/server/plugins/engine/components/AutocompleteField.d.ts +4 -4
- package/.server/server/plugins/engine/components/CheckboxesField.d.ts +2 -2
- package/.server/server/plugins/engine/components/CheckboxesField.js +2 -2
- package/.server/server/plugins/engine/components/CheckboxesField.js.map +1 -1
- package/.server/server/plugins/engine/components/ComponentBase.d.ts +5 -5
- package/.server/server/plugins/engine/components/ComponentCollection.d.ts +8 -8
- package/.server/server/plugins/engine/components/DatePartsField.d.ts +11 -11
- package/.server/server/plugins/engine/components/DeclarationField.d.ts +3 -3
- package/.server/server/plugins/engine/components/Details.d.ts +1 -1
- package/.server/server/plugins/engine/components/EastingNorthingField.d.ts +22 -22
- package/.server/server/plugins/engine/components/EmailAddressField.d.ts +4 -4
- package/.server/server/plugins/engine/components/FileUploadField.d.ts +3 -3
- package/.server/server/plugins/engine/components/FormComponent.d.ts +10 -10
- package/.server/server/plugins/engine/components/GeospatialField.d.ts +6 -6
- package/.server/server/plugins/engine/components/HiddenField.d.ts +2 -2
- package/.server/server/plugins/engine/components/Html.d.ts +1 -1
- package/.server/server/plugins/engine/components/InsetText.d.ts +1 -1
- package/.server/server/plugins/engine/components/LatLongField.d.ts +22 -22
- package/.server/server/plugins/engine/components/List.d.ts +8 -8
- package/.server/server/plugins/engine/components/ListFormComponent.d.ts +10 -10
- package/.server/server/plugins/engine/components/LocationFieldBase.d.ts +6 -6
- package/.server/server/plugins/engine/components/LocationFieldHelpers.d.ts +14 -14
- package/.server/server/plugins/engine/components/Markdown.d.ts +1 -1
- package/.server/server/plugins/engine/components/MonthYearField.d.ts +11 -11
- package/.server/server/plugins/engine/components/MultilineTextField.d.ts +5 -5
- package/.server/server/plugins/engine/components/NationalGridFieldNumberField.d.ts +1 -1
- package/.server/server/plugins/engine/components/NumberField.d.ts +3 -3
- package/.server/server/plugins/engine/components/OsGridRefField.d.ts +1 -1
- package/.server/server/plugins/engine/components/PaymentField.d.ts +12 -12
- package/.server/server/plugins/engine/components/RadiosField.d.ts +1 -1
- package/.server/server/plugins/engine/components/SelectField.d.ts +4 -4
- package/.server/server/plugins/engine/components/SelectionControlField.d.ts +10 -10
- package/.server/server/plugins/engine/components/TelephoneNumberField.d.ts +4 -4
- package/.server/server/plugins/engine/components/TextField.d.ts +2 -2
- package/.server/server/plugins/engine/components/UkAddressField.d.ts +11 -11
- package/.server/server/plugins/engine/components/YesNoField.d.ts +2 -2
- package/.server/server/plugins/engine/components/helpers/__stubs__/geospatial.d.ts +1 -1
- package/.server/server/plugins/engine/components/helpers/components.d.ts +5 -5
- package/.server/server/plugins/engine/components/helpers/geospatial.d.ts +1 -1
- package/.server/server/plugins/engine/components/index.d.ts +27 -27
- package/.server/server/plugins/engine/components/types.d.ts +1 -1
- package/.server/server/plugins/engine/configureEnginePlugin.d.ts +4 -4
- package/.server/server/plugins/engine/date-helper.d.ts +1 -1
- package/.server/server/plugins/engine/helpers.d.ts +8 -8
- package/.server/server/plugins/engine/index.d.ts +5 -5
- package/.server/server/plugins/engine/models/FormModel.d.ts +6 -6
- package/.server/server/plugins/engine/models/SummaryViewModel.d.ts +6 -6
- package/.server/server/plugins/engine/models/index.d.ts +2 -2
- package/.server/server/plugins/engine/models/types.d.ts +4 -4
- package/.server/server/plugins/engine/options.d.ts +1 -1
- package/.server/server/plugins/engine/options.js +1 -1
- package/.server/server/plugins/engine/options.test.js +1 -1
- package/.server/server/plugins/engine/outputFormatters/adapter/v1.d.ts +4 -4
- package/.server/server/plugins/engine/outputFormatters/human/v1.d.ts +4 -4
- package/.server/server/plugins/engine/outputFormatters/index.d.ts +5 -5
- package/.server/server/plugins/engine/outputFormatters/machine/v1.d.ts +4 -4
- package/.server/server/plugins/engine/outputFormatters/machine/v2.d.ts +4 -4
- package/.server/server/plugins/engine/pageControllers/FileUploadPageController.d.ts +8 -8
- package/.server/server/plugins/engine/pageControllers/PageController.d.ts +6 -6
- package/.server/server/plugins/engine/pageControllers/QuestionPageController.d.ts +8 -8
- package/.server/server/plugins/engine/pageControllers/RepeatPageController.d.ts +5 -5
- package/.server/server/plugins/engine/pageControllers/StartPageController.d.ts +4 -4
- package/.server/server/plugins/engine/pageControllers/StatusPageController.d.ts +4 -4
- package/.server/server/plugins/engine/pageControllers/SummaryPageController.d.ts +5 -5
- package/.server/server/plugins/engine/pageControllers/TerminalPageController.d.ts +3 -3
- package/.server/server/plugins/engine/pageControllers/__stubs__/request.d.ts +2 -2
- package/.server/server/plugins/engine/pageControllers/errors.d.ts +1 -1
- package/.server/server/plugins/engine/pageControllers/helpers/pages.d.ts +2 -2
- package/.server/server/plugins/engine/pageControllers/helpers/state.d.ts +5 -5
- package/.server/server/plugins/engine/pageControllers/helpers/state.js +1 -1
- package/.server/server/plugins/engine/pageControllers/helpers/state.js.map +1 -1
- package/.server/server/plugins/engine/pageControllers/helpers/submission.d.ts +1 -1
- package/.server/server/plugins/engine/pageControllers/index.d.ts +7 -7
- package/.server/server/plugins/engine/plugin.d.ts +1 -1
- package/.server/server/plugins/engine/routes/file-upload.d.ts +1 -1
- package/.server/server/plugins/engine/routes/index.d.ts +3 -3
- package/.server/server/plugins/engine/routes/payment-helper.d.ts +3 -3
- package/.server/server/plugins/engine/routes/payment-helper.js +2 -2
- package/.server/server/plugins/engine/routes/payment.js +5 -5
- package/.server/server/plugins/engine/routes/payment.test.js +1 -1
- package/.server/server/plugins/engine/routes/questions.d.ts +2 -2
- package/.server/server/plugins/engine/routes/repeaters/item-delete.d.ts +2 -2
- package/.server/server/plugins/engine/routes/repeaters/summary.d.ts +2 -2
- package/.server/server/plugins/engine/services/index.d.ts +3 -3
- package/.server/server/plugins/engine/services/notifyService.d.ts +4 -4
- package/.server/server/plugins/engine/services/uploadService.d.ts +2 -2
- package/.server/server/plugins/engine/services/uploadService.js +1 -1
- package/.server/server/plugins/engine/types/index.d.ts +10 -10
- package/.server/server/plugins/engine/types/schema.d.ts +1 -1
- package/.server/server/plugins/engine/types.d.ts +25 -16
- package/.server/server/plugins/engine/types.js.map +1 -1
- package/.server/server/plugins/engine/validationHelpers.d.ts +2 -2
- package/.server/server/plugins/engine/vision.d.ts +1 -1
- package/.server/server/plugins/map/index.d.ts +1 -1
- package/.server/server/plugins/map/index.js +1 -1
- package/.server/server/plugins/map/routes/get-os-token.d.ts +11 -1
- package/.server/server/plugins/map/routes/get-os-token.js +12 -2
- package/.server/server/plugins/map/routes/get-os-token.js.map +1 -1
- package/.server/server/plugins/map/routes/index.d.ts +4 -4
- package/.server/server/plugins/map/routes/index.js +3 -2
- package/.server/server/plugins/map/routes/index.js.map +1 -1
- package/.server/server/plugins/map/service.d.ts +1 -1
- package/.server/server/plugins/map/service.js +5 -2
- package/.server/server/plugins/map/service.js.map +1 -1
- package/.server/server/plugins/map/test/__stubs__/find.d.ts +1 -1
- package/.server/server/plugins/map/test/__stubs__/find.js +1 -1
- package/.server/server/plugins/nunjucks/context.d.ts +2 -2
- package/.server/server/plugins/nunjucks/context.js +2 -2
- package/.server/server/plugins/nunjucks/context.test.js +1 -1
- package/.server/server/plugins/nunjucks/enviroment.test.js +1 -1
- package/.server/server/plugins/nunjucks/environment.d.ts +3 -3
- package/.server/server/plugins/nunjucks/environment.js +3 -3
- package/.server/server/plugins/nunjucks/filters/answer.d.ts +1 -1
- package/.server/server/plugins/nunjucks/filters/answer.js +2 -2
- package/.server/server/plugins/nunjucks/filters/answer.test.js +1 -1
- package/.server/server/plugins/nunjucks/filters/evaluate.d.ts +1 -1
- package/.server/server/plugins/nunjucks/filters/evaluate.js +1 -1
- package/.server/server/plugins/nunjucks/filters/field.d.ts +1 -1
- package/.server/server/plugins/nunjucks/filters/field.js +1 -1
- package/.server/server/plugins/nunjucks/filters/field.test.js +1 -1
- package/.server/server/plugins/nunjucks/filters/href.d.ts +1 -1
- package/.server/server/plugins/nunjucks/filters/href.js +1 -1
- package/.server/server/plugins/nunjucks/filters/href.test.js +1 -1
- package/.server/server/plugins/nunjucks/filters/index.d.ts +8 -8
- package/.server/server/plugins/nunjucks/filters/page.d.ts +1 -1
- package/.server/server/plugins/nunjucks/filters/page.js +1 -1
- package/.server/server/plugins/nunjucks/filters/page.test.js +1 -1
- package/.server/server/plugins/nunjucks/index.d.ts +3 -3
- package/.server/server/plugins/nunjucks/render.d.ts +2 -2
- package/.server/server/plugins/nunjucks/render.js +1 -1
- package/.server/server/plugins/nunjucks/types.d.ts +1 -1
- package/.server/server/plugins/nunjucks/types.js +1 -1
- package/.server/server/plugins/payment/helper.d.ts +2 -2
- package/.server/server/plugins/payment/helper.js +1 -1
- package/.server/server/plugins/payment/service.d.ts +3 -3
- package/.server/server/plugins/payment/service.js +1 -1
- package/.server/server/plugins/postcode-lookup/index.d.ts +1 -1
- package/.server/server/plugins/postcode-lookup/index.js +1 -1
- package/.server/server/plugins/postcode-lookup/models/index.d.ts +6 -6
- package/.server/server/plugins/postcode-lookup/models/index.js +1 -1
- package/.server/server/plugins/postcode-lookup/routes/index.d.ts +6 -6
- package/.server/server/plugins/postcode-lookup/routes/index.js +15 -15
- package/.server/server/plugins/postcode-lookup/routes/index.js.map +1 -1
- package/.server/server/plugins/postcode-lookup/service.d.ts +1 -1
- package/.server/server/plugins/postcode-lookup/service.js +5 -2
- package/.server/server/plugins/postcode-lookup/service.js.map +1 -1
- package/.server/server/plugins/postcode-lookup/types.js +1 -1
- package/.server/server/routes/index.d.ts +2 -2
- package/.server/server/routes/types.d.ts +1 -1
- package/.server/server/schemas/index.d.ts +2 -2
- package/.server/server/services/cacheService.d.ts +8 -8
- package/.server/server/services/cacheService.js +2 -5
- package/.server/server/services/cacheService.js.map +1 -1
- package/.server/server/services/httpService.test.js +1 -1
- package/.server/server/services/index.d.ts +1 -1
- package/.server/server/types.d.ts +7 -7
- package/.server/server/utils/file-form-service.d.ts +2 -2
- package/.server/server/utils/file-form-service.js +1 -1
- package/package.json +8 -4
- package/src/client/javascripts/application.js +1 -1
- package/src/client/javascripts/geospatial-map.js +4 -4
- package/src/client/javascripts/location-map.js +2 -2
- package/src/client/javascripts/map.js +3 -3
- package/src/client/javascripts/shared.js +7 -7
- package/src/index.ts +3 -3
- package/src/server/common/helpers/logging/logger-options.ts +1 -1
- package/src/server/common/helpers/logging/logger.ts +1 -1
- package/src/server/common/helpers/logging/request-logger.ts +1 -1
- package/src/server/common/helpers/logging/request-tracing.js +1 -1
- package/src/server/common/helpers/redis-client.js +2 -2
- package/src/server/index.ts +13 -13
- package/src/server/plugins/crumb.ts +2 -2
- package/src/server/plugins/engine/beta/form-context.ts +9 -9
- package/src/server/plugins/engine/components/AutocompleteField.ts +3 -3
- package/src/server/plugins/engine/components/CheckboxesField.ts +7 -8
- package/src/server/plugins/engine/components/ComponentBase.ts +5 -5
- package/src/server/plugins/engine/components/ComponentCollection.ts +9 -9
- package/src/server/plugins/engine/components/DatePartsField.ts +8 -8
- package/src/server/plugins/engine/components/DeclarationField.ts +3 -3
- package/src/server/plugins/engine/components/Details.ts +1 -1
- package/src/server/plugins/engine/components/EastingNorthingField.ts +9 -9
- package/src/server/plugins/engine/components/EmailAddressField.ts +3 -3
- package/src/server/plugins/engine/components/FileUploadField.ts +6 -6
- package/src/server/plugins/engine/components/FormComponent.ts +4 -4
- package/src/server/plugins/engine/components/GeospatialField.ts +5 -5
- package/src/server/plugins/engine/components/HiddenField.ts +4 -4
- package/src/server/plugins/engine/components/Html.ts +1 -1
- package/src/server/plugins/engine/components/InsetText.ts +1 -1
- package/src/server/plugins/engine/components/LatLongField.ts +9 -9
- package/src/server/plugins/engine/components/List.ts +2 -2
- package/src/server/plugins/engine/components/ListFormComponent.ts +4 -4
- package/src/server/plugins/engine/components/LocationFieldBase.ts +5 -5
- package/src/server/plugins/engine/components/LocationFieldHelpers.ts +5 -5
- package/src/server/plugins/engine/components/Markdown.ts +1 -1
- package/src/server/plugins/engine/components/MonthYearField.ts +8 -8
- package/src/server/plugins/engine/components/MultilineTextField.ts +4 -4
- package/src/server/plugins/engine/components/NationalGridFieldNumberField.ts +2 -2
- package/src/server/plugins/engine/components/NumberField.ts +3 -3
- package/src/server/plugins/engine/components/OsGridRefField.ts +2 -2
- package/src/server/plugins/engine/components/PaymentField.ts +8 -8
- package/src/server/plugins/engine/components/RadiosField.ts +1 -1
- package/src/server/plugins/engine/components/SelectField.ts +2 -2
- package/src/server/plugins/engine/components/SelectionControlField.ts +4 -4
- package/src/server/plugins/engine/components/TelephoneNumberField.ts +4 -4
- package/src/server/plugins/engine/components/TextField.ts +3 -3
- package/src/server/plugins/engine/components/UkAddressField.ts +7 -7
- package/src/server/plugins/engine/components/YesNoField.ts +5 -5
- package/src/server/plugins/engine/components/helpers/__stubs__/geospatial.ts +1 -1
- package/src/server/plugins/engine/components/helpers/components.ts +8 -8
- package/src/server/plugins/engine/components/helpers/geospatial.ts +1 -1
- package/src/server/plugins/engine/components/index.ts +27 -27
- package/src/server/plugins/engine/components/types.ts +1 -1
- package/src/server/plugins/engine/configureEnginePlugin.ts +10 -10
- package/src/server/plugins/engine/date-helper.ts +1 -1
- package/src/server/plugins/engine/helpers.ts +8 -8
- package/src/server/plugins/engine/index.ts +8 -8
- package/src/server/plugins/engine/models/FormModel.ts +15 -15
- package/src/server/plugins/engine/models/SummaryViewModel.ts +10 -10
- package/src/server/plugins/engine/models/index.ts +2 -2
- package/src/server/plugins/engine/models/types.ts +4 -4
- package/src/server/plugins/engine/options.js +3 -3
- package/src/server/plugins/engine/outputFormatters/adapter/v1.ts +6 -6
- package/src/server/plugins/engine/outputFormatters/human/v1.ts +9 -9
- package/src/server/plugins/engine/outputFormatters/index.ts +8 -8
- package/src/server/plugins/engine/outputFormatters/machine/v1.ts +7 -7
- package/src/server/plugins/engine/outputFormatters/machine/v2.ts +6 -6
- package/src/server/plugins/engine/pageControllers/FileUploadPageController.ts +9 -9
- package/src/server/plugins/engine/pageControllers/PageController.ts +7 -7
- package/src/server/plugins/engine/pageControllers/QuestionPageController.ts +13 -13
- package/src/server/plugins/engine/pageControllers/RepeatPageController.ts +6 -6
- package/src/server/plugins/engine/pageControllers/StartPageController.ts +3 -3
- package/src/server/plugins/engine/pageControllers/StatusPageController.ts +5 -5
- package/src/server/plugins/engine/pageControllers/SummaryPageController.ts +12 -12
- package/src/server/plugins/engine/pageControllers/TerminalPageController.ts +3 -3
- package/src/server/plugins/engine/pageControllers/__stubs__/request.ts +3 -3
- package/src/server/plugins/engine/pageControllers/__stubs__/server.ts +2 -2
- package/src/server/plugins/engine/pageControllers/errors.ts +1 -1
- package/src/server/plugins/engine/pageControllers/helpers/pages.ts +2 -2
- package/src/server/plugins/engine/pageControllers/helpers/state.ts +9 -9
- package/src/server/plugins/engine/pageControllers/helpers/submission.ts +5 -5
- package/src/server/plugins/engine/pageControllers/index.ts +7 -7
- package/src/server/plugins/engine/pageControllers/validationOptions.ts +1 -1
- package/src/server/plugins/engine/plugin.ts +14 -14
- package/src/server/plugins/engine/routes/file-upload.ts +2 -2
- package/src/server/plugins/engine/routes/index.ts +10 -10
- package/src/server/plugins/engine/routes/payment-helper.js +4 -4
- package/src/server/plugins/engine/routes/payment.js +9 -9
- package/src/server/plugins/engine/routes/questions.ts +10 -10
- package/src/server/plugins/engine/routes/repeaters/item-delete.ts +6 -6
- package/src/server/plugins/engine/routes/repeaters/summary.ts +5 -5
- package/src/server/plugins/engine/services/formSubmissionService.js +2 -2
- package/src/server/plugins/engine/services/index.js +3 -3
- package/src/server/plugins/engine/services/localFormsService.js +2 -2
- package/src/server/plugins/engine/services/notifyService.ts +9 -9
- package/src/server/plugins/engine/services/uploadService.js +3 -3
- package/src/server/plugins/engine/types/index.ts +10 -10
- package/src/server/plugins/engine/types/schema.ts +2 -2
- package/src/server/plugins/engine/types.ts +22 -17
- package/src/server/plugins/engine/validationHelpers.ts +3 -3
- package/src/server/plugins/engine/vision.ts +3 -3
- package/src/server/plugins/map/index.js +2 -2
- package/src/server/plugins/map/routes/get-os-token.js +15 -3
- package/src/server/plugins/map/routes/index.js +7 -5
- package/src/server/plugins/map/service.js +7 -4
- package/src/server/plugins/map/test/__stubs__/find.js +1 -1
- package/src/server/plugins/nunjucks/context.js +5 -5
- package/src/server/plugins/nunjucks/environment.js +6 -6
- package/src/server/plugins/nunjucks/filters/answer.js +3 -3
- package/src/server/plugins/nunjucks/filters/evaluate.js +2 -2
- package/src/server/plugins/nunjucks/filters/field.js +1 -1
- package/src/server/plugins/nunjucks/filters/href.js +2 -2
- package/src/server/plugins/nunjucks/filters/index.js +8 -8
- package/src/server/plugins/nunjucks/filters/page.js +1 -1
- package/src/server/plugins/nunjucks/index.js +3 -3
- package/src/server/plugins/nunjucks/plugin.js +3 -3
- package/src/server/plugins/nunjucks/render.js +2 -2
- package/src/server/plugins/nunjucks/types.js +1 -1
- package/src/server/plugins/payment/helper.js +2 -2
- package/src/server/plugins/payment/service.js +4 -4
- package/src/server/plugins/postcode-lookup/index.js +2 -2
- package/src/server/plugins/postcode-lookup/models/index.js +3 -3
- package/src/server/plugins/postcode-lookup/routes/index.js +24 -14
- package/src/server/plugins/postcode-lookup/service.js +7 -4
- package/src/server/plugins/postcode-lookup/types.js +1 -1
- package/src/server/plugins/session.ts +1 -1
- package/src/server/routes/index.ts +2 -2
- package/src/server/routes/public.ts +1 -1
- package/src/server/routes/types.ts +1 -1
- package/src/server/schemas/index.ts +2 -2
- package/src/server/secure-context.js +1 -1
- package/src/server/services/cacheService.ts +13 -18
- package/src/server/services/httpService.ts +1 -1
- package/src/server/services/index.ts +1 -1
- package/src/server/types.ts +7 -7
- package/src/server/utils/notify.ts +2 -2
- package/src/server/utils/utils.js +1 -1
- package/src/typings/hapi/index.d.ts +4 -4
- package/src/typings/joi/index.d.ts +1 -1
- package/src/server/common/helpers/logging/logger-options.test.ts +0 -50
- package/src/server/index.test.ts +0 -644
- package/src/server/plugins/engine/beta/form-context.test.ts +0 -373
- package/src/server/plugins/engine/components/AutocompleteField.test.ts +0 -362
- package/src/server/plugins/engine/components/CheckboxesField.test.ts +0 -486
- package/src/server/plugins/engine/components/DatePartsField.test.ts +0 -927
- package/src/server/plugins/engine/components/DeclarationField.test.ts +0 -560
- package/src/server/plugins/engine/components/Details.test.ts +0 -49
- package/src/server/plugins/engine/components/EastingNorthingField.test.ts +0 -727
- package/src/server/plugins/engine/components/EmailAddressField.test.ts +0 -445
- package/src/server/plugins/engine/components/FileUploadField.test.ts +0 -1079
- package/src/server/plugins/engine/components/GeospatialField.test.ts +0 -380
- package/src/server/plugins/engine/components/HiddenField.test.ts +0 -188
- package/src/server/plugins/engine/components/Html.test.ts +0 -48
- package/src/server/plugins/engine/components/InsetText.test.ts +0 -48
- package/src/server/plugins/engine/components/LatLongField.test.ts +0 -898
- package/src/server/plugins/engine/components/List.test.ts +0 -79
- package/src/server/plugins/engine/components/LocationFieldBase.test.ts +0 -253
- package/src/server/plugins/engine/components/LocationFieldHelpers.test.ts +0 -743
- package/src/server/plugins/engine/components/Markdown.test.ts +0 -48
- package/src/server/plugins/engine/components/MonthYearField.test.ts +0 -617
- package/src/server/plugins/engine/components/MultilineTextField.test.ts +0 -647
- package/src/server/plugins/engine/components/NationalGridFieldNumberField.test.ts +0 -449
- package/src/server/plugins/engine/components/NumberField.test.ts +0 -723
- package/src/server/plugins/engine/components/OsGridRefField.test.ts +0 -460
- package/src/server/plugins/engine/components/PaymentField.test.ts +0 -745
- package/src/server/plugins/engine/components/RadiosField.test.ts +0 -297
- package/src/server/plugins/engine/components/SelectField.test.ts +0 -289
- package/src/server/plugins/engine/components/TelephoneNumberField.test.ts +0 -384
- package/src/server/plugins/engine/components/TextField.test.ts +0 -521
- package/src/server/plugins/engine/components/UkAddressField.test.ts +0 -806
- package/src/server/plugins/engine/components/YesNoField.test.ts +0 -256
- package/src/server/plugins/engine/components/helpers/components.test.ts +0 -399
- package/src/server/plugins/engine/components/helpers/geospatial.test.js +0 -55
- package/src/server/plugins/engine/components/helpers/helpers.test.ts +0 -219
- package/src/server/plugins/engine/date-helper.test.ts +0 -47
- package/src/server/plugins/engine/helpers.test.ts +0 -868
- package/src/server/plugins/engine/models/FormModel.test.ts +0 -725
- package/src/server/plugins/engine/models/SummaryViewModel.test.ts +0 -472
- package/src/server/plugins/engine/options.test.js +0 -63
- package/src/server/plugins/engine/outputFormatters/adapter/v1.location.test.ts +0 -356
- package/src/server/plugins/engine/outputFormatters/adapter/v1.test.ts +0 -871
- package/src/server/plugins/engine/outputFormatters/human/v1.payment.test.ts +0 -147
- package/src/server/plugins/engine/outputFormatters/human/v1.test.ts +0 -145
- package/src/server/plugins/engine/outputFormatters/index.test.ts +0 -17
- package/src/server/plugins/engine/outputFormatters/machine/v1.test.ts +0 -268
- package/src/server/plugins/engine/outputFormatters/machine/v2.location.test.ts +0 -341
- package/src/server/plugins/engine/outputFormatters/machine/v2.payment.test.ts +0 -115
- package/src/server/plugins/engine/outputFormatters/machine/v2.test.ts +0 -311
- package/src/server/plugins/engine/pageControllers/FileUploadPageController.test.ts +0 -1372
- package/src/server/plugins/engine/pageControllers/PageController.test.ts +0 -246
- package/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts +0 -1686
- package/src/server/plugins/engine/pageControllers/RepeatPageController.test.ts +0 -279
- package/src/server/plugins/engine/pageControllers/StartPageController.test.ts +0 -32
- package/src/server/plugins/engine/pageControllers/StatusPageController.test.ts +0 -32
- package/src/server/plugins/engine/pageControllers/SummaryPageController.test.ts +0 -89
- package/src/server/plugins/engine/pageControllers/TerminalController.test.ts +0 -37
- package/src/server/plugins/engine/pageControllers/errors.test.ts +0 -78
- package/src/server/plugins/engine/pageControllers/helpers/helpers.test.ts +0 -182
- package/src/server/plugins/engine/pageControllers/helpers/state.test.ts +0 -359
- package/src/server/plugins/engine/pageControllers/helpers/submission.test.ts +0 -373
- package/src/server/plugins/engine/referenceNumbers.test.ts +0 -74
- package/src/server/plugins/engine/routes/index.test.ts +0 -332
- package/src/server/plugins/engine/routes/payment-helper.test.js +0 -136
- package/src/server/plugins/engine/routes/payment.test.js +0 -180
- package/src/server/plugins/engine/routes/questions.test.ts +0 -502
- package/src/server/plugins/engine/routes/repeaters/item-delete.test.ts +0 -83
- package/src/server/plugins/engine/routes/repeaters/summary.test.ts +0 -75
- package/src/server/plugins/engine/services/formsService.test.js +0 -26
- package/src/server/plugins/engine/services/notifyService.test.ts +0 -310
- package/src/server/plugins/engine/types/schema.test.ts +0 -234
- package/src/server/plugins/engine/views/components/service-banner/template.test.js +0 -43
- package/src/server/plugins/engine/views/components/tag-env/template.test.js +0 -28
- package/src/server/plugins/engine/views/partials/preview-banner.test.js +0 -122
- package/src/server/plugins/map/routes/get-os-token.test.js +0 -55
- package/src/server/plugins/map/service.test.js +0 -144
- package/src/server/plugins/nunjucks/context.test.js +0 -109
- package/src/server/plugins/nunjucks/enviroment.test.js +0 -207
- package/src/server/plugins/nunjucks/filters/answer.test.js +0 -92
- package/src/server/plugins/nunjucks/filters/field.test.js +0 -75
- package/src/server/plugins/nunjucks/filters/href.test.js +0 -80
- package/src/server/plugins/nunjucks/filters/merge.test.js +0 -15
- package/src/server/plugins/nunjucks/filters/page.test.js +0 -65
- package/src/server/plugins/payment/helper.test.js +0 -29
- package/src/server/plugins/payment/service.test.js +0 -218
- package/src/server/plugins/postcode-lookup/service.test.js +0 -177
- package/src/server/postcode-lookup.test.ts +0 -64
- package/src/server/routes/dummy-api.test.ts +0 -97
- package/src/server/services/cacheService.test.ts +0 -308
- package/src/server/services/httpService.test.js +0 -491
- package/src/server/utils/file-form-service.test.js +0 -127
- package/src/server/utils/notify.test.ts +0 -37
- package/src/server/utils/secure-context/get-trust-store-certs.test.js +0 -19
- package/src/server/utils/utils.test.js +0 -69
|
@@ -28,38 +28,38 @@ import { add, format } from 'date-fns'
|
|
|
28
28
|
import { Parser, type Value } from 'expr-eval-fork'
|
|
29
29
|
import joi from 'joi'
|
|
30
30
|
|
|
31
|
-
import { createLogger } from '
|
|
32
|
-
import { type ListFormComponent } from '
|
|
33
|
-
import {} from '
|
|
31
|
+
import { createLogger } from '../../../common/helpers/logging/logger.js'
|
|
32
|
+
import { type ListFormComponent } from '../components/ListFormComponent.js'
|
|
33
|
+
import {} from '../components/YesNoField.js'
|
|
34
34
|
import {
|
|
35
35
|
hasListFormField,
|
|
36
36
|
type Component
|
|
37
|
-
} from '
|
|
38
|
-
import { todayAsDateOnly } from '
|
|
37
|
+
} from '../components/helpers/components.js'
|
|
38
|
+
import { todayAsDateOnly } from '../date-helper.js'
|
|
39
39
|
import {
|
|
40
40
|
findPage,
|
|
41
41
|
getError,
|
|
42
42
|
getPage,
|
|
43
43
|
setPageTitles
|
|
44
|
-
} from '
|
|
45
|
-
import { type ExecutableCondition } from '
|
|
46
|
-
import { type PageController } from '
|
|
44
|
+
} from '../helpers.js'
|
|
45
|
+
import { type ExecutableCondition } from './types.js'
|
|
46
|
+
import { type PageController } from '../pageControllers/PageController.js'
|
|
47
47
|
import {
|
|
48
48
|
createPage,
|
|
49
49
|
type PageControllerClass
|
|
50
|
-
} from '
|
|
51
|
-
import { validationOptions as opts } from '
|
|
52
|
-
import * as defaultServices from '
|
|
50
|
+
} from '../pageControllers/helpers/pages.js'
|
|
51
|
+
import { validationOptions as opts } from '../pageControllers/validationOptions.js'
|
|
52
|
+
import * as defaultServices from '../services/index.js'
|
|
53
53
|
import {
|
|
54
54
|
type FormContext,
|
|
55
55
|
type FormContextRequest,
|
|
56
56
|
type FormState,
|
|
57
57
|
type FormSubmissionError,
|
|
58
58
|
type FormSubmissionState
|
|
59
|
-
} from '
|
|
60
|
-
import { FormAction } from '
|
|
61
|
-
import { merge } from '
|
|
62
|
-
import { type Services } from '
|
|
59
|
+
} from '../types.js'
|
|
60
|
+
import { FormAction } from '../../../routes/types.js'
|
|
61
|
+
import { merge } from '../../../services/cacheService.js'
|
|
62
|
+
import { type Services } from '../../../types.js'
|
|
63
63
|
|
|
64
64
|
const logger = createLogger()
|
|
65
65
|
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import { SchemaVersion, type Section } from '@defra/forms-model'
|
|
2
2
|
|
|
3
|
-
import { PaymentField } from '
|
|
4
|
-
import { type PaymentState } from '
|
|
3
|
+
import { PaymentField } from '../components/PaymentField.js'
|
|
4
|
+
import { type PaymentState } from '../components/PaymentField.types.js'
|
|
5
5
|
import {
|
|
6
6
|
getAnswer,
|
|
7
7
|
type Field
|
|
8
|
-
} from '
|
|
8
|
+
} from '../components/helpers/components.js'
|
|
9
9
|
import {
|
|
10
10
|
type BackLink,
|
|
11
11
|
type ComponentViewModel
|
|
12
|
-
} from '
|
|
12
|
+
} from '../components/types.js'
|
|
13
13
|
import {
|
|
14
14
|
evaluateTemplate,
|
|
15
15
|
getError,
|
|
16
16
|
getPageHref
|
|
17
|
-
} from '
|
|
17
|
+
} from '../helpers.js'
|
|
18
18
|
import {
|
|
19
19
|
type Detail,
|
|
20
20
|
type DetailItem,
|
|
21
21
|
type DetailItemField,
|
|
22
22
|
type DetailItemRepeat
|
|
23
|
-
} from '
|
|
24
|
-
import { RepeatPageController } from '
|
|
25
|
-
import { type PageControllerClass } from '
|
|
26
|
-
import { validationOptions as opts } from '
|
|
23
|
+
} from './types.js'
|
|
24
|
+
import { RepeatPageController } from '../pageControllers/RepeatPageController.js'
|
|
25
|
+
import { type PageControllerClass } from '../pageControllers/helpers/pages.js'
|
|
26
|
+
import { validationOptions as opts } from '../pageControllers/validationOptions.js'
|
|
27
27
|
import {
|
|
28
28
|
type CheckAnswers,
|
|
29
29
|
type FormContext,
|
|
@@ -32,7 +32,7 @@ import {
|
|
|
32
32
|
type FormSubmissionError,
|
|
33
33
|
type SummaryListAction,
|
|
34
34
|
type SummaryListRow
|
|
35
|
-
} from '
|
|
35
|
+
} from '../types.js'
|
|
36
36
|
|
|
37
37
|
export class SummaryViewModel {
|
|
38
38
|
/**
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { FormModel } from '
|
|
2
|
-
export { SummaryViewModel } from '
|
|
1
|
+
export { FormModel } from './FormModel.js'
|
|
2
|
+
export { SummaryViewModel } from './SummaryViewModel.js'
|
|
@@ -8,13 +8,13 @@ import { type Expression } from 'expr-eval-fork'
|
|
|
8
8
|
import {
|
|
9
9
|
getAnswer,
|
|
10
10
|
type Field
|
|
11
|
-
} from '
|
|
12
|
-
import { type RepeatPageController } from '
|
|
13
|
-
import { type PageControllerClass } from '
|
|
11
|
+
} from '../components/helpers/components.js'
|
|
12
|
+
import { type RepeatPageController } from '../pageControllers/RepeatPageController.js'
|
|
13
|
+
import { type PageControllerClass } from '../pageControllers/helpers/pages.js'
|
|
14
14
|
import {
|
|
15
15
|
type FormState,
|
|
16
16
|
type FormSubmissionError
|
|
17
|
-
} from '
|
|
17
|
+
} from '../types.js'
|
|
18
18
|
|
|
19
19
|
export type ExecutableCondition = ConditionWrapper & {
|
|
20
20
|
expr: Expression
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getErrorMessage } from '@defra/forms-model'
|
|
2
2
|
import Joi from 'joi'
|
|
3
3
|
|
|
4
|
-
import { createLogger } from '
|
|
5
|
-
import { CacheService } from '
|
|
4
|
+
import { createLogger } from '../../common/helpers/logging/logger.js'
|
|
5
|
+
import { CacheService } from '../../services/index.js'
|
|
6
6
|
|
|
7
7
|
const logger = createLogger()
|
|
8
8
|
|
|
@@ -53,5 +53,5 @@ export function validatePluginOptions(options) {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
/**
|
|
56
|
-
* @import { PluginOptions } from '
|
|
56
|
+
* @import { PluginOptions } from './types.js'
|
|
57
57
|
*/
|
|
@@ -6,18 +6,18 @@ import {
|
|
|
6
6
|
import {
|
|
7
7
|
getFormVersion,
|
|
8
8
|
type checkFormStatus
|
|
9
|
-
} from '
|
|
10
|
-
import { type FormModel } from '
|
|
11
|
-
import { type DetailItem } from '
|
|
12
|
-
import { categoriseData } from '
|
|
13
|
-
import { FormAdapterSubmissionSchemaVersion } from '
|
|
9
|
+
} from '../../helpers.js'
|
|
10
|
+
import { type FormModel } from '../../models/FormModel.js'
|
|
11
|
+
import { type DetailItem } from '../../models/types.js'
|
|
12
|
+
import { categoriseData } from '../machine/v2.js'
|
|
13
|
+
import { FormAdapterSubmissionSchemaVersion } from '../../types/enums.js'
|
|
14
14
|
import {
|
|
15
15
|
type FormAdapterSubmissionMessageData,
|
|
16
16
|
type FormAdapterSubmissionMessageMeta,
|
|
17
17
|
type FormAdapterSubmissionMessagePayload,
|
|
18
18
|
type FormAdapterSubmissionMessageResult,
|
|
19
19
|
type FormContext
|
|
20
|
-
} from '
|
|
20
|
+
} from '../../types.js'
|
|
21
21
|
|
|
22
22
|
export function format(
|
|
23
23
|
context: FormContext,
|
|
@@ -4,21 +4,21 @@ import {
|
|
|
4
4
|
} from '@defra/forms-model'
|
|
5
5
|
import { addDays, format as dateFormat } from 'date-fns'
|
|
6
6
|
|
|
7
|
-
import { config } from '
|
|
8
|
-
import { getAnswer } from '
|
|
9
|
-
import { escapeMarkdown } from '
|
|
10
|
-
import { PaymentField } from '
|
|
11
|
-
import { type checkFormStatus } from '
|
|
12
|
-
import { type FormModel } from '
|
|
7
|
+
import { config } from '../../../../../config/index.js'
|
|
8
|
+
import { getAnswer } from '../../components/helpers/components.js'
|
|
9
|
+
import { escapeMarkdown } from '../../components/helpers/index.js'
|
|
10
|
+
import { PaymentField } from '../../components/index.js'
|
|
11
|
+
import { type checkFormStatus } from '../../helpers.js'
|
|
12
|
+
import { type FormModel } from '../../models/index.js'
|
|
13
13
|
import {
|
|
14
14
|
type DetailItem,
|
|
15
15
|
type DetailItemField
|
|
16
|
-
} from '
|
|
17
|
-
import { type FormContext } from '
|
|
16
|
+
} from '../../models/types.js'
|
|
17
|
+
import { type FormContext } from '../../types.js'
|
|
18
18
|
import {
|
|
19
19
|
formatCurrency,
|
|
20
20
|
formatPaymentDate
|
|
21
|
-
} from '
|
|
21
|
+
} from '../../../payment/helper.js'
|
|
22
22
|
|
|
23
23
|
const designerUrl = config.get('designerUrl')
|
|
24
24
|
|
|
@@ -3,14 +3,14 @@ import {
|
|
|
3
3
|
type SubmitResponsePayload
|
|
4
4
|
} from '@defra/forms-model'
|
|
5
5
|
|
|
6
|
-
import { type checkFormStatus } from '
|
|
7
|
-
import { type FormModel } from '
|
|
8
|
-
import { type DetailItem } from '
|
|
9
|
-
import { format as formatAdapterV1 } from '
|
|
10
|
-
import { format as formatHumanV1 } from '
|
|
11
|
-
import { format as formatMachineV1 } from '
|
|
12
|
-
import { format as formatMachineV2 } from '
|
|
13
|
-
import { type FormContext } from '
|
|
6
|
+
import { type checkFormStatus } from '../helpers.js'
|
|
7
|
+
import { type FormModel } from '../models/index.js'
|
|
8
|
+
import { type DetailItem } from '../models/types.js'
|
|
9
|
+
import { format as formatAdapterV1 } from './adapter/v1.js'
|
|
10
|
+
import { format as formatHumanV1 } from './human/v1.js'
|
|
11
|
+
import { format as formatMachineV1 } from './machine/v1.js'
|
|
12
|
+
import { format as formatMachineV2 } from './machine/v2.js'
|
|
13
|
+
import { type FormContext } from '../types.js'
|
|
14
14
|
|
|
15
15
|
type Formatter = (
|
|
16
16
|
context: FormContext,
|
|
@@ -3,17 +3,17 @@ import {
|
|
|
3
3
|
type SubmitResponsePayload
|
|
4
4
|
} from '@defra/forms-model'
|
|
5
5
|
|
|
6
|
-
import { config } from '
|
|
7
|
-
import { getAnswer } from '
|
|
8
|
-
import { FileUploadField } from '
|
|
9
|
-
import { type checkFormStatus } from '
|
|
10
|
-
import { type FormModel } from '
|
|
6
|
+
import { config } from '../../../../../config/index.js'
|
|
7
|
+
import { getAnswer } from '../../components/helpers/components.js'
|
|
8
|
+
import { FileUploadField } from '../../components/index.js'
|
|
9
|
+
import { type checkFormStatus } from '../../helpers.js'
|
|
10
|
+
import { type FormModel } from '../../models/index.js'
|
|
11
11
|
import {
|
|
12
12
|
type DetailItem,
|
|
13
13
|
type DetailItemField,
|
|
14
14
|
type DetailItemRepeat
|
|
15
|
-
} from '
|
|
16
|
-
import { type FormContext } from '
|
|
15
|
+
} from '../../models/types.js'
|
|
16
|
+
import { type FormContext } from '../../types.js'
|
|
17
17
|
|
|
18
18
|
const designerUrl = config.get('designerUrl')
|
|
19
19
|
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { type SubmitResponsePayload } from '@defra/forms-model'
|
|
2
2
|
|
|
3
|
-
import { config } from '
|
|
3
|
+
import { config } from '../../../../../config/index.js'
|
|
4
4
|
import {
|
|
5
5
|
FileUploadField,
|
|
6
6
|
PaymentField
|
|
7
|
-
} from '
|
|
8
|
-
import { type checkFormStatus } from '
|
|
9
|
-
import { type FormModel } from '
|
|
7
|
+
} from '../../components/index.js'
|
|
8
|
+
import { type checkFormStatus } from '../../helpers.js'
|
|
9
|
+
import { type FormModel } from '../../models/index.js'
|
|
10
10
|
import {
|
|
11
11
|
type DetailItem,
|
|
12
12
|
type DetailItemField,
|
|
13
13
|
type DetailItemRepeat
|
|
14
|
-
} from '
|
|
14
|
+
} from '../../models/types.js'
|
|
15
15
|
import {
|
|
16
16
|
type FileUploadFieldDetailitem,
|
|
17
17
|
type FormAdapterFile,
|
|
18
18
|
type FormContext,
|
|
19
19
|
type RichFormValue
|
|
20
|
-
} from '
|
|
20
|
+
} from '../../types.js'
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* Payment data for the machine output format
|
|
@@ -7,20 +7,20 @@ import { type ValidationErrorItem } from 'joi'
|
|
|
7
7
|
import {
|
|
8
8
|
FileUploadField,
|
|
9
9
|
tempItemSchema
|
|
10
|
-
} from '
|
|
11
|
-
import { type FormComponent } from '
|
|
10
|
+
} from '../components/FileUploadField.js'
|
|
11
|
+
import { type FormComponent } from '../components/FormComponent.js'
|
|
12
12
|
import {
|
|
13
13
|
getCacheService,
|
|
14
14
|
getError,
|
|
15
15
|
getExponentialBackoffDelay
|
|
16
|
-
} from '
|
|
17
|
-
import { type FormModel } from '
|
|
18
|
-
import { QuestionPageController } from '
|
|
19
|
-
import { getProxyUrlForLocalDevelopment } from '
|
|
16
|
+
} from '../helpers.js'
|
|
17
|
+
import { type FormModel } from '../models/index.js'
|
|
18
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
19
|
+
import { getProxyUrlForLocalDevelopment } from './helpers/index.js'
|
|
20
20
|
import {
|
|
21
21
|
getUploadStatus,
|
|
22
22
|
initiateUpload
|
|
23
|
-
} from '
|
|
23
|
+
} from '../services/uploadService.js'
|
|
24
24
|
import {
|
|
25
25
|
FileStatus,
|
|
26
26
|
UploadStatus,
|
|
@@ -35,12 +35,12 @@ import {
|
|
|
35
35
|
type ItemDeletePageViewModel,
|
|
36
36
|
type UploadInitiateResponse,
|
|
37
37
|
type UploadStatusFileResponse
|
|
38
|
-
} from '
|
|
38
|
+
} from '../types.js'
|
|
39
39
|
import {
|
|
40
40
|
type FormRequest,
|
|
41
41
|
type FormRequestPayload,
|
|
42
42
|
type FormResponseToolkit
|
|
43
|
-
} from '
|
|
43
|
+
} from '../../../routes/types.js'
|
|
44
44
|
|
|
45
45
|
const MAX_UPLOADS = 25
|
|
46
46
|
const CDP_UPLOAD_TIMEOUT_MS = 60000 // 1 minute
|
|
@@ -8,26 +8,26 @@ import {
|
|
|
8
8
|
import Boom from '@hapi/boom'
|
|
9
9
|
import { type Lifecycle, type RouteOptions, type Server } from '@hapi/hapi'
|
|
10
10
|
|
|
11
|
-
import { type ComponentCollection } from '
|
|
12
|
-
import { type FormComponent } from '
|
|
11
|
+
import { type ComponentCollection } from '../components/ComponentCollection.js'
|
|
12
|
+
import { type FormComponent } from '../components/FormComponent.js'
|
|
13
13
|
import {
|
|
14
14
|
getSaveAndExitHelpers,
|
|
15
15
|
getStartPath,
|
|
16
16
|
normalisePath
|
|
17
|
-
} from '
|
|
18
|
-
import { type FormModel } from '
|
|
19
|
-
import { type ExecutableCondition } from '
|
|
17
|
+
} from '../helpers.js'
|
|
18
|
+
import { type FormModel } from '../models/index.js'
|
|
19
|
+
import { type ExecutableCondition } from '../models/types.js'
|
|
20
20
|
import {
|
|
21
21
|
type FormContext,
|
|
22
22
|
type PageViewModelBase
|
|
23
|
-
} from '
|
|
23
|
+
} from '../types.js'
|
|
24
24
|
import {
|
|
25
25
|
type FormRequest,
|
|
26
26
|
type FormRequestPayload,
|
|
27
27
|
type FormRequestPayloadRefs,
|
|
28
28
|
type FormRequestRefs,
|
|
29
29
|
type FormResponseToolkit
|
|
30
|
-
} from '
|
|
30
|
+
} from '../../../routes/types.js'
|
|
31
31
|
|
|
32
32
|
export class PageController {
|
|
33
33
|
/**
|
|
@@ -17,10 +17,10 @@ import {
|
|
|
17
17
|
EXTERNAL_STATE_APPENDAGE,
|
|
18
18
|
EXTERNAL_STATE_PAYLOAD,
|
|
19
19
|
PAYMENT_EXPIRED_NOTIFICATION
|
|
20
|
-
} from '
|
|
21
|
-
import { ComponentCollection } from '
|
|
22
|
-
import { optionalText } from '
|
|
23
|
-
import { type BackLink } from '
|
|
20
|
+
} from '../../../constants.js'
|
|
21
|
+
import { ComponentCollection } from '../components/ComponentCollection.js'
|
|
22
|
+
import { optionalText } from '../components/constants.js'
|
|
23
|
+
import { type BackLink } from '../components/types.js'
|
|
24
24
|
import {
|
|
25
25
|
checkFormStatus,
|
|
26
26
|
getCacheService,
|
|
@@ -28,10 +28,10 @@ import {
|
|
|
28
28
|
getSaveAndExitHelpers,
|
|
29
29
|
normalisePath,
|
|
30
30
|
proceed
|
|
31
|
-
} from '
|
|
32
|
-
import { type FormModel } from '
|
|
33
|
-
import { PageController } from '
|
|
34
|
-
import { prefillStateFromQueryParameters } from '
|
|
31
|
+
} from '../helpers.js'
|
|
32
|
+
import { type FormModel } from '../models/index.js'
|
|
33
|
+
import { PageController } from './PageController.js'
|
|
34
|
+
import { prefillStateFromQueryParameters } from './helpers/state.js'
|
|
35
35
|
import {
|
|
36
36
|
type AnyFormRequest,
|
|
37
37
|
type FormContext,
|
|
@@ -42,8 +42,8 @@ import {
|
|
|
42
42
|
type FormState,
|
|
43
43
|
type FormStateValue,
|
|
44
44
|
type FormSubmissionState
|
|
45
|
-
} from '
|
|
46
|
-
import { getComponentsByType } from '
|
|
45
|
+
} from '../types.js'
|
|
46
|
+
import { getComponentsByType } from '../validationHelpers.js'
|
|
47
47
|
import {
|
|
48
48
|
FormAction,
|
|
49
49
|
FormStatus,
|
|
@@ -52,13 +52,13 @@ import {
|
|
|
52
52
|
type FormRequestPayloadRefs,
|
|
53
53
|
type FormRequestRefs,
|
|
54
54
|
type FormResponseToolkit
|
|
55
|
-
} from '
|
|
55
|
+
} from '../../../routes/types.js'
|
|
56
56
|
import {
|
|
57
57
|
actionSchema,
|
|
58
58
|
crumbSchema,
|
|
59
59
|
paramsSchema
|
|
60
|
-
} from '
|
|
61
|
-
import { merge } from '
|
|
60
|
+
} from '../../../schemas/index.js'
|
|
61
|
+
import { merge } from '../../../services/cacheService.js'
|
|
62
62
|
|
|
63
63
|
export class QuestionPageController extends PageController {
|
|
64
64
|
collection: ComponentCollection
|
|
@@ -4,10 +4,10 @@ import { type PageRepeat, type Repeat } from '@defra/forms-model'
|
|
|
4
4
|
import Boom from '@hapi/boom'
|
|
5
5
|
import Joi from 'joi'
|
|
6
6
|
|
|
7
|
-
import { isRepeatState } from '
|
|
8
|
-
import { redirectPath } from '
|
|
9
|
-
import { type FormModel } from '
|
|
10
|
-
import { QuestionPageController } from '
|
|
7
|
+
import { isRepeatState } from '../components/FormComponent.js'
|
|
8
|
+
import { redirectPath } from '../helpers.js'
|
|
9
|
+
import { type FormModel } from '../models/index.js'
|
|
10
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
11
11
|
import {
|
|
12
12
|
type FormContext,
|
|
13
13
|
type FormContextRequest,
|
|
@@ -20,13 +20,13 @@ import {
|
|
|
20
20
|
type RepeaterSummaryPageViewModel,
|
|
21
21
|
type SummaryList,
|
|
22
22
|
type SummaryListAction
|
|
23
|
-
} from '
|
|
23
|
+
} from '../types.js'
|
|
24
24
|
import {
|
|
25
25
|
FormAction,
|
|
26
26
|
type FormRequest,
|
|
27
27
|
type FormRequestPayload,
|
|
28
28
|
type FormResponseToolkit
|
|
29
|
-
} from '
|
|
29
|
+
} from '../../../routes/types.js'
|
|
30
30
|
|
|
31
31
|
export class RepeatPageController extends QuestionPageController {
|
|
32
32
|
declare pageDef: PageRepeat
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { QuestionPageController } from '
|
|
2
|
-
import { type FormContext } from '
|
|
3
|
-
import { type FormRequest } from '
|
|
1
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
2
|
+
import { type FormContext } from '../types.js'
|
|
3
|
+
import { type FormRequest } from '../../../routes/types.js'
|
|
4
4
|
|
|
5
5
|
export class StartPageController extends QuestionPageController {
|
|
6
6
|
/**
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { type PageStatus } from '@defra/forms-model'
|
|
2
2
|
|
|
3
|
-
import { getCacheService } from '
|
|
4
|
-
import { type FormModel } from '
|
|
5
|
-
import { QuestionPageController } from '
|
|
6
|
-
import { type FormContext } from '
|
|
3
|
+
import { getCacheService } from '../helpers.js'
|
|
4
|
+
import { type FormModel } from '../models/index.js'
|
|
5
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
6
|
+
import { type FormContext } from '../types.js'
|
|
7
7
|
import {
|
|
8
8
|
type FormRequest,
|
|
9
9
|
type FormResponseToolkit
|
|
10
|
-
} from '
|
|
10
|
+
} from '../../../routes/types.js'
|
|
11
11
|
|
|
12
12
|
export class StatusPageController extends QuestionPageController {
|
|
13
13
|
declare pageDef: PageStatus
|
|
@@ -10,52 +10,52 @@ import { type RouteOptions } from '@hapi/hapi'
|
|
|
10
10
|
import {
|
|
11
11
|
COMPONENT_STATE_ERROR,
|
|
12
12
|
PAYMENT_EXPIRED_NOTIFICATION
|
|
13
|
-
} from '
|
|
14
|
-
import { ComponentCollection } from '
|
|
15
|
-
import { PaymentField } from '
|
|
13
|
+
} from '../../../constants.js'
|
|
14
|
+
import { ComponentCollection } from '../components/ComponentCollection.js'
|
|
15
|
+
import { PaymentField } from '../components/PaymentField.js'
|
|
16
16
|
import {
|
|
17
17
|
checkEmailAddressForLiveFormSubmission,
|
|
18
18
|
checkFormStatus,
|
|
19
19
|
createError,
|
|
20
20
|
getCacheService
|
|
21
|
-
} from '
|
|
21
|
+
} from '../helpers.js'
|
|
22
22
|
import {
|
|
23
23
|
SummaryViewModel,
|
|
24
24
|
type FormModel
|
|
25
|
-
} from '
|
|
25
|
+
} from '../models/index.js'
|
|
26
26
|
import {
|
|
27
27
|
type Detail,
|
|
28
28
|
type DetailItem,
|
|
29
29
|
type DetailItemField
|
|
30
|
-
} from '
|
|
31
|
-
import { QuestionPageController } from '
|
|
30
|
+
} from '../models/types.js'
|
|
31
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
32
32
|
import {
|
|
33
33
|
InvalidComponentStateError,
|
|
34
34
|
PaymentErrorTypes,
|
|
35
35
|
PaymentPreAuthError,
|
|
36
36
|
PaymentSubmissionError
|
|
37
|
-
} from '
|
|
37
|
+
} from './errors.js'
|
|
38
38
|
import {
|
|
39
39
|
buildMainRecords,
|
|
40
40
|
buildRepeaterRecords
|
|
41
|
-
} from '
|
|
41
|
+
} from './helpers/submission.js'
|
|
42
42
|
import {
|
|
43
43
|
type FormConfirmationState,
|
|
44
44
|
type FormContext,
|
|
45
45
|
type FormContextRequest
|
|
46
|
-
} from '
|
|
46
|
+
} from '../types.js'
|
|
47
47
|
import {
|
|
48
48
|
DEFAULT_PAYMENT_HELP_URL,
|
|
49
49
|
formatCurrency,
|
|
50
50
|
formatPaymentDate
|
|
51
|
-
} from '
|
|
51
|
+
} from '../../payment/helper.js'
|
|
52
52
|
import {
|
|
53
53
|
FormAction,
|
|
54
54
|
type FormRequest,
|
|
55
55
|
type FormRequestPayload,
|
|
56
56
|
type FormRequestPayloadRefs,
|
|
57
57
|
type FormResponseToolkit
|
|
58
|
-
} from '
|
|
58
|
+
} from '../../../routes/types.js'
|
|
59
59
|
|
|
60
60
|
export class SummaryPageController extends QuestionPageController {
|
|
61
61
|
declare pageDef: Page
|
|
@@ -2,12 +2,12 @@ import { type PageTerminal } from '@defra/forms-model'
|
|
|
2
2
|
import Boom from '@hapi/boom'
|
|
3
3
|
import { type ResponseObject } from '@hapi/hapi'
|
|
4
4
|
|
|
5
|
-
import { QuestionPageController } from '
|
|
6
|
-
import { type FormContext } from '
|
|
5
|
+
import { QuestionPageController } from './QuestionPageController.js'
|
|
6
|
+
import { type FormContext } from '../types.js'
|
|
7
7
|
import {
|
|
8
8
|
type FormRequestPayload,
|
|
9
9
|
type FormResponseToolkit
|
|
10
|
-
} from '
|
|
10
|
+
} from '../../../routes/types.js'
|
|
11
11
|
|
|
12
12
|
export class TerminalPageController extends QuestionPageController {
|
|
13
13
|
declare pageDef: PageTerminal
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { server } from '
|
|
2
|
-
import { type FormContextRequest } from '
|
|
3
|
-
import { type FormRequest } from '
|
|
1
|
+
import { server } from './server.js'
|
|
2
|
+
import { type FormContextRequest } from '../../types.js'
|
|
3
|
+
import { type FormRequest } from '../../../../routes/types.js'
|
|
4
4
|
|
|
5
5
|
const mockYar = {
|
|
6
6
|
flash: jest.fn().mockReturnValue([]),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Server } from '@hapi/hapi'
|
|
2
2
|
|
|
3
|
-
import { type PluginOptions } from '
|
|
4
|
-
import { type CacheService } from '
|
|
3
|
+
import { type PluginOptions } from '../../types.js'
|
|
4
|
+
import { type CacheService } from '../../../../services/index.js'
|
|
5
5
|
|
|
6
6
|
export const server: Server = {
|
|
7
7
|
plugins: {
|
|
@@ -4,8 +4,8 @@ import {
|
|
|
4
4
|
type Page
|
|
5
5
|
} from '@defra/forms-model'
|
|
6
6
|
|
|
7
|
-
import { type FormModel } from '
|
|
8
|
-
import * as PageControllers from '
|
|
7
|
+
import { type FormModel } from '../../models/index.js'
|
|
8
|
+
import * as PageControllers from '../index.js'
|
|
9
9
|
|
|
10
10
|
export type PageControllerClass = InstanceType<PageControllerType>
|
|
11
11
|
export type PageControllerType =
|