@defra-fish/gafl-webapp-service 1.22.1 → 1.23.0-rc.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.22.1",
+  "version": "1.23.0-rc.10",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,32 +36,32 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.22.1",
-    "@defra-fish/connectors-lib": "1.22.1",
+    "@defra-fish/business-rules-lib": "1.23.0-rc.10",
+    "@defra-fish/connectors-lib": "1.23.0-rc.10",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
     "@hapi/cookie": "^11.0.2",
     "@hapi/crumb": "^8.0.1",
-    "@hapi/hapi": "^20.1.3",
-    "@hapi/inert": "^6.0.3",
+    "@hapi/hapi": "^20.2.1",
+    "@hapi/inert": "^6.0.5",
     "@hapi/joi-date": "^2.0.1",
     "@hapi/scooter": "^6.0.1",
     "@hapi/vision": "^6.1.0",
     "blankie": "^5.0.0",
-    "debug": "^4.3.1",
+    "debug": "^4.3.3",
     "disinfect": "^1.1.0",
     "find": "^0.3.0",
     "flatpickr": "^4.6.9",
-    "govuk-frontend": "^3.12.0",
+    "govuk-frontend": "^4.0.1",
     "hapi-i18n": "^3.0.1",
-    "joi": "^17.4.0",
+    "joi": "^17.6.0",
     "moment": "^2.29.1",
-    "moment-timezone": "^0.5.33",
-    "node-fetch": "^2.6.1",
+    "moment-timezone": "^0.5.34",
+    "node-fetch": "^2.6.7",
     "nunjucks": "^3.2.3",
-    "openid-client": "^4.7.4",
-    "pdfmake": "^0.1.71",
+    "openid-client": "^4.9.1",
+    "pdfmake": "^0.1.72",
     "semver": "^7.3.5",
     "uuid": "^8.3.2"
   },
@@ -72,9 +72,9 @@
     "gulp-concat": "^2.6.1",
     "gulp-merge": "^0.1.1",
     "gulp-minify": "^3.1.0",
-    "gulp-sass": "^4.1.0",
+    "gulp-sass": "^4.1.1",
     "gulp-sourcemaps": "^3.0.0",
-    "node-sass": "^6.0.0"
+    "node-sass": "^6.0.1"
   },
-  "gitHead": "b456e0fda4c7a9119146da462fec3c6502a976f9"
+  "gitHead": "a6ddfeb935bf94b5b393fbcb5ad518077945850d"
 }

package/src/__tests__/plugin.spec.js

@@ -0,0 +1,24 @@
+import { getPlugins } from '../plugins'
+
+describe('plugins', () => {
+  const findPlugin = (pluginArray, pluginName) => pluginArray.find(plugin => plugin?.plugin?.plugin?.name === pluginName)
+
+  describe('initialiseHapiI18nPlugin', () => {
+    it.each([
+      [['en'], undefined, undefined],
+      [['en'], undefined, false],
+      [['en'], undefined, 'false'],
+      [['en', 'cy'], 'lang', true],
+      [['en', 'cy'], 'lang', 'true']
+    ])(
+      'should return the locale as %s and queryParameter as %s, if SHOW_WELSH_CONTENT is %s',
+      async (expectedLocale, expectedQueryParamter, showWelshContent) => {
+        process.env.SHOW_WELSH_CONTENT = showWelshContent
+        const pluginArray = getPlugins()
+        const hapI18nPlugin = findPlugin(pluginArray, 'hapi-i18n')
+        expect(hapI18nPlugin.options.locales).toStrictEqual(expectedLocale)
+        expect(hapI18nPlugin.options.queryParameter).toBe(expectedQueryParamter)
+      }
+    )
+  })
+})

package/src/pages/contact/address/entry/address-entry.njk

@@ -102,6 +102,7 @@
       },
       id: "postcode",
       name: "postcode",
+      hint: { text: mssgs.address_lookup_postcode_hint },
       value: payload['postcode'],
       classes: "govuk-input--width-20",
       attributes: { maxlength: 10 },

package/src/pages/contact/address/select/address-select.njk

@@ -32,6 +32,7 @@
 
     {{ govukRadios({
         idPrefix: "address",
+        classes: "address_list",
         name: "address",
         items: addressItems,
         errorMessage: { text: mssgs.address_select_error_choose } if error

package/src/pages/contact/digital-licence/licence-confirmation-method/licence-confirmation-method.njk

@@ -114,7 +114,7 @@
 {% else %}
     {% set title = mssgs.licence_confirm_method_where_title_you if data.isLicenceForYou else mssgs.licence_confirm_method_where_title_other %}
     {% set bodyText = mssgs.licence_confirm_method_where_body_text %}
-    {% set hintText = mssgs.licence_confirm_method_where_body_hint_you if data.isLicenceForYou else mssgs.licence_confirm_method_how_title_other %}
+    {% set hintText = mssgs.licence_confirm_method_where_body_hint_you if data.isLicenceForYou else mssgs.licence_confirm_method_where_body_hint_other %}
 {% endif %}
 
 {% block pageContent %}

package/src/plugins.js

@@ -97,13 +97,17 @@ const initialiseHapiGapiPlugin = () => {
   }
 }
 
-const initialiseHapiI18nPlugin = () => ({
-  plugin: HapiI18n,
-  options: {
-    locales: ['en'],
-    directory: path.join(Dirname, 'src/locales')
+const initialiseHapiI18nPlugin = () => {
+  const showWelshContent = process.env.SHOW_WELSH_CONTENT?.toLowerCase() === 'true'
+  return {
+    plugin: HapiI18n,
+    options: {
+      locales: ['en', ...(showWelshContent ? ['cy'] : [])],
+      directory: path.join(Dirname, 'src/locales'),
+      ...(showWelshContent && { queryParameter: 'lang' })
+    }
   }
-})
+}
 
 export const getPlugins = () => {
   return [

package/src/services/address-lookup/__tests__/address-lookup-service.spec.js

@@ -3,15 +3,38 @@ import fetch from 'node-fetch'
 
 jest.mock('node-fetch')
 
-describe('Address lookup service', () => {
+describe('address-lookup-service', () => {
   beforeAll(() => {
     process.env.ADDRESS_LOOKUP_KEY = 'ADDRESS_LOOKUP_KEY'
     process.env.ADDRESS_LOOKUP_URL = 'https://address.lookup.url'
   })
+  beforeEach(jest.clearAllMocks)
 
-  it('returns empty array if results node is missing', async () => {
-    fetch.mockResolvedValue({ json: () => Promise.resolve({}) })
-    const results = await als()
-    expect(results).toEqual([])
+  describe('default', () => {
+    it('returns empty array if results node is missing', async () => {
+      fetch.mockResolvedValue({ json: () => Promise.resolve({}) })
+      const results = await als()
+      expect(results).toEqual([])
+    })
+
+    it.each([
+      ['1 HOWECROFT COURT, EASTMEAD LANE, BRISTOL, BS9 1HJ', 'BS9 1HJ', '1 howecroft court, eastmead lane, bristol, BS9 1HJ', 'BS9 1HJ'],
+      ['9 ORBIT STREET, ADAMSDOWN, CARDIfF, CF24 0JX', 'CF24 0JX', '9 orbit street, adamsdown, cardiff, CF24 0JX', 'CF24 0JX'],
+      ['45 TINTERN CLOSE, EASTBOURNE, BN22 0UF', 'BN22 0UF', '45 tintern close, eastbourne, BN22 0UF', 'BN22 0UF']
+    ])('if data is returned from the API, it maps the data correctly in lower case, other than postcode', async (address, postcode, expectedAddress, expectedPostcode) => {
+      fetch.mockResolvedValue({
+        json: () => ({
+          results: [{
+            address: address,
+            postcode: postcode
+          }]
+        })
+      })
+      const results = await als()
+      expect(results[0]).toEqual(expect.objectContaining({
+        address: expectedAddress,
+        postcode: expectedPostcode
+      }))
+    })
   })
 })

package/src/services/address-lookup/address-lookup-service.js

@@ -38,7 +38,7 @@ export default async (premises, postcode) => {
   return results
     ? results.map((r, idx) => ({
       id: idx,
-      address: r.address,
+      address: `${r.address.replace(r.postcode, '').toLowerCase()}${r.postcode}`,
       premises: r.premises,
       street: r.street_address,
       locality: r.locality,