Merge branch 'micol/dynamic-urls' into micol/removing-personal-details

Author: micolgiannelli2

model/src/data-model/types.ts

@@ -245,4 +245,5 @@ export type FormDefinition = {
   confirmationSessionTimeout: number | undefined;
   returnTo?: boolean | undefined;
   secureFormSubmissionConfig: SecureFormSubmissionConfig;
+  error500ContactEmail?: string | undefined;
 };

model/src/schema/schema.ts

@@ -379,6 +379,7 @@ export const Schema = joi
     confirmationSessionTimeout: joi.number().optional(),
     returnTo: joi.boolean().optional(),
     secureFormSubmissionConfig: secureFormSubmissionConfig.optional(),
+    error500ContactEmail: joi.string().optional(),
   });
 
 /**

runner/src/server/forms/close-contact-form-cca-nl8.json

@@ -3433,8 +3433,8 @@
       "name": "disease_code_list",
       "type": "string",
       "items": [
-        { "text": "Avian Bird Flu", "value": "001F00" },
-        { "text": "Mers-Cov", "value": "001F01" }
+        { "text": "001F00", "value": "001F00" },
+        { "text": "001F01", "value": "001F01" }
       ]
     },
     {

runner/src/server/forms/kls-enquiries.json

@@ -2713,5 +2713,6 @@
     "url": "https://submit.forms.service.gov.uk/form/7932/give-feedback-on-knowledge-and-library-services-kls/30055"
   },
   "showFilenamesOnSummaryPage": true,
-  "jwtKey": "${KLSJwtKey}"
+  "jwtKey": "${KLSJwtKey}",
+  "error500ContactEmail": "libraries@kls.ukhsa.gov.uk"
 }

runner/src/server/forms/kls-magic-link.json

@@ -249,5 +249,6 @@
     "url": "https://submit.forms.service.gov.uk/form/7932/give-feedback-on-knowledge-and-library-services-kls/30055"
   },
   "version": 2,
-  "conditions": []
+  "conditions": [],
+  "error500ContactEmail": "libraries@kls.ukhsa.gov.uk"
 }

runner/src/server/forms/kls-training-magic-link.json

@@ -253,5 +253,6 @@
     "maxAttempts": 3,
     "showPaymentSkippedWarningPage": false
   },
-  "jwtKey": "${KLSTrainingJwtKey}"
+  "jwtKey": "${KLSTrainingJwtKey}",
+  "error500ContactEmail": "libraries@kls.ukhsa.gov.uk"
 }

runner/src/server/forms/kls-training-request.json

@@ -1086,5 +1086,6 @@
     "feedbackForm": true,
     "url": "https://submit.forms.service.gov.uk/form/7932/give-feedback-on-knowledge-and-library-services-kls/30055"
   },
-  "jwtKey": "${KLSTrainingJwtKey}"
+  "jwtKey": "${KLSTrainingJwtKey}",
+  "error500ContactEmail": "libraries@kls.ukhsa.gov.uk"
 }

runner/src/server/plugins/errorPages.ts

@@ -1,4 +1,4 @@
-import { HapiRequest, HapiResponseToolkit } from "../types";
+import { HapiRequest, HapiResponseToolkit, HapiServer } from "../types";
 import config from "../config";
 
 /*
@@ -7,7 +7,7 @@ import config from "../config";
 export default {
   plugin: {
     name: "error-pages",
-    register: (server) => {
+    register: (server: HapiServer) => {
       server.ext(
         "onPreResponse",
         (request: HapiRequest, h: HapiResponseToolkit) => {
@@ -47,7 +47,10 @@ export default {
 
             // The return the `500` view
             return h
-              .view("500", { name: form.name || config.serviceName })
+              .view("500", {
+                name: form?.name || config.serviceName,
+                contactEmail: form?.def.error500ContactEmail,
+              })
               .code(statusCode);
           }
           return h.continue;

runner/src/server/views/500.html

@@ -6,7 +6,12 @@
       <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
           <h1 class="govuk-heading-l">Sorry, there is a problem with the service</h1>
-          <p class="govuk-body">Contact your closest consulate.</p>
+  
+          {% if contactEmail %}
+            <p class="govuk-body">Contact <a href="mailto:{{contactEmail}}">{{contactEmail}}</a>.</p>
+          {% else %}
+            <p class="govuk-body">Contact your closest consulate.</p>
+          {% endif %}
         </div>
       </div>
     </div>