Fix: Cookies and column widths

.github/workflows/code-pr-check.yml

@@ -47,18 +47,18 @@ jobs:
         distribution: "microsoft"
         java-version: "17"
 
-#    - name: Start SonarCloud scanner
-#      run: |
-#        dotnet-sonarscanner begin \
-#        /k:"DFE-Digital_sts-content-support" \
-#        /o:"dfe-digital" \
-#        /d:sonar.login="${{ secrets.SONAR_TOKEN }}" \
-#        /d:sonar.host.url="https://sonarcloud.io" \
-#        /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml \
-#        /d:sonar.coverage.exclusions=**/Program.cs,**/wwwroot/** \
-#        /d:sonar.issue.ignore.multicriteria=e1 \
-#        /d:sonar.issue.ignore.multicriteria.e1.ruleKey=csharpsquid:S6602 \
-#        /d:sonar.issue.ignore.multicriteria.e1.resourceKey=src/**/*.cs
+    - name: Start SonarCloud scanner
+      run: |
+        dotnet-sonarscanner begin \
+        /k:"DFE-Digital_sts-content-support" \
+        /o:"dfe-digital" \
+        /d:sonar.login="${{ secrets.SONAR_TOKEN }}" \
+        /d:sonar.host.url="https://sonarcloud.io" \
+        /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml \
+        /d:sonar.coverage.exclusions=**/Program.cs,**/wwwroot/** \
+        /d:sonar.issue.ignore.multicriteria=e1 \
+        /d:sonar.issue.ignore.multicriteria.e1.ruleKey=csharpsquid:S6602 \
+        /d:sonar.issue.ignore.multicriteria.e1.resourceKey=src/**/*.cs
 
     - name: Build web app
       uses: ./.github/actions/build-dotnet-app
@@ -71,15 +71,14 @@ jobs:
       with:
         solution_filename: sts-contentsupport.sln
 
-#    - name: Merge test results
-#      run: dotnet-coverage merge -f xml -o "coverage.xml" -s "coverage.settings.xml" -r coverage.cobertura.xml
-#
-#    - name: End SonarCloud Scanner
-#      run: dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
-#
-#    - name: Archive code coverage results
-#      uses: actions/upload-artifact@v4
-#      with:
-#        name: code-coverage-report
-#        path: coverage.xml
-#
+    - name: Merge test results
+      run: dotnet-coverage merge -f xml -o "coverage.xml" -s "coverage.settings.xml" -r coverage.cobertura.xml
+
+    - name: End SonarCloud Scanner
+      run: dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+
+    - name: Archive code coverage results
+      uses: actions/upload-artifact@v4
+      with:
+        name: code-coverage-report
+        path: coverage.xml

src/Dfe.ContentSupport.Web/Controllers/ContentController.cs

@@ -28,8 +28,10 @@ public async Task<IActionResult> Home()
         return View(defaultModel);
     }
 
+
+
     [HttpGet("{slug}/{page?}")]
-    public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false)
+    public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false, [FromQuery] List<string>? tags = null)
     {
         if (!ModelState.IsValid) return RedirectToAction("error");
         if (string.IsNullOrEmpty(slug)) return RedirectToAction("error");
@@ -38,10 +40,12 @@ public async Task<IActionResult> Index(string slug, string page = "", bool isPre
         if (resp is null) return RedirectToAction("error");
 
         resp = layoutService.GenerateLayout(resp, Request, page);
+        ViewBag.tags = tags;
 
         return View("CsIndex", resp);
     }
 
+
     public IActionResult Privacy()
     {
         return View();

src/Dfe.ContentSupport.Web/Controllers/SitemapController.cs

@@ -7,10 +7,9 @@
 
 [Route("/sitemap")]
 [AllowAnonymous]
 public class SitemapController(IContentService contentfulService) : Controller
 {
 
-
     [HttpGet]
     [Route("/sitemap.xml")]
     public async Task<IActionResult> Sitemap()

src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj

@@ -8,24 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Remove="appsettings.json"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="appsettings.json">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-            <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-        </None>
-    </ItemGroup>
-
-    <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="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" />
     </ItemGroup>
 </Project>

src/Dfe.ContentSupport.Web/Models/ContentBase.cs

@@ -1,9 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-
 namespace Dfe.ContentSupport.Web.Models;
 
 [ExcludeFromCodeCoverage]
-public class ContentBase : ContentType
+public class ContentBase : Contentful.Core.Models.Entry<ContentBase>
 {
     public string InternalName { get; set; } = null!;
 

src/Dfe.ContentSupport.Web/Models/ContentItemBase.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+using Contentful.Core.Models;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Dfe.ContentSupport.Web.Models;
 

src/Dfe.ContentSupport.Web/Models/Mapped/CsPage.cs

@@ -17,5 +17,5 @@ public class CsPage
     public DateTime? UpdatedAt { get; init; }
     public bool HasFeedbackBanner { get; set; }
     public List<PageLink>? MenuItems { get; set; }
-
+    public List<string> Tags { get;set; } = null!;
 }

src/Dfe.ContentSupport.Web/Models/Mapped/RichTextContentItem.cs

@@ -9,4 +9,5 @@ public class RichTextContentItem : CsContentItem
     public List<RichTextContentItem> Content { get; set; } = null!;
     public RichTextNodeType NodeType { get; set; } = RichTextNodeType.Unknown;
     public string Value { get; set; } = null!;
+    public List<string> Tags { get; set; } = [];
 }

src/Dfe.ContentSupport.Web/Services/ModelMapper.cs

@@ -1,4 +1,5 @@
-using Dfe.ContentSupport.Web.Common;
+using Contentful.Core.Models;
+using Dfe.ContentSupport.Web.Common;
 using Dfe.ContentSupport.Web.Configuration;
 using Dfe.ContentSupport.Web.Models;
 using Dfe.ContentSupport.Web.Models.Mapped;
@@ -29,12 +30,20 @@ public CsPage MapToCsPage(ContentSupportPage incoming)
             HasPrint = incoming.HasPrint,
             Content = MapEntriesToContent(incoming.Content),
             ShowVerticalNavigation = incoming.ShowVerticalNavigation,
-            CreatedAt = incoming.Sys.CreatedAt,
-            UpdatedAt = incoming.Sys.UpdatedAt
+            CreatedAt = incoming.SystemProperties.CreatedAt,
+            UpdatedAt = incoming.SystemProperties.UpdatedAt,
+            Tags = FlattenMetadata(incoming.Metadata)
         };
         return result;
     }
 
+    private static List<string> FlattenMetadata(ContentfulMetadata item)
+    {
+        if (item is null) return [];
+
+        return item.Tags.Select(o => o.Sys.Id).ToList();
+    }
+
     private List<CsContentItem> MapEntriesToContent(List<Entry> entries)
     {
         return entries.Select(ConvertEntryToContentItem).ToList();
@@ -59,6 +68,7 @@ public CsContentItem ConvertEntryToContentItem(Entry entry)
                 Subtitle = entry.Subtitle,
                 NodeType = ConvertToRichTextNodeType(richText.NodeType),
                 Content = MapRichTextNodes(richText.Content),
+                Tags = FlattenMetadata(entry.Metadata)
             };
         return item;
     }
@@ -69,11 +79,14 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
         { NodeType = RichTextNodeType.Unknown, InternalName = node.InternalName }).ToList();
     }
 
+
     public RichTextContentItem? MapContent(ContentItem contentItem)
     {
         RichTextContentItem? item;
         var nodeType = ConvertToRichTextNodeType(contentItem.NodeType);
         var internalName = contentItem.InternalName;
+
+
         switch (nodeType)
         {
             case RichTextNodeType.Text:
@@ -84,7 +97,7 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
                 break;
             case RichTextNodeType.Hyperlink:
                 var uri = contentItem.Data.Uri.ToString();
-                item = new Hyperlink
+                item = new Models.Mapped.Standard.Hyperlink
                 {
                     Uri = uri,
                     IsVimeo = uri.Contains("vimeo.com")
@@ -137,12 +150,13 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
         item.Content = MapRichTextNodes(contentItem.Content);
         item.Value = contentItem.Value;
         item.InternalName = internalName;
+        item.Tags = FlattenMetadata(contentItem.Metadata);
         return item;
     }
 
     public CustomComponent? GenerateCustomComponent(Target target)
     {
-        var contentType = target.Sys.ContentType?.Sys.Id;
+        var contentType = target.SystemProperties.ContentType?.SystemProperties.Id;
         if (contentType is null) return null;
         return contentType switch
         {

src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml

@@ -30,9 +30,7 @@
         {
             <partial name="_Content" model="@content"/>
         }
-    </div>
-
-    <div class="govuk-grid-column-full">
+
         @if (Model.HasCitation)
         {
             <partial name="_Citation" model="Model"/>

src/Dfe.ContentSupport.Web/Views/Shared/RichText/_RichText.cshtml

@@ -1,61 +1,66 @@
 @model RichTextContentItem
-
 @{
+    var tags = ViewBag.tags ?? new List<string>();
+}
+
+
+@if (tags.Count == 0 || (Model.Tags.Count == 0 || Model.Tags.Exists(el => tags.Contains(el))))
+{
     var nodeType = Model.NodeType;
 
     switch (nodeType)
     {
         case RichTextNodeType.Document:
-            <partial name="RichText/_Document" model="@Model"/>
+            <partial name="RichText/_Document" model="@Model" />
             break;
         case RichTextNodeType.Paragraph:
-            <partial name="RichText/_Paragraph" model="@Model"/>
+            <partial name="RichText/_Paragraph" model="@Model" />
             break;
         case RichTextNodeType.Heading2:
         case RichTextNodeType.Heading3:
         case RichTextNodeType.Heading4:
         case RichTextNodeType.Heading5:
         case RichTextNodeType.Heading6:
-            <partial name="RichText/_H" model="@Model"/>
+            <partial name="RichText/_H" model="@Model" />
             break;
         case RichTextNodeType.UnorderedList:
-            <partial name="RichText/_UnorderedList" model="@Model"/>
+            <partial name="RichText/_UnorderedList" model="@Model" />
             break;
         case RichTextNodeType.OrderedList:
-            <partial name="RichText/_OrderedList" model="@Model"/>
+            <partial name="RichText/_OrderedList" model="@Model" />
             break;
         case RichTextNodeType.ListItem:
-            <partial name="RichText/_ListItem" model="@Model"/>
+            <partial name="RichText/_ListItem" model="@Model" />
             break;
         case RichTextNodeType.Hyperlink:
-            <partial name="RichText/_Hyperlink" model="@Model"/>
+            <partial name="RichText/_Hyperlink" model="@Model" />
             break;
         case RichTextNodeType.Table:
-            <partial name="RichText/_Table" model="@Model"/>
+            <partial name="RichText/_Table" model="@Model" />
             break;
         case RichTextNodeType.TableRow:
-            <partial name="RichText/_TableRow" model="@Model"/>
+            <partial name="RichText/_TableRow" model="@Model" />
             break;
         case RichTextNodeType.TableHeaderCell:
-            <partial name="RichText/_TableHeaderCell" model="@Model"/>
+            <partial name="RichText/_TableHeaderCell" model="@Model" />
             break;
         case RichTextNodeType.TableCell:
-            <partial name="RichText/_TableCell" model="@Model"/>
+            <partial name="RichText/_TableCell" model="@Model" />
             break;
         case RichTextNodeType.Hr:
-            <hr/>
+            <hr />
             break;
         case RichTextNodeType.EmbeddedAsset:
-            <partial name="RichText/_Asset" model="@Model"/>
+            <partial name="RichText/_Asset" model="@Model" />
             break;
         case RichTextNodeType.Text:
-            <partial name="RichText/_Text" model="@Model"/>
+            <partial name="RichText/_Text" model="@Model" />
             break;
         case RichTextNodeType.EmbeddedEntry:
-            <partial name="RichText/_Entry" model="@Model"/>
+            <partial name="RichText/_Entry" model="@Model" />
             break;
         default:
-            <partial name="_UnsupportedElement" model="@Model"/>
+            <partial name="_UnsupportedElement" model="@Model" />
             break;
     }
-}
+}