From 61b28b923bf6a40a7d80c06a7be11225adf6a831 Mon Sep 17 00:00:00 2001
From: Paul McPhee <paul.mcphee@digital.justice.gov.uk>
Date: Wed, 5 Feb 2025 11:15:09 +0000
Subject: [PATCH] MAN-172: No fixed address and error fixes

---
 integration_tests/e2e/personalDetails.cy.ts   |  2 +-
 .../edit-contact-details.njk                  |  7 +++++--
 server/views/pages/personal-details.njk       | 13 +++++++-----
 .../views/pages/personal-details/_address.njk |  9 ++++----
 .../pages/personal-details/addresses.njk      | 21 ++++++++++---------
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/integration_tests/e2e/personalDetails.cy.ts b/integration_tests/e2e/personalDetails.cy.ts
index 58be81e1..8ffd468b 100644
--- a/integration_tests/e2e/personalDetails.cy.ts
+++ b/integration_tests/e2e/personalDetails.cy.ts
@@ -21,7 +21,7 @@ context('Personal Details', () => {
     page.getRowData('contactDetails', 'telephoneNumber', 'Value').should('contain.text', '0123456999')
     page.getRowData('contactDetails', 'mobileNumber', 'Value').should('contain.text', '071838893')
     page.getRowData('contactDetails', 'emailAddress', 'Value').should('contain.text', 'address1@gmail.com')
-    page.getRowData('contactDetails', 'mainAddress', 'Value').should('contain.text', '32 SCOTLAND STREET')
+    page.getRowData('contactDetails', 'mainAddress', 'Value').should('contain.text', 'No fixed address')
     page.getRowData('contactDetails', 'otherAddresses', 'Value').should('contain.text', '1 other address')
     page.getRowData('contactDetails', 'contacts', 'Value').should('contain.text', 'Steve Wilson – GP (secondary)')
 
diff --git a/server/views/pages/edit-contact-details/edit-contact-details.njk b/server/views/pages/edit-contact-details/edit-contact-details.njk
index bdbee5c3..d7ab6a79 100644
--- a/server/views/pages/edit-contact-details/edit-contact-details.njk
+++ b/server/views/pages/edit-contact-details/edit-contact-details.njk
@@ -8,7 +8,7 @@
 {% set headerGender = personalDetails.preferredGender %}
 {% set dateWarning = 'An end date will change this to a previous address and you will need to add a new main address.' %}
 {% set addressTypeSelectItems = [{text: "Select address type", value: null }] %}
-  {% for addressType in personalDetails.addressTypes %}
+  {% for addressType in personalDetails.addressTypes|sort(attribute='description') %}
       {% set addressTypeSelectItems = (addressTypeSelectItems.push({
           selected: personalDetails.mainAddress.typeCode === addressType.code,
           text: addressType.description,
@@ -55,7 +55,10 @@
     }) if personalDetails.mainAddress.to }}
 
     {% if errorMessages %}
-        {{ govukErrorSummary({ titleText: "There is a problem", errorList: errorMessages | toErrorList }) }}
+    {% set errorList = errorMessages | toErrorList %}
+        {% if errorList > 0 %}
+            {{ govukErrorSummary({ titleText: "There is a problem", errorList: errorList }) }}
+        {% endif %}
     {% endif %}
 
 {% endblock %}
diff --git a/server/views/pages/personal-details.njk b/server/views/pages/personal-details.njk
index ac24f4e7..db61222f 100644
--- a/server/views/pages/personal-details.njk
+++ b/server/views/pages/personal-details.njk
@@ -38,13 +38,16 @@
 {% block pageContent %}
     {% set contactDetails %}
         {% set mainAddress = personalDetails.mainAddress %}
-
             {% set address %}
                 {% if personalDetails.mainAddress %}
-                    {% set addressAsList = addressToList(mainAddress, noFixedAddress) %}
-                    {% if addressAsList.length > 0 %}
-                        {{ addressAsList.join('<br>') | safe }}
-                        <br/>
+                    {% if mainAddress.noFixedAddress === true %}
+                        No fixed address
+                    {% else %}
+                        {% set addressAsList = addressToList(mainAddress) %}
+                            {% if addressAsList.length > 0 %}
+                                {{ addressAsList.join('<br>') | safe }}
+                                <br/>
+                            {% endif %}
                     {% endif %}
                     <p class="govuk-!-margin-top-2 govuk-!-margin-bottom-0">
                         <span class="govuk-summary-list__key govuk-!-padding-bottom-0" data-qa="addressTypeLabel">Type of address</span>
diff --git a/server/views/pages/personal-details/_address.njk b/server/views/pages/personal-details/_address.njk
index 8459f0b1..e8bf2ddc 100644
--- a/server/views/pages/personal-details/_address.njk
+++ b/server/views/pages/personal-details/_address.njk
@@ -8,12 +8,11 @@
 
 {% set addressHtml %}
   {% set fullAddress %}
-    {% if address.noFixedAbode %}
-      No fixed abode<br />
-      {{ address.type }}
+    {% if address.noFixedAddress %}
+      No fixed address
+    {% else %}
+      {{ addressToList(address).join('<br>') | safe }}
     {% endif %}
-
-    {{ addressToList(address).join('<br>') | safe }}
   {% endset %}
 
   {{ govukSummaryList({
diff --git a/server/views/pages/personal-details/addresses.njk b/server/views/pages/personal-details/addresses.njk
index 37c12bed..6de102b5 100644
--- a/server/views/pages/personal-details/addresses.njk
+++ b/server/views/pages/personal-details/addresses.njk
@@ -34,18 +34,19 @@
   iconFallbackText: 'Warning'
 }) }} -->
 
-<p>
-    <a href="{{ deliusDeepLinkUrl('AddressandAccommodation', crn) }}" target="_blank">Update addresses on NDelius (opens in new tab)</a>
-</p>
-
 {% set address = addressOverview.mainAddress %}
-<span data-qa="mainAddressSection">
-    {% set addressType = 'address' %}
-    {% set loopIndex = '' %}
-    {% include './_address.njk' %}
-</span>
+{% if addressOverview.mainAddress %}
+    <p>
+        <a href="{{ deliusDeepLinkUrl('AddressandAccommodation', crn) }}" target="_blank">Update addresses on NDelius (opens in new tab)</a>
+    </p>
+    <span data-qa="mainAddressSection">
+        {% set addressType = 'address' %}
+        {% set loopIndex = '' %}
+        {% include './_address.njk' %}
+    </span>
+{% endif %}
 
-{% if addressOverview.otherAddresses.length > 0 %}
+    {% if addressOverview.otherAddresses.length > 0 %}
     <h2 class="govuk-heading-l govuk-!-margin-top-8">Other addresses</h2>
     <p>
         <a href="{{ deliusDeepLinkUrl('AddressandAccommodation', crn) }}" target="_blank">Edit all other addresses on NDelius (opens in new tab)</a>