From 189cf24c899bf376f64df318ffeb6e42b042bdef Mon Sep 17 00:00:00 2001
From: Harry Young <harry.young@hippodigital.co.uk>
Date: Tue, 4 Mar 2025 10:53:54 +0000
Subject: [PATCH] Move last fetched from UI to a data attribute

---
 src/web/CareLeavers.Web/Views/Contentful/Page.cshtml   |  5 +++--
 .../CareLeavers.Web/Views/Shared/_LastUpdated.cshtml   | 10 +++-------
 .../Tests/SnapshotTests/Input/SimpleParagraph.json     |  4 +++-
 .../Tests/SnapshotTests/Output/ComponentTest.html      |  6 +-----
 .../SnapshotTests/Output/HomePageWithSupport.html      |  6 +-----
 .../Tests/SnapshotTests/Output/SimpleAsset.html        |  2 +-
 .../Tests/SnapshotTests/Output/SimpleParagraph.html    |  2 +-
 7 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/web/CareLeavers.Web/Views/Contentful/Page.cshtml b/src/web/CareLeavers.Web/Views/Contentful/Page.cshtml
index 8554412..3a8f0ac 100644
--- a/src/web/CareLeavers.Web/Views/Contentful/Page.cshtml
+++ b/src/web/CareLeavers.Web/Views/Contentful/Page.cshtml
@@ -1,3 +1,4 @@
+@using System.Globalization
 @using CareLeavers.Web.Configuration
 @using CareLeavers.Web.Models.Enums
 @using Microsoft.AspNetCore.Mvc.TagHelpers
@@ -33,7 +34,7 @@
     </div>
 }
 
-<div class="govuk-grid-row">
+<div class="govuk-grid-row" data-last-fetched="@Model.Fetched.ToString("s", CultureInfo.InvariantCulture)">
     <div class="@pageWidth">
         @if (Model.Type.HasValue)
         {
@@ -48,7 +49,7 @@
         @if (Model.ShowLastUpdated)
         {
             <hr/>
-            <partial name="_LastUpdated" model="@Model"/>
+            <partial name="_LastUpdated" model="@Model.Sys"/>
         }
         
     </div>
diff --git a/src/web/CareLeavers.Web/Views/Shared/_LastUpdated.cshtml b/src/web/CareLeavers.Web/Views/Shared/_LastUpdated.cshtml
index caf851b..ccaa927 100644
--- a/src/web/CareLeavers.Web/Views/Shared/_LastUpdated.cshtml
+++ b/src/web/CareLeavers.Web/Views/Shared/_LastUpdated.cshtml
@@ -1,5 +1,5 @@
 @using System.Globalization
-@model CareLeavers.Web.Models.Content.ContentfulContent
+@model Contentful.Core.Models.SystemProperties
 
 <div class="govuk-grid-row">
     <div class="metadata-logo-wrapper">
@@ -12,14 +12,10 @@
 
                     </dd>
                     <dt class="gem-c-metadata__term">Published</dt>
-                    <dd class="gem-c-metadata__definition">@Model.Sys.CreatedAt?.ToString("dd MMMM yyyy", DateTimeFormatInfo.InvariantInfo)</dd>
+                    <dd class="gem-c-metadata__definition">@Model.CreatedAt?.ToString("dd MMMM yyyy", DateTimeFormatInfo.InvariantInfo)</dd>
                     <dt class="gem-c-metadata__term">Last updated</dt>
                     <dd class="gem-c-metadata__definition">
-                        @Model.Sys.UpdatedAt?.ToString("dd MMMM yyyy", DateTimeFormatInfo.InvariantInfo)
-                    </dd>
-                    <dt class="gem-c-metadata__term">Paged Fetched</dt>
-                    <dd class="gem-c-metadata__definition">
-                        @Model.Fetched.ToString("dd MMMM yyyy HH:mm:ss", DateTimeFormatInfo.InvariantInfo)
+                        @Model.UpdatedAt?.ToString("dd MMMM yyyy", DateTimeFormatInfo.InvariantInfo)
                     </dd>
                 </dl>
             </div>
diff --git a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Input/SimpleParagraph.json b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Input/SimpleParagraph.json
index 80b0831..48f581b 100644
--- a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Input/SimpleParagraph.json
+++ b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Input/SimpleParagraph.json
@@ -104,5 +104,7 @@
         ]
       }
     ]
-  }
+  },
+  "metadata": null,
+  "fetched": "2025-02-26T13:03:09.51649+00:00"
 }
\ No newline at end of file
diff --git a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/ComponentTest.html b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/ComponentTest.html
index fdf68a3..a31a79d 100644
--- a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/ComponentTest.html
+++ b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/ComponentTest.html
@@ -130,7 +130,7 @@ <h1 class="govuk-heading-xl">
 		</section>
 		<div b-k59dbireqp="" class="govuk-width-container" id="main-content-container">
 			<main b-k59dbireqp="" class="govuk-main-wrapper" id="main-content" role="main">
-				<div class="govuk-grid-row">
+				<div class="govuk-grid-row" data-last-fetched="2025-02-26T13:10:21">
 					<div class="govuk-grid-column-full">
 						<span class="govuk-caption-m">Guide</span>
 						<section class="govuk-!-margin-top-5 govuk-!-margin-bottom-5">
@@ -213,10 +213,6 @@ <h3 class="govuk-heading-s">
 											<dd class="gem-c-metadata__definition">
 												20 February 2025
 											</dd>
-											<dt class="gem-c-metadata__term">Paged Fetched</dt>
-											<dd class="gem-c-metadata__definition">
-												26 February 2025 13:10:21
-											</dd>
 										</dl>
 									</div>
 								</div>
diff --git a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/HomePageWithSupport.html b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/HomePageWithSupport.html
index cf3720a..0146e3e 100644
--- a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/HomePageWithSupport.html
+++ b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/HomePageWithSupport.html
@@ -125,7 +125,7 @@ <h1 class="govuk-heading-xl">
 		</section>
 		<div b-k59dbireqp="" class="govuk-width-container" id="main-content-container">
 			<main b-k59dbireqp="" class="govuk-main-wrapper" id="main-content" role="main">
-				<div class="govuk-grid-row">
+				<div class="govuk-grid-row" data-last-fetched="2025-02-26T13:03:09">
 					<div class="govuk-grid-column-full">
 						<div class="govuk-grid-row">
 							<section class="dfe-section">
@@ -203,10 +203,6 @@ <h3 class="govuk-heading-m">Housing and accommodation</h3>
 											<dd class="gem-c-metadata__definition">
 												18 February 2025
 											</dd>
-											<dt class="gem-c-metadata__term">Paged Fetched</dt>
-											<dd class="gem-c-metadata__definition">
-												26 February 2025 13:03:09
-											</dd>
 										</dl>
 									</div>
 								</div>
diff --git a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleAsset.html b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleAsset.html
index 25a9e96..849f81a 100644
--- a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleAsset.html
+++ b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleAsset.html
@@ -130,7 +130,7 @@ <h1 class="govuk-heading-xl">
 		</section>
 		<div b-k59dbireqp="" class="govuk-width-container" id="main-content-container">
 			<main b-k59dbireqp="" class="govuk-main-wrapper" id="main-content" role="main">
-				<div class="govuk-grid-row">
+				<div class="govuk-grid-row" data-last-fetched="2025-01-30T10:12:30">
 					<div class="govuk-grid-column-two-thirds">
 						<img class="full-width-image" src="//images.ctfassets.net/3y72rykjd1o5/71UfwHVCjz9O7RxA0e3jrJ/10a9c71dd9d5aa3ef795b1a571aa33d4/Test.png" alt="Test alt description">
 						<p class="govuk-body"></p>
diff --git a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleParagraph.html b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleParagraph.html
index 3fdd8ba..d031c00 100644
--- a/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleParagraph.html
+++ b/src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleParagraph.html
@@ -123,7 +123,7 @@ <h1 class="govuk-heading-xl">
 		</section>
 		<div b-k59dbireqp="" class="govuk-width-container" id="main-content-container">
 			<main b-k59dbireqp="" class="govuk-main-wrapper" id="main-content" role="main">
-				<div class="govuk-grid-row">
+				<div class="govuk-grid-row" data-last-fetched="2025-02-26T13:03:09">
 					<div class="govuk-grid-column-two-thirds">
 						<h2 class="govuk-heading-l" id="Test-1">Test 1</h2>
 						<p class="govuk-body">Test 1</p>