Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move last fetched from UI to a data attribute #45

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Move last fetched from UI to a data attribute #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/web/CareLeavers.Web/Views/Contentful/Page.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@using System.Globalization
@using CareLeavers.Web.Configuration
@using CareLeavers.Web.Models.Enums
@using Microsoft.AspNetCore.Mvc.TagHelpers
Expand Down Expand Up @@ -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)
{
Expand All @@ -48,7 +49,7 @@
@if (Model.ShowLastUpdated)
{
<hr/>
<partial name="_LastUpdated" model="@Model"/>
<partial name="_LastUpdated" model="@Model.Sys"/>
}

</div>
Expand Down
10 changes: 3 additions & 7 deletions src/web/CareLeavers.Web/Views/Shared/_LastUpdated.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Input/SimpleParagraph.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,7 @@
]
}
]
}
},
"metadata": null,
"fetched": "2025-02-26T13:03:09.51649+00:00"
}
6 changes: 1 addition & 5 deletions src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/ComponentTest.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions ...b/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/HomePageWithSupport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleAsset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/web/tests/CareLeavers.Integration.Tests/Tests/SnapshotTests/Output/SimpleParagraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down