@defra-fish/gafl-webapp-service 1.61.0-rc.14 → 1.61.0-rc.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.61.0-rc.14",
+  "version": "1.61.0-rc.16",
   "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.61.0-rc.14",
-    "@defra-fish/connectors-lib": "1.61.0-rc.14",
+    "@defra-fish/business-rules-lib": "1.61.0-rc.16",
+    "@defra-fish/connectors-lib": "1.61.0-rc.16",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "2b857c4b1b039cc48fbba5a870cd5c8c587f812d"
+  "gitHead": "a4d24d55c8279ed8fad6436a48312f8542adfada"
 }

package/src/handlers/authentication-handler.js

@@ -43,7 +43,7 @@ export default async (request, h) => {
 
   if (!authenticationResult) {
     payload.referenceNumber = referenceNumber
-    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload, error: { referenceNumber: 'string.invalid' } })
+    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload })
     await request.cache().helpers.status.setCurrentPermission({ referenceNumber, authentication: { authorized: false } })
     return h.redirectWithLanguageCode(LICENCE_NOT_FOUND.uri)
   } else {

package/src/locales/cy.json

@@ -418,8 +418,7 @@
   "licence_length_title_other": "Am ba hyd y maent am gael y drwydded?",
   "licence_length_title_you": "Am ba hyd yr hoffech chi gael y drwydded?",
   "licence_num": "Rhif trwydded",
-  "licence_not_found_title": "Methu dod o hyd i drwydded ",
-  "licence_not_found_header": "Ni allwn ddod o hyd i drwydded sy’n cyfateb â'r manylion a roddwyd",
+  "licence_not_found_title": "Ni allwn ddod o hyd i drwydded sy’n cyfateb â'r manylion a roddwyd",
   "licence_not_found_body_1": "Gwiriwch eich bod wedi mewnbynnu’r manylion yn gywir - ",
   "licence_not_found_body_previous_page": "ewch yn ôl i’r dudalen flaenorol",
   "licence_not_found_body_2": "Os byddwch yn parhau i weld y dudalen hon gallwch ofyn am gymorth drwy e-bostio ",
@@ -472,7 +471,8 @@
   "licence_start_title_other": "Dyddiad dechrau’r drwydded?",
   "licence_start_title_you": "Pryd yr hoffech i'ch trwydded ddechrau?",
   "licence_start_today_or_within": "Gall y drwydded ddechrau heddiw neu unrhyw ddiwrnod o fewn y ",
-  "licence_summary_blue_badge_num": "Rhif Bathodyn Glas",
+  "licence_summary_blue_badge": "Bathodyn Glas",
+  "licence_summary_blue_badge_eligible": "Cymwys",
   "licence_summary_change": "Newid",
   "licence_summary_disability_concession": "Consesiwn anabledd",
   "licence_summary_dob": "Dyddiad geni",

package/src/locales/en.json

@@ -417,8 +417,7 @@
   "licence_length_one_day": "1 day licences are valid for 24 hours from the start time that you select.",
   "licence_length_title_other": "How long do they want the licence for?",
   "licence_length_title_you": "How long do you want your licence for?",
-  "licence_not_found_title": "Licence cannot be found ",
-  "licence_not_found_header": "We cannot find a licence matching the details you provided",
+  "licence_not_found_title": "We cannot find a licence matching the details you provided",
   "licence_not_found_body_1": "Check you have entered your details correctly - ",
   "licence_not_found_body_previous_page": "go back to the previous page",
   "licence_not_found_body_2": "If you keep seeing this page you can get help by emailing ",
@@ -472,7 +471,8 @@
   "licence_start_title_other": "When should the licence start?",
   "licence_start_title_you": "When would you like your licence to start?",
   "licence_start_today_or_within": "The licence can start today or any day within the next ",
-  "licence_summary_blue_badge_num": "Blue Badge number",
+  "licence_summary_blue_badge": "Blue Badge",
+  "licence_summary_blue_badge_eligible": "Eligible",
   "licence_summary_change": "Change",
   "licence_summary_disability_concession": "Disability concession",
   "licence_summary_dob": "Date of birth",

package/src/pages/concessions/disability/__tests__/disability-concession.spec.js

@@ -31,15 +31,6 @@ describe('The disability concession page', () => {
     expect(response.headers.location).toHaveValidPathFor(DISABILITY_CONCESSION.uri)
   })
 
-  it('redirects back to itself on posting blue badge with an empty blue number', async () => {
-    const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': ''
-    })
-    expect(response.statusCode).toBe(302)
-    expect(response.headers.location).toHaveValidPathFor(DISABILITY_CONCESSION.uri)
-  })
-
   it('on setting a correct ni number it redirects to the licence-to-start page', async () => {
     const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
       'disability-concession': disabilityConcessionTypes.pipDla,
@@ -62,32 +53,28 @@ describe('The disability concession page', () => {
     })
   })
 
-  it('on setting a correct blue badge number redirects to the licence-to-start page', async () => {
+  it('on selecting blue badge or meets criteria of bb, it causes a redirect to the licence-to-start page', async () => {
     const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     expect(response.statusCode).toBe(302)
     expect(response.headers.location).toHaveValidPathFor(LICENCE_TO_START.uri)
   })
 
-  it('on setting a correct blue badge number adds a disabled concession to the cache', async () => {
+  it('on selecting blue badge or meets criteria of bb, it adds a disabled concession to the cache', async () => {
     await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     const { payload } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
     expect(concessionHelper.hasDisabled(JSON.parse(payload).permissions[0])).toBeTruthy()
     expect(JSON.parse(payload).permissions[0].concessions[0].proof).toEqual({
-      type: CONCESSION_PROOF.blueBadge,
-      referenceNumber: '1234'
+      type: CONCESSION_PROOF.blueBadge
     })
   })
 
   it('on setting a disability concession and changing to a 8 day licence and back, the concession is restored', async () => {
     await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     await injectWithCookies('POST', LICENCE_LENGTH.uri, { 'licence-length': '8D' })
     const { payload } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
@@ -96,8 +83,7 @@ describe('The disability concession page', () => {
     const { payload: payload2 } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
     expect(concessionHelper.hasDisabled(JSON.parse(payload2).permissions[0])).toBeTruthy()
     expect(JSON.parse(payload2).permissions[0].concessions[0].proof).toEqual({
-      type: CONCESSION_PROOF.blueBadge,
-      referenceNumber: '1234'
+      type: CONCESSION_PROOF.blueBadge
     })
   })
 

package/src/pages/concessions/disability/disability-concession.njk

@@ -14,10 +14,6 @@
         'ni-number': {
             'string.empty': { ref: '#ni-number', text: mssgs.disability_concession_error_ni_empty },
             'string.pattern.base': { ref: '#ni-number', text: mssgs.disability_concession_error_ni_pattern }
-        },
-        'blue-badge-number': {
-            'string.empty': { ref: '#blue-badge-number', text: mssgs.disability_concession_badge_error_msg },
-            'string.max': { ref: '#blue-badge-number', text: mssgs.disability_concession_badge_error_msg }
         }
     }
 %}
@@ -39,20 +35,6 @@
     }) }}
 {% endset -%}
 
-{% set blueBadge %}
-    {{ govukInput({
-      label: {
-        html: mssgs.disability_concession_badge_error_msg
-      },
-      id: "blue-badge-number",
-      name: "blue-badge-number",
-      value: payload['blue-badge-number'],
-      classes: "govuk-input--width-20",
-      attributes: { maxlength: 25 },
-      errorMessage: { text: mssgs.disability_concession_badge_error_msg } if error['blue-badge-number']
-    }) }}
-{% endset -%}
-
 {% block pageContent %}
     {% if not data.hasJunior and not data.hasSenior %}
         <p class="govuk-hint">{{ mssgs.disability_concession_12_month }}<a href="https://www.gov.uk/government/publications/blue-badge-can-i-get-one/can-i-get-a-blue-badge" class="govuk-link" target="_blank">{{ mssgs.disability_concession_12_month_link }}</a></p>
@@ -71,13 +53,12 @@
                {
                   text: mssgs['disability_concession_radio_badge_' ~ suffix],
                   value: data.blueBadge,
-                  checked: payload['disability-concession'] === data.blueBadge,
-                  conditional: { html: blueBadge }
+                  checked: payload['disability-concession'] === data.blueBadge
                },
                {
-                   text: mssgs['disability_concession_radio_no_' ~ suffix],
-                   value: data.no,
-                   checked: payload['disability-concession'] === data.no
+                  text: mssgs['disability_concession_radio_no_' ~ suffix],
+                  value: data.no,
+                  checked: payload['disability-concession'] === data.no
                }
            ],
            errorMessage: { text: mssgs.disability_concession_error_choose_option } if error['disability-concession']

package/src/pages/concessions/disability/route.js

@@ -14,11 +14,6 @@ const validator = Joi.object({
     is: disabilityConcessionTypes.pipDla,
     then: validation.contact.createNationalInsuranceNumberValidator(Joi).required(),
     otherwise: Joi.string().empty('')
-  }),
-  'blue-badge-number': Joi.alternatives().conditional('disability-concession', {
-    is: disabilityConcessionTypes.blueBadge,
-    then: Joi.string().max(25).required(),
-    otherwise: Joi.string().empty('')
   })
 }).options({ abortEarly: false, allowUnknown: true })
 

package/src/pages/concessions/disability/update-transaction.js

@@ -19,7 +19,7 @@ export default async request => {
     concessionHelper.addDisabled(permission, CONCESSION_PROOF.NI, payload['ni-number'])
     Object.assign(permission, { licenceLength: '12M', licenceStartTime: '0' })
   } else if (payload['disability-concession'] === disabilityConcessionTypes.blueBadge) {
-    concessionHelper.addDisabled(permission, CONCESSION_PROOF.blueBadge, payload['blue-badge-number'])
+    concessionHelper.addDisabled(permission, CONCESSION_PROOF.blueBadge)
     Object.assign(permission, { licenceLength: '12M', licenceStartTime: '0' })
   } else {
     concessionHelper.removeDisabled(permission)

package/src/pages/renewals/licence-not-found/licence-not-found.njk

@@ -6,7 +6,7 @@
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <h1 class="govuk-heading-l">{{ mssgs.licence_not_found_header }}</h1>
+    <h1 class="govuk-heading-l">{{ mssgs.licence_not_found_title }}</h1>
     <p class="govuk-body">
       {{ mssgs.licence_not_found_body_1 }}
       <a class="govuk-link" href="/buy/renew/identify">{{ mssgs.licence_not_found_body_previous_page }}</a>{{ mssgs.full_stop }}

package/src/pages/summary/licence-summary/__tests__/__snapshots__/route.spec.js.snap

@@ -599,7 +599,7 @@ Array [
       "text": "licence_summary_disability_concession",
     },
     "value": Object {
-      "html": "<span>licence_summary_none</span>",
+      "html": "licence_summary_none",
     },
   },
   Object {
@@ -930,15 +930,15 @@ Array [
           },
           "href": "/buy/disability-concession",
           "text": "contact_summary_change",
-          "visuallyHiddenText": "licence_summary_blue_badge_num",
+          "visuallyHiddenText": "licence_summary_blue_badge",
         },
       ],
     },
     "key": Object {
-      "text": "licence_summary_blue_badge_num",
+      "text": "licence_summary_blue_badge",
     },
     "value": Object {
-      "html": "AB1 CDE 0 1234F5678",
+      "html": "licence_summary_blue_badge_eligible",
     },
   },
   Object {
@@ -1172,7 +1172,7 @@ Array [
       "text": "licence_summary_disability_concession",
     },
     "value": Object {
-      "html": "<span>licence_summary_none</span>",
+      "html": "licence_summary_none",
     },
   },
   Object {

package/src/pages/summary/licence-summary/__tests__/route.spec.js

@@ -84,7 +84,8 @@ const getMockRequest = ({
       licence_type_12m: 'licence_type_12m',
       licence_type_8d: 'licence_type_8d',
       licence_type_1d: 'licence_type_1d',
-      licence_summary_blue_badge_num: 'licence_summary_blue_badge_num',
+      licence_summary_blue_badge: 'licence_summary_blue_badge',
+      licence_summary_blue_badge_eligible: 'licence_summary_blue_badge_eligible',
       licence_summary_ni_num: 'licence_summary_ni_num',
       licence_summary_disability_concession: 'licence_summary_disability_concession',
       free: 'gratis',
@@ -163,8 +164,7 @@ const getMockBlueBadgePermission = () => ({
     {
       type: mappingConstants.CONCESSION.DISABLED,
       proof: {
-        type: mappingConstants.CONCESSION_PROOF.blueBadge,
-        referenceNumber: 'AB1 CDE 0 1234F5678'
+        type: mappingConstants.CONCESSION_PROOF.blueBadge
       }
     }
   ]

package/src/pages/summary/licence-summary/route.js

@@ -70,7 +70,7 @@ class RowGenerator {
 
   _getConcessionText () {
     if (this.disabled?.proof?.type === CONCESSION_PROOF.blueBadge) {
-      return this.labels.licence_summary_blue_badge_num
+      return this.labels.licence_summary_blue_badge
     } else if (this.disabled?.proof?.type === CONCESSION_PROOF.NI) {
       return this.labels.licence_summary_ni_num
     }
@@ -93,7 +93,16 @@ class RowGenerator {
   }
 
   generateConcessionRow () {
-    const label = this.disabled ? this.disabled.proof.referenceNumber : `<span>${this.labels.licence_summary_none}</span>`
+    const label = (() => {
+      if (this.disabled?.proof?.type === CONCESSION_PROOF.blueBadge) {
+        return this.labels.licence_summary_blue_badge_eligible
+      }
+      if (this.disabled?.proof?.type === CONCESSION_PROOF.NI) {
+        return this.disabled.proof.referenceNumber
+      }
+      return this.labels.licence_summary_none
+    })()
+
     const concessionText = this._getConcessionText()
     return this._generateRow(concessionText, label, DISABILITY_CONCESSION.uri, concessionText, 'change-benefit-check')
   }