@defra-fish/gafl-webapp-service 1.55.0-rc.0 → 1.55.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.55.0-rc.0",
+  "version": "1.55.0-rc.2",
   "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.55.0-rc.0",
-    "@defra-fish/connectors-lib": "1.55.0-rc.0",
+    "@defra-fish/business-rules-lib": "1.55.0-rc.2",
+    "@defra-fish/connectors-lib": "1.55.0-rc.2",
     "@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": "4f9605d647641cf38a1a0c90381c383aaa723774"
+  "gitHead": "9c7ffaba65b8275be19d27f4b862d93b6e20d8a7"
 }

package/src/locales/cy.json

@@ -466,11 +466,11 @@
   "licence_type_payment_edge_case": "Mae’n rhaid i chi gwblhau eich taliad cyn 11:30pm ar 31 Mawrth 2024 i dalu’r pris a ddangosir",
   "licence_type_radio_salmon_hint": "Mae'n cynnwys brithyllod a physgod bras (hyd at 3 gwialen)",
   "licence_type_radio_salmon": "Eogiaid a brithyllod y môr",
-  "licence_type_radio_salmon_payment_summary": "eogiaid a brithyllod y môr",
+  "licence_type_radio_salmon_payment_summary": "Eogiaid a brithyllod y môr",
   "licence_type_radio_trout_three_rod": "Brithyllod a physgod bras (hyd at 3 gwialen)",
-  "licence_type_radio_trout_three_rod_payment_summary": "brithyllod a physgod bras (hyd at 3 gwialen)",
+  "licence_type_radio_trout_three_rod_payment_summary": "Brithyllod a physgod bras (hyd at 3 gwialen)",
   "licence_type_radio_trout_two_rod": "Brithyllod a physgod bras (hyd at 2 wialen)",
-  "licence_type_radio_trout_two_rod_payment_summary": "brithyllod a physgod bras (hyd at 2 wialen)",
+  "licence_type_radio_trout_two_rod_payment_summary": "Brithyllod a physgod bras (hyd at 2 wialen)",
   "licence_type_rules": "rheolau pysgota â gwialen (yn agor ar dudalen newydd)",
   "licence_type_salmon_acr_note_1": "Yn ôl y gyfraith, mae'n rhaid i chi roi gwybod am ",
   "licence_type_salmon_acr_note_2": " ffurflen daliadau (yn agor ar dudalen newydd)",

package/src/locales/en.json

@@ -466,11 +466,11 @@
   "licence_type_payment_edge_case": "You must complete payment before 11:30pm on 31 March 2024 to get the price shown",
   "licence_type_radio_salmon_hint": "Includes trout and coarse (up to 3 rods)",
   "licence_type_radio_salmon": "Salmon and sea trout",
-  "licence_type_radio_salmon_payment_summary": "salmon and sea trout",
+  "licence_type_radio_salmon_payment_summary": "Salmon and sea trout",
   "licence_type_radio_trout_three_rod": "Trout and coarse (up to 3 rods)",
-  "licence_type_radio_trout_three_rod_payment_summary": "trout and coarse (up to 3 rods)",
+  "licence_type_radio_trout_three_rod_payment_summary": "Trout and coarse (up to 3 rods)",
   "licence_type_radio_trout_two_rod": "Trout and coarse (up to 2 rods)",
-  "licence_type_radio_trout_two_rod_payment_summary": "trout and coarse (up to 2 rods)",
+  "licence_type_radio_trout_two_rod_payment_summary": "Trout and coarse (up to 2 rods)",
   "licence_type_rules": "rod fishing rules (opens in new tab)",
   "licence_type_salmon_acr_note_1": "Licence holders must by law ",
   "licence_type_salmon_acr_note_2": " report a catch return (opens in new tab)",

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

@@ -246,6 +246,127 @@ Array [
 ]
 `;
 
+exports[`licence-summary > route licence summary rows creates licence summary name rows for 1 year new three rod licence  1`] = `
+Array [
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-name",
+          },
+          "href": "/buy/name",
+          "text": "contact_summary_change",
+          "visuallyHiddenText": "licence_summary_name",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "licence_summary_name",
+    },
+    "value": Object {
+      "html": "Brenin Pysgotwr",
+    },
+  },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-birth-date",
+          },
+          "href": "/buy/date-of-birth",
+          "text": "contact_summary_change",
+          "visuallyHiddenText": "licence_summary_dob",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "licence_summary_dob",
+    },
+    "value": Object {
+      "html": "1st January 1946",
+    },
+  },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-licence-type",
+          },
+          "href": "/buy/licence-type",
+          "text": "contact_summary_change",
+          "visuallyHiddenText": "licence_summary_type",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "licence_summary_type",
+    },
+    "value": Object {
+      "html": "Special Canal Licence, Shopping Trollies and Old Wellies",
+    },
+  },
+  Object {
+    "key": Object {
+      "text": "licence_summary_length",
+    },
+    "value": Object {
+      "html": "licence_type_12m",
+    },
+  },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-licence-to-start",
+          },
+          "href": "/buy/start-kind",
+          "text": "contact_summary_change",
+          "visuallyHiddenText": "licence_summary_start_date",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "licence_summary_start_date",
+    },
+    "value": Object {
+      "html": "30licence_summary_minutes_after_payment",
+    },
+  },
+  Object {
+    "actions": Object {
+      "items": Array [
+        Object {
+          "attributes": Object {
+            "id": "change-benefit-check",
+          },
+          "href": "/buy/disability-concession",
+          "text": "contact_summary_change",
+          "visuallyHiddenText": "licence_summary_ni_num",
+        },
+      ],
+    },
+    "key": Object {
+      "text": "licence_summary_ni_num",
+    },
+    "value": Object {
+      "html": "AB 12 34 56 A",
+    },
+  },
+  Object {
+    "key": Object {
+      "text": "damage",
+    },
+    "value": Object {
+      "html": "#6",
+    },
+  },
+]
+`;
+
 exports[`licence-summary > route licence summary rows creates licence summary name rows for 1 year renewal 1`] = `
 Array [
   Object {

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

@@ -116,7 +116,7 @@ const getMockPermission = (licenseeOverrides = {}) => ({
   licenceToStart: 'after-payment',
   licenceStartDate: '2022-11-10',
   licenceType: 'Trout and coarse',
-  numberOfRods: '3',
+  numberOfRods: '2',
   permit: { cost: 6 }
 })
 
@@ -372,16 +372,17 @@ describe('licence-summary > route', () => {
 
   describe('licence summary rows', () => {
     it.each`
-      desc                         | currentPermission
-      ${'1 year renewal'}          | ${getMockPermission()}
-      ${'1 year new licence'}      | ${getMockNewPermission()}
-      ${'1 year senior renewal'}   | ${getMockSeniorPermission()}
-      ${'8 day licence'}           | ${{ ...getMockNewPermission(), licenceLength: '8D' }}
-      ${'1 day licence'}           | ${{ ...getMockNewPermission(), licenceLength: '1D' }}
-      ${'Junior licence'}          | ${getMockJuniorPermission()}
-      ${'Blue badge concession'}   | ${getMockBlueBadgePermission()}
-      ${'Continuing permission'}   | ${getMockContinuingPermission()}
-      ${'Another date permission'} | ${{ ...getMockPermission(), licenceToStart: 'another-date' }}
+      desc                               | currentPermission
+      ${'1 year renewal'}                | ${getMockPermission()}
+      ${'1 year new licence'}            | ${getMockNewPermission()}
+      ${'1 year senior renewal'}         | ${getMockSeniorPermission()}
+      ${'8 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '8D' }}
+      ${'1 day licence'}                 | ${{ ...getMockNewPermission(), licenceLength: '1D' }}
+      ${'Junior licence'}                | ${getMockJuniorPermission()}
+      ${'Blue badge concession'}         | ${getMockBlueBadgePermission()}
+      ${'Continuing permission'}         | ${getMockContinuingPermission()}
+      ${'Another date permission'}       | ${{ ...getMockPermission(), licenceToStart: 'another-date' }}
+      ${'1 year new three rod licence '} | ${{ ...getMockNewPermission(), numberOfRods: '3' }}
     `('creates licence summary name rows for $desc', async ({ currentPermission }) => {
       const mockRequest = getMockRequest({ currentPermission })
       const data = await getData(mockRequest)

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

@@ -113,12 +113,13 @@ class RowGenerator {
   }
 
   generateLicenceLengthRow () {
-    return this.generateStandardRow(
-      'licence_summary_length',
-      this.labels[`licence_type_${this.permission.licenceLength.toLowerCase()}`],
-      LICENCE_LENGTH.uri,
-      'change-licence-length'
-    )
+    const args = ['licence_summary_length', this.labels[`licence_type_${this.permission.licenceLength.toLowerCase()}`]]
+
+    if (this.permission.numberOfRods !== '3') {
+      args.push(LICENCE_LENGTH.uri, 'change-licence-length')
+    }
+
+    return this.generateStandardRow(...args)
   }
 }