Merge pull request #1172 from TechnologyEnhancedLearning/Develop/Fixes/TD-5665-Adding-resources-to-the-community-catalogue-is-suspended

TD-5665-Adding resources to the community catalogue is suspended

Author: swapnamol-abraham

LearningHub.Nhs.WebUI/Interfaces/IUserGroupService.cs

@@ -22,6 +22,12 @@ public interface IUserGroupService
         /// <returns>The <see cref="Task{List}"/>.</returns>
         Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailForUserAsync(int userId);
 
+        /// <summary>
+        /// The UserHasCatalogueContributionPermission.
+        /// </summary>
+        /// <returns>The <see cref="UserHasCatalogueContributionPermission"/>.</returns>
+        Task<bool> UserHasCatalogueContributionPermission();
+
         /// <summary>
         /// Check if user has given permission.
         /// </summary>

LearningHub.Nhs.WebUI/Services/NavigationPermissionService.cs

@@ -11,14 +11,19 @@
     public class NavigationPermissionService : INavigationPermissionService
     {
         private readonly IResourceService resourceService;
+        private readonly IUserGroupService userGroupService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NavigationPermissionService"/> class.
         /// </summary>
         /// <param name="resourceService">Resource service.</param>
-        public NavigationPermissionService(IResourceService resourceService)
+        /// <param name="userGroupService">UserGroup service.</param>
+        public NavigationPermissionService(
+        IResourceService resourceService,
+        IUserGroupService userGroupService)
         {
             this.resourceService = resourceService;
+            this.userGroupService = userGroupService;
         }
 
         /// <summary>
@@ -52,7 +57,7 @@ public async Task<NavigationModel> GetNavigationModelAsync(IPrincipal user, bool
             }
             else if (user.IsInRole("BlueUser"))
             {
-                return this.AuthenticatedBlueUser(controllerName);
+                return await this.AuthenticatedBlueUser(controllerName);
             }
             else
             {
@@ -114,11 +119,11 @@ private NavigationModel AuthenticatedAdministrator(string controllerName)
         /// </summary>
         /// <param name="controllerName">The controller name.</param>
         /// <returns>The <see cref="NavigationModel"/>.</returns>
-        private NavigationModel AuthenticatedBlueUser(string controllerName)
+        private async Task<NavigationModel> AuthenticatedBlueUser(string controllerName)
         {
             return new NavigationModel()
             {
-                ShowMyContributions = true,
+                ShowMyContributions = await this.userGroupService.UserHasCatalogueContributionPermission(),
                 ShowMyLearning = true,
                 ShowMyBookmarks = true,
                 ShowSearch = controllerName != "search" && controllerName != string.Empty,

LearningHub.Nhs.WebUI/Services/UserGroupService.cs

@@ -45,7 +45,7 @@ public UserGroupService(
         /// <inheritdoc />
         public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailAsync()
         {
-            var cacheKey = $"{this.contextAccessor.HttpContext.User.Identity.GetCurrentUserId()}:AllRolesWithPermissions";
+            var cacheKey = $"{this.contextAccessor.HttpContext.User.Identity.GetCurrentUserId()}:AllRolesWithPermissions";        
             return await this.cacheService.GetOrFetchAsync(cacheKey, () => this.FetchRoleUserGroupDetailAsync());
         }
 
@@ -56,6 +56,18 @@ public async Task<List<RoleUserGroupViewModel>> GetRoleUserGroupDetailForUserAsy
             return await this.cacheService.GetOrFetchAsync(cacheKey, () => this.FetchRoleUserGroupDetailForUserAsync(userId));
         }
 
+        /// <inheritdoc />
+        public async Task<bool> UserHasCatalogueContributionPermission()
+        {
+            var userRoleGroups = await this.GetRoleUserGroupDetailAsync();
+            if (userRoleGroups != null && userRoleGroups.Any(r => r.RoleName == "Local Admin" || r.RoleName == "Editor"))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <inheritdoc />
         public async Task<bool> UserHasPermissionAsync(string permissionCode)
         {