From c4a2037cdfc5c408e596b6ea3975dd0495a6ba93 Mon Sep 17 00:00:00 2001
From: Tom Hallett <tehallett+github@gmail.com>
Date: Mon, 23 Sep 2024 11:43:17 +0100
Subject: [PATCH 1/3] TDRD-497 and TDRD-479 updates

---
 .../judgment/judgmentComplete.scala.html      |  2 +-
 app/views/tna/metadataReviewAction.scala.html | 59 +++++++++----------
 app/views/tna/metadataReviews.scala.html      |  4 +-
 .../MetadataReviewControllerSpec.scala        |  5 +-
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/app/views/judgment/judgmentComplete.scala.html b/app/views/judgment/judgmentComplete.scala.html
index f36db970f..162dfb9ab 100644
--- a/app/views/judgment/judgmentComplete.scala.html
+++ b/app/views/judgment/judgmentComplete.scala.html
@@ -31,7 +31,7 @@ <h2 class="govuk-heading-m">What happens next</h2>
 
                     <h2 class="govuk-heading-m">If this is an update to an existing judgment or decision</h2>
                     <p class="govuk-body">
-                        If this transfer was an update or revision, email <a href="mailto:@Messages("nationalArchives.judgmentsEmail")">@Messages("nationalArchives.judgmentsEmail")</a> and include the following:
+                        If this transfer was an update or revision, email <a href="mailto:@Messages("nationalArchives.judgmentsEmail")?subject=Ref: @reference">@Messages("nationalArchives.judgmentsEmail")</a> and include the following:
                     </p>
                     <ul class="govuk-list govuk-list--number">
                         <li>the neutral citation</li>
diff --git a/app/views/tna/metadataReviewAction.scala.html b/app/views/tna/metadataReviewAction.scala.html
index 50dbda188..7d504362c 100644
--- a/app/views/tna/metadataReviewAction.scala.html
+++ b/app/views/tna/metadataReviewAction.scala.html
@@ -47,43 +47,40 @@ <h1 class="govuk-heading-l govuk-!-margin-bottom-3">
                     </div>
                 </dl>
 
-                <h2 class="govuk-label-wrapper">
-                    <label class="govuk-label govuk-label--m" for="download-metadata">
-                        1. Download and review transfer metadata
-                    </label>
-                </h2>
+                <h2 class="govuk-heading-m">1. Download and review transfer metadata</h2>
 
                 @downloadMetadataLink(consignmentId)
 
                 @if(isTransferAdvisor) {
-                    <h2 class="govuk-label-wrapper">
-                        <label class="govuk-label govuk-label--m">
-                            2. Set the status of this review
-                        </label>
-                    </h2>
+                    <div class="govuk-form-group">
+                        <h2 class="govuk-label-wrapper">
+                            <label class="govuk-label govuk-label--m" for="status">
+                                2. Set the status of this review
+                            </label>
+                        </h2>
 
-                    @form(routes.MetadataReviewActionController.submitReview(consignmentId, consignmentDetails.consignmentReference, userEmail), (Symbol("novalidate"), "")) {
-                        @CSRF.formField
-                        @inputDropdown(
-                            dropdownField.fieldId,
-                            dropdownField.fieldName,
-                            dropdownField.fieldDescription,
-                            dropdownField.options,
-                            dropdownField.selectedOption,
-                            dropdownField.multiValue,
-                            Map(
-                                Symbol("_dynamicForm") -> false,
-                            ),
-                            dropdownField.fieldErrors,
-                            "Select a status"
-                        )
+                        @form(routes.MetadataReviewActionController.submitReview(consignmentId, consignmentDetails.consignmentReference, userEmail), (Symbol("novalidate"), "")) {
+                            @CSRF.formField
+                            @inputDropdown(
+                                dropdownField.fieldId,
+                                dropdownField.fieldName,
+                                dropdownField.fieldDescription,
+                                dropdownField.options,
+                                dropdownField.selectedOption,
+                                dropdownField.multiValue,
+                                Map(
+                                    Symbol("_dynamicForm") -> false,
+                                ),
+                                dropdownField.fieldErrors,
+                                "Select a status"
+                            )
+                    </div>
 
-                        <div class="govuk-button-group">
-                            <button data-prevent-double-click="true" class="govuk-button" type="submit" data-module="govuk-button"
-                            role="button">
-                                Submit
-                            </button>
-                        </div>
+                    <div class="govuk-button-group">
+                         <button data-prevent-double-click="true" class="govuk-button" type="submit" data-module="govuk-button" role="button">
+                             Submit
+                         </button>
+                    </div>
                     }
                 }
             </div>
diff --git a/app/views/tna/metadataReviews.scala.html b/app/views/tna/metadataReviews.scala.html
index d14f4d27a..4aca9ccc7 100644
--- a/app/views/tna/metadataReviews.scala.html
+++ b/app/views/tna/metadataReviews.scala.html
@@ -16,7 +16,9 @@ <h1 class="govuk-heading-l">Metadata Reviews</h1>
             <th scope="col" class="govuk-table__header">Status</th>
             <th scope="col" class="govuk-table__header">Department</th>
             <th scope="col" class="govuk-table__header">Series</th>
-            <th scope="col" class="govuk-table__header"></th>
+            <th scope="col" class="govuk-table__header">
+              <span class="govuk-visually-hidden">Actions</span>
+            </th>
           </tr>
         </thead>
         <tbody>
diff --git a/test/controllers/MetadataReviewControllerSpec.scala b/test/controllers/MetadataReviewControllerSpec.scala
index 7d22f3311..ebb404f60 100644
--- a/test/controllers/MetadataReviewControllerSpec.scala
+++ b/test/controllers/MetadataReviewControllerSpec.scala
@@ -80,7 +80,10 @@ class MetadataReviewControllerSpec extends FrontEndTestHelper {
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Status</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Department</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Series</th>""")
-    metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header"></th>""")
+    metadataReviewPageAsString must include(
+      s"""<th scope="col" class="govuk-table__header">
+         |              <span class="govuk-visually-hidden">Actions</span>
+         |            </th>""".stripMargin)
     metadataReviewPageAsString must include(s"""These are requested reviews that have not been responded to.""")
     metadataReviewPageAsString must include(s"""<th scope="row" class="govuk-table__header">TDR-2024-TEST</th>""")
     metadataReviewPageAsString must include(s"""<strong class="tdr-tag tdr-tag--green">Requested</strong>""")

From af4e3121831d04c0951cc153bb6685390cae3ca4 Mon Sep 17 00:00:00 2001
From: Tom Hallett <tehallett+github@gmail.com>
Date: Mon, 23 Sep 2024 11:50:36 +0100
Subject: [PATCH 2/3] Scalafmt

---
 test/controllers/MetadataReviewControllerSpec.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/controllers/MetadataReviewControllerSpec.scala b/test/controllers/MetadataReviewControllerSpec.scala
index ebb404f60..66bbed635 100644
--- a/test/controllers/MetadataReviewControllerSpec.scala
+++ b/test/controllers/MetadataReviewControllerSpec.scala
@@ -80,8 +80,7 @@ class MetadataReviewControllerSpec extends FrontEndTestHelper {
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Status</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Department</th>""")
     metadataReviewPageAsString must include("""<th scope="col" class="govuk-table__header">Series</th>""")
-    metadataReviewPageAsString must include(
-      s"""<th scope="col" class="govuk-table__header">
+    metadataReviewPageAsString must include(s"""<th scope="col" class="govuk-table__header">
          |              <span class="govuk-visually-hidden">Actions</span>
          |            </th>""".stripMargin)
     metadataReviewPageAsString must include(s"""These are requested reviews that have not been responded to.""")

From fdf516bf661a32e7c218f01bc24a094edbaf9348 Mon Sep 17 00:00:00 2001
From: Tom Hallett <tehallett+github@gmail.com>
Date: Tue, 24 Sep 2024 11:58:12 +0100
Subject: [PATCH 3/3] Fixing unit test

---
 app/views/tna/metadataReviews.scala.html            | 1 -
 test/controllers/MetadataReviewControllerSpec.scala | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/views/tna/metadataReviews.scala.html b/app/views/tna/metadataReviews.scala.html
index 4b9da4f07..c08a9824f 100644
--- a/app/views/tna/metadataReviews.scala.html
+++ b/app/views/tna/metadataReviews.scala.html
@@ -7,7 +7,6 @@
 
       <span class="govuk-caption-l">Transfer Digital Records</span>
       <h1 class="govuk-heading-l">Metadata Reviews</h1>
-      <p class="govuk-body">These are transfers awaiting metadata review:</p>
 
       <table data-module="table-row-expander" class="govuk-table govuk-table--tdr-transfers govuk-!-margin-bottom-2">
         <thead class="govuk-table__head">
diff --git a/test/controllers/MetadataReviewControllerSpec.scala b/test/controllers/MetadataReviewControllerSpec.scala
index 66bbed635..bef98f26d 100644
--- a/test/controllers/MetadataReviewControllerSpec.scala
+++ b/test/controllers/MetadataReviewControllerSpec.scala
@@ -83,7 +83,6 @@ class MetadataReviewControllerSpec extends FrontEndTestHelper {
     metadataReviewPageAsString must include(s"""<th scope="col" class="govuk-table__header">
          |              <span class="govuk-visually-hidden">Actions</span>
          |            </th>""".stripMargin)
-    metadataReviewPageAsString must include(s"""These are requested reviews that have not been responded to.""")
     metadataReviewPageAsString must include(s"""<th scope="row" class="govuk-table__header">TDR-2024-TEST</th>""")
     metadataReviewPageAsString must include(s"""<strong class="tdr-tag tdr-tag--green">Requested</strong>""")
     metadataReviewPageAsString must include(s"""<td class="govuk-table__cell">TransferringBody</td>""")