From 38af36d0ebeb41a80a88896f491d388a54dd627a Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:50:16 +0100
Subject: [PATCH 01/10] feat: changed header logo to go to self-assessment
 (#153)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
---
 src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
index 0fb2a92..b4bdf6a 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
@@ -1,7 +1,7 @@
 <div class="dfe-header">
     <div class="dfe-width-container dfe-header__container">
         <div class="dfe-header__logo">
-            <a class="dfe-header__link dfe-header__link--service " href="/" aria-label="DfE homepage">
+            <a class="dfe-header__link dfe-header__link--service " href="/self-assessment" aria-label="DfE homepage">
                 <img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
                 <img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
             </a>

From 916f73c1dc0352f3bae941bb919a7cfb6a746ec3 Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Mon, 2 Sep 2024 14:07:16 +0100
Subject: [PATCH 02/10] Fix/bleeding links (#154)

* fix: feedback link fixed

* Fix: Fixed bleeding links

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
---
 .../Views/Shared/RichText/_HyperLink.cshtml                 | 6 ++----
 src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml  | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
index 46be2f8..8f82978 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
@@ -2,11 +2,9 @@
 
 @if (Model.IsVimeo)
 {
-    <partial name="RichText/_Vimeo" model="@Model" />
+    <partial name="RichText/_Vimeo" model="@Model"/>
 }
 else
 {
-    <a href="@Model.Uri" target="_blank" rel="noopener noreferrer">
-        <partial name="RichText/_Items" model="@Model"/>
-    </a>
+    <a href="@Model.Uri" target="_blank" rel="noopener noreferrer"><partial name="RichText/_Text" model="@Model.Content.First()"/></a>
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
index 70580a5..790376a 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
@@ -3,10 +3,7 @@
         @* <govuk-phase-banner-tag>Beta</govuk-phase-banner-tag> *@
         <strong class="govuk-tag govuk-phase-banner__content__tag">Beta</strong>
         This is a new service - your
-        <a href="https://forms.office.com/e/Jk5PuNWvGe" class="govuk-link" target="_blank"
-        rel="noopener">
-            feedback
-        </a> will
+        <a href="https://forms.office.com/e/Jk5PuNWvGe" class="govuk-link" target="_blank" rel="noopener">feedback</a> will
         help us to improve it.
     </p>
 </div>
\ No newline at end of file

From 592a0a64a51c1b08efca901ce83448afbc9c6416 Mon Sep 17 00:00:00 2001
From: Tom Whittington <tom.whittington@education.gov.uk>
Date: Tue, 3 Sep 2024 11:22:07 +0100
Subject: [PATCH 03/10] fix: added missing span from feedback banner

---
 src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
index 790376a..b39601a 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_BetaHeader.cshtml
@@ -2,8 +2,8 @@
     <p class="govuk-phase-banner__content">
         @* <govuk-phase-banner-tag>Beta</govuk-phase-banner-tag> *@
         <strong class="govuk-tag govuk-phase-banner__content__tag">Beta</strong>
-        This is a new service - your
-        <a href="https://forms.office.com/e/Jk5PuNWvGe" class="govuk-link" target="_blank" rel="noopener">feedback</a> will
-        help us to improve it.
+        <span class="govuk-phase-banner__text">
+            This is a new service - your <a href="https://forms.office.com/e/Jk5PuNWvGe" class="govuk-link" target="_blank" rel="noopener">feedback</a> will help us to improve it.
+        </span>
     </p>
 </div>
\ No newline at end of file

From 9367c393ad10b6876e148512d4252db000c2ad29 Mon Sep 17 00:00:00 2001
From: katie-gardner-AND <katharine.gardner@and.digital>
Date: Thu, 5 Sep 2024 10:36:17 +0100
Subject: [PATCH 04/10] chore: Simplify hiding js-only elements

---
 .../Views/Content/CsIndex.cshtml              | 26 +------------------
 .../Views/Shared/_CsLayout.cshtml             |  7 +++++
 .../Views/Shared/_Feedback.cshtml             |  2 +-
 .../Views/Shared/_Print.cshtml                |  2 +-
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
index 3087d3a..f0cba6a 100644
--- a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
@@ -76,28 +76,4 @@
             addPrintButtonEventListener();
         </script>
     }
-
-    <script nonce="@Context.Items["nonce"]" defer>
-        const hiddenClass = "govuk-visually-hidden";
-
-        //Some elements should remain hidden
-        const idsToNotShow = ["support-links"];
-
-        //Remove hidden visibility CSS class if JS enabled
-        const removeHiddenClassFromElements = () => {
-            const hiddenElements = Array.from(document.querySelectorAll(`.${hiddenClass}`));
-
-            for(const element of hiddenElements){
-                if(idsToNotShow.indexOf(element.id) > -1){
-                    continue;
-                }
-
-                element.classList.remove(hiddenClass);
-                //Also unset "aria-hidden" attribute
-                element.ariaHidden = undefined;
-            }
-        }
-
-        removeHiddenClassFromElements();
-    </script>
-}
\ No newline at end of file
+}
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
index fa842bf..5aed44a 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
@@ -69,6 +69,13 @@
     <script defer type="module" nonce="@Context.Items["nonce"]">
         import * as govuk from '/js/govuk-frontend.min.js';
         govuk.initAll();
+
+        function showHiddenElement(element) {
+            element.classList.remove("govuk-visually-hidden");
+            element.ariaHidden = undefined;
+        }
+        // unhide all js-only elements when js is enabled
+        [...document.getElementsByClassName("js-only")].forEach(showHiddenElement)
     </script>
 
     @RenderSection("BodyEnd", false)
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_Feedback.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_Feedback.cshtml
index c6fbf40..b7fc3d0 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_Feedback.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_Feedback.cshtml
@@ -17,7 +17,7 @@
 
 @if (track)
 {
-    <div class="dfe-feedback-banner govuk-!-margin-top-9 govuk-visually-hidden" aria-hidden="true" id="feedback-banner">
+    <div class="dfe-feedback-banner govuk-!-margin-top-9 js-only govuk-visually-hidden" aria-hidden="true" id="feedback-banner">
         <div class="dfe-feedback-banner--content">
             <form id="feedbackForm">
                 <div class="dfe-feedback-banner--content-questions">
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_Print.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_Print.cshtml
index b65a3b2..406ccdf 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_Print.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_Print.cshtml
@@ -1,3 +1,3 @@
-<div class="print-button govuk-visually-hidden" aria-hidden="true">
+<div class="js-only print-button govuk-visually-hidden" aria-hidden="true">
     <button class="govuk-link print-link-button" data-module="print-link" id="print-link" >Print this page</button>
 </div>
\ No newline at end of file

From 4ab2bba4d7e46303accf0c2f83a3cabbfaac8179 Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:57:18 +0100
Subject: [PATCH 05/10] feature: setup to use plantechs head and cookies when
 ran with it (#156)

* feature: setup to use plantechs head and cookies when ran with it

* fix: added a title to the gtm iframe

* chore: using index reference rather than .First

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
---
 .../_CookieBanner.cshtml}                     |  0
 .../Views/Shared/RichText/_HyperLink.cshtml   |  2 +-
 .../Views/Shared/_BodyEnd.cshtml              |  4 ++
 .../Views/Shared/_CsBeforeContent.cshtml      | 10 ++++
 .../Views/Shared/_CsHeader.cshtml             | 26 +++++----
 .../Views/Shared/_CsLayout.cshtml             | 54 +++----------------
 .../Views/Shared/_Head.cshtml                 | 14 +++++
 7 files changed, 52 insertions(+), 58 deletions(-)
 rename src/Dfe.ContentSupport.Web/Views/Shared/{_CookieConsent.cshtml => CookiesBanner/_CookieBanner.cshtml} (100%)
 create mode 100644 src/Dfe.ContentSupport.Web/Views/Shared/_BodyEnd.cshtml
 create mode 100644 src/Dfe.ContentSupport.Web/Views/Shared/_CsBeforeContent.cshtml
 create mode 100644 src/Dfe.ContentSupport.Web/Views/Shared/_Head.cshtml

diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CookieConsent.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/CookiesBanner/_CookieBanner.cshtml
similarity index 100%
rename from src/Dfe.ContentSupport.Web/Views/Shared/_CookieConsent.cshtml
rename to src/Dfe.ContentSupport.Web/Views/Shared/CookiesBanner/_CookieBanner.cshtml
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
index 8f82978..ab2f610 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_HyperLink.cshtml
@@ -6,5 +6,5 @@
 }
 else
 {
-    <a href="@Model.Uri" target="_blank" rel="noopener noreferrer"><partial name="RichText/_Text" model="@Model.Content.First()"/></a>
+    <a href="@Model.Uri" target="_blank" rel="noopener noreferrer"><partial name="RichText/_Text" model="@Model.Content[0]"/></a>
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_BodyEnd.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_BodyEnd.cshtml
new file mode 100644
index 0000000..49f78dd
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_BodyEnd.cshtml
@@ -0,0 +1,4 @@
+<script defer type="module" nonce="@Context.Items["nonce"]">
+    import * as govuk from '/js/govuk-frontend.min.js';
+    govuk.initAll();
+</script>
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CsBeforeContent.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_CsBeforeContent.cshtml
new file mode 100644
index 0000000..6d28fe4
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_CsBeforeContent.cshtml
@@ -0,0 +1,10 @@
+@using Dfe.ContentSupport.Web.Configuration
+@inject TrackingOptions TrackingOptions
+
+<!-- Google Tag Manager (noscript) -->
+<noscript>
+    <iframe src=@($"https://www.googletagmanager.com/ns.html?id={TrackingOptions.Gtm}") height="0" width="0"
+            style="display:none;visibility:hidden" title="cs_gtm">
+    </iframe>
+</noscript>
+<!-- End Google Tag Manager (noscript) -->
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
index b4bdf6a..25d3b2c 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_CsHeader.cshtml
@@ -1,13 +1,17 @@
-<div class="dfe-header">
-    <div class="dfe-width-container dfe-header__container">
-        <div class="dfe-header__logo">
-            <a class="dfe-header__link dfe-header__link--service " href="/self-assessment" aria-label="DfE homepage">
-                <img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
-                <img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
-            </a>
+<header role="banner">
+    <partial name="CookiesBanner/_CookieBanner" />
+    <div class="dfe-header">
+        <div class="dfe-width-container dfe-header__container">
+            <div class="dfe-header__logo">
+                <a class="dfe-header__link dfe-header__link--service " href="/" aria-label="DfE homepage">
+                    <img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
+                    <img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
+                </a>
+            </div>
+        </div>
+        <div class="dfe-width-container dfe-header__service-name">
+            <a href="/self-assessment" class="dfe-header__link--service">Plan technology for your school</a>
         </div>
     </div>
-    <div class="dfe-width-container dfe-header__service-name">
-        <a href="/self-assessment" class="dfe-header__link--service">Plan technology for your school</a>
-    </div>
-</div>
\ No newline at end of file
+    <partial name="_Hero" model="@Model.Heading"/>
+</header>
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
index fa842bf..d6b4001 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_CsLayout.cshtml
@@ -1,64 +1,30 @@
-@using Dfe.ContentSupport.Web.Configuration
-@inject TrackingOptions TrackingOptions
 @model CsPage;
 
 @{
     Layout = "_GovUkPageTemplate";
     ViewData["Title"] = Model.Heading.Title;
     ViewData["containerClasses"] = "dfe-width-container";
-    var consentCookie = Context.Request.Cookies[".AspNet.Consent"];
-    var track = consentCookie == "true";
 }
 
 @section Head {
-    @{
-        if (track)
-        {
-            <!-- Google Tag Manager -->
-            <script>(function (w, d, s, l, i) {
-                    w[l] = w[l] || []; w[l].push({
-                        'gtm.start':
-                            new Date().getTime(), event: 'gtm.js'
-                    }); var f = d.getElementsByTagName(s)[0],
-                        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
-                            'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
-                })(window, document, 'script', 'dataLayer', '@(TrackingOptions.Gtm)');</script>
-            <!-- End Google Tag Manager -->
-        }
-    }
+    <partial name="_Head"/>
 }
 
 @section Header {
     <link rel="stylesheet" as="style" href="~/css/application.css">
     <link rel="stylesheet" as="style" href="~/css/cands-site.css">
-    <header role="banner">
-        <partial name="_CookieConsent"/>
-        <partial name="_CsHeader"/>
-        <partial name="_Hero" model="@Model.Heading"/>
-    </header>
-    @RenderSection("Header", false)
+    <partial name="_CsHeader"/>
+    @await RenderSectionAsync("Header", false)
 }
 
 @section BeforeContent {
     <script
         defer>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
-
-    @{
-        if (track)
-        {
-            <!-- Google Tag Manager (noscript) -->
-            <noscript>
-                <iframe src=@($"https://www.googletagmanager.com/ns.html?id={TrackingOptions.Gtm}") height="0" width="0"
-                        style="display:none;visibility:hidden">
-                </iframe>
-            </noscript>
-            <!-- End Google Tag Manager (noscript) -->
-        }
-    }
-
-    @RenderSection("BeforeContent", false)
+    <partial name="_CsBeforeContent"/>
+    @await RenderSectionAsync("BeforeContent", false)
 }
 
+
 @RenderBody()
 
 @section Footer {
@@ -66,10 +32,6 @@
 }
 
 @section BodyEnd {
-    <script defer type="module" nonce="@Context.Items["nonce"]">
-        import * as govuk from '/js/govuk-frontend.min.js';
-        govuk.initAll();
-    </script>
-
-    @RenderSection("BodyEnd", false)
+    <partial name="_BodyEnd"/>
+    @await RenderSectionAsync("BodyEnd", false)
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_Head.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_Head.cshtml
new file mode 100644
index 0000000..afc694d
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_Head.cshtml
@@ -0,0 +1,14 @@
+@using Dfe.ContentSupport.Web.Configuration
+@inject TrackingOptions TrackingOptions
+
+
+<!-- Google Tag Manager -->
+<script>(function (w, d, s, l, i) {
+                    w[l] = w[l] || []; w[l].push({
+                        'gtm.start':
+                            new Date().getTime(), event: 'gtm.js'
+                    }); var f = d.getElementsByTagName(s)[0],
+                        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+                            'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+                })(window, document, 'script', 'dataLayer', '@(TrackingOptions.Gtm)');</script>
+<!-- End Google Tag Manager -->
\ No newline at end of file

From 9af728af94873981451f7fd88211ff529183449a Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:24:31 +0100
Subject: [PATCH 06/10] docs: added basic readme file (#160)

* docs: added basic readme file

* docs: added testing instruction to README.md

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
---
 README.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6ba1bbd..3b57945 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,19 @@
-# sts-knowledgebase
-Using Specify part of knowledgebase -DfE help schools to describe the digital technology they want to buy?.
+# sts-contentsupport
+
+Web application to surface additional support for STS services
+
+## Requirements
+
+- .Net 8.0 and any supported IDE for DEV running.
+
+
+## Running locally
+
+- The startup project is [./src/Dfe.ContentSupport.Web](./src/Dfe.ContentSupport.Web)
+- Add 'dotNet-user-secret' to .NET secrets found in keyvault s190d01-cands-kv
+- Add yourself with some permissions in the keyvault
+  - s190d01-cands-kv/access_policies
+- The secrets should be pulled from the keyvault by using them settings. You may need to add your public IP to the firewall on the keyvault
+  - s190d01-cands-kv/networking
+- Run the application using the http profile
+- Go to URL/content/SLUG to test
\ No newline at end of file

From c482ff4b082b4337f4afc1d792968d536bb74de1 Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Thu, 26 Sep 2024 12:54:34 +0100
Subject: [PATCH 07/10] Fix: fixed contentful fail on first attempt (#159)

* Using plantech contentful connection

* chore: cleaned up contentful reshuffle

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
---
 .../Configuration/CsContentfulOptions.cs      |  9 -----
 .../Dfe.ContentSupport.Web.csproj             |  3 +-
 .../Extensions/HttpClientPolicyExtensions.cs  | 17 ++++++++++
 .../WebApplicationBuilderExtensions.cs        | 34 +++++++++++++------
 .../Http/HttpContentfulClient.cs              | 33 ------------------
 .../Http/IHttpContentfulClient.cs             | 10 ------
 .../Http/StubHttpContentfulClient.cs          | 22 ------------
 src/Dfe.ContentSupport.Web/Program.cs         |  4 ---
 .../Services/ContentService.cs                |  5 +--
 .../Services/ContentfulService.cs             | 31 +++++++++++------
 .../Services/IContentfulService.cs            | 14 ++++----
 .../Services/StubContentfulService.cs         | 22 ++++++++++++
 .../Dfe.ContentSupport.Web.Tests.csproj       |  6 ++++
 .../WebApplicationBuilderExtensionsTests.cs   | 13 ++++---
 .../Http/HttpContentfulClientTests.cs         | 19 -----------
 .../Http/StubHttpContentfulClientTests.cs     | 17 ----------
 .../Services/ContentServiceTests.cs           | 34 ++++++++-----------
 .../Services/ContentfulServiceTests.cs        | 23 ++++++-------
 .../Services/StubContentfulServiceTests.cs    | 15 ++++++++
 .../StubData/ContentfulCollection.json        |  2 +-
 20 files changed, 147 insertions(+), 186 deletions(-)
 delete mode 100644 src/Dfe.ContentSupport.Web/Configuration/CsContentfulOptions.cs
 create mode 100644 src/Dfe.ContentSupport.Web/Extensions/HttpClientPolicyExtensions.cs
 delete mode 100644 src/Dfe.ContentSupport.Web/Http/HttpContentfulClient.cs
 delete mode 100644 src/Dfe.ContentSupport.Web/Http/IHttpContentfulClient.cs
 delete mode 100644 src/Dfe.ContentSupport.Web/Http/StubHttpContentfulClient.cs
 create mode 100644 src/Dfe.ContentSupport.Web/Services/StubContentfulService.cs
 delete mode 100644 tests/Dfe.ContentSupport.Web.Tests/Http/HttpContentfulClientTests.cs
 delete mode 100644 tests/Dfe.ContentSupport.Web.Tests/Http/StubHttpContentfulClientTests.cs
 create mode 100644 tests/Dfe.ContentSupport.Web.Tests/Services/StubContentfulServiceTests.cs
 rename {src/Dfe.ContentSupport.Web/Http => tests/Dfe.ContentSupport.Web.Tests}/StubData/ContentfulCollection.json (99%)

diff --git a/src/Dfe.ContentSupport.Web/Configuration/CsContentfulOptions.cs b/src/Dfe.ContentSupport.Web/Configuration/CsContentfulOptions.cs
deleted file mode 100644
index 6441cf0..0000000
--- a/src/Dfe.ContentSupport.Web/Configuration/CsContentfulOptions.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Contentful.Core.Configuration;
-
-namespace Dfe.ContentSupport.Web.Configuration;
-
-public class CsContentfulOptions : ContentfulOptions
-{
-    public int IncludeDepth { get; set; } = 10;
-    public int RetryAttempts { get; set; } = 3;
-}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj b/src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj
index c927a0e..34b1ed2 100644
--- a/src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj
+++ b/src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj
@@ -10,10 +10,11 @@
     <ItemGroup>
         <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
         <PackageReference Include="Azure.Identity" Version="1.11.4" />
-        <PackageReference Include="contentful.aspnetcore" Version="7.5.1" />
         <PackageReference Include="contentful.csharp" Version="7.5.1" />
         <PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.5.0" />
         <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
+        <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
     </ItemGroup>
 </Project>
diff --git a/src/Dfe.ContentSupport.Web/Extensions/HttpClientPolicyExtensions.cs b/src/Dfe.ContentSupport.Web/Extensions/HttpClientPolicyExtensions.cs
new file mode 100644
index 0000000..e7bd609
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Extensions/HttpClientPolicyExtensions.cs
@@ -0,0 +1,17 @@
+using Polly;
+using Polly.Extensions.Http;
+
+namespace Dfe.ContentSupport.Web.Extensions;
+
+public static class HttpClientPolicyExtensions
+{
+    public static void AddRetryPolicy(IHttpClientBuilder builder) =>
+        builder
+            .SetHandlerLifetime(TimeSpan.FromMinutes(5))
+            .AddPolicyHandler(GetRetryPolicy());
+
+    public static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy() =>
+        HttpPolicyExtensions.HandleTransientHttpError()
+            .OrResult(msg => msg.StatusCode == System.Net.HttpStatusCode.NotFound)
+            .WaitAndRetryAsync(6, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Extensions/WebApplicationBuilderExtensions.cs b/src/Dfe.ContentSupport.Web/Extensions/WebApplicationBuilderExtensions.cs
index 71ea637..085bd9e 100644
--- a/src/Dfe.ContentSupport.Web/Extensions/WebApplicationBuilderExtensions.cs
+++ b/src/Dfe.ContentSupport.Web/Extensions/WebApplicationBuilderExtensions.cs
@@ -1,5 +1,6 @@
-using Dfe.ContentSupport.Web.Configuration;
-using Dfe.ContentSupport.Web.Http;
+using Contentful.Core;
+using Contentful.Core.Configuration;
+using Dfe.ContentSupport.Web.Configuration;
 using Dfe.ContentSupport.Web.Models.Mapped;
 using Dfe.ContentSupport.Web.Services;
 using Microsoft.Extensions.Options;
@@ -10,19 +11,16 @@ public static class WebApplicationBuilderExtensions
 {
     public static void InitCsDependencyInjection(this WebApplicationBuilder app)
     {
-        app.Services.Configure<CsContentfulOptions>(app.Configuration.GetSection("cs:contentful"))
-            .AddSingleton(sp => sp.GetRequiredService<IOptions<CsContentfulOptions>>().Value);
-
         app.Services.Configure<TrackingOptions>(app.Configuration.GetSection("tracking"))
             .AddSingleton(sp => sp.GetRequiredService<IOptions<TrackingOptions>>().Value);
 
         app.Services.Configure<SupportedAssetTypes>(app.Configuration.GetSection("cs:supportedAssetTypes"))
             .AddSingleton(sp => sp.GetRequiredService<IOptions<SupportedAssetTypes>>().Value);
-        
-        app.Services
-            .AddTransient<ICacheService<List<CsPage>>, CsPagesCacheService>();
+
+        app.Services.SetupContentfulClient(app);
+
+        app.Services.AddTransient<ICacheService<List<CsPage>>, CsPagesCacheService>();
         app.Services.AddTransient<IModelMapper, ModelMapper>();
-        app.Services.AddTransient<IContentfulService, ContentfulService>();
         app.Services.AddTransient<IContentService, ContentService>();
         app.Services.AddTransient<ILayoutService, LayoutService>();
 
@@ -33,13 +31,27 @@ public static void InitCsDependencyInjection(this WebApplicationBuilder app)
             options.ConsentCookieValue = "false";
         });
 
+
+    }
+
+    public static void SetupContentfulClient(this IServiceCollection services, WebApplicationBuilder app)
+    {
+        app.Services.Configure<ContentfulOptions>(app.Configuration.GetSection("cs:contentful"))
+            .AddSingleton(sp => sp.GetRequiredService<IOptions<ContentfulOptions>>().Value);
+
+        services.AddScoped<IContentfulClient, ContentfulClient>();
+        
         if (app.Environment.EnvironmentName.Equals("e2e"))
         {
-            app.Services.AddTransient<IHttpContentfulClient, StubHttpContentfulClient>();
+            services.AddScoped<IContentfulService, StubContentfulService>();
         }
         else
         {
-            app.Services.AddTransient<IHttpContentfulClient, HttpContentfulClient>();
+            services.AddScoped<IContentfulService, ContentfulService>();
         }
+        
+        
+
+        HttpClientPolicyExtensions.AddRetryPolicy(services.AddHttpClient<ContentfulClient>());
     }
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Http/HttpContentfulClient.cs b/src/Dfe.ContentSupport.Web/Http/HttpContentfulClient.cs
deleted file mode 100644
index 32c446a..0000000
--- a/src/Dfe.ContentSupport.Web/Http/HttpContentfulClient.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Contentful.Core;
-using Dfe.ContentSupport.Web.Configuration;
-using Contentful.Core.Models;
-using Contentful.Core.Search;
-
-namespace Dfe.ContentSupport.Web.Http;
-
-public class HttpContentfulClient(HttpClient httpClient, CsContentfulOptions options)
-    : ContentfulClient(httpClient, options), IHttpContentfulClient
-{
-    public async Task<ContentfulCollection<T>> Query<T>(QueryBuilder<T> queryBuilder,
-        CancellationToken cancellationToken = default) where T : class
-    {
-        queryBuilder = queryBuilder.Include(options.IncludeDepth);
-
-        for (int attempt = 1; attempt <= options.RetryAttempts; attempt++)
-        {
-            try
-            {
-                return await GetEntries(queryBuilder, cancellationToken);
-            }
-            catch (Exception)
-            {
-                if (attempt == options.RetryAttempts)
-                {
-                    throw;
-                }
-            }
-        }
-
-        return default!;
-    }
-}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Http/IHttpContentfulClient.cs b/src/Dfe.ContentSupport.Web/Http/IHttpContentfulClient.cs
deleted file mode 100644
index 60ad964..0000000
--- a/src/Dfe.ContentSupport.Web/Http/IHttpContentfulClient.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Contentful.Core.Models;
-using Contentful.Core.Search;
-
-namespace Dfe.ContentSupport.Web.Http;
-
-public interface IHttpContentfulClient
-{
-    Task<ContentfulCollection<T>> Query<T>(QueryBuilder<T> queryBuilder,
-        CancellationToken cancellationToken = default) where T : class;
-}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Http/StubHttpContentfulClient.cs b/src/Dfe.ContentSupport.Web/Http/StubHttpContentfulClient.cs
deleted file mode 100644
index aaf00ab..0000000
--- a/src/Dfe.ContentSupport.Web/Http/StubHttpContentfulClient.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Contentful.Core;
-using Dfe.ContentSupport.Web.Configuration;
-using Contentful.Core.Models;
-using Contentful.Core.Search;
-using Newtonsoft.Json;
-
-namespace Dfe.ContentSupport.Web.Http;
-
-public class StubHttpContentfulClient(HttpClient httpClient, CsContentfulOptions options)
-    : ContentfulClient(httpClient, options), IHttpContentfulClient
-{
-    public async Task<ContentfulCollection<T>> Query<T>(QueryBuilder<T> queryBuilder,
-        CancellationToken cancellationToken = default) where T : class
-    {
-        var json = await System.IO.File.ReadAllTextAsync("Http/StubData/ContentfulCollection.json",
-            cancellationToken);
-        var resp = JsonConvert.DeserializeObject<T>(json);
-        return resp == null
-            ? new ContentfulCollection<T>()
-            : new ContentfulCollection<T> { Items = new[] { resp } };
-    }
-}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Program.cs b/src/Dfe.ContentSupport.Web/Program.cs
index b1b5f4c..0e70ecf 100644
--- a/src/Dfe.ContentSupport.Web/Program.cs
+++ b/src/Dfe.ContentSupport.Web/Program.cs
@@ -1,10 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using Azure.Identity;
-using Contentful.AspNetCore;
 using Dfe.ContentSupport.Web.Extensions;
 using GovUk.Frontend.AspNetCore;
 
-
 namespace Dfe.ContentSupport.Web;
 
 [ExcludeFromCodeCoverage]
@@ -24,7 +22,6 @@ public static void Main(string[] args)
         builder.Services.AddHealthChecks();
 
         builder.Services.AddGovUkFrontend();
-        builder.Services.AddContentful(builder.Configuration);
         builder.InitCsDependencyInjection();
 
         var app = builder.Build();
@@ -34,7 +31,6 @@ public static void Main(string[] args)
             app.UseHsts();
         }
 
-
         app.UseHttpsRedirection();
         app.UseStaticFiles();
         app.UseRouting();
diff --git a/src/Dfe.ContentSupport.Web/Services/ContentService.cs b/src/Dfe.ContentSupport.Web/Services/ContentService.cs
index 9b3bc57..d049c38 100644
--- a/src/Dfe.ContentSupport.Web/Services/ContentService.cs
+++ b/src/Dfe.ContentSupport.Web/Services/ContentService.cs
@@ -1,5 +1,4 @@
 using System.Xml.Linq;
-using Contentful.Core.Search;
 using Dfe.ContentSupport.Web.Models.Mapped;
 using Dfe.ContentSupport.Web.ViewModels;
 
@@ -59,9 +58,7 @@ public async Task<List<CsPage>> GetContentSupportPages(
         }
 
 
-        var builder = QueryBuilder<ContentSupportPage>.New.ContentTypeIs(nameof(ContentSupportPage))
-            .FieldEquals($"fields.{field}", value);
-        var result = await contentfulService.ContentfulClient(isPreview).Query(builder);
+        var result = await contentfulService.GetContentSupportPages(field, value);
         var pages = modelMapper.MapToCsPages(result);
 
         if (!isPreview)
diff --git a/src/Dfe.ContentSupport.Web/Services/ContentfulService.cs b/src/Dfe.ContentSupport.Web/Services/ContentfulService.cs
index dce404e..c446905 100644
--- a/src/Dfe.ContentSupport.Web/Services/ContentfulService.cs
+++ b/src/Dfe.ContentSupport.Web/Services/ContentfulService.cs
@@ -1,15 +1,26 @@
-using Dfe.ContentSupport.Web.Configuration;
-using Dfe.ContentSupport.Web.Http;
+using Contentful.Core;
+using Contentful.Core.Search;
+using Dfe.ContentSupport.Web.ViewModels;
 
-namespace Dfe.ContentSupport.Web.Services
+namespace Dfe.ContentSupport.Web.Services;
+
+public class ContentfulService(IContentfulClient client)
+    : IContentfulService
 {
-    public class ContentfulService(CsContentfulOptions contentfulOptions, IHttpContentfulClient httpContentfulClient) : IContentfulService
+    private const int DefaultRequestDepth = 10;
+
+    private readonly IContentfulClient _client =
+        client ?? throw new ArgumentNullException(nameof(client));
+
+    public async Task<IEnumerable<ContentSupportPage>> GetContentSupportPages(string field,
+        string value, CancellationToken cancellationToken = default)
     {
+        var builder = QueryBuilder<ContentSupportPage>.New.ContentTypeIs(nameof(ContentSupportPage))
+            .FieldEquals($"fields.{field}", value)
+            .Include(DefaultRequestDepth);
+
+        var entries = await _client.GetEntries(builder, cancellationToken);
 
-        public IHttpContentfulClient ContentfulClient(bool isPreview = false)
-        {
-            contentfulOptions.UsePreviewApi = isPreview;
-            return httpContentfulClient;
-        }
+        return entries ?? Enumerable.Empty<ContentSupportPage>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Services/IContentfulService.cs b/src/Dfe.ContentSupport.Web/Services/IContentfulService.cs
index 63ab5bf..b86813f 100644
--- a/src/Dfe.ContentSupport.Web/Services/IContentfulService.cs
+++ b/src/Dfe.ContentSupport.Web/Services/IContentfulService.cs
@@ -1,9 +1,9 @@
-using Dfe.ContentSupport.Web.Http;
+using Dfe.ContentSupport.Web.ViewModels;
 
-namespace Dfe.ContentSupport.Web.Services
+namespace Dfe.ContentSupport.Web.Services;
+
+public interface IContentfulService
 {
-    public interface IContentfulService
-    {
-        IHttpContentfulClient ContentfulClient(bool isPreview = false);
-    }
-}
+    Task<IEnumerable<ContentSupportPage>> GetContentSupportPages(string field, string value,
+        CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Services/StubContentfulService.cs b/src/Dfe.ContentSupport.Web/Services/StubContentfulService.cs
new file mode 100644
index 0000000..30578ac
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Services/StubContentfulService.cs
@@ -0,0 +1,22 @@
+using Contentful.Core;
+using Contentful.Core.Configuration;
+using Contentful.Core.Models;
+using Dfe.ContentSupport.Web.ViewModels;
+using Newtonsoft.Json;
+
+namespace Dfe.ContentSupport.Web.Services;
+
+public class StubContentfulService(HttpClient httpClient, ContentfulOptions options)
+    : ContentfulClient(httpClient, options), IContentfulService
+{
+    public async Task<IEnumerable<ContentSupportPage>> GetContentSupportPages(string field,
+        string value, CancellationToken cancellationToken = default)
+    {
+        var json = await System.IO.File.ReadAllTextAsync("StubData/ContentfulCollection.json",
+            cancellationToken);
+        var resp = JsonConvert.DeserializeObject<ContentSupportPage>(json);
+        return resp == null
+            ? new ContentfulCollection<ContentSupportPage>()
+            : new ContentfulCollection<ContentSupportPage> { Items = [resp] };
+    }
+}
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Dfe.ContentSupport.Web.Tests.csproj b/tests/Dfe.ContentSupport.Web.Tests/Dfe.ContentSupport.Web.Tests.csproj
index e9ee0bd..fd5ec67 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Dfe.ContentSupport.Web.Tests.csproj
+++ b/tests/Dfe.ContentSupport.Web.Tests/Dfe.ContentSupport.Web.Tests.csproj
@@ -28,4 +28,10 @@
         <ProjectReference Include="..\..\src\Dfe.ContentSupport.Web\Dfe.ContentSupport.Web.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="StubData\ContentfulCollection.json">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+
 </Project>
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Extensions/WebApplicationBuilderExtensionsTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Extensions/WebApplicationBuilderExtensionsTests.cs
index 86779f8..c7b1363 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Extensions/WebApplicationBuilderExtensionsTests.cs
+++ b/tests/Dfe.ContentSupport.Web.Tests/Extensions/WebApplicationBuilderExtensionsTests.cs
@@ -1,5 +1,4 @@
 using Dfe.ContentSupport.Web.Extensions;
-using Dfe.ContentSupport.Web.Http;
 using Dfe.ContentSupport.Web.Models.Mapped;
 using Microsoft.AspNetCore.Builder;
 
@@ -17,9 +16,9 @@ public void Builder_Contains_Correct_Services()
         {
             typeof(IContentService),
             typeof(IContentfulService),
-            typeof(IHttpContentfulClient),
             typeof(ICacheService<List<CsPage>>),
-            typeof(IModelMapper)
+            typeof(IModelMapper),
+            typeof(ILayoutService)
         };
         foreach (var type in types)
             builder.Services.Where(o => o.ServiceType == type).Should().ContainSingle();
@@ -32,8 +31,8 @@ public void Builder_Default_Uses_DefaultClient()
         builder.InitCsDependencyInjection();
 
 
-        var service = builder.Services.First(o => o.ServiceType == typeof(IHttpContentfulClient));
-        service.ImplementationType?.Name.Should().BeEquivalentTo(nameof(HttpContentfulClient));
+        var service = builder.Services.First(o => o.ServiceType == typeof(IContentfulService));
+        service.ImplementationType?.Name.Should().BeEquivalentTo(nameof(ContentfulService));
     }
 
     [Fact]
@@ -46,7 +45,7 @@ public void Builder_E2e_Uses_MockClient()
 
         builder.InitCsDependencyInjection();
 
-        var service = builder.Services.First(o => o.ServiceType == typeof(IHttpContentfulClient));
-        service.ImplementationType?.Name.Should().BeEquivalentTo(nameof(StubHttpContentfulClient));
+        var service = builder.Services.First(o => o.ServiceType == typeof(IContentfulService));
+        service.ImplementationType?.Name.Should().BeEquivalentTo(nameof(StubContentfulService));
     }
 }
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Http/HttpContentfulClientTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Http/HttpContentfulClientTests.cs
deleted file mode 100644
index 7b2c9d2..0000000
--- a/tests/Dfe.ContentSupport.Web.Tests/Http/HttpContentfulClientTests.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Dfe.ContentSupport.Web.Configuration;
-using Contentful.Core.Errors;
-using Contentful.Core.Search;
-using Dfe.ContentSupport.Web.Http;
-
-namespace Dfe.ContentSupport.Web.Tests.Http;
-
-public class HttpContentfulClientTests
-{
-    [Fact]
-    public async Task Client_Calls_Contentful_And_Bounce()
-    {
-        var sut = new HttpContentfulClient(new HttpClient(), new CsContentfulOptions());
-
-        await sut.Invoking(o => o.Query(new QueryBuilder<dynamic>())).Should()
-            .ThrowExactlyAsync<ContentfulException>()
-            .WithMessage("The resource could not be found.");
-    }
-}
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Http/StubHttpContentfulClientTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Http/StubHttpContentfulClientTests.cs
deleted file mode 100644
index d638062..0000000
--- a/tests/Dfe.ContentSupport.Web.Tests/Http/StubHttpContentfulClientTests.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Dfe.ContentSupport.Web.Configuration;
-using Contentful.Core.Search;
-using Dfe.ContentSupport.Web.Http;
-
-namespace Dfe.ContentSupport.Web.Tests.Http;
-
-public class StubHttpContentfulClientTests
-{
-    [Fact]
-    public async Task Client_Get_MockContent()
-    {
-        var sut = new StubHttpContentfulClient(new HttpClient(), new CsContentfulOptions());
-
-        var collection = await sut.Query(It.IsAny<QueryBuilder<ContentSupportPage>>());
-        collection.First().InternalName.Should().BeEquivalentTo("MockContent");
-    }
-}
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Services/ContentServiceTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Services/ContentServiceTests.cs
index 135cfba..9a475ed 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Services/ContentServiceTests.cs
+++ b/tests/Dfe.ContentSupport.Web.Tests/Services/ContentServiceTests.cs
@@ -1,20 +1,16 @@
 using System.Xml.Linq;
 using Dfe.ContentSupport.Web.Configuration;
 using Contentful.Core.Models;
-using Contentful.Core.Search;
-using Dfe.ContentSupport.Web.Http;
-using Dfe.ContentSupport.Web.Models;
 using Dfe.ContentSupport.Web.Models.Mapped;
 
 namespace Dfe.ContentSupport.Web.Tests.Services;
 
 public class ContentServiceTests
 {
-    private readonly Mock<IHttpContentfulClient> _httpContentClientMock = new();
+    private readonly Mock<IContentfulService> _httpContentClientMock = new();
     private readonly Mock<ICacheService<List<CsPage>>> _cacheMock = new();
     private readonly Mock<IModelMapper> _mapperMock = new();
 
-
     private readonly ContentfulCollection<ContentSupportPage> _response = new()
     {
         Items = new List<ContentSupportPage>
@@ -25,18 +21,15 @@ public class ContentServiceTests
         }
     };
 
-    private ContentService GetService() => new(GetClient(), _cacheMock.Object, _mapperMock.Object);
-
-    private ContentfulService GetClient() =>
-        new(new CsContentfulOptions(), _httpContentClientMock.Object);
-
+    private ContentService GetService() => new(_httpContentClientMock.Object, _cacheMock.Object, _mapperMock.Object);
+    
     private void SetupResponse(ContentfulCollection<ContentSupportPage>? response = null)
     {
         var res = response ?? _response;
-        _httpContentClientMock.Setup(o => o.Query(It.IsAny<QueryBuilder<ContentSupportPage>>(),
-            It.IsAny<CancellationToken>())).ReturnsAsync(res);
-
 
+        _httpContentClientMock.Setup(o => o.GetContentSupportPages(It.IsAny<string>(),
+            It.IsAny<string>(), It.IsAny<CancellationToken>())).ReturnsAsync(res);
+        
         _mapperMock.Setup(o => o.MapToCsPages(res))
             .Returns(res.Items
                 .Select(page => new ModelMapper(new SupportedAssetTypes()).MapToCsPage(page))
@@ -51,8 +44,9 @@ public async Task GetContent_Calls_Client_Once()
         await sut.GetContent(It.IsAny<string>());
 
         _httpContentClientMock.Verify(o =>
-                o.Query(
-                    It.IsAny<QueryBuilder<ContentSupportPage>>(),
+                o.GetContentSupportPages(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()),
             Times.Once
         );
@@ -105,8 +99,9 @@ public async Task GetCsPages_Calls_Client_Once()
         await sut.GetCsPages();
 
         _httpContentClientMock.Verify(o =>
-                o.Query(
-                    It.IsAny<QueryBuilder<ContentSupportPage>>(),
+                o.GetContentSupportPages(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()),
             Times.Once
         );
@@ -226,8 +221,9 @@ public async Task GetContentSupportPages_NotGotCache_Calls_Client()
         await sut.GetContentSupportPages(field, value, isPreview);
 
         _httpContentClientMock.Verify(o =>
-                o.Query(
-                    It.IsAny<QueryBuilder<ContentSupportPage>>(),
+                o.GetContentSupportPages(
+                    It.IsAny<string>(),
+                    It.IsAny<string>(),
                     It.IsAny<CancellationToken>()),
             Times.Once
         );
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Services/ContentfulServiceTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Services/ContentfulServiceTests.cs
index 8191f86..15bbbbf 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Services/ContentfulServiceTests.cs
+++ b/tests/Dfe.ContentSupport.Web.Tests/Services/ContentfulServiceTests.cs
@@ -1,22 +1,21 @@
-using Dfe.ContentSupport.Web.Configuration;
-using Dfe.ContentSupport.Web.Http;
+using Contentful.Core;
+using Dfe.ContentSupport.Web.Configuration;
+using Contentful.Core.Errors;
+using Contentful.Core.Search;
 
-namespace Dfe.ContentSupport.Web.Tests.Services;
+namespace Dfe.ContentSupport.Web.Tests.Http;
 
 public class ContentfulServiceTests
 {
-    private readonly Mock<IHttpContentfulClient> _httpContentClientMock = new();
+    private readonly Mock<IContentfulClient> _clientMock = new();
 
     [Fact]
-    public void ContentfulClient_Sets_IsPreview()
+    public async Task Client_Calls_Contentful_And_Bounce()
     {
-        var options = new CsContentfulOptions();
+        var sut = new ContentfulService(_clientMock.Object);
 
-        var sut = new ContentfulService(options, _httpContentClientMock.Object);
-
-        sut.ContentfulClient(true);
-        options.UsePreviewApi.Should().BeTrue();
-        sut.ContentfulClient();
-        options.UsePreviewApi.Should().BeFalse();
+        await sut.GetContentSupportPages(It.IsAny<string>(), It.IsAny<string>(),It.IsAny<CancellationToken>());
+        
+        _clientMock.Verify(o=>o.GetEntries(It.IsAny<QueryBuilder<ContentSupportPage>>(), It.IsAny<CancellationToken>()),Times.Once);
     }
 }
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Services/StubContentfulServiceTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Services/StubContentfulServiceTests.cs
new file mode 100644
index 0000000..17b696a
--- /dev/null
+++ b/tests/Dfe.ContentSupport.Web.Tests/Services/StubContentfulServiceTests.cs
@@ -0,0 +1,15 @@
+using Contentful.Core.Configuration;
+
+namespace Dfe.ContentSupport.Web.Tests.Http;
+
+public class StubContentfulClientTests
+{
+    [Fact]
+    public async Task Client_Get_MockContent()
+    {
+        var sut = new StubContentfulService(new HttpClient(), new ContentfulOptions());
+
+        var collection = await sut.GetContentSupportPages(It.IsAny<string>(), It.IsAny<string>());
+        collection.First().InternalName.Should().BeEquivalentTo("MockContent");
+    }
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Http/StubData/ContentfulCollection.json b/tests/Dfe.ContentSupport.Web.Tests/StubData/ContentfulCollection.json
similarity index 99%
rename from src/Dfe.ContentSupport.Web/Http/StubData/ContentfulCollection.json
rename to tests/Dfe.ContentSupport.Web.Tests/StubData/ContentfulCollection.json
index fc8937e..bf82a14 100644
--- a/src/Dfe.ContentSupport.Web/Http/StubData/ContentfulCollection.json
+++ b/tests/Dfe.ContentSupport.Web.Tests/StubData/ContentfulCollection.json
@@ -1,4 +1,4 @@
-{
+{
   "InternalName": "MockContent",
   "Slug": "mock-slug",
   "BeforeTitleContent": [],

From 407558390d024c043043c53f60febc09452b19fb Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:04:25 +0100
Subject: [PATCH 08/10] feat: vertical navigation changes (#161)

* feat: made urls use new slug value instead of internal name

* chore: cleanedup lint issues

* chore: linter issue

* fix: updated tests for slug change

* fix: updated tests for slug change

* feat: now uses csPage heading when no page available or when new useParentHero option is selected in contentful

* feat: added unsupported element when item type isn't recognised

* Removed tests for removed endpoints

* Update src/Dfe.ContentSupport.Web/Views/Shared/_VerticalNavigation.cshtml

Co-authored-by: jimwashbrook <131891854+jimwashbrook@users.noreply.github.com>

* chore: fixed formatting in test

* chore: removed redundant case

* changes method back to not static and removed Privacy.cshtml

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: jimwashbrook <131891854+jimwashbrook@users.noreply.github.com>
---
 .../Controllers/ContentController.cs          |  28 +----
 .../Models/ContentBase.cs                     |   8 +-
 src/Dfe.ContentSupport.Web/Models/Entry.cs    |   1 +
 src/Dfe.ContentSupport.Web/Models/Heading.cs  |   6 +-
 .../Models/Mapped/CsContentItem.cs            |   3 +
 .../Models/Mapped/Custom/CustomAccordion.cs   |   1 -
 .../Models/Mapped/Custom/CustomAttachment.cs  |   5 +-
 .../Models/Mapped/Custom/CustomCard.cs        |   1 -
 .../Models/Mapped/Standard/EmbeddedAsset.cs   |   1 -
 src/Dfe.ContentSupport.Web/Models/Target.cs   |   4 +-
 .../Services/ILayoutService.cs                |  12 +-
 .../Services/LayoutService.cs                 | 111 ++++++++----------
 .../Services/ModelMapper.cs                   |  12 +-
 .../ViewModels/ContentSupportPage.cs          |   6 -
 .../Views/Content/CsIndex.cshtml              |  21 +---
 .../Views/Content/Privacy.cshtml              |   6 -
 .../Views/Shared/RichText/_Asset.cshtml       |   4 +-
 .../Views/Shared/RichText/_H.cshtml           |   3 +-
 .../Views/Shared/_VerticalNavigation.cshtml   |  16 +++
 .../Controllers/ContentControllerTests.cs     |  23 ----
 .../Services/LayoutServiceTests.cs            |  79 +++++++++++--
 21 files changed, 171 insertions(+), 180 deletions(-)
 delete mode 100644 src/Dfe.ContentSupport.Web/Views/Content/Privacy.cshtml
 create mode 100644 src/Dfe.ContentSupport.Web/Views/Shared/_VerticalNavigation.cshtml

diff --git a/src/Dfe.ContentSupport.Web/Controllers/ContentController.cs b/src/Dfe.ContentSupport.Web/Controllers/ContentController.cs
index 2f449d8..169511c 100644
--- a/src/Dfe.ContentSupport.Web/Controllers/ContentController.cs
+++ b/src/Dfe.ContentSupport.Web/Controllers/ContentController.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using Dfe.ContentSupport.Web.Models.Mapped;
 using Dfe.ContentSupport.Web.Services;
 using Dfe.ContentSupport.Web.ViewModels;
 using Microsoft.AspNetCore.Authorization;
@@ -13,25 +12,7 @@ public class ContentController(IContentService contentService, ILayoutService la
     : Controller
 {
     public const string ErrorActionName = "error";
-
-    public async Task<IActionResult> Home()
-    {
-        var defaultModel = new CsPage
-        {
-            Heading = new Models.Heading
-            {
-                Title = "Department for Education",
-                Subtitle = "Content and Support"
-            }
-        };
-
-        ViewBag.pages = await contentService.GetCsPages();
-
-        return View(defaultModel);
-    }
-
-  
-
+    
     [HttpGet("{slug}/{page?}")]
     public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false, [FromQuery] List<string>? tags = null)
     {
@@ -67,12 +48,7 @@ public async Task<IActionResult> Index(string slug, string page = "", bool isPre
             return RedirectToAction(ErrorActionName);
         }
     }
-
-
-    public IActionResult Privacy()
-    {
-        return View();
-    }
+    
 
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public IActionResult Error()
diff --git a/src/Dfe.ContentSupport.Web/Models/ContentBase.cs b/src/Dfe.ContentSupport.Web/Models/ContentBase.cs
index 86ad154..02426ef 100644
--- a/src/Dfe.ContentSupport.Web/Models/ContentBase.cs
+++ b/src/Dfe.ContentSupport.Web/Models/ContentBase.cs
@@ -1,12 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
+
 namespace Dfe.ContentSupport.Web.Models;
 
 [ExcludeFromCodeCoverage]
 public class ContentBase : Contentful.Core.Models.Entry<ContentBase>
 {
     public string InternalName { get; set; } = null!;
-
-    public string? Title { get; set; } = null;
-
-    public string? Subtitle { get; set; } = null;
+    public string Slug { get; set; } = null!;
+    public string? Title { get; set; }
+    public string? Subtitle { get; set; }
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Entry.cs b/src/Dfe.ContentSupport.Web/Models/Entry.cs
index 2eb2d01..b7a8f8c 100644
--- a/src/Dfe.ContentSupport.Web/Models/Entry.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Entry.cs
@@ -7,4 +7,5 @@ public class Entry : ContentBase
 {
     public string JumpIdentifier { get; set; } = null!;
     public ContentItemBase RichText { get; set; } = null!;
+    public bool UseParentHero { get; set; }
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Heading.cs b/src/Dfe.ContentSupport.Web/Models/Heading.cs
index 7e7555c..de5f0b6 100644
--- a/src/Dfe.ContentSupport.Web/Models/Heading.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Heading.cs
@@ -3,8 +3,4 @@
 namespace Dfe.ContentSupport.Web.Models;
 
 [ExcludeFromCodeCoverage]
-public class Heading : ContentBase
-{
-    public string Title { get; init; } = null!;
-    public string Subtitle { get; init; } = null!;
-}
\ No newline at end of file
+public class Heading : ContentBase;
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Mapped/CsContentItem.cs b/src/Dfe.ContentSupport.Web/Models/Mapped/CsContentItem.cs
index 7255ede..54e520e 100644
--- a/src/Dfe.ContentSupport.Web/Models/Mapped/CsContentItem.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Mapped/CsContentItem.cs
@@ -6,6 +6,9 @@ namespace Dfe.ContentSupport.Web.Models.Mapped;
 public class CsContentItem
 {
     public string InternalName { get; set; } = null!;
+    public string Slug { get; set; } = null!;
     public string? Title { get; set; } = null;
     public string? Subtitle { get; set; } = null;
+    public bool UseParentHero { get; set; }
+
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAccordion.cs b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAccordion.cs
index 3846d31..ed61326 100644
--- a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAccordion.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAccordion.cs
@@ -14,5 +14,4 @@ public CustomAccordion()
     public List<CustomAccordion> Accordions { get; set; } = null!;
     public RichTextContentItem? Body { get; set; }
     public string SummaryLine { get; set; } = null!;
-    public string Title { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAttachment.cs b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAttachment.cs
index c444284..9c96273 100644
--- a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAttachment.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomAttachment.cs
@@ -1,4 +1,4 @@
-using Dfe.ContentSupport.Web.Models.Mapped.Types;
+using Dfe.ContentSupport.Web.Models.Mapped.Types;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Dfe.ContentSupport.Web.Models.Mapped.Custom;
@@ -13,7 +13,6 @@ public CustomAttachment()
 
     public string ContentType { get; set; } = null!;
     public long Size { get; set; }
-    public string Title { get; set; } = null!;
     public string Uri { get; set; } = null!;
-    public DateTime? UpdatedAt { get; set; } = null!;
+    public DateTime? UpdatedAt { get; set; }
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomCard.cs b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomCard.cs
index efa1fd3..501c3ce 100644
--- a/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomCard.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Mapped/Custom/CustomCard.cs
@@ -15,6 +15,5 @@ public CustomCard()
     public string ImageAlt { get; set; } = null!;
     public string ImageUri { get; set; } = null!;
     public string Meta { get; set; } = null!;
-    public string Title { get; set; } = null!;
     public string Uri { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Mapped/Standard/EmbeddedAsset.cs b/src/Dfe.ContentSupport.Web/Models/Mapped/Standard/EmbeddedAsset.cs
index 606a047..68723a0 100644
--- a/src/Dfe.ContentSupport.Web/Models/Mapped/Standard/EmbeddedAsset.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Mapped/Standard/EmbeddedAsset.cs
@@ -14,6 +14,5 @@ public EmbeddedAsset()
     public AssetContentType AssetContentType { get; set; } = AssetContentType.Unknown;
 
     public string Description { get; set; } = null!;
-    public string Title { get; set; } = null!;
     public string Uri { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Models/Target.cs b/src/Dfe.ContentSupport.Web/Models/Target.cs
index adc0772..2260c76 100644
--- a/src/Dfe.ContentSupport.Web/Models/Target.cs
+++ b/src/Dfe.ContentSupport.Web/Models/Target.cs
@@ -6,8 +6,7 @@ namespace Dfe.ContentSupport.Web.Models;
 [ExcludeFromCodeCoverage]
 public class Target : Entry
 {
-    public Fields Fields { get; set; } = null!;
-    public string Title { get; set; } = null!;
+    public new Fields Fields { get; set; } = null!;
     public Asset Asset { get; set; } = null!;
     public string SummaryLine { get; set; } = null!;
     public string Description { get; set; } = null!;
@@ -16,4 +15,5 @@ public class Target : Entry
     public string Uri { get; set; } = null!;
     public Image Image { get; set; } = null!;
     public List<Target> Content { get; set; } = [];
+    public new string Title { get; set; } = null!;
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Services/ILayoutService.cs b/src/Dfe.ContentSupport.Web/Services/ILayoutService.cs
index d028752..52f166b 100644
--- a/src/Dfe.ContentSupport.Web/Services/ILayoutService.cs
+++ b/src/Dfe.ContentSupport.Web/Services/ILayoutService.cs
@@ -1,10 +1,8 @@
 using Dfe.ContentSupport.Web.Models.Mapped;
 
-namespace Dfe.ContentSupport.Web.Services
-{
-    public interface ILayoutService
-    {
-        CsPage GenerateLayout(CsPage page, HttpRequest request, string pageName);
+namespace Dfe.ContentSupport.Web.Services;
 
-    }
-}
+public interface ILayoutService
+{
+    CsPage GenerateLayout(CsPage page, HttpRequest request, string pageSlug);
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Services/LayoutService.cs b/src/Dfe.ContentSupport.Web/Services/LayoutService.cs
index 1f559c0..c25c275 100644
--- a/src/Dfe.ContentSupport.Web/Services/LayoutService.cs
+++ b/src/Dfe.ContentSupport.Web/Services/LayoutService.cs
@@ -1,85 +1,78 @@
 using Dfe.ContentSupport.Web.Models;
 using Dfe.ContentSupport.Web.Models.Mapped;
 
+namespace Dfe.ContentSupport.Web.Services;
 
-namespace Dfe.ContentSupport.Web.Services
+public class LayoutService : ILayoutService
 {
-    public class LayoutService : ILayoutService
+    public CsPage GenerateLayout(CsPage page, HttpRequest request, string pageSlug)
     {
-        public CsPage GenerateLayout(CsPage page, HttpRequest request, string pageName)
-        {
-            if (!page.ShowVerticalNavigation) return page;
-
-            return new()
-            {
-                Heading = GetHeading(page, pageName),
-                MenuItems = GenerateVerticalNavigation(page, request, pageName),
-                Content = GetVisiblePageList(page, pageName),
-                UpdatedAt = page.UpdatedAt,
-                CreatedAt = page.CreatedAt,
-                HasCitation = page.HasCitation,
-                HasBackToTop = page.HasBackToTop,
-                IsSitemap = page.IsSitemap,
-                ShowVerticalNavigation = page.ShowVerticalNavigation,
-                Slug = page.Slug,
-            };
-        }
-
+        if (!page.ShowVerticalNavigation) return page;
 
-        public Heading GetHeading(CsPage page, string pageName)
+        return new CsPage
         {
-            var selectedPage = page.Content.Find(o => o.InternalName == pageName);
+            Heading = GetHeading(page, pageSlug),
+            MenuItems = GenerateVerticalNavigation(page, request, pageSlug),
+            Content = GetVisiblePageList(page, pageSlug),
+            UpdatedAt = page.UpdatedAt,
+            CreatedAt = page.CreatedAt,
+            HasCitation = page.HasCitation,
+            HasBackToTop = page.HasBackToTop,
+            IsSitemap = page.IsSitemap,
+            ShowVerticalNavigation = page.ShowVerticalNavigation,
+            Slug = page.Slug
+        };
+    }
 
-            if (selectedPage != null)
-                return new()
-                {
-                    Title = selectedPage.Title ?? "",
-                    Subtitle = selectedPage.Subtitle ?? ""
-                };
 
+    public Heading GetHeading(CsPage page, string pageSlug)
+    {
+        var selectedPage = page.Content.Find(o => o.Slug == pageSlug);
 
-            return new()
+        if (selectedPage is { UseParentHero: false })
+            return new Heading
             {
-                Title = page.Content[0]?.Title ?? "",
-                Subtitle = page.Content[0]?.Subtitle ?? ""
+                Title = selectedPage.Title ?? string.Empty,
+                Subtitle = selectedPage.Subtitle ?? string.Empty
             };
-        }
 
+        return page.Heading;
+    }
 
-        public List<PageLink> GenerateVerticalNavigation(CsPage page, HttpRequest request, string pageName)
-        {
-            var baseUrl = GetNavigationUrl(request);
 
-            var menuItems = page.Content.Select(o => new PageLink()
-            {
-                Title = o.Title ?? "",
-                Subtitle = o.Subtitle ?? "",
-                Url = $"{baseUrl}/{o.InternalName}",
-                IsActive = pageName == o.InternalName
-            }).ToList();
+    public List<PageLink> GenerateVerticalNavigation(CsPage page, HttpRequest request,
+        string pageSlug)
+    {
+        var baseUrl = GetNavigationUrl(request);
 
-            if (string.IsNullOrEmpty(pageName) && menuItems.Count > 0)
-                menuItems[0].IsActive = true;
+        var menuItems = page.Content.Select(o => new PageLink
+        {
+            Title = o.Title ?? "",
+            Subtitle = o.Subtitle ?? "",
+            Url = $"{baseUrl}/{o.Slug}",
+            IsActive = pageSlug == o.Slug
+        }).ToList();
 
-            return menuItems;
-        }
+        if (string.IsNullOrEmpty(pageSlug) && menuItems.Count > 0)
+            menuItems[0].IsActive = true;
 
+        return menuItems;
+    }
 
-        public List<CsContentItem> GetVisiblePageList(CsPage page, string pageName)
-        {
-            if (!string.IsNullOrEmpty(pageName))
-                return page.Content.Where(o => o.InternalName == pageName).ToList();
 
+    public List<CsContentItem> GetVisiblePageList(CsPage page, string pageSlug)
+    {
+        if (!string.IsNullOrEmpty(pageSlug))
+            return page.Content.Where(o => o.Slug == pageSlug).ToList();
 
-            return page.Content.GetRange(0, 1);
-        }
 
+        return page.Content.GetRange(0, 1);
+    }
 
-        public string GetNavigationUrl(HttpRequest request)
-        {
-            var splitUrl = request.Path.ToString().Split("/");
-            return string.Join("/", splitUrl.Take(3));
-        }
 
+    public string GetNavigationUrl(HttpRequest request)
+    {
+        var splitUrl = request.Path.ToString().Split("/");
+        return string.Join("/", splitUrl.Take(3));
     }
-}
+}
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Services/ModelMapper.cs b/src/Dfe.ContentSupport.Web/Services/ModelMapper.cs
index b36ae15..3c7043f 100644
--- a/src/Dfe.ContentSupport.Web/Services/ModelMapper.cs
+++ b/src/Dfe.ContentSupport.Web/Services/ModelMapper.cs
@@ -53,7 +53,11 @@ public CsContentItem ConvertEntryToContentItem(Entry entry)
     {
         CsContentItem item = entry.RichText is not null
             ? MapRichTextContent(entry.RichText, entry)!
-            : new CsContentItem { InternalName = entry.InternalName, Title = entry.Title, Subtitle = entry.Subtitle };
+            : new CsContentItem
+            {
+                InternalName = entry.InternalName, Slug = entry.Slug, Title = entry.Title,
+                Subtitle = entry.Subtitle, UseParentHero = entry.UseParentHero
+            };
         return item;
     }
 
@@ -64,8 +68,10 @@ public CsContentItem ConvertEntryToContentItem(Entry entry)
             new RichTextContentItem
             {
                 InternalName = entry.InternalName,
+                Slug = entry.Slug,
                 Title = entry.Title,
                 Subtitle = entry.Subtitle,
+                UseParentHero = entry.UseParentHero,
                 NodeType = ConvertToRichTextNodeType(richText.NodeType),
                 Content = MapRichTextNodes(richText.Content),
                 Tags = FlattenMetadata(entry.Metadata)
@@ -76,7 +82,7 @@ public CsContentItem ConvertEntryToContentItem(Entry entry)
     public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
     {
         return nodes.Select(node => MapContent(node) ?? new RichTextContentItem
-        { NodeType = RichTextNodeType.Unknown, InternalName = node.InternalName }).ToList();
+            { NodeType = RichTextNodeType.Unknown, InternalName = node.InternalName }).ToList();
     }
 
 
@@ -85,7 +91,7 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
         RichTextContentItem? item;
         var nodeType = ConvertToRichTextNodeType(contentItem.NodeType);
         var internalName = contentItem.InternalName;
-        
+
 
         switch (nodeType)
         {
diff --git a/src/Dfe.ContentSupport.Web/ViewModels/ContentSupportPage.cs b/src/Dfe.ContentSupport.Web/ViewModels/ContentSupportPage.cs
index 7668062..bffadc4 100644
--- a/src/Dfe.ContentSupport.Web/ViewModels/ContentSupportPage.cs
+++ b/src/Dfe.ContentSupport.Web/ViewModels/ContentSupportPage.cs
@@ -6,14 +6,8 @@ namespace Dfe.ContentSupport.Web.ViewModels;
 [ExcludeFromCodeCoverage]
 public class ContentSupportPage : ContentBase
 {
-    public string Slug { get; init; } = null!;
-
-    public List<dynamic> BeforeTitleContent { get; init; } = [];
-
     public Heading Heading { get; init; } = null!;
     public List<Entry> Content { get; init; } = [];
-
-    public bool DisplayBackButton { get; init; }
     public bool IsSitemap { get; init; }
     public bool HasCitation { get; init; }
     public bool HasBackToTop { get; init; }
diff --git a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
index 3087d3a..1063572 100644
--- a/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
@@ -8,20 +8,7 @@
 
     @if (Model.MenuItems is not null)
     {
-        <div class="govuk-grid-column-one-quarter sticky">
-            <nav class="dfe-vertical-nav">
-                <div class="dfe-vertical-nav__section">
-                    <ul class="dfe-vertical-nav__section">
-                        @foreach (var menuItem in Model.MenuItems)
-                        {
-                            <li class="dfe-vertical-nav__section-item">
-                                <a class="dfe-vertical-nav__link @(menuItem.IsActive ? "dfe-vertical-nav__section-item--current" : "")" href="@menuItem.Url">@(string.IsNullOrEmpty(menuItem.Subtitle) ? "" : $"{menuItem.Subtitle} : ") @menuItem.Title </a>
-                            </li>
-                        }
-                    </ul>
-                </div>
-            </nav>
-        </div>
+        <partial name="_VerticalNavigation" model="@Model.MenuItems"/>
     }
 
     <div class="govuk-grid-column-three-quarters">
@@ -30,7 +17,7 @@
         {
             <partial name="_Content" model="@content"/>
         }
-    
+
         @if (Model.HasCitation)
         {
             <partial name="_Citation" model="Model"/>
@@ -45,10 +32,10 @@
         {
             <partial name="_Print"/>
         }
-        
+
         @if (Model.HasFeedbackBanner)
         {
-            <partial name="_Feedback" />
+            <partial name="_Feedback"/>
         }
     </div>
 </div>
diff --git a/src/Dfe.ContentSupport.Web/Views/Content/Privacy.cshtml b/src/Dfe.ContentSupport.Web/Views/Content/Privacy.cshtml
deleted file mode 100644
index 88d5bc4..0000000
--- a/src/Dfe.ContentSupport.Web/Views/Content/Privacy.cshtml
+++ /dev/null
@@ -1,6 +0,0 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
-}
-<h1>@ViewData["Title"]</h1>
-
-<p class="govuk-body">Use this page to detail your site's privacy policy.</p>
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_Asset.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_Asset.cshtml
index 847a098..c161f5b 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_Asset.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_Asset.cshtml
@@ -12,8 +12,8 @@
                 Your browser does not support the video tag.
             </video>
             break;
-        case AssetContentType.Unknown:
         default:
-            throw new ArgumentOutOfRangeException(nameof(Model.AssetContentType));
+            <partial name="_UnsupportedElement" model="@Model"/>
+            break;
     }
 </div>
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_H.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_H.cshtml
index 830e6bf..f59c2e9 100644
--- a/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_H.cshtml
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/RichText/_H.cshtml
@@ -29,6 +29,7 @@
             </h6>
             break;
         default:
-            throw new ArgumentOutOfRangeException(nameof(Model.NodeType));
+            <partial name="_UnsupportedElement" model="@Model"/>
+            break;
     }
 }
\ No newline at end of file
diff --git a/src/Dfe.ContentSupport.Web/Views/Shared/_VerticalNavigation.cshtml b/src/Dfe.ContentSupport.Web/Views/Shared/_VerticalNavigation.cshtml
new file mode 100644
index 0000000..8f5c8f3
--- /dev/null
+++ b/src/Dfe.ContentSupport.Web/Views/Shared/_VerticalNavigation.cshtml
@@ -0,0 +1,16 @@
+@model IEnumerable<PageLink>
+
+<div class="govuk-grid-column-one-quarter sticky">
+    <nav class="dfe-vertical-nav">
+        <div class="dfe-vertical-nav__section">
+            <ul class="dfe-vertical-nav__section">
+                @foreach (var menuItem in Model)
+                {
+                    <li class="dfe-vertical-nav__section-item">
+                        <a class="dfe-vertical-nav__link @(menuItem.IsActive ? "dfe-vertical-nav__section-item--current" : "")" href="@menuItem.Url">@(string.IsNullOrEmpty(menuItem.Subtitle) ? "" : $"{menuItem.Subtitle} : ") @menuItem.Title </a>
+                    </li>
+                }
+            </ul>
+        </div>
+    </nav>
+</div>
\ No newline at end of file
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Controllers/ContentControllerTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Controllers/ContentControllerTests.cs
index 04b5d40..e114a49 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Controllers/ContentControllerTests.cs
+++ b/tests/Dfe.ContentSupport.Web.Tests/Controllers/ContentControllerTests.cs
@@ -16,19 +16,6 @@ private ContentController GetController()
         return new ContentController(_contentServiceMock.Object, new LayoutService(), _loggerMock.Object);
     }
 
-
-    [Fact]
-    public async Task Home_Returns_View()
-    {
-        _contentServiceMock.Setup(o => o.GetCsPages(It.IsAny<bool>())).ReturnsAsync([]);
-
-        var sut = GetController();
-        var result = await sut.Home();
-
-        result.Should().BeOfType<ViewResult>();
-        (result as ViewResult)!.Model.Should().BeOfType<CsPage>();
-    }
-
     [Fact]
     public async Task Index_NoSlug_Returns_ErrorAction()
     {
@@ -120,16 +107,6 @@ public async Task Index_WithSlug_Returns_View()
         (result as ViewResult)!.Model.Should().BeOfType<CsPage>();
     }
 
-    [Fact]
-    public void Privacy_Returns_EmptyView()
-    {
-        var sut = GetController();
-
-        var result = sut.Privacy();
-
-        result.Should().BeOfType<ViewResult>();
-    }
-
     [Fact]
     public void Error_Returns_ErrorView()
     {
diff --git a/tests/Dfe.ContentSupport.Web.Tests/Services/LayoutServiceTests.cs b/tests/Dfe.ContentSupport.Web.Tests/Services/LayoutServiceTests.cs
index d1c405a..8ce1939 100644
--- a/tests/Dfe.ContentSupport.Web.Tests/Services/LayoutServiceTests.cs
+++ b/tests/Dfe.ContentSupport.Web.Tests/Services/LayoutServiceTests.cs
@@ -1,4 +1,4 @@
-
+using Dfe.ContentSupport.Web.Models;
 using Dfe.ContentSupport.Web.Models.Mapped;
 using Microsoft.AspNetCore.Http;
 
@@ -12,25 +12,45 @@ public class LayoutServiceTests
         private readonly string Home = "Home";
         private readonly string About = "About";
         private readonly string Contact = "Contact";
+        private readonly string HomeSlug = "Home Slug";
+        private readonly string AboutSlug = "About Slug";
         private readonly string HomeTitle = "Home Title";
         private readonly string AboutTitle = "About Title";
         private readonly string HomeSubtitle = "Home Subtitle";
         private readonly string AboutSubtitle = "About Subtitle";
 
+        private readonly string HeadingTitle = "Heading Title";
+        private readonly string HeadingSubtitle = "Heading Subtitle";
+
         private CsPage GetPage()
         {
             return new CsPage
             {
+                Heading = new Heading
+                {
+                    Title = HeadingTitle,
+                    Subtitle = HeadingSubtitle
+                },
                 Content = new()
-            {
-                new () { InternalName = Home, Title = HomeTitle, Subtitle = HomeSubtitle },
-                new () { InternalName = About, Title = AboutTitle, Subtitle = AboutSubtitle }
-            }
+                {
+                    new()
+                    {
+                        InternalName = Home, Slug = HomeSlug, Title = HomeTitle,
+                        Subtitle = HomeSubtitle,
+                        UseParentHero = true
+                    },
+                    new()
+                    {
+                        InternalName = About, Slug = AboutSlug, Title = AboutTitle,
+                        Subtitle = AboutSubtitle,
+                        UseParentHero = false
+                    }
+                }
             };
         }
 
 
-        private string GetSegmentLength(int length)
+        private static string GetSegmentLength(int length)
         {
             var segment = "";
             for (var i = 1; i <= length; i++)
@@ -49,7 +69,7 @@ public void GetHeading_PageExists_ReturnsCorrectHeading()
             var page = GetPage();
 
             // Act
-            var result = _layoutService.GetHeading(page, About);
+            var result = _layoutService.GetHeading(page, AboutSlug);
 
             // Assert
             Assert.Equal(AboutTitle, result.Title);
@@ -58,7 +78,7 @@ public void GetHeading_PageExists_ReturnsCorrectHeading()
 
 
         [Fact]
-        public void GetHeading_PageDoesNotExist_ReturnsFirstPageHeading()
+        public void GetHeading_PageDoesNotExist_ReturnsParentHero()
         {
             // Arrange
             var page = GetPage();
@@ -67,8 +87,8 @@ public void GetHeading_PageDoesNotExist_ReturnsFirstPageHeading()
             var result = _layoutService.GetHeading(page, Contact);
 
             // Assert
-            Assert.Equal(HomeTitle, result.Title);
-            Assert.Equal(HomeSubtitle, result.Subtitle);
+            result.Title.Should().Be(HeadingTitle);
+            result.Subtitle.Should().Be(HeadingSubtitle);
         }
 
 
@@ -81,7 +101,7 @@ public void GenerateVerticalNavigation_PageNameMatches_ReturnsCorrectMenuItems()
             var request = new DefaultHttpContext().Request;
 
             // Act
-            var result = _layoutService.GenerateVerticalNavigation(page, request, About);
+            var result = _layoutService.GenerateVerticalNavigation(page, request, AboutSlug);
 
             // Assert
             Assert.Equal(page.Content.Count, result.Count);
@@ -115,7 +135,7 @@ public void GetVisiblePageList_PageNameProvidedAndMatches_ReturnsMatchingItems()
             var page = GetPage();
 
             // Act
-            var result = _layoutService.GetVisiblePageList(page, About);
+            var result = _layoutService.GetVisiblePageList(page, AboutSlug);
 
             // Assert
             Assert.Single(result);
@@ -227,5 +247,38 @@ public void GetNavigationUrl_EmptyUrl_ReturnsEmptyString()
             Assert.Equal(emptyRequestPath, result);
         }
 
+
+        [Fact]
+        public void GetHeading_NoPage_ReturnsParentHero()
+        {
+            var page = GetPage();
+
+            var result = _layoutService.GetHeading(page, string.Empty);
+
+            result.Title.Should().Be(HeadingTitle);
+            result.Subtitle.Should().Be(HeadingSubtitle);
+        }
+
+        [Fact]
+        public void GetHeading_Page_UseParent_ReturnsParentHero()
+        {
+            var page = GetPage();
+
+            var result = _layoutService.GetHeading(page, HomeSlug);
+
+            result.Title.Should().Be(HeadingTitle);
+            result.Subtitle.Should().Be(HeadingSubtitle);
+        }
+
+        [Fact]
+        public void GetHeading_Page_DontUseParent_ReturnsParentHero()
+        {
+            var page = GetPage();
+
+            var result = _layoutService.GetHeading(page, AboutSlug);
+
+            result.Title.Should().Be(AboutTitle);
+            result.Subtitle.Should().Be(AboutSubtitle);
+        }
     }
-}
+}
\ No newline at end of file

From 1d6c1f61944580075099079f09b43f925c0405d7 Mon Sep 17 00:00:00 2001
From: "jack.coggin" <jack.coggin@and.digital>
Date: Tue, 1 Oct 2024 14:44:43 +0100
Subject: [PATCH 09/10] remove unnused variables from cypress config

---
 tests/Dfe.ContentSupport.Web.E2ETests/cypress.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Dfe.ContentSupport.Web.E2ETests/cypress.config.js b/tests/Dfe.ContentSupport.Web.E2ETests/cypress.config.js
index 8c452e5..e3d2ff8 100644
--- a/tests/Dfe.ContentSupport.Web.E2ETests/cypress.config.js
+++ b/tests/Dfe.ContentSupport.Web.E2ETests/cypress.config.js
@@ -3,7 +3,7 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
+    setupNodeEvents() {
       // implement node event listeners here
     },
     baseUrl: process.env.CYPRESS_BASE_URL || 'http://localhost:5265',

From d56b2257e3a9b9a4a050225e2d9c4ecaae255662 Mon Sep 17 00:00:00 2001
From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:34:04 +0100
Subject: [PATCH 10/10] "Bits and Bats". Required changes for plantech
 integration (#158) (#165)

* feat: changed header logo to go to self-assessment (#153)



* Fix/bleeding links (#154)

* fix: feedback link fixed

* Fix: Fixed bleeding links

---------



* fix: added missing span from feedback banner

* feature: setup to use plantechs head and cookies when ran with it (#156)

* feature: setup to use plantechs head and cookies when ran with it

* fix: added a title to the gtm iframe

* chore: using index reference rather than .First

---------



---------

Co-authored-by: jimwashbrook <131891854+jimwashbrook@users.noreply.github.com>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>