TD-4704: LH Live: Issue not showing the 'elfh' logo on 'Catalogue details' screen when accessed 'Search' & 'Catalogue cards' screens

Author: ArunimaGeorge

LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml

@@ -34,15 +34,6 @@
     return string.Empty;
   }
 
-  string GetBadgeUrl()
-  {
-    if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
-    {
-      return GetFileLink(Model.Catalogue.BadgeUrl);
-    }
-    return string.Empty;
-  }
-
   string GetFileLink(string fileName)
   {
     return "/api/catalogue/download-image/" + Uri.EscapeDataString(fileName);
@@ -82,6 +73,9 @@
         CatalogueAccessRequest = Model.CatalogueAccessRequest,
         UserGroups = Model.UserGroups
       };
+
+   var provider = Model.Catalogue.Providers?.FirstOrDefault();
+   var hasBadge = !string.IsNullOrWhiteSpace(Model.Catalogue.BadgeUrl);
 }
 
 @section styles{
@@ -124,9 +118,13 @@
       }
 
       <div class="catalogue-title nhsuk-u-margin-bottom-7">
-        @if (!string.IsNullOrEmpty(Model.Catalogue.BadgeUrl))
+        @if (provider != null)
+        {
+           <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name catalogue badge" class="provider-badge" />
+        }
+        else if (hasBadge)
         {
-          <img alt="Provider's catalogue badge" src="@GetBadgeUrl()" class="catalogue-badge" />
+           <img src="@("/api/catalogue/download-image/" + Uri.EscapeDataString(Model.Catalogue.BadgeUrl))" alt="Provider's catalogue badgeTest" class="catalogue-card-badge" />
         }
 
         <h1 class="heading-lg title nhsuk-u-margin-bottom-0">@(ViewBag.ActiveTab == "browse" && Model.NodeDetails != null ? Model.NodeDetails.Name : Model.Catalogue.Name)</h1>

WebAPI/LearningHub.Nhs.Services/CatalogueService.cs

@@ -198,6 +198,7 @@ public async Task<CatalogueViewModel> GetCatalogueAsync(string reference, int us
             var bookmark = this.bookmarkRepository.GetAll().Where(b => b.NodeId == catalogue.NodeId && b.UserId == userId).FirstOrDefault();
             catalogueVM.BookmarkId = bookmark?.Id;
             catalogueVM.IsBookmarked = !bookmark?.Deleted ?? false;
+            catalogueVM.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogueVM.Id);
             return catalogueVM;
         }
 

WebAPI/LearningHub.Nhs.Services/DashboardService.cs

@@ -51,6 +51,15 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearnings(str
 
             var cataloguesResponse = dashboardType.ToLower() == "my-catalogues" ? this.catalogueNodeVersionRepository.GetCatalogues(dashboardType, pageNumber, userId) : (TotalCount: 0, Catalogues: new List<DashboardCatalogueDto>());
 
+            var catalogueList = cataloguesResponse.Catalogues.Any() ? this.mapper.Map<List<DashboardCatalogueViewModel>>(cataloguesResponse.Catalogues) : new List<DashboardCatalogueViewModel>();
+            if (catalogueList.Any())
+            {
+                foreach (var catalogue in catalogueList)
+                {
+                    catalogue.Providers = await this.providerService.GetByCatalogueVersionIdAsync(catalogue.NodeVersionId);
+                }
+            }
+
             var resourceList = resources.Any() ? this.mapper.Map<List<DashboardResourceViewModel>>(resources) : new List<DashboardResourceViewModel>();
             if (resourceList.Any())
             {
@@ -64,7 +73,7 @@ public async Task<DashboardMyLearningResponseViewModel> GetMyAccessLearnings(str
             {
                 Type = dashboardType,
                 Resources = resourceList,
-                Catalogues = cataloguesResponse.Catalogues.Any() ? this.mapper.Map<List<DashboardCatalogueViewModel>>(cataloguesResponse.Catalogues) : new List<DashboardCatalogueViewModel>(),
+                Catalogues = catalogueList,
                 TotalCount = dashboardType.ToLower() == "my-catalogues" ? cataloguesResponse.TotalCount : resourceCount,
                 CurrentPage = pageNumber,
             };