Merge pull request #69 from DEFRA/DSFAAP-580_refactor-templates

Simplify templates
DEFRA · Dec 13, 2024 · ca31c9d · ca31c9d
2 parents 71d9c57 + b449f70
commit ca31c9d
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 104 deletions.
diff --git a/src/server/check-answers/controller.js b/src/server/check-answers/controller.js
@@ -56,11 +56,13 @@ export const checkAnswersPostController = {
     const confirmation = new Confirmation(payload)
 
     const { isValid, errors } = confirmation.validate()
+
     if (!isValid) {
       return res.view('check-answers/index', {
         pageTitle: `Error: ${pageTitle}`,
         heading,
         confirmation,
+        errorMessages: Confirmation.errorMessages(errors),
         errorMessage: errors.confirmation,
         ...tasks
       })

diff --git a/src/server/check-answers/index.njk b/src/server/check-answers/index.njk
@@ -43,22 +43,6 @@
     <div class="govuk-grid-column-two-thirds">
       <div class="govuk-body" data-testid="app-page-body">
         <div class="govuk-!-margin-top-0 govuk-!-margin-bottom-8">
-
-          {% if (errorMessage) %}
-            {{ govukErrorSummary({
-              titleText: "There is a problem",
-              errorList: [
-                {
-                  text: errorMessage.text,
-                  href: "#confirmation"
-                }
-              ]
-            }) }}
-          {% endif %}
-          <h1 class="govuk-heading-l">
-              {{ heading }}
-          </h1>
-
           <h2 class="govuk-heading-m">Movement origin</h2>
           {{ section([{
             key: "Are you moving the cattle on or off your farm or premises?",

diff --git a/src/server/common/model/answer/on-off-farm.js b/src/server/common/model/answer/on-off-farm.js
@@ -47,16 +47,6 @@ export class OnOffFarm extends AnswerModel {
     }
   }
 
-  /** @param {AnswerErrors} errors */
-  static errorMessages(errors) {
-    return [
-      {
-        href: '#on-farm-radio',
-        text: errors.onOffFarm?.text
-      }
-    ]
-  }
-
   /**
    * @param {OnOffFarmData | undefined} state
    * @returns {OnOffFarm}

diff --git a/src/server/common/model/answer/on-off-farm.test.js b/src/server/common/model/answer/on-off-farm.test.js
@@ -73,17 +73,6 @@ describe('OnOffFarm.fromState', () => {
   })
 })
 
-describe('OnOffFarm.errorMessages', () => {
-  it('should calculate the href to the first radio button', () => {
-    expect(OnOffFarm.errorMessages({ onOffFarm: { text: 'error' } })).toEqual([
-      {
-        href: '#on-farm-radio',
-        text: 'error'
-      }
-    ])
-  })
-})
-
 describe('#OnOffFarm.value', () => {
   it('should return a value-wrapped object to rendering in the template', () => {
     expect(new OnOffFarm({ onOffFarm: 'on' }).value).toBe('on')

diff --git a/src/server/common/templates/layouts/questions.njk b/src/server/common/templates/layouts/questions.njk
@@ -1,8 +1,32 @@
+{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/button/macro.njk" import govukButton %}
 
 {% extends 'layouts/page.njk' %}
 
 {% block content %}
+
+  {% if (errorMessages) %}
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        {{ govukErrorSummary({
+          titleText: "There is a problem",
+          errorList: errorMessages
+          })
+        }}
+      </div>
+    </div>
+  {% endif %}
+
+  {% if (heading) %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-l">
+          {{ heading }}
+      </h1>
+    </div>
+  </div>
+  {% endif %}
+
   {% block beforequestion %}
   {% endblock %}
 

diff --git a/src/server/licence/check-answers/index.njk b/src/server/licence/check-answers/index.njk
@@ -4,7 +4,6 @@
 {% extends 'layouts/questions.njk' %}
 
 {% block questions %}
-  <h1 class="govuk-heading-l">{{pageTitle}}</h1>
 
   {{ govukSummaryList({
     classes: "govuk-!-margin-bottom-9",
@@ -31,4 +30,5 @@
       }
     ]
   }) }}
+
 {% endblock %}
diff --git a/src/server/licence/email-address/index.njk b/src/server/licence/email-address/index.njk
@@ -1,25 +1,11 @@
-{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
-
 {% from "govuk/components/input/macro.njk" import govukInput %}
 {% from "govuk/components/fieldset/macro.njk" import govukFieldset %}
 
 {% extends 'layouts/questions.njk' %}
 
 {% block questions %}
-{% if (errorMessages) %}
-  {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errorMessages
-    }) }}
-  {% endif %}
 
-  {% call govukFieldset({
-    legend: {
-      text: heading,
-      classes: "govuk-fieldset__legend--l",
-      isPageHeading: true
-    }
-  }) %}
+  {% call govukFieldset() %}
 
     {{ govukInput({
       id: "emailAddress",

diff --git a/src/server/origin/address/index.njk b/src/server/origin/address/index.njk
@@ -1,24 +1,11 @@
-{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 {% from "govuk/components/input/macro.njk" import govukInput %}
 {% from "govuk/components/fieldset/macro.njk" import govukFieldset %}
 
 {% extends 'layouts/questions.njk' %}
 
 {% block questions %}
-  {% if (errorMessages.length) %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errorMessages
-    }) }}
-  {% endif %}
 
-  {% call govukFieldset({
-    legend: {
-      text: heading,
-      classes: "govuk-fieldset__legend--l",
-      isPageHeading: true
-    }
-  }) %}
+  {% call govukFieldset() %}
 
     {{ govukInput({
       label: {

diff --git a/src/server/origin/cph-number/index.njk b/src/server/origin/cph-number/index.njk
@@ -1,26 +1,11 @@
-{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
-
 {% from "govuk/components/input/macro.njk" import govukInput %}
 {% from "govuk/components/fieldset/macro.njk" import govukFieldset %}
 
 {% extends 'layouts/questions.njk' %}
 
 {% block questions %}
-  {% if (errorMessages) %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errorMessages
-      }) }}
-  {% endif %}
-
-  {% call govukFieldset({
-    legend: {
-      text: heading,
-      classes: "govuk-fieldset__legend--l",
-      isPageHeading: true
-    }
-  }) %}
 
+  {% call govukFieldset() %}
     {{ govukInput({
       id: "cphNumber",
       name: "cphNumber",
@@ -34,4 +19,5 @@
     }) }}
 
   {% endcall %}
+
 {% endblock %}
diff --git a/src/server/origin/on-off-farm/index.njk b/src/server/origin/on-off-farm/index.njk
@@ -1,30 +1,17 @@
 {% from "govuk/components/radios/macro.njk" import govukRadios %}
-{% from "govuk/components/error-summary/macro.njk" import govukErrorSummary %}
 
 {% extends 'layouts/questions.njk' %}
 
 {% block questions %}
-  {% if (errorMessages) %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errorMessages
-    }) }}
-  {% endif %}
 
   {{ govukRadios({
     name: "onOffFarm",
-    id: "onOffFarm",
-    fieldset: {
-      legend: {
-        text: "Are you moving the cattle on or off your farm or premises?",
-        isPageHeading: true,
-        classes: "govuk-fieldset__legend--l"
-      }
-    },
+    id: "on-off-farm",
+    fieldset:{},
     value: value,
     items: [
       {
-        id: "on-farm-radio",
+        id: "onOffFarm",
         value: "on",
         text: "On to the farm or premises"
       },

diff --git a/src/server/origin/summary/index.njk b/src/server/origin/summary/index.njk
@@ -28,16 +28,15 @@
     })) %}
   {% endfor %}
 
-
-
   {{ govukSummaryList({
     classes: "govuk-!-margin-bottom-9",
     rows: summaryRows
   }) }}
+
 {% endmacro %}
 
 {% block questions %}
-  <h1 class="govuk-heading-l">{{pageTitle}}</h1>
 
   {{ createSummary(originSummary) }}
+
 {% endblock %}
diff --git a/user-journey-tests/page-objects/origin/toFromFarmPage.js b/user-journey-tests/page-objects/origin/toFromFarmPage.js
@@ -16,15 +16,15 @@ class ToFromFarmPage extends Page {
   }
 
   get onThefarmRadio() {
-    return $('#on-farm-radio')
+    return $('#onOffFarm')
   }
 
   get offThefarmRadio() {
     return $('#off-farm-radio')
   }
 
   get onFarmSummaryErrorLink() {
-    return $('[href="#on-farm-radio"]')
+    return $('[href="#onOffFarm"]')
   }
 
   get pageError() {