@defra-fish/gafl-webapp-service 1.65.0-rc.0 → 1.65.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.0",
+  "version": "1.65.0-rc.1",
   "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.65.0-rc.0",
-    "@defra-fish/connectors-lib": "1.65.0-rc.0",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.1",
+    "@defra-fish/connectors-lib": "1.65.0-rc.1",
     "@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": "cdf9253964871c4afe0ff85d085364ffe4e890cf"
+  "gitHead": "3e4014cd3d4fae6d6dc6b7f5b338821a572286fb"
 }

package/src/locales/cy.json

@@ -787,7 +787,10 @@
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
-  "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
+  "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
+  "rp_cancel_confirm_reject": "No, I've changed my mind",
+  "rp_cancel_confirm_title": "Confirm you want to cancel",
   "rp_cancel_details_last_purchased": "Last licence purchased",
   "rp_cancel_details_licence_holder": "Licence holder",
   "rp_cancel_details_licence_type": "Licence type",

package/src/locales/en.json

@@ -787,7 +787,10 @@
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
-  "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
+  "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
+  "rp_cancel_confirm_reject": "No, I've changed my mind",
+  "rp_cancel_confirm_title": "Confirm you want to cancel",
   "rp_cancel_details_last_purchased": "Last licence purchased",
   "rp_cancel_details_licence_holder": "Licence holder",
   "rp_cancel_details_licence_type": "Licence type",

package/src/pages/recurring-payments/cancel/confirm/__tests__/route.spec.js

@@ -0,0 +1,112 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import moment from 'moment-timezone'
+
+require('../route.js')
+
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
+  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') },
+  CANCEL_RP_IDENTIFY: { uri: Symbol('cancel-rp-identify-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('moment-timezone')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes expected arguments to pageRoute', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_CONFIRM.page,
+        CANCEL_RP_CONFIRM.uri,
+        expect.any(Function),
+        expect.any(Function),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request object', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_COMPLETE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expecetdUri = Symbol('cancel-rp-complete-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expecetdUri)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expecetdUri)
+  })
+})
+
+describe('getData function', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    moment.mockReturnValue({ format: jest.fn(() => '18th November, 2025') })
+  })
+
+  const mockRequest = () => {
+    const getCurrentPermission = jest.fn(() => ({ recurringPayment: { endDate: '2025-02-15' } }))
+
+    return {
+      locale: 'en',
+      cache: () => ({
+        helpers: {
+          transaction: {
+            getCurrentPermission
+          }
+        }
+      })
+    }
+  }
+
+  it('calls addLanguageCodeToUri with request object', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_IDENTIFY uri', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_IDENTIFY.uri)
+  })
+
+  it('cancelRpIdentify uri is equal to return of addLanguageCodeToUri for CANCEL_RP_IDENTIFY page', async () => {
+    const expectedUri = Symbol('expected-cancel-rp-identify-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedUri)
+
+    const data = await getData(mockRequest())
+
+    expect(data.uri).toEqual({
+      cancelRpIdentify: expectedUri
+    })
+  })
+
+  it('returns licenceExpiry in correct format', async () => {
+    const mockFormat = jest.fn().mockReturnValue('19th November, 2025')
+    moment.mockReturnValue({ format: mockFormat })
+
+    const data = await getData(mockRequest())
+
+    expect(data.licenceExpiry).toEqual('19th November, 2025')
+  })
+})

package/src/pages/recurring-payments/cancel/confirm/cancel-rp-confirm.njk

@@ -2,23 +2,42 @@
 
 {% from "button/macro.njk" import govukButton %}
 {% from "page-title.njk" import pageTitle %}
+{% from "fieldset/macro.njk" import govukFieldset %}
 
 {% set title = mssgs.rp_cancel_confirm_title %}
 {% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
 
 {% block content %}
-<div class="govuk-grid-row">
+  {% set legendHtml %}
+    <span class="govuk-caption-l">{{ mssgs.cancel_rp_identify_caption }}</span>
+    {{ title }}
+  {% endset %}
+
+  {% call govukFieldset({
+    legend: {
+      html: legendHtml,
+      classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
+      isPageHeading: true
+    }
+  }) %}
+
+  <p class="govuk-body-m">{{ mssgs.rp_cancel_confirm_body }}</p>
+
+  <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <form method="post" class="govuk-!-margin-bottom-6">
           {{ govukButton({
             attributes: { id: 'continue' },
             preventDoubleClick: true,
             name: "continue",
-            text: mssgs.continue,
+            text: mssgs.rp_cancel_confirm_accept,
             classes: "govuk-!-margin-top-1"
           }) }}
           {{ csrf() }}
         </form>
+        <p class="govuk-body no-print"><a class="govuk-link" href="{{ data.uri.cancelRpIdentify }}">{{ mssgs.rp_cancel_confirm_reject }}</a></p>
     </div>
-</div>
+  </div>
+
+  {% endcall %}
 {% endblock %}

package/src/pages/recurring-payments/cancel/confirm/route.js

@@ -1,11 +1,24 @@
 import pageRoute from '../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../uri.js'
+import { CANCEL_RP_COMPLETE, CANCEL_RP_CONFIRM, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+import { cacheDateFormat } from '../../../../processors/date-and-time-display.js'
+import moment from 'moment-timezone'
+
+const getData = async request => {
+  const permission = await request.cache().helpers.transaction.getCurrentPermission()
+
+  return {
+    licenceExpiry: moment(permission.recurringPayment.endDate, cacheDateFormat, request.locale).format('Do MMMM, YYYY'),
+    uri: {
+      cancelRpIdentify: addLanguageCodeToUri(request, CANCEL_RP_IDENTIFY.uri)
+    }
+  }
+}
 
 export default pageRoute(
   CANCEL_RP_CONFIRM.page,
   CANCEL_RP_CONFIRM.uri,
   () => {},
   request => addLanguageCodeToUri(request, CANCEL_RP_COMPLETE.uri),
-  () => {}
+  getData
 )

package/src/routes/journey-definition.js

@@ -455,7 +455,8 @@ export default [
     next: {
       [CommonResults.OK]: {
         page: CANCEL_RP_COMPLETE
-      }
+      },
+      backLink: CANCEL_RP_DETAILS.uri
     }
   }
 ]

package/src/pages/recurring-payments/cancel/confirm/__tests__/route.test.js

@@ -1,106 +0,0 @@
-import pageRoute from '../../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../../uri.js'
-import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
-
-require('../route.js')
-// eslint-disable-next-line no-unused-vars
-const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
-
-jest.mock('../../../../../routes/page-route.js')
-jest.mock('../../../../../uri.js', () => ({
-  ...jest.requireActual('../../../../../uri.js'),
-  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
-  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') }
-}))
-jest.mock('../../../../../processors/uri-helper.js')
-
-describe('pageRoute receives expected arguments', () => {
-  it('passes CANCEL_RP_CONFIRM.page as the view name', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        CANCEL_RP_CONFIRM.page,
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes CANCEL_RP_CONFIRM.uri as the path', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        CANCEL_RP_CONFIRM.uri,
-        expect.anything(),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function as the validator', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function),
-        expect.anything(),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function to generate redirect location on completion', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function),
-        expect.anything()
-      )
-    })
-  })
-
-  it('passes a function to get the page data', () => {
-    jest.isolateModules(() => {
-      require('../route.js')
-      expect(pageRoute).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.anything(),
-        expect.any(Function)
-      )
-    })
-  })
-})
-
-describe('completion function', () => {
-  beforeEach(jest.clearAllMocks)
-
-  it('calls addLanguageCodeToUri with request object', () => {
-    const sampleRequest = Symbol('sample request')
-    completion(sampleRequest)
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
-  })
-
-  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
-    completion({})
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
-  })
-
-  it('returns the value of addLanguageCodeToUri', () => {
-    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
-    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
-
-    const completionRedirect = completion({})
-
-    expect(completionRedirect).toBe(expectedCompletionRedirect)
-  })
-})