@defra-fish/gafl-webapp-service 1.21.0 → 1.22.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.21.0",
+  "version": "1.22.0-rc.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.21.0",
-    "@defra-fish/connectors-lib": "1.21.0",
+    "@defra-fish/business-rules-lib": "1.22.0-rc.0",
+    "@defra-fish/connectors-lib": "1.22.0-rc.0",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -75,5 +75,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.0"
   },
-  "gitHead": "4c2c180096ef2223a1973f48249607a217331e49"
+  "gitHead": "4229720833c36e305c1703bb5f34a54ad24d5825"
 }

package/src/handlers/__tests__/error-handler.spec.js

@@ -0,0 +1,53 @@
+import { errorHandler } from '../error-handler.js'
+import { CLIENT_ERROR } from '../../uri.js'
+
+const mockView = jest.fn(() => ({
+  code: jest.fn()
+}))
+const h = {
+  view: mockView
+}
+
+describe('error-handler', () => {
+  describe('errorHandler', () => {
+    it('should pass the referer to the view if it is present', async () => {
+      const request = {
+        headers: {
+          referer: 'http://example.com'
+        },
+        response: {
+          isBoom: true,
+          output: {
+            statusCode: 400
+          }
+        }
+      }
+      await errorHandler(request, h)
+      expect(mockView).toBeCalledWith(
+        CLIENT_ERROR.page,
+        expect.objectContaining({
+          referer: 'http://example.com'
+        })
+      )
+    })
+
+    it('should not pass the referer to the view if it is not present', async () => {
+      const request = {
+        headers: {},
+        response: {
+          isBoom: true,
+          output: {
+            statusCode: 400
+          }
+        }
+      }
+      await errorHandler(request, h)
+      expect(mockView).toBeCalledWith(
+        CLIENT_ERROR.page,
+        expect.not.objectContaining({
+          referer: 'http://example.com'
+        })
+      )
+    })
+  })
+})

package/src/handlers/error-handler.js

@@ -18,6 +18,7 @@ export const errorHandler = async (request, h) => {
      */
     return h
       .view(CLIENT_ERROR.page, {
+        referer: request?.headers?.referer,
         clientError: request.response.output.payload,
         path: request.path,
         uri: { new: NEW_TRANSACTION.uri, controller: CONTROLLER.uri, agreed: AGREED.uri }

package/src/pages/errors/client-error.njk

@@ -2,8 +2,6 @@
 {% from "fieldset/macro.njk" import govukFieldset %}
 {% from "button/macro.njk" import govukButton %}
 
-{% block pageTitle %}A problem has occurred{% endblock %}
-
 {% set title = '' %}
 {% if clientError.statusCode === 400 %}
     {% set title = 'Bad request' %}
@@ -15,33 +13,25 @@
     {% set title = 'Page not found' %}
 {% endif %}
 
+{% block pageTitle %}Sorry, there is a problem with the service - {{title}}{% endblock %}
+
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
             {% call govukFieldset({
               legend: {
-                text: "A problem has occurred",
+                text: "Sorry, there is a problem with the service",
                 classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-6",
                 isPageHeading: true
               }
             }) %}
-            {% if title|length %}
-                <h2 class="govuk-heading-m">{{ title }}</h2>
-            {% endif %}
-            <p class="govuk-body-m">An unexpected error occurred. Use only the buttons and links to navigate the service and do not use the back button from the payment pages.</p>
-            {% if path !== uri.agreed %}
-                {{ govukButton({
-                    attributes: { id: "try-again" },
-                    preventDoubleClick: true,
-                    name: "try-again",
-                    text: "Try again",
-                    href: uri.controller,
-                    classes: "govuk-!-margin-top-5"
-                }) }}
-            {% endif %}
-
+            <p class="govuk-body-m">
+                You can <a class="govuk-link" href="{{referer if referer else 'javascript:history.back()'}}">try to get back to your application</a>.
+            </p>
+            <p class="govuk-body">
+                If that does not work, you will have to <a class="govuk-link" href="{{ uri.new }}">start again</a>. Sorry.
+            </p>
             {% endcall %}
-            <p class="govuk-body-m"><a class="govuk-link" href="{{ uri.new }}">Start again</a></p>
      </div>
 </div>
 {% endblock %}