From 6e6e6c2034a6d64e1a706f3799b8a13406c9f143 Mon Sep 17 00:00:00 2001
From: carloveo-moj <144013256+carloveo-moj@users.noreply.github.com>
Date: Thu, 28 Mar 2024 10:17:40 +0000
Subject: [PATCH] CMG-107 align error page with CCARD (#267)

---
 server/app.ts                                |  2 +-
 server/middleware/populateCurrentPrisoner.ts |  5 ++--
 server/views/pages/error.njk                 | 28 +++++++++-----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/server/app.ts b/server/app.ts
index 11141398..f55ed649 100755
--- a/server/app.ts
+++ b/server/app.ts
@@ -39,8 +39,8 @@ export default function createApp(services: Services): express.Application {
   app.use(authorisationMiddleware())
   app.use(setUpCsrf())
   app.use(setUpCurrentUser(services))
-  app.use('/:nomsId', populateCurrentPrisoner(services.prisonerSearchService))
   app.get('*', getFrontendComponents(services))
+  app.use('/:nomsId', populateCurrentPrisoner(services.prisonerSearchService))
 
   app.use(routes(services))
 
diff --git a/server/middleware/populateCurrentPrisoner.ts b/server/middleware/populateCurrentPrisoner.ts
index 10b2c804..a1bf464f 100644
--- a/server/middleware/populateCurrentPrisoner.ts
+++ b/server/middleware/populateCurrentPrisoner.ts
@@ -11,9 +11,8 @@ export default function populateCurrentPrisoner(prisonerSearchService: PrisonerS
     if (username && nomsId) {
       try {
         const prisoner = await prisonerSearchService.getPrisonerDetails(nomsId, caseloads, username)
-        if (caseloads.includes(prisoner.prisonId)) {
-          res.locals.prisoner = prisoner
-        } else {
+        res.locals.prisoner = prisoner
+        if (!caseloads.includes(prisoner.prisonId)) {
           throw FullPageError.notInCaseLoadError()
         }
       } catch (error) {
diff --git a/server/views/pages/error.njk b/server/views/pages/error.njk
index fea3deba..4c4dd45b 100755
--- a/server/views/pages/error.njk
+++ b/server/views/pages/error.njk
@@ -7,31 +7,29 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <h1 class="govuk-heading-xl govuk-!-margin-bottom-6" data-qa="error-heading">
-        {% if status === 404 and not errorKey %}
+      <h1 class="govuk-heading-xl" data-qa="error-heading">
+        {% if errorKey === 'NOT_IN_CASELOAD' %}
+            The details for this person cannot be found
+        {% elif status === 404 and not errorKey %}
             Page not found
         {% else %}
             There is a problem
         {% endif %}
 
       </h1>
-
+    </div>
+  </div>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
       {% if errorKey %}
         {% if errorKey === 'NOT_IN_CASELOAD' %}
-          <p class="govuk-body">The details for this person cannot be found.</p>
-          <p class="govuk-body"> This could be because this person:</p>
+          <p class="govuk-body">This could be because this person:</p>
           <ul class="govuk-list govuk-list--bullet">
-            <li>is not in your caseload</li>
-            <li>has no bookings assigned to them</li>
-            <li>has no active bookings</li>
-            <li>offence dates</li>
-            <li>sentences</li>
-            <li>adjustments </li>
+              <li>is not in your case load</li>
+              <li>has no bookings assigned to them</li>
+              <li>has no active bookings</li>
           </ul>
-
-          <p class="govuk-body govuk-!-margin-top-6">            
-              Check the details in NOMIS and then <a href="/">try again</a>.
-            </p>
+          <p class="gouk-body">Check the details in NOMIS and then <a class="govuk-link" href="{{ url }}">try again</a>.</p> 
         {% elif errorKey === 'NO_SENTENCES' %}
           <p>There are no active sentences recorded.</p>