@defra/forms-engine-plugin 4.9.2 → 4.11.0

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.
Files changed (69) hide show
  1. package/.public/javascripts/shared.min.js +1 -1
  2. package/.public/javascripts/shared.min.js.map +1 -1
  3. package/.server/client/javascripts/geospatial-map.js +34 -3
  4. package/.server/client/javascripts/geospatial-map.js.map +1 -1
  5. package/.server/client/javascripts/map.d.ts +0 -6
  6. package/.server/client/javascripts/map.js +1 -14
  7. package/.server/client/javascripts/map.js.map +1 -1
  8. package/.server/index.js +1 -2
  9. package/.server/index.js.map +1 -1
  10. package/.server/server/common/helpers/logging/logger.d.ts +1 -1
  11. package/.server/server/common/helpers/logging/logger.js +5 -1
  12. package/.server/server/common/helpers/logging/logger.js.map +1 -1
  13. package/.server/server/common/helpers/redis-client.js +1 -2
  14. package/.server/server/common/helpers/redis-client.js.map +1 -1
  15. package/.server/server/plugins/engine/components/GeospatialField.d.ts +1 -0
  16. package/.server/server/plugins/engine/components/GeospatialField.js +6 -2
  17. package/.server/server/plugins/engine/components/GeospatialField.js.map +1 -1
  18. package/.server/server/plugins/engine/components/PaymentField.js +1 -2
  19. package/.server/server/plugins/engine/components/PaymentField.js.map +1 -1
  20. package/.server/server/plugins/engine/components/helpers/geospatial.d.ts +2 -1
  21. package/.server/server/plugins/engine/components/helpers/geospatial.js +32 -1
  22. package/.server/server/plugins/engine/components/helpers/geospatial.js.map +1 -1
  23. package/.server/server/plugins/engine/components/helpers/geospatial.test.js +21 -1
  24. package/.server/server/plugins/engine/components/helpers/geospatial.test.js.map +1 -1
  25. package/.server/server/plugins/engine/helpers.js +1 -2
  26. package/.server/server/plugins/engine/helpers.js.map +1 -1
  27. package/.server/server/plugins/engine/models/FormModel.js +1 -2
  28. package/.server/server/plugins/engine/models/FormModel.js.map +1 -1
  29. package/.server/server/plugins/engine/options.js +1 -2
  30. package/.server/server/plugins/engine/options.js.map +1 -1
  31. package/.server/server/plugins/engine/routes/payment.js +1 -2
  32. package/.server/server/plugins/engine/routes/payment.js.map +1 -1
  33. package/.server/server/plugins/engine/views/components/geospatialfield.html +1 -1
  34. package/.server/server/plugins/map/routes/index.d.ts +9 -1
  35. package/.server/server/plugins/map/routes/index.js +51 -2
  36. package/.server/server/plugins/map/routes/index.js.map +1 -1
  37. package/.server/server/plugins/map/routes/vts/countries.geojson +39285 -0
  38. package/.server/server/plugins/map/service.js +1 -2
  39. package/.server/server/plugins/map/service.js.map +1 -1
  40. package/.server/server/plugins/map/types.d.ts +23 -1
  41. package/.server/server/plugins/map/types.js +14 -1
  42. package/.server/server/plugins/map/types.js.map +1 -1
  43. package/.server/server/plugins/nunjucks/context.js +1 -2
  44. package/.server/server/plugins/nunjucks/context.js.map +1 -1
  45. package/.server/server/plugins/payment/service.js +1 -2
  46. package/.server/server/plugins/payment/service.js.map +1 -1
  47. package/.server/server/plugins/postcode-lookup/service.js +1 -2
  48. package/.server/server/plugins/postcode-lookup/service.js.map +1 -1
  49. package/package.json +10 -8
  50. package/src/client/javascripts/geospatial-map.js +39 -3
  51. package/src/client/javascripts/map.js +1 -14
  52. package/src/index.ts +1 -3
  53. package/src/server/common/helpers/logging/logger.ts +5 -1
  54. package/src/server/common/helpers/redis-client.js +1 -3
  55. package/src/server/plugins/engine/components/GeospatialField.ts +8 -2
  56. package/src/server/plugins/engine/components/PaymentField.ts +1 -3
  57. package/src/server/plugins/engine/components/helpers/geospatial.ts +48 -2
  58. package/src/server/plugins/engine/helpers.ts +1 -3
  59. package/src/server/plugins/engine/models/FormModel.ts +1 -3
  60. package/src/server/plugins/engine/options.js +1 -3
  61. package/src/server/plugins/engine/routes/payment.js +1 -3
  62. package/src/server/plugins/engine/views/components/geospatialfield.html +1 -1
  63. package/src/server/plugins/map/routes/index.js +58 -2
  64. package/src/server/plugins/map/routes/vts/countries.geojson +39285 -0
  65. package/src/server/plugins/map/service.js +1 -3
  66. package/src/server/plugins/map/types.js +14 -1
  67. package/src/server/plugins/nunjucks/context.js +1 -3
  68. package/src/server/plugins/payment/service.js +1 -3
  69. package/src/server/plugins/postcode-lookup/service.js +1 -3
@@ -1,11 +1,9 @@
1
1
  import { getErrorMessage } from '@defra/forms-model'
2
2
  import Boom from '@hapi/boom'
3
3
 
4
- import { createLogger } from '../../common/helpers/logging/logger.js'
4
+ import { logger } from '../../common/helpers/logging/logger.js'
5
5
  import { getJson } from '../../services/httpService.js'
6
6
 
7
- const logger = createLogger()
8
-
9
7
  /**
10
8
  * Returns an empty result set
11
9
  */
@@ -28,6 +28,13 @@
28
28
  * @property {number} northing - the Northing point
29
29
  */
30
30
 
31
+ /**
32
+ * Geospatial countries query params
33
+ * @typedef {object} GeospatialCountriesQuery
34
+ * @property {string} omit - the country to omit
35
+ * @property {string} only - the country to include
36
+ */
37
+
31
38
  /**
32
39
  * Map geocode get request
33
40
  * @typedef {object} MapProxyGetRequestRefs
@@ -41,11 +48,17 @@
41
48
  */
42
49
 
43
50
  /**
44
- * Map reverst geocode get request
51
+ * Map reverse geocode get request
45
52
  * @typedef {object} MapReverseGeocodeGetRequestRefs
46
53
  * @property {MapReverseGeocodeQuery} Query - Request query
47
54
  */
48
55
 
56
+ /**
57
+ * Map countries geojson get request
58
+ * @typedef {object} GeospatialCountriesGetRequestRefs
59
+ * @property {GeospatialCountriesQuery} Query - Request query
60
+ */
61
+
49
62
  /**
50
63
  * @typedef {MapProxyGetRequestRefs} MapProxyRequestRefs
51
64
  * @typedef {MapGeocodeGetRequestRefs} MapGeocodeRequestRefs
@@ -5,14 +5,12 @@ import Boom from '@hapi/boom'
5
5
  import { StatusCodes } from 'http-status-codes'
6
6
 
7
7
  import { config } from '../../../config/index.js'
8
- import { createLogger } from '../../common/helpers/logging/logger.js'
8
+ import { logger } from '../../common/helpers/logging/logger.js'
9
9
  import {
10
10
  checkFormStatus,
11
11
  encodeUrl
12
12
  } from '../engine/helpers.js'
13
13
 
14
- const logger = createLogger()
15
-
16
14
  /** @type {Record<string, string> | undefined} */
17
15
  let webpackManifest
18
16
 
@@ -1,6 +1,6 @@
1
1
  import { StatusCodes } from 'http-status-codes'
2
2
 
3
- import { createLogger } from '../../common/helpers/logging/logger.js'
3
+ import { logger } from '../../common/helpers/logging/logger.js'
4
4
  import {
5
5
  buildPaymentInfo,
6
6
  convertPenceToPounds
@@ -10,8 +10,6 @@ import { get, post, postJson } from '../../services/httpService.js'
10
10
  const PAYMENT_BASE_URL = 'https://publicapi.payments.service.gov.uk'
11
11
  const PAYMENT_ENDPOINT = '/v1/payments'
12
12
 
13
- const logger = createLogger()
14
-
15
13
  /**
16
14
  * @param {string} apiKey
17
15
  * @returns {{ Authorization: string }}
@@ -1,11 +1,9 @@
1
1
  import { getErrorMessage } from '@defra/forms-model'
2
2
  import Boom from '@hapi/boom'
3
3
 
4
- import { createLogger } from '../../common/helpers/logging/logger.js'
4
+ import { logger } from '../../common/helpers/logging/logger.js'
5
5
  import { getJson } from '../../services/httpService.js'
6
6
 
7
- const logger = createLogger()
8
-
9
7
  /**
10
8
  * Returns an empty result set
11
9
  */