Only include the script files when required by the content model.

DFE-Digital · Oct 4, 2023 · 9430691 · 9430691
1 parent 8e7681c
commit 9430691
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 13 deletions.
diff --git a/Childrens-Social-Care-CPD/Controllers/ContentController.cs b/Childrens-Social-Care-CPD/Controllers/ContentController.cs
@@ -52,15 +52,16 @@ public async Task<IActionResult> Index(CancellationToken cancellationToken, stri
         }
 
         var contextModel = new ContextModel(
-            Id: pageContent.Id, 
-            Title: pageContent.Title, 
-            PageName: pageName, 
+            Id: pageContent.Id,
+            Title: pageContent.Title,
+            PageName: pageName,
             Category: pageContent.Category,
-            UseContainers: pageContent.SideMenu == null, 
-            PreferenceSet: preferenceSet, 
+            UseContainers: pageContent.SideMenu == null,
+            PreferenceSet: preferenceSet,
             BackLink: pageContent.BackLink);
 
         ViewData["ContextModel"] = contextModel;
+        ViewData["StateModel"] = new StateModel();
         return View(pageContent);
     }
 }
diff --git a/Childrens-Social-Care-CPD/Models/StateModel.cs b/Childrens-Social-Care-CPD/Models/StateModel.cs
@@ -0,0 +1,6 @@
+namespace Childrens_Social_Care_CPD.Models;
+
+public class StateModel
+{
+    public bool IncludeMediaPlayer { get; set; } = false;
+}
diff --git a/Childrens-Social-Care-CPD/Views/Content/Index.cshtml b/Childrens-Social-Care-CPD/Views/Content/Index.cshtml
@@ -39,4 +39,15 @@
 
 <partial name="_Content" model="Model" />
 
-@_relatedContentRenderer.Render(Model.RelatedContent)
+@_relatedContentRenderer.Render(Model.RelatedContent)
+
+@section Scripts {
+    @if (ViewData.TryGetValue("StateModel", out var stateModel))
+    {
+        if (((StateModel)stateModel).IncludeMediaPlayer)
+        {
+            <script src=/javascript/mediaelement-and-player.min.js></script>
+            <script src=/javascript/mediaelement-configuration.js></script>
+        }
+    }
+}
diff --git a/Childrens-Social-Care-CPD/Views/Resources/Search.cshtml b/Childrens-Social-Care-CPD/Views/Resources/Search.cshtml
@@ -7,10 +7,6 @@
     Layout = "_SearchPageLayout";
 }
 
-@section Scripts {
-    <script src="/javascript/resources.js"></script>
-}
-
 @section PageBanner {
     <partial name="_PageBanner" model="Model.Content" />
 }

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_AudioResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_AudioResource.cshtml
@@ -2,6 +2,10 @@
 
 @model AudioResource
 
+@{
+    ((StateModel)ViewData["StateModel"]).IncludeMediaPlayer = true;
+}
+
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
         <audio id="audioPlayer" preload="none">
@@ -19,4 +23,5 @@
             </details>
         }
     </div>
-</div>
+</div>
+
diff --git a/Childrens-Social-Care-CPD/Views/Shared/_DefaultPageLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_DefaultPageLayout.cshtml
@@ -7,6 +7,10 @@
     @await RenderSectionAsync("PageBanner", required: false)
 }
 
+@section Scripts {
+    @await RenderSectionAsync("Scripts", required: false)
+}
+
 @await RenderSectionAsync("Hero", required: false)
 <div class="dfe-width-container">
     @RenderBody()

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_SiteLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_SiteLayout.cshtml
@@ -32,8 +32,6 @@
     <!-- component HTML -->
     <script src="/javascript/govuk-frontend-4.7.0.min.js"></script>
     <script src="/javascript/dfefrontend-0.1.8.min.js"></script>
-    <script src=/javascript/mediaelement-and-player.min.js></script>
-    <script src=/javascript/mediaelement-configuration.js></script>
     <script>
         window.GOVUKFrontend.initAll()
     </script>

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_SubPageLayout.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_SubPageLayout.cshtml
@@ -7,6 +7,10 @@
     @await RenderSectionAsync("PageBanner", required: false)
 }
 
+@section Scripts {
+    @await RenderSectionAsync("Scripts", required: false)
+}
+
 <div class="govuk-width-container dfe-width-container">
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-one-quarter">

diff --git a/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml b/Childrens-Social-Care-CPD/Views/Shared/_VideoResource.cshtml
@@ -2,6 +2,10 @@
 
 @model VideoResource
 
+@{
+    ((StateModel)ViewData["StateModel"]).IncludeMediaPlayer = true;
+}
+
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
         <video id="videoPlayer" preload="none">