TD-5434_Made changes to the code and now we are loading the banner text information directly from the centre table into the view component based on the logged in user, instead of using the views to inject it into the view components, did some clean up of removing the unwanted bannerText viewdata assigning, cleaned up unwanted braces.

Author: ABSinhaa

DigitalLearningSolutions.Web/ViewComponents/DlsFooterBannerTextViewComponent.cs

@@ -1,13 +1,33 @@
-using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
+using System.Security.Claims;
+using DigitalLearningSolutions.Data.DataServices;
+using DigitalLearningSolutions.Web.Helpers;
 using Microsoft.AspNetCore.Mvc;
+using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
+using DigitalLearningSolutions.Web.Services;
+using System;
+using System.Threading.Tasks;
 
 namespace DigitalLearningSolutions.Web.ViewComponents
 {
     public class DlsFooterBannerTextViewComponent : ViewComponent
     {
-        public IViewComponentResult Invoke(string centreName)
+        private readonly ICentresService centresService;
+
+        public DlsFooterBannerTextViewComponent(ICentresService centresService)
         {
-            var model = new DlsFooterBannerTextViewModel(centreName);
+            this.centresService = centresService;
+        }
+
+        public  IViewComponentResult Invoke()
+        {
+            var centreId = ((ClaimsPrincipal)User).GetCustomClaimAsInt(CustomClaimTypes.UserCentreId);
+            if (centreId == null)
+            {
+                return View(new DlsFooterBannerTextViewModel(null));
+            }
+
+            var bannerText = centresService.GetBannerText(Convert.ToInt32(centreId));
+            var model = new DlsFooterBannerTextViewModel(bannerText);
             return View(model);
         }
     }

DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/DlsFooterBannerTextViewModel.cs

@@ -2,11 +2,11 @@
 {
     public class DlsFooterBannerTextViewModel
     {
-        public  readonly string? CentreName;
+        public  readonly string? BannerText;
 
-        public DlsFooterBannerTextViewModel(string centreName)
+        public DlsFooterBannerTextViewModel(string bannerText)
         {
-            CentreName = centreName;
+            BannerText = bannerText;
         }
 
     }

DigitalLearningSolutions.Web/Views/LearningMenu/CoursePassword.cshtml

@@ -12,7 +12,6 @@
   ViewData["CustomisationId"] = Model.Id;
   ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}/Password";
   ViewData["HeaderPathName"] = Model.Title;
-  ViewData["BannerText"] = Model.BannerText;
 }
 @section NavMenuItems {
   <partial name="Shared/_NavMenuItems" />

DigitalLearningSolutions.Web/Views/LearningMenu/Index.cshtml

@@ -12,7 +12,6 @@
   ViewData["CustomisationId"] = Model.Id;
   ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningMenu/{Model.Id}";
   ViewData["HeaderPathName"] = Model.Title;
-  ViewData["BannerText"] = Model.BannerText;
 }
 @section NavMenuItems {
   <partial name="Shared/_NavMenuItems" />

DigitalLearningSolutions.Web/Views/LearningPortal/Available/Available.cshtml

@@ -10,7 +10,6 @@
     ViewData["Title"] = "Available Activities";
     ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Available";
     ViewData["HeaderPathName"] = "Learning Portal";
-    ViewData["BannerText"] = Model.BannerText;
 }
 
 @section NavMenuItems {

DigitalLearningSolutions.Web/Views/LearningPortal/Completed/Completed.cshtml

@@ -10,7 +10,6 @@
     ViewData["Title"] = "My Completed Activities";
     ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Completed";
     ViewData["HeaderPathName"] = "Learning Portal";
-    ViewData["BannerText"] = Model.BannerText;
 }
 
 @if (Model.JavascriptSearchSortFilterPaginateEnabled)

DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml

@@ -12,7 +12,6 @@
     ViewData["Title"] = "My Current Activities";
     ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/LearningPortal/Current";
     ViewData["HeaderPathName"] = "Learning Portal";
-    ViewData["BannerText"] = Model.BannerText;
 }
 
 @section NavMenuItems {

DigitalLearningSolutions.Web/Views/Shared/Components/DlsFooterBannerText/Default.cshtml

@@ -1,13 +1,13 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @model DlsFooterBannerTextViewModel
 @{
-    if (!String.IsNullOrEmpty(Model.CentreName))
+    if (!String.IsNullOrEmpty(Model.BannerText))
     {
         <h2 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2 nhsuk-u-secondary-text-color">Need help?</h2>
         <div class="nhsuk-footer nhsuk-u-font-size-16 nhsuk-u-secondary-text-color">
             <ul class="nhsuk-footer__list">
                 <li class="nhsuk-footer__list-item">
-                    <span>Centre contact information:</span> <span>@Model.CentreName</span>
+                    <span>Centre contact information:</span> <span>@Model.BannerText</span>
                 </li>
             </ul>
         </div>

DigitalLearningSolutions.Web/Views/Shared/_DlsFooter.cshtml

@@ -1,10 +1,7 @@
-@{
-
-}
 <footer role="contentinfo">
     <div class="nhsuk-footer-container">
         <div class="nhsuk-width-container">
-            @await Component.InvokeAsync("DlsFooterBannerText", new { centreName = ViewData["BannerText"] })
+            @await Component.InvokeAsync("DlsFooterBannerText")
             <h2 class="nhsuk-u-visually-hidden">Support links</h2>
             <div class="nhsuk-footer">
                 <ul class="nhsuk-footer__list">

DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml

@@ -6,7 +6,6 @@
     ViewData["Title"] = "Dashboard";
     ViewData["Application"] = "Supervisor";
     ViewData["HeaderPathName"] = "Supervisor";
-    ViewData["BannerText"] = Model.BannerText;
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {