@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
|
@@ -1,725 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
SchemaVersion,
|
|
3
|
-
formDefinitionSchema,
|
|
4
|
-
formDefinitionV2Schema,
|
|
5
|
-
type FormDefinition
|
|
6
|
-
} from '@defra/forms-model'
|
|
7
|
-
|
|
8
|
-
import { todayAsDateOnly } from '~/src/server/plugins/engine/date-helper.js'
|
|
9
|
-
import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
|
|
10
|
-
import { buildFormContextRequest } from '~/src/server/plugins/engine/pageControllers/__stubs__/request.js'
|
|
11
|
-
import { type FormContextRequest } from '~/src/server/plugins/engine/types.js'
|
|
12
|
-
import { FormAction } from '~/src/server/routes/types.js'
|
|
13
|
-
import { V2 as definitionV2 } from '~/test/form/definitions/conditions-basic.js'
|
|
14
|
-
import definition from '~/test/form/definitions/conditions-escaping.js'
|
|
15
|
-
import conditionsListDefinition from '~/test/form/definitions/conditions-list.js'
|
|
16
|
-
import relativeDatesDefinition from '~/test/form/definitions/conditions-relative-dates-v2.js'
|
|
17
|
-
import fieldsRequiredDefinition from '~/test/form/definitions/fields-required.js'
|
|
18
|
-
import joinedConditionsDefinition from '~/test/form/definitions/joined-conditions-simple-v2.js'
|
|
19
|
-
|
|
20
|
-
jest.mock('~/src/server/plugins/engine/date-helper.ts')
|
|
21
|
-
|
|
22
|
-
describe('FormModel', () => {
|
|
23
|
-
beforeEach(() => {
|
|
24
|
-
jest.resetAllMocks()
|
|
25
|
-
})
|
|
26
|
-
|
|
27
|
-
describe('Constructor', () => {
|
|
28
|
-
it('loads a valid form definition', () => {
|
|
29
|
-
expect(
|
|
30
|
-
() => new FormModel(definition, { basePath: 'test' })
|
|
31
|
-
).not.toThrow()
|
|
32
|
-
})
|
|
33
|
-
|
|
34
|
-
it('Sets the page title from first form component when empty (V2 only)', () => {
|
|
35
|
-
const noTitlesDefinition = {
|
|
36
|
-
...definitionV2,
|
|
37
|
-
pages: definitionV2.pages.map((page) => ({ ...page, title: '' }))
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
const model = new FormModel(noTitlesDefinition, { basePath: 'test' })
|
|
41
|
-
|
|
42
|
-
expect(model.def.pages.at(0)?.title).toBe(
|
|
43
|
-
'Have you previously been married?'
|
|
44
|
-
)
|
|
45
|
-
expect(model.def.pages.at(1)?.title).toBe('Date of marriage')
|
|
46
|
-
})
|
|
47
|
-
|
|
48
|
-
it('Gets a list by ID', () => {
|
|
49
|
-
const definitionWithLists: FormDefinition = {
|
|
50
|
-
...definitionV2,
|
|
51
|
-
lists: [
|
|
52
|
-
{
|
|
53
|
-
id: 'c5eba145-b04d-4d41-a50c-e5e2f9b6357f',
|
|
54
|
-
type: 'string',
|
|
55
|
-
title: 'foo',
|
|
56
|
-
name: 'foo',
|
|
57
|
-
items: [
|
|
58
|
-
{ text: 'a', value: 'a' },
|
|
59
|
-
{ text: 'b', value: 'b' }
|
|
60
|
-
]
|
|
61
|
-
},
|
|
62
|
-
{
|
|
63
|
-
type: 'string',
|
|
64
|
-
title: 'bar',
|
|
65
|
-
name: 'bar',
|
|
66
|
-
items: [
|
|
67
|
-
{
|
|
68
|
-
id: 'a85a42a8-3e08-4c2a-b263-a0dc0b8c49f6',
|
|
69
|
-
text: 'a',
|
|
70
|
-
value: 'a'
|
|
71
|
-
},
|
|
72
|
-
{
|
|
73
|
-
id: 'c31664ac-887b-434b-b9f4-e5bc30d24439',
|
|
74
|
-
text: 'b',
|
|
75
|
-
value: 'b'
|
|
76
|
-
}
|
|
77
|
-
]
|
|
78
|
-
}
|
|
79
|
-
]
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
formDefinitionV2Schema.validate = jest
|
|
83
|
-
.fn()
|
|
84
|
-
.mockReturnValue({ value: definitionWithLists })
|
|
85
|
-
|
|
86
|
-
const model = new FormModel(definitionWithLists, { basePath: 'test' })
|
|
87
|
-
|
|
88
|
-
expect(
|
|
89
|
-
model.getListById('c5eba145-b04d-4d41-a50c-e5e2f9b6357f')
|
|
90
|
-
).toBeDefined()
|
|
91
|
-
expect(model.listDefIdMap.size).toBe(2) // 1 + the yes/no list. list 'bar' isn't present as there's no ID
|
|
92
|
-
})
|
|
93
|
-
|
|
94
|
-
it('Gets a component by ID', () => {
|
|
95
|
-
formDefinitionV2Schema.validate = jest
|
|
96
|
-
.fn()
|
|
97
|
-
.mockReturnValue({ value: definitionV2 })
|
|
98
|
-
|
|
99
|
-
const model = new FormModel(definitionV2, { basePath: 'test' })
|
|
100
|
-
|
|
101
|
-
expect(
|
|
102
|
-
model.getComponentById('717eb213-4e4b-4a2d-9cfd-2780f5e1e3e5')
|
|
103
|
-
).toBeDefined()
|
|
104
|
-
expect(model.listDefIdMap.size).toBe(1)
|
|
105
|
-
})
|
|
106
|
-
|
|
107
|
-
it('gets a condition by its ID', () => {
|
|
108
|
-
formDefinitionV2Schema.validate = jest
|
|
109
|
-
.fn()
|
|
110
|
-
.mockReturnValue({ value: definitionV2 })
|
|
111
|
-
const model = new FormModel(definitionV2, { basePath: 'test' })
|
|
112
|
-
|
|
113
|
-
expect(
|
|
114
|
-
model.getConditionById('6c9e2f4a-1d7b-5e8c-3f6a-9e2d5b7c4f1a')
|
|
115
|
-
).toBeDefined()
|
|
116
|
-
})
|
|
117
|
-
|
|
118
|
-
it('throws an error if schema validation fails', () => {
|
|
119
|
-
formDefinitionV2Schema.validate = jest.fn().mockReturnValueOnce({
|
|
120
|
-
error: 'Validation error'
|
|
121
|
-
})
|
|
122
|
-
|
|
123
|
-
expect(() => new FormModel(definitionV2, { basePath: 'test' })).toThrow(
|
|
124
|
-
'Validation error'
|
|
125
|
-
)
|
|
126
|
-
})
|
|
127
|
-
|
|
128
|
-
it('assigns v1 to the schema if not defined', () => {
|
|
129
|
-
const definitionWithoutSchema: FormDefinition = {
|
|
130
|
-
...definition,
|
|
131
|
-
schema: undefined
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
// Mock validation to just return the definition
|
|
135
|
-
formDefinitionV2Schema.validate = jest
|
|
136
|
-
.fn()
|
|
137
|
-
.mockReturnValue({ value: definitionWithoutSchema })
|
|
138
|
-
|
|
139
|
-
const model = new FormModel(definitionWithoutSchema, { basePath: 'test' })
|
|
140
|
-
|
|
141
|
-
expect(model.schemaVersion).toBe(SchemaVersion.V1)
|
|
142
|
-
})
|
|
143
|
-
|
|
144
|
-
it.each([
|
|
145
|
-
{
|
|
146
|
-
input: undefined,
|
|
147
|
-
expected: SchemaVersion.V1,
|
|
148
|
-
schema: formDefinitionSchema
|
|
149
|
-
},
|
|
150
|
-
{
|
|
151
|
-
input: SchemaVersion.V1,
|
|
152
|
-
expected: SchemaVersion.V1,
|
|
153
|
-
schema: formDefinitionSchema
|
|
154
|
-
},
|
|
155
|
-
{
|
|
156
|
-
input: SchemaVersion.V2,
|
|
157
|
-
expected: SchemaVersion.V2,
|
|
158
|
-
schema: formDefinitionV2Schema
|
|
159
|
-
}
|
|
160
|
-
])(
|
|
161
|
-
'assigns $expected to the schema when defined',
|
|
162
|
-
({ input, expected, schema }) => {
|
|
163
|
-
const definitionWithSchema: FormDefinition = {
|
|
164
|
-
...definition,
|
|
165
|
-
schema: input
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
// we just want to test that we're validating the right schema
|
|
169
|
-
// we don't care about the actual validation logic, this isn't an integration test
|
|
170
|
-
const spy = jest.spyOn(schema, 'validate').mockReturnValue({
|
|
171
|
-
value: definitionWithSchema,
|
|
172
|
-
error: undefined
|
|
173
|
-
})
|
|
174
|
-
|
|
175
|
-
const model = new FormModel(definitionWithSchema, { basePath: 'test' })
|
|
176
|
-
|
|
177
|
-
expect(model.schemaVersion).toBe(expected)
|
|
178
|
-
expect(spy).toHaveBeenCalledWith(definitionWithSchema, {
|
|
179
|
-
abortEarly: false
|
|
180
|
-
})
|
|
181
|
-
|
|
182
|
-
spy.mockRestore()
|
|
183
|
-
}
|
|
184
|
-
)
|
|
185
|
-
})
|
|
186
|
-
|
|
187
|
-
describe('getFormContext', () => {
|
|
188
|
-
it.each([FormAction.Validate, undefined])(
|
|
189
|
-
'returns a form context with the correct payload and state when action is %s',
|
|
190
|
-
(action) => {
|
|
191
|
-
const formModel = new FormModel(fieldsRequiredDefinition, {
|
|
192
|
-
basePath: '/components'
|
|
193
|
-
})
|
|
194
|
-
|
|
195
|
-
const state = {
|
|
196
|
-
$$__referenceNumber: 'foobar'
|
|
197
|
-
}
|
|
198
|
-
const pageUrl = new URL('http://example.com/components/fields-required')
|
|
199
|
-
|
|
200
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
201
|
-
method: 'post',
|
|
202
|
-
payload: {
|
|
203
|
-
crumb: 'dummyCrumb',
|
|
204
|
-
action,
|
|
205
|
-
textField: 'Hello world'
|
|
206
|
-
},
|
|
207
|
-
query: {},
|
|
208
|
-
path: pageUrl.pathname,
|
|
209
|
-
params: { path: 'components', slug: 'fields-required' },
|
|
210
|
-
url: pageUrl,
|
|
211
|
-
app: { model: formModel }
|
|
212
|
-
})
|
|
213
|
-
|
|
214
|
-
const context = formModel.getFormContext(request, state)
|
|
215
|
-
|
|
216
|
-
expect(context.payload.textField).toBe('Hello world')
|
|
217
|
-
expect(context.state.textField).toBe('Hello world')
|
|
218
|
-
expect(context.referenceNumber).toEqual(expect.any(String))
|
|
219
|
-
}
|
|
220
|
-
)
|
|
221
|
-
|
|
222
|
-
it('returns without updating the state when the action is not validate or saveAndExit', () => {
|
|
223
|
-
const formModel = new FormModel(fieldsRequiredDefinition, {
|
|
224
|
-
basePath: '/components'
|
|
225
|
-
})
|
|
226
|
-
|
|
227
|
-
const state = {
|
|
228
|
-
$$__referenceNumber: 'foobar',
|
|
229
|
-
textField: 'old'
|
|
230
|
-
}
|
|
231
|
-
const pageUrl = new URL('http://example.com/components/fields-required')
|
|
232
|
-
|
|
233
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
234
|
-
method: 'post',
|
|
235
|
-
payload: { crumb: 'dummyCrumb', action: 'continue', textField: 'new' },
|
|
236
|
-
query: {},
|
|
237
|
-
path: pageUrl.pathname,
|
|
238
|
-
params: { path: 'components', slug: 'fields-required' },
|
|
239
|
-
url: pageUrl,
|
|
240
|
-
app: { model: formModel }
|
|
241
|
-
})
|
|
242
|
-
|
|
243
|
-
const context = formModel.getFormContext(request, state)
|
|
244
|
-
|
|
245
|
-
// Early return branch should not merge payload into state
|
|
246
|
-
expect(context.state.textField).toBe('old')
|
|
247
|
-
expect(context.errors).toBeUndefined()
|
|
248
|
-
expect(context.referenceNumber).toEqual(expect.any(String))
|
|
249
|
-
})
|
|
250
|
-
|
|
251
|
-
it('clears a previous checkbox field value when the field is omitted from the payload', () => {
|
|
252
|
-
const formModel = new FormModel(fieldsRequiredDefinition, {
|
|
253
|
-
basePath: '/components'
|
|
254
|
-
})
|
|
255
|
-
|
|
256
|
-
const state = {
|
|
257
|
-
$$__referenceNumber: 'foobar',
|
|
258
|
-
checkboxesSingle: ['Arabian', 'Shetland']
|
|
259
|
-
}
|
|
260
|
-
const pageUrl = new URL('http://example.com/components/fields-required')
|
|
261
|
-
|
|
262
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
263
|
-
method: 'post',
|
|
264
|
-
payload: { crumb: 'dummyCrumb', action: 'validate' },
|
|
265
|
-
query: {},
|
|
266
|
-
path: pageUrl.pathname,
|
|
267
|
-
params: { path: 'components', slug: 'fields-required' },
|
|
268
|
-
url: pageUrl,
|
|
269
|
-
app: { model: formModel }
|
|
270
|
-
})
|
|
271
|
-
|
|
272
|
-
const context = formModel.getFormContext(request, state)
|
|
273
|
-
|
|
274
|
-
expect(context.payload.checkboxesSingle).toEqual([])
|
|
275
|
-
expect(context.errors).toContainEqual(
|
|
276
|
-
expect.objectContaining({ name: 'checkboxesSingle' })
|
|
277
|
-
)
|
|
278
|
-
expect(context.referenceNumber).toEqual(expect.any(String))
|
|
279
|
-
})
|
|
280
|
-
|
|
281
|
-
it('handles missing reference numbers', () => {
|
|
282
|
-
const formModel = new FormModel(fieldsRequiredDefinition, {
|
|
283
|
-
basePath: '/components'
|
|
284
|
-
})
|
|
285
|
-
|
|
286
|
-
const state = {
|
|
287
|
-
checkboxesSingle: ['Arabian', 'Shetland']
|
|
288
|
-
}
|
|
289
|
-
const pageUrl = new URL('http://example.com/components/fields-required')
|
|
290
|
-
|
|
291
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
292
|
-
method: 'post',
|
|
293
|
-
payload: { crumb: 'dummyCrumb', action: 'validate' },
|
|
294
|
-
query: {},
|
|
295
|
-
path: pageUrl.pathname,
|
|
296
|
-
params: { path: 'components', slug: 'fields-required' },
|
|
297
|
-
url: pageUrl,
|
|
298
|
-
app: { model: formModel }
|
|
299
|
-
})
|
|
300
|
-
|
|
301
|
-
expect(() => formModel.getFormContext(request, state)).toThrow(
|
|
302
|
-
'Reference number not found in form state'
|
|
303
|
-
)
|
|
304
|
-
})
|
|
305
|
-
|
|
306
|
-
it('handles non-string reference numbers', () => {
|
|
307
|
-
const formModel = new FormModel(fieldsRequiredDefinition, {
|
|
308
|
-
basePath: '/components'
|
|
309
|
-
})
|
|
310
|
-
|
|
311
|
-
const state = {
|
|
312
|
-
$$__referenceNumber: 123456789,
|
|
313
|
-
checkboxesSingle: ['Arabian', 'Shetland']
|
|
314
|
-
}
|
|
315
|
-
const pageUrl = new URL('http://example.com/components/fields-required')
|
|
316
|
-
|
|
317
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
318
|
-
method: 'post',
|
|
319
|
-
payload: { crumb: 'dummyCrumb', action: 'validate' },
|
|
320
|
-
query: {},
|
|
321
|
-
path: pageUrl.pathname,
|
|
322
|
-
params: { path: 'components', slug: 'fields-required' },
|
|
323
|
-
url: pageUrl,
|
|
324
|
-
app: { model: formModel }
|
|
325
|
-
})
|
|
326
|
-
|
|
327
|
-
expect(() => formModel.getFormContext(request, state)).toThrow(
|
|
328
|
-
'Reference number not found in form state'
|
|
329
|
-
)
|
|
330
|
-
})
|
|
331
|
-
|
|
332
|
-
it('redirects to the page if the list field (radio) is invalidated due to list item conditions', () => {
|
|
333
|
-
const formModel = new FormModel(conditionsListDefinition, {
|
|
334
|
-
basePath: '/conditional-list-items'
|
|
335
|
-
})
|
|
336
|
-
|
|
337
|
-
const state = {
|
|
338
|
-
$$__referenceNumber: 'foobar',
|
|
339
|
-
gXsqLq: true,
|
|
340
|
-
QwcNsc: 'meat',
|
|
341
|
-
zeQDES: ['peppers', 'cheese', 'ham']
|
|
342
|
-
}
|
|
343
|
-
const pageUrl = new URL(
|
|
344
|
-
'http://example.com/conditional-list-items/summary'
|
|
345
|
-
)
|
|
346
|
-
|
|
347
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
348
|
-
method: 'get',
|
|
349
|
-
query: {},
|
|
350
|
-
path: pageUrl.pathname,
|
|
351
|
-
params: { path: 'summary', slug: 'conditional-list-items' },
|
|
352
|
-
url: pageUrl,
|
|
353
|
-
app: { model: formModel }
|
|
354
|
-
})
|
|
355
|
-
|
|
356
|
-
const context = formModel.getFormContext(request, state)
|
|
357
|
-
|
|
358
|
-
expect(context.errors).toHaveLength(1)
|
|
359
|
-
expect(context.errors?.at(0)?.text).toBe(
|
|
360
|
-
'Options are different because you changed a previous answer'
|
|
361
|
-
)
|
|
362
|
-
expect(context.relevantPages).toHaveLength(2)
|
|
363
|
-
expect(context.paths).toHaveLength(2)
|
|
364
|
-
expect(context.relevantState).toEqual({ gXsqLq: true, QwcNsc: 'meat' })
|
|
365
|
-
})
|
|
366
|
-
|
|
367
|
-
it('redirects to the page if the list field (check) is invalidated due to list item conditions', () => {
|
|
368
|
-
const formModel = new FormModel(conditionsListDefinition, {
|
|
369
|
-
basePath: '/conditional-list-items'
|
|
370
|
-
})
|
|
371
|
-
|
|
372
|
-
const state = {
|
|
373
|
-
$$__referenceNumber: 'foobar',
|
|
374
|
-
gXsqLq: true,
|
|
375
|
-
QwcNsc: 'vegan',
|
|
376
|
-
zeQDES: ['peppers', 'cheese', 'ham']
|
|
377
|
-
}
|
|
378
|
-
const pageUrl = new URL(
|
|
379
|
-
'http://example.com/conditional-list-items/summary'
|
|
380
|
-
)
|
|
381
|
-
|
|
382
|
-
const request: FormContextRequest = buildFormContextRequest({
|
|
383
|
-
method: 'get',
|
|
384
|
-
query: {},
|
|
385
|
-
path: pageUrl.pathname,
|
|
386
|
-
params: { path: 'summary', slug: 'conditional-list-items' },
|
|
387
|
-
url: pageUrl,
|
|
388
|
-
app: { model: formModel }
|
|
389
|
-
})
|
|
390
|
-
|
|
391
|
-
const context = formModel.getFormContext(request, state)
|
|
392
|
-
|
|
393
|
-
expect(context.errors).toHaveLength(1)
|
|
394
|
-
expect(context.errors?.at(0)?.text).toBe(
|
|
395
|
-
'Options are different because you changed a previous answer'
|
|
396
|
-
)
|
|
397
|
-
expect(context.relevantPages).toHaveLength(3)
|
|
398
|
-
expect(context.paths).toHaveLength(3)
|
|
399
|
-
expect(context.relevantState).toEqual({
|
|
400
|
-
gXsqLq: true,
|
|
401
|
-
QwcNsc: 'vegan',
|
|
402
|
-
zeQDES: ['peppers', 'cheese', 'ham']
|
|
403
|
-
})
|
|
404
|
-
})
|
|
405
|
-
})
|
|
406
|
-
|
|
407
|
-
describe('makeCondition', () => {
|
|
408
|
-
test('relative date condition', () => {
|
|
409
|
-
formDefinitionV2Schema.validate = jest
|
|
410
|
-
.fn()
|
|
411
|
-
.mockReturnValue({ value: relativeDatesDefinition })
|
|
412
|
-
const model = new FormModel(relativeDatesDefinition, { basePath: 'test' })
|
|
413
|
-
|
|
414
|
-
const allConditionsKeys = Object.keys(model.conditions)
|
|
415
|
-
expect(allConditionsKeys).toHaveLength(8)
|
|
416
|
-
|
|
417
|
-
// Only test releative date conditions
|
|
418
|
-
const relativeConditionsKeys = allConditionsKeys.slice(4)
|
|
419
|
-
expect(relativeConditionsKeys).toHaveLength(4)
|
|
420
|
-
|
|
421
|
-
const formState = {
|
|
422
|
-
ybMHIv: '2023-06-18'
|
|
423
|
-
}
|
|
424
|
-
|
|
425
|
-
const expectedResultsDayBefore = [true, false, false, true]
|
|
426
|
-
|
|
427
|
-
const expectedResultsDayOf = [true, true, false, false]
|
|
428
|
-
|
|
429
|
-
const expectedResultsDayAfter = [false, true, true, false]
|
|
430
|
-
|
|
431
|
-
// Only relative date conditions
|
|
432
|
-
for (let i = 0; i < relativeConditionsKeys.length; i++) {
|
|
433
|
-
const condition = model.conditions[relativeConditionsKeys[i]]
|
|
434
|
-
jest.mocked(todayAsDateOnly).mockReturnValue(new Date(2025, 5, 19))
|
|
435
|
-
const conditionExec = model.makeCondition(
|
|
436
|
-
// @ts-expect-error - type doesnt need to match for this test
|
|
437
|
-
condition
|
|
438
|
-
)
|
|
439
|
-
formState.ybMHIv = '2023-06-18'
|
|
440
|
-
expect(conditionExec.fn(formState)).toBe(expectedResultsDayBefore[i])
|
|
441
|
-
|
|
442
|
-
formState.ybMHIv = '2023-06-19'
|
|
443
|
-
expect(conditionExec.fn(formState)).toBe(expectedResultsDayOf[i])
|
|
444
|
-
|
|
445
|
-
formState.ybMHIv = '2023-06-20'
|
|
446
|
-
expect(conditionExec.fn(formState)).toBe(expectedResultsDayAfter[i])
|
|
447
|
-
}
|
|
448
|
-
})
|
|
449
|
-
})
|
|
450
|
-
})
|
|
451
|
-
|
|
452
|
-
describe('FormModel - Joined Conditions', () => {
|
|
453
|
-
it('should handle joined conditions correctly', () => {
|
|
454
|
-
formDefinitionV2Schema.validate = jest
|
|
455
|
-
.fn()
|
|
456
|
-
.mockReturnValue({ value: joinedConditionsDefinition })
|
|
457
|
-
|
|
458
|
-
const model = new FormModel(joinedConditionsDefinition, {
|
|
459
|
-
basePath: 'test'
|
|
460
|
-
})
|
|
461
|
-
|
|
462
|
-
expect(model.conditions).toBeDefined()
|
|
463
|
-
expect(Object.keys(model.conditions)).toHaveLength(3)
|
|
464
|
-
|
|
465
|
-
const joinedCondition =
|
|
466
|
-
model.conditions['db43c6bc-9ce6-478b-8345-4fff5eff2ba3']
|
|
467
|
-
expect(joinedCondition).toBeDefined()
|
|
468
|
-
expect(joinedCondition?.displayName).toBe('is Bob AND over 18')
|
|
469
|
-
|
|
470
|
-
const stateAllTrue = { userName: 'Bob', isOverEighteen: true }
|
|
471
|
-
expect(joinedCondition?.fn(stateAllTrue)).toBe(true)
|
|
472
|
-
|
|
473
|
-
const statePartialTrue = { userName: 'Alice', isOverEighteen: true }
|
|
474
|
-
expect(joinedCondition?.fn(statePartialTrue)).toBe(false)
|
|
475
|
-
|
|
476
|
-
const stateFalse = { userName: 'Alice', isOverEighteen: false }
|
|
477
|
-
expect(joinedCondition?.fn(stateFalse)).toBe(false)
|
|
478
|
-
})
|
|
479
|
-
|
|
480
|
-
it('should evaluate page conditions using joined conditions', () => {
|
|
481
|
-
formDefinitionV2Schema.validate = jest
|
|
482
|
-
.fn()
|
|
483
|
-
.mockReturnValue({ value: joinedConditionsDefinition })
|
|
484
|
-
|
|
485
|
-
const model = new FormModel(joinedConditionsDefinition, {
|
|
486
|
-
basePath: 'test'
|
|
487
|
-
})
|
|
488
|
-
|
|
489
|
-
const joinedConditionPage = model.pages.find(
|
|
490
|
-
(page) => page.path === '/simple-and-page'
|
|
491
|
-
)
|
|
492
|
-
|
|
493
|
-
expect(joinedConditionPage?.condition).toBeDefined()
|
|
494
|
-
|
|
495
|
-
const trueState = { userName: 'Bob', isOverEighteen: true }
|
|
496
|
-
expect(joinedConditionPage?.condition?.fn(trueState)).toBe(true)
|
|
497
|
-
|
|
498
|
-
const falseState = { userName: 'Bob', isOverEighteen: false }
|
|
499
|
-
expect(joinedConditionPage?.condition?.fn(falseState)).toBe(false)
|
|
500
|
-
})
|
|
501
|
-
|
|
502
|
-
it('should handle V1 joined conditions without aliases', () => {
|
|
503
|
-
formDefinitionV2Schema.validate = jest
|
|
504
|
-
.fn()
|
|
505
|
-
.mockReturnValue({ value: definition })
|
|
506
|
-
|
|
507
|
-
const model = new FormModel(definition, {
|
|
508
|
-
basePath: 'test'
|
|
509
|
-
})
|
|
510
|
-
|
|
511
|
-
expect(model.conditions).toBeDefined()
|
|
512
|
-
expect(Object.keys(model.conditions)).toHaveLength(1)
|
|
513
|
-
|
|
514
|
-
const joinedCondition = model.conditions.ZCXeMz
|
|
515
|
-
expect(joinedCondition).toBeDefined()
|
|
516
|
-
expect(joinedCondition?.displayName).toBe('test')
|
|
517
|
-
|
|
518
|
-
const testState = { NIJphU: "ap'ostrophe's", iraEpG: "shouldn't've" }
|
|
519
|
-
expect(joinedCondition?.fn(testState)).toBe(true)
|
|
520
|
-
|
|
521
|
-
const testStateFalse = { NIJphU: 'other', iraEpG: "shouldn't've" }
|
|
522
|
-
expect(joinedCondition?.fn(testStateFalse)).toBe(false)
|
|
523
|
-
|
|
524
|
-
const context = model.toConditionContext(testState, model.conditions)
|
|
525
|
-
|
|
526
|
-
expect(context).not.toHaveProperty('cond_ZCXeMz')
|
|
527
|
-
|
|
528
|
-
expect(context).toHaveProperty('ZCXeMz')
|
|
529
|
-
|
|
530
|
-
expect(context).toHaveProperty('NIJphU', "ap'ostrophe's")
|
|
531
|
-
expect(context).toHaveProperty('iraEpG', "shouldn't've")
|
|
532
|
-
})
|
|
533
|
-
|
|
534
|
-
it('should use schema version to determine condition aliases', () => {
|
|
535
|
-
const v1Definition = { ...definition, schema: SchemaVersion.V1 }
|
|
536
|
-
formDefinitionV2Schema.validate = jest
|
|
537
|
-
.fn()
|
|
538
|
-
.mockReturnValue({ value: v1Definition })
|
|
539
|
-
|
|
540
|
-
const v1Model = new FormModel(v1Definition, { basePath: 'test' })
|
|
541
|
-
expect(v1Model.schemaVersion).toBe(SchemaVersion.V1)
|
|
542
|
-
|
|
543
|
-
const v1TestState = { NIJphU: "ap'ostrophe's", iraEpG: "shouldn't've" }
|
|
544
|
-
const v1Context = v1Model.toConditionContext(
|
|
545
|
-
v1TestState,
|
|
546
|
-
v1Model.conditions
|
|
547
|
-
)
|
|
548
|
-
|
|
549
|
-
expect(v1Context).toHaveProperty('ZCXeMz')
|
|
550
|
-
expect(v1Context).not.toHaveProperty('cond_ZCXeMz')
|
|
551
|
-
|
|
552
|
-
formDefinitionV2Schema.validate = jest
|
|
553
|
-
.fn()
|
|
554
|
-
.mockReturnValue({ value: joinedConditionsDefinition })
|
|
555
|
-
|
|
556
|
-
const v2Model = new FormModel(joinedConditionsDefinition, {
|
|
557
|
-
basePath: 'test'
|
|
558
|
-
})
|
|
559
|
-
expect(v2Model.schemaVersion).toBe(SchemaVersion.V2)
|
|
560
|
-
|
|
561
|
-
const v2TestState = { userName: 'Bob', isOverEighteen: true }
|
|
562
|
-
const v2Context = v2Model.toConditionContext(
|
|
563
|
-
v2TestState,
|
|
564
|
-
v2Model.conditions
|
|
565
|
-
)
|
|
566
|
-
|
|
567
|
-
expect(v2Context).toHaveProperty('cond_d15aff7a622440a28e5f51a5af2f7910')
|
|
568
|
-
expect(v2Context).toHaveProperty('cond_d1f9fcc7f09847e79d314f5ee57ba985')
|
|
569
|
-
expect(v2Context).toHaveProperty('cond_db43c6bc9ce6478b83454fff5eff2ba3')
|
|
570
|
-
|
|
571
|
-
expect(v2Context).not.toHaveProperty('d15aff7a-6224-40a2-8e5f-51a5af2f7910')
|
|
572
|
-
expect(v2Context).not.toHaveProperty('d1f9fcc7-f098-47e7-9d31-4f5ee57ba985')
|
|
573
|
-
expect(v2Context).not.toHaveProperty('db43c6bc-9ce6-478b-8345-4fff5eff2ba3')
|
|
574
|
-
})
|
|
575
|
-
|
|
576
|
-
describe('generateConditionAlias', () => {
|
|
577
|
-
it('should generate valid JavaScript identifiers from condition IDs', () => {
|
|
578
|
-
formDefinitionV2Schema.validate = jest
|
|
579
|
-
.fn()
|
|
580
|
-
.mockReturnValue({ value: joinedConditionsDefinition })
|
|
581
|
-
|
|
582
|
-
const model = new FormModel(joinedConditionsDefinition, {
|
|
583
|
-
basePath: 'test'
|
|
584
|
-
})
|
|
585
|
-
|
|
586
|
-
const evaluationState = { userName: 'Bob', isOverEighteen: true }
|
|
587
|
-
|
|
588
|
-
const context = model.toConditionContext(
|
|
589
|
-
evaluationState,
|
|
590
|
-
model.conditions
|
|
591
|
-
)
|
|
592
|
-
|
|
593
|
-
expect(context).toHaveProperty('cond_d15aff7a622440a28e5f51a5af2f7910')
|
|
594
|
-
expect(context).toHaveProperty('cond_d1f9fcc7f09847e79d314f5ee57ba985')
|
|
595
|
-
expect(context).toHaveProperty('cond_db43c6bc9ce6478b83454fff5eff2ba3')
|
|
596
|
-
})
|
|
597
|
-
})
|
|
598
|
-
|
|
599
|
-
describe('toConditionExpression', () => {
|
|
600
|
-
it('should handle V2 engine with display name replacement', () => {
|
|
601
|
-
formDefinitionV2Schema.validate = jest
|
|
602
|
-
.fn()
|
|
603
|
-
.mockReturnValue({ value: joinedConditionsDefinition })
|
|
604
|
-
|
|
605
|
-
const model = new FormModel(joinedConditionsDefinition, {
|
|
606
|
-
basePath: 'test'
|
|
607
|
-
})
|
|
608
|
-
|
|
609
|
-
const joinedCondition =
|
|
610
|
-
model.conditions['db43c6bc-9ce6-478b-8345-4fff5eff2ba3']
|
|
611
|
-
expect(joinedCondition).toBeDefined()
|
|
612
|
-
|
|
613
|
-
const stateTrue = { userName: 'Bob', isOverEighteen: true }
|
|
614
|
-
const stateFalse = { userName: 'Alice', isOverEighteen: false }
|
|
615
|
-
|
|
616
|
-
expect(joinedCondition?.fn(stateTrue)).toBe(true)
|
|
617
|
-
expect(joinedCondition?.fn(stateFalse)).toBe(false)
|
|
618
|
-
|
|
619
|
-
expect(joinedCondition?.expr).toBeDefined()
|
|
620
|
-
expect(typeof joinedCondition?.expr.evaluate).toBe('function')
|
|
621
|
-
})
|
|
622
|
-
|
|
623
|
-
it('should handle V1 engine without display name replacement', () => {
|
|
624
|
-
const model = new FormModel(definition, { basePath: 'test' })
|
|
625
|
-
|
|
626
|
-
const condition = model.conditions.ZCXeMz
|
|
627
|
-
expect(condition).toBeDefined()
|
|
628
|
-
expect(condition?.expr).toBeDefined()
|
|
629
|
-
|
|
630
|
-
const testState = { NIJphU: "ap'ostrophe's", iraEpG: "shouldn't've" }
|
|
631
|
-
expect(condition?.fn(testState)).toBe(true)
|
|
632
|
-
})
|
|
633
|
-
|
|
634
|
-
it('should handle conditions without display names', () => {
|
|
635
|
-
const definitionWithoutDisplayName = {
|
|
636
|
-
...joinedConditionsDefinition,
|
|
637
|
-
conditions: joinedConditionsDefinition.conditions.map((condition) => ({
|
|
638
|
-
...condition,
|
|
639
|
-
displayName: condition.displayName || 'fallback'
|
|
640
|
-
}))
|
|
641
|
-
}
|
|
642
|
-
|
|
643
|
-
formDefinitionV2Schema.validate = jest
|
|
644
|
-
.fn()
|
|
645
|
-
.mockReturnValue({ value: definitionWithoutDisplayName })
|
|
646
|
-
|
|
647
|
-
const model = new FormModel(definitionWithoutDisplayName, {
|
|
648
|
-
basePath: 'test'
|
|
649
|
-
})
|
|
650
|
-
|
|
651
|
-
expect(model.conditions).toBeDefined()
|
|
652
|
-
expect(Object.keys(model.conditions)).toHaveLength(3)
|
|
653
|
-
})
|
|
654
|
-
})
|
|
655
|
-
|
|
656
|
-
describe('getSection', () => {
|
|
657
|
-
it('should look up section by name for V1 schema', () => {
|
|
658
|
-
const v1Definition = {
|
|
659
|
-
...definition,
|
|
660
|
-
sections: [
|
|
661
|
-
{ name: 'personal', title: 'Personal details' },
|
|
662
|
-
{ name: 'contact', title: 'Contact details' }
|
|
663
|
-
]
|
|
664
|
-
}
|
|
665
|
-
|
|
666
|
-
const model = new FormModel(v1Definition, { basePath: 'test' })
|
|
667
|
-
|
|
668
|
-
expect(model.getSection('personal')).toEqual(
|
|
669
|
-
expect.objectContaining({
|
|
670
|
-
name: 'personal',
|
|
671
|
-
title: 'Personal details'
|
|
672
|
-
})
|
|
673
|
-
)
|
|
674
|
-
expect(model.getSection('contact')).toEqual(
|
|
675
|
-
expect.objectContaining({
|
|
676
|
-
name: 'contact',
|
|
677
|
-
title: 'Contact details'
|
|
678
|
-
})
|
|
679
|
-
)
|
|
680
|
-
expect(model.getSection('nonexistent')).toBeUndefined()
|
|
681
|
-
})
|
|
682
|
-
|
|
683
|
-
it('should look up section by ID for V2 schema', () => {
|
|
684
|
-
const v2Definition = {
|
|
685
|
-
...definitionV2,
|
|
686
|
-
sections: [
|
|
687
|
-
{
|
|
688
|
-
id: 'a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d',
|
|
689
|
-
name: 'personal',
|
|
690
|
-
title: 'Personal details'
|
|
691
|
-
},
|
|
692
|
-
{
|
|
693
|
-
id: 'b2c3d4e5-6f7a-8b9c-0d1e-2f3a4b5c6d7e',
|
|
694
|
-
name: 'contact',
|
|
695
|
-
title: 'Contact details'
|
|
696
|
-
}
|
|
697
|
-
]
|
|
698
|
-
}
|
|
699
|
-
|
|
700
|
-
formDefinitionV2Schema.validate = jest
|
|
701
|
-
.fn()
|
|
702
|
-
.mockReturnValue({ value: v2Definition })
|
|
703
|
-
|
|
704
|
-
const model = new FormModel(v2Definition, { basePath: 'test' })
|
|
705
|
-
|
|
706
|
-
expect(model.getSection('a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d')).toEqual(
|
|
707
|
-
expect.objectContaining({
|
|
708
|
-
id: 'a1b2c3d4-5e6f-7a8b-9c0d-1e2f3a4b5c6d',
|
|
709
|
-
name: 'personal',
|
|
710
|
-
title: 'Personal details'
|
|
711
|
-
})
|
|
712
|
-
)
|
|
713
|
-
expect(model.getSection('b2c3d4e5-6f7a-8b9c-0d1e-2f3a4b5c6d7e')).toEqual(
|
|
714
|
-
expect.objectContaining({
|
|
715
|
-
id: 'b2c3d4e5-6f7a-8b9c-0d1e-2f3a4b5c6d7e',
|
|
716
|
-
name: 'contact',
|
|
717
|
-
title: 'Contact details'
|
|
718
|
-
})
|
|
719
|
-
)
|
|
720
|
-
// V2 should not find by name
|
|
721
|
-
expect(model.getSection('personal')).toBeUndefined()
|
|
722
|
-
expect(model.getSection('nonexistent')).toBeUndefined()
|
|
723
|
-
})
|
|
724
|
-
})
|
|
725
|
-
})
|