Merge pull request #237 from TechnologyEnhancedLearning/Develop/Fixes/TD-3699-UserGroup-Access-Removal

Fixes-TD-3699

Author: AnjuJose011

LearningHub.Nhs.WebUI/Models/RestrictedAccessBannerViewModel.cs

@@ -1,9 +1,11 @@
 namespace LearningHub.Nhs.WebUI.Models
 {
+    using System.Collections.Generic;
     using LearningHub.Nhs.Models.Catalogue;
     using LearningHub.Nhs.Models.Entities.Hierarchy;
+    using LearningHub.Nhs.Models.User;
 
-    /// <summary>
+     /// <summary>
     /// Defines the <see cref="RestrictedAccessBannerViewModel" />.
     /// </summary>
     public class RestrictedAccessBannerViewModel
@@ -37,5 +39,10 @@ public class RestrictedAccessBannerViewModel
         /// Gets or sets the CatalogueAccessRequest if there is one.
         /// </summary>
         public CatalogueAccessRequestViewModel CatalogueAccessRequest { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current user's usergroups.
+        /// </summary>
+        public List<RoleUserGroupViewModel> UserGroups { get; set; }
     }
 }

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

@@ -79,7 +79,8 @@
         CatalogueNodeVersionId = Model.Catalogue.Id,
         RestrictedAccess = Model.Catalogue.RestrictedAccess,
         HasCatalogueAccess = Unlocked(),
-        CatalogueAccessRequest = Model.CatalogueAccessRequest
+        CatalogueAccessRequest = Model.CatalogueAccessRequest,
+        UserGroups = Model.UserGroups
       };
 }
 

LearningHub.Nhs.WebUI/Views/Shared/_RestrictedAccessBanner.cshtml

@@ -6,7 +6,7 @@
 {
     <div class="nhsuk-bg-pale-blue nhsuk-u-padding-top-4 nhsuk-u-padding-bottom-3 nhsuk-u-margin-bottom-3">
         <div class="nhsuk-width-container app-width-container">
-            @if (Model.CatalogueAccessRequest == null)
+            @if (Model.CatalogueAccessRequest == null || Model.UserGroups.Count == 0)
             {
                 <h2>@Model.TitleText</h2>
                 <p class="nhsuk-u-reading-width">@Model.BodyText</p>