@defra-fish/gafl-webapp-service 1.57.0-rc.8 → 1.57.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.57.0-rc.8",
+  "version": "1.57.0",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.57.0-rc.8",
-    "@defra-fish/connectors-lib": "1.57.0-rc.8",
+    "@defra-fish/business-rules-lib": "1.57.0",
+    "@defra-fish/connectors-lib": "1.57.0",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -80,5 +80,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "0bec5c50b0ee09c450d0016cf7b5225f00b1556c"
+  "gitHead": "518fbfa16b2b97d78e8d924122344b1f444edfde"
 }

package/src/locales/cy.json

@@ -282,7 +282,7 @@
   "dob_error_non_numeric": "Rhowch rifau yn unig",
   "dob_error_year_min": "Mae’r dyddiad geni yn rhy bell yn ôl",
   "dob_error_year_max": "Mae'n rhaid i’r dyddiad geni fod yn y gorffennol",
-  "dob_error": "Rhowch y dyddiad geni",
+  "dob_error": "Rhowch dyddiad geni",
   "dob_month": "Mis",
   "dob_privacy_link_prefix": "Os nad ydych yn darparu dyddiad geni cywir, gallai hynny achosi oedi wrth adnewyddu trwydded, neu olygu nad yw’r drwydded yn ddilys. Darllenwch am ",
   "dob_privacy_link": "sut yr ydym ni'n defnyddio data personol (yn agor ar dudalen newydd)",

package/src/pages/licence-details/licence-to-start/licence-to-start.njk

@@ -38,6 +38,9 @@
       'date-range': {
         'date.min': { ref: '#licence-start-date-day', text: mssgs.licence_start_error_within + data.advancedPurchaseMaxDays + mssgs.licence_start_days },
         'date.max': { ref: '#licence-start-date-day', text: mssgs.licence_start_error_within + data.advancedPurchaseMaxDays + mssgs.licence_start_days }
+      },
+      'licence-to-start': {
+        'any.required': { ref: '#licence-to-start', text: mssgs.licence_start_error_choose_when }
       }
     }
 %}

package/src/pages/renewals/identify/__tests__/route.spec.js

@@ -66,6 +66,23 @@ describe('getData', () => {
     await getData(getMockRequest(undefined, pageGet))
     expect(pageGet).toHaveBeenCalledWith(IDENTIFY.page)
   })
+
+  it.each([
+    ['full-date', 'object.missing'],
+    ['day', 'any.required']
+  ])('should add error details ({%s: %s}) to the page data', async (errorKey, errorValue) => {
+    const pageGet = async () => ({
+      error: { [errorKey]: errorValue }
+    })
+
+    const result = await getData(getMockRequest(undefined, pageGet))
+    expect(result.error).toEqual({ errorKey, errorValue })
+  })
+
+  it('omits error if there is no error', async () => {
+    const result = await getData(getMockRequest())
+    expect(result.error).toBeUndefined()
+  })
 })
 
 describe('default', () => {

package/src/pages/renewals/identify/identify.njk

@@ -141,7 +141,7 @@
                             classes: "govuk-!-font-weight-bold govuk-label"
                       }
                   },
-                  errorMessage: { text: mssgs.enter_dob } if error['date-of-birth'],
+                  errorMessage: { text: errorMap[data.error.errorKey][data.error.errorValue].text } if data.error,
                   hint: {
                     text: mssgs.enter_dob_example
                   }

package/src/pages/renewals/identify/route.js

@@ -21,13 +21,21 @@ export const getData = async request => {
     }
   }
 
-  return {
+  const pageData = {
     referenceNumber: permission.referenceNumber,
     uri: {
       new: addLanguageCodeToUri(request, NEW_TRANSACTION.uri)
     },
     ...getDateErrorFlags(page?.error)
   }
+
+  if (page?.error) {
+    const [errorKey] = Object.keys(page.error)
+    const errorValue = page.error[errorKey]
+    pageData.error = { errorKey, errorValue }
+  }
+
+  return pageData
 }
 
 export const validator = payload => {