From 12fde4911c3803a2ce4facccbf23d4dfaeeca8cc Mon Sep 17 00:00:00 2001
From: binon <Binon.Yesudhas@hee.nhs.uk>
Date: Thu, 18 Jan 2024 10:41:14 +0000
Subject: [PATCH 1/2] WebAPI - hot fix changes

---
 .../Scripts/ExternalSystemData.sql            | 38 +++++++++++++++++++
 .../GetNodeContentsForCatalogueBrowse.sql     |  2 +-
 ...ntsForCatalogueBrowse_withEmptyFolders.sql |  2 +-
 .../HierarchyService.cs                       |  9 ++++-
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/ExternalSystemData.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/ExternalSystemData.sql
index 8ed6229df..5560158ab 100644
--- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/ExternalSystemData.sql
+++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/ExternalSystemData.sql
@@ -17,3 +17,41 @@ INSERT INTO [external].[ExternalSystemDeepLink]
            ,57541
            ,SYSDATETIMEOFFSET())
 END
+
+IF NOT EXISTS (SELECT 1 FROM [external].[ExternalSystem] WHERE [Code] = 'DigitalLearningSolutionsSso')
+BEGIN
+INSERT INTO [external].[ExternalSystem]
+           ([Name]
+           ,[Code]
+           ,[CallbackUrl]
+           ,[SecretKey]
+           ,[TermsAndConditions]
+           ,[DefaultUserGroupId]
+           ,[DefaultStaffGroupId]
+           ,[DefaultJobRoleId]
+           ,[DefaultGradingId]
+           ,[DefaultSpecialityId]
+           ,[DefaultLocationId]
+           ,[Deleted]
+           ,[CreateUserId]
+           ,[CreateDate]
+           ,[AmendUserId]
+           ,[AmendDate])
+     VALUES
+           ('Digital Learning Solutions'
+           ,'DigitalLearningSolutionsSso'
+           ,'https://www.dls.nhs.uk/v2/linkaccount/accountlinked'
+           ,'74A90C2B-5BC5-4877-8607-43AD08DEA983'
+           ,'By clicking the button below, you agree to the Learning Hub and Digital Learning Solutions creating a link between your accounts on their systems so that you can log in to the Learning Hub seamlessly from the Digital Learning Solutions site via Single Sign On. Do you agree to the Learning Hub and Digital Learning Solutions linking your accounts?'
+           ,'1070'
+           ,null
+           ,null
+           ,null
+           ,227
+           ,1
+           ,0
+           ,57541
+           ,SYSDATETIMEOFFSET()
+           ,57541
+           ,SYSDATETIMEOFFSET())
+END
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql
index 0bd9f3f52..6c2c4fb8d 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse.sql	
@@ -122,6 +122,6 @@ BEGIN
 			AND rv.Deleted = 0
 
 	) AS t1
-	ORDER BY DisplayOrder ASC
+	ORDER BY NodeTypeId DESC,DisplayOrder ASC
 END
 GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse_withEmptyFolders.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse_withEmptyFolders.sql
index 9dfa34fe7..1e0000213 100644
--- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse_withEmptyFolders.sql	
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/GetNodeContentsForCatalogueBrowse_withEmptyFolders.sql	
@@ -117,6 +117,6 @@ BEGIN
 			AND rv.Deleted = 0
 
 	) AS t1
-	ORDER BY  DisplayOrder ASC
+	ORDER BY  NodeTypeId DESC,DisplayOrder ASC
 END
 GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
index 9b9d97e7d..0f55404f7 100644
--- a/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/HierarchyService.cs
@@ -269,6 +269,10 @@ public async Task<List<NodeContentBrowseViewModel>> GetNodeContentsForCatalogueB
 
             string cacheKey = $"{CacheKeys.PublishedNodeContents}:{nodeId}";
             var nodeContents = await this.cachingService.GetAsync<List<NodeContentBrowseViewModel>>(cacheKey);
+            if (includeEmptyFolder)
+            {
+                nodeContents.ResponseEnum = CacheReadResponseEnum.NotFound;
+            }
 
             if (nodeContents.ResponseEnum == CacheReadResponseEnum.Found)
             {
@@ -285,7 +289,10 @@ public async Task<List<NodeContentBrowseViewModel>> GetNodeContentsForCatalogueB
                     throw new Exception($"Corrupt data. Duplicate Nodes returned in NodeContent for NodeId={nodeId}");
                 }
 
-                await this.cachingService.SetAsync(cacheKey, retVal);
+                if (!includeEmptyFolder)
+                {
+                    await this.cachingService.SetAsync(cacheKey, retVal);
+                }
             }
 
             var list = retVal.Where(ncm => ncm.ResourceVersionId.HasValue);

From abddd2ccdb2cab8ceef394346a91503ce636f77f Mon Sep 17 00:00:00 2001
From: binon <Binon.Yesudhas@hee.nhs.uk>
Date: Thu, 18 Jan 2024 10:50:46 +0000
Subject: [PATCH 2/2] RC hot fixes WebUI

---
 .gitguardian.yaml                             |   5 +
 .../Controllers/Api/UserController.cs         |  12 ++
 .../Controllers/ResourceController.cs         |   2 +-
 .../Scripts/vuesrc/data/user.ts               |  15 +-
 .../vuesrc/resource/ResourceContent.vue       |  23 +-
 .../resource/blocks/ImageCarouselViewer.vue   |   3 +-
 .../Services/SearchService.cs                 |   9 +-
 .../Views/Catalogue/Catalogues.cshtml         | 196 +++++++++---------
 .../Views/Home/_CatalogueCard.cshtml          |   2 +-
 .../Views/Home/_ResourceCard.cshtml           | 130 ++++++------
 .../Search/_CatalogueSearchResult.cshtml      | 170 +++++++--------
 .../Views/Search/_ResourceSearchResult.cshtml | 148 ++++++-------
 12 files changed, 373 insertions(+), 342 deletions(-)
 create mode 100644 .gitguardian.yaml

diff --git a/.gitguardian.yaml b/.gitguardian.yaml
new file mode 100644
index 000000000..0685713d8
--- /dev/null
+++ b/.gitguardian.yaml
@@ -0,0 +1,5 @@
+secret:
+  ignored-matches:
+  - match: 26841b2b92a38ec6d2dd87ccc2d4f6d3613486c21f4cf5cb4d98b4527dfc0061
+    name: Generic High Entropy Secret - LearningHub.Nhs.WebUI/Program.cs
+version: 2
diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs
index e2b9c09b5..7e5d42864 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/UserController.cs
@@ -90,6 +90,18 @@ public async Task<ActionResult> GetUserAccessType()
             return this.Ok(isGeneralUser);
         }
 
+        /// <summary>
+        /// to get user role.
+        /// </summary>
+        /// <returns>The <see cref="Task{ActionResult}"/>.</returns>
+        [HttpGet]
+        [Route("CheckUserRole")]
+        public async Task<ActionResult> CheckUserRole()
+        {
+            var isSystemAdmin = this.User.IsInRole("Administrator");
+            return this.Ok(isSystemAdmin);
+        }
+
         /// <summary>
         /// The GetCurrentUserPersonalDetails.
         /// </summary>
diff --git a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
index 97df3861f..b040c2cf8 100644
--- a/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/ResourceController.cs
@@ -136,7 +136,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
                 var userGroups = await this.userGroupService.GetRoleUserGroupDetailForUserAsync(this.CurrentUserId);
 
                 hasCatalogueAccess = userGroups.Any(x => x.CatalogueNodeId == resource.Catalogue.NodeId &&
-                    (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader));
+                    (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader)) || this.User.IsInRole("Administrator");
             }
             else if (!resource.Catalogue.RestrictedAccess)
             {
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/user.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/user.ts
index 757b948ba..472ca9bac 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/user.ts
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/data/user.ts
@@ -54,6 +54,18 @@ const isGeneralUser = async function (): Promise<boolean[]> {
         });
 };
 
+const IsSystemAdmin = async function (): Promise<boolean[]> {
+    var IsSystemAdmin = `/api/User/CheckUserRole`;
+    return await AxiosWrapper.axios.get<boolean[]>(IsSystemAdmin)
+        .then(response => {
+            return response.data;
+        })
+        .catch(e => {
+            console.log('IsSystemAdmin:' + e);
+            throw e;
+        });
+};
+
 const getCurrentUserBasicDetails = async function (): Promise<UserBasicModel> {
     return await AxiosWrapper.axios.get<UserBasicModel>('/api/User/GetCurrentUserBasicDetails')
         .then(response => {
@@ -160,5 +172,6 @@ export const userData = {
     updateSecurityQuestionAnswers,
     keepUserSessionAlive,
     getkeepUserSessionAliveInterval,
-    isGeneralUser
+    isGeneralUser,
+    IsSystemAdmin
 }
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
index efc9dad7c..fd68981da 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/ResourceContent.vue
@@ -8,7 +8,7 @@
 
                     <!--Video-->
                     <div id="mediacontainer" class="resource-item nhsuk-u-margin-bottom-7" v-if="hasMediaAccess && (resourceItem.resourceTypeEnum === ResourceType.VIDEO)">
-                        
+
                         <video id="resourceAzureMediaPlayer" data-setup='{"logo": { "enabled": false }, "techOrder": ["azureHtml5JS", "flashSS",  "silverlightSS", "html5"], "nativeControlsForTouch": false}' controls class="azuremediaplayer amp-default-skin amp-big-play-centered resource-video nhsuk-u-margin-bottom-4">
                             <source :src="resourceItem.videoDetails.resourceAzureMediaAsset.locatorUri" type="application/vnd.ms-sstr+xml" :data-setup='getAESProtection(resourceItem.videoDetails.resourceAzureMediaAsset.authenticationToken)' />
                             <source :src="getMediaAssetProxyUrl(resourceItem.videoDetails.resourceAzureMediaAsset)" type="application/vnd.apple.mpegurl" disableUrlRewriter="true" />
@@ -73,7 +73,7 @@
     import '../filters';
     import { resourceData } from '../data/resource';
     import { userData } from '../data/user';
-    import { VersionStatus, ResourceType, ResourceAccessibility,ActivityStatus, MediaResourceActivityType, AzureMediaPlayerOptions, RoleEnum } from '../constants';
+    import { VersionStatus, ResourceType, ResourceAccessibility, ActivityStatus, MediaResourceActivityType, AzureMediaPlayerOptions, RoleEnum } from '../constants';
     import { ResourceItemModel } from '../models/resourceItemModel';
     import { ScormContentDetailsModel } from '../models/scormModel';
     import { RoleUserGroupModel } from '../models/roleUserGroupModel';
@@ -119,19 +119,20 @@
                 interactionQueue: new Array<InteractionQueueModel>(),
                 scormContentDetailsModel: new ScormContentDetailsModel(),
                 assessmentProgress: null as AssessmentProgressModel,
-                isGeneralUser: false
+                isGeneralUser: false,
+                isSystemAdmin: false
             }
         },
         computed: {
             hasCatalogueAccess(): boolean {
-                return (!this.resourceItem.catalogue.restrictedAccess
+                return (!this.resourceItem.catalogue.restrictedAccess || this.IsSystemAdmin
                     ||
                     (this.roleUserGroups.filter((rug: any) => rug.catalogueNodeId == this.resourceItem.catalogue.nodeId
                         && (rug.roleEnum == RoleEnum.LocalAdmin || rug.roleEnum == RoleEnum.Editor || rug.roleEnum == RoleEnum.Reader)).length > 0)
                 );
             },
             hasMediaAccess(): boolean {
-                return this.userAuthenticated && (this.resourceItem.resourceTypeEnum == this.ResourceType.AUDIO || this.resourceItem.resourceTypeEnum == this.ResourceType.VIDEO ) && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
+                return this.userAuthenticated && (this.resourceItem.resourceTypeEnum == this.ResourceType.AUDIO || this.resourceItem.resourceTypeEnum == this.ResourceType.VIDEO) && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
             },
             hasScormAccess(): boolean {
                 return this.userAuthenticated && this.resourceItem.resourceTypeEnum == this.ResourceType.SCORM && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
@@ -146,12 +147,13 @@
                 this.mediaStartTime = parseInt(this.$route.query.mediaStartTime as string);
             }
             await this.getGeneralUser();
+            await this.getUserRole();
             await this.loadResourceItem(Number(this.$route.params.resId));
 
             if (this.userAuthenticated && this.resourceItem.catalogue.restrictedAccess) {
                 await this.loadRoleUserGroups();
             }
-            
+
 
             if (this.userAuthenticated && (this.resourceItem.resourceTypeEnum == ResourceType.VIDEO || this.resourceItem.resourceTypeEnum == ResourceType.AUDIO) && this.hasResourceAccess()) {
                 this.addMediaEventListeners();
@@ -165,8 +167,7 @@
 
             // call complete activity if resource type is media or scorm.
             if (this.userAuthenticated && (this.resourceItem.resourceTypeEnum === ResourceType.VIDEO || this.resourceItem.resourceTypeEnum === ResourceType.AUDIO) && this.hasResourceAccess()) {
-                //var isIE11 = (!!window.MSInputMethodContext && !!((<any>document).documentMode));
-                var isIE11 = (!!((window as any).MSInputMethodContext) && !!((document as any).documentMode));
+                var isIE11 = (!!window.MSInputMethodContext && !!((<any>document).documentMode));
                 var self = this;
 
                 if (isIE11) {
@@ -236,6 +237,9 @@
             async getGeneralUser(): Promise<void> {
                 this.isGeneralUser = await userData.isGeneralUser();
             },
+            async getUserRole(): Promise<void> {
+                this.IsSystemAdmin = await userData.IsSystemAdmin();
+            },
 
             hasResourceAccess(): boolean {
                 return this.userAuthenticated && (!(this.isGeneralUser && this.resourceItem.resourceAccessibilityEnum == this.ResourceAccessibility.FullAccess))
@@ -550,7 +554,7 @@
     .resource-item-row {
         margin-top: 32px;
     }
-    
+
     .border-bottom {
         border-bottom: 1px solid $nhsuk-grey-lighter;
         padding-bottom: 20px;
@@ -628,7 +632,6 @@
         color: #ffffff;
         background-color: transparent;
     }
-
 </style>
 
 <style lang="scss">
diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/ImageCarouselViewer.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/ImageCarouselViewer.vue
index 6f9d1cb1c..6840eeee7 100644
--- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/ImageCarouselViewer.vue
+++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/ImageCarouselViewer.vue
@@ -38,7 +38,6 @@
     import ImagePublishedView from "../../contribute-resource/components/published-view/ImagePublishedView.vue";
     import { Carousel3d, Slide } from 'vue-carousel-3d';
     import ImageCarouselImageView from "./ImageCarouselImageView.vue";
-    let counterInterval: undefined | ReturnType<typeof setTimeout>;
     
     export default Vue.extend({
         components: {
@@ -50,7 +49,7 @@
         },
         data() {
             return {
-                counterInterval,  
+                counterInterval: 0,  
             }
         },
         created() {
diff --git a/LearningHub.Nhs.WebUI/Services/SearchService.cs b/LearningHub.Nhs.WebUI/Services/SearchService.cs
index 04998ce72..1951d1d23 100644
--- a/LearningHub.Nhs.WebUI/Services/SearchService.cs
+++ b/LearningHub.Nhs.WebUI/Services/SearchService.cs
@@ -145,12 +145,9 @@ public async Task<SearchResultViewModel> PerformSearch(IPrincipal user, SearchRe
 
                         var generalAccessValue = (int)ResourceAccessibilityEnum.GeneralAccess;
                         var basicUserAudienceFilterItem = accessLevelFilters.Where(x => x.DisplayName == generalAccessValue.ToString()).FirstOrDefault();
-
-                        if (basicUserAudienceFilterItem != null)
-                        {
-                            var basicUserAudienceFilter = new SearchFilterModel() { DisplayName = ResourceAccessLevelHelper.GetPrettifiedResourceAccessLevelOptionDisplayName(ResourceAccessibilityEnum.GeneralAccess), Count = basicUserAudienceFilterItem.Count, Value = generalAccessValue.ToString(), Selected = (searchRequest.ResourceAccessLevelId ?? 0) == generalAccessValue };
-                            resourceAccessLevelFilters.Add(basicUserAudienceFilter);
-                        }
+                        var basicResourceAccesslevelCount = basicUserAudienceFilterItem?.Count ?? 0;
+                        var basicUserAudienceFilter = new SearchFilterModel() { DisplayName = ResourceAccessLevelHelper.GetPrettifiedResourceAccessLevelOptionDisplayName(ResourceAccessibilityEnum.GeneralAccess), Count = basicResourceAccesslevelCount, Value = generalAccessValue.ToString(), Selected = (searchRequest.ResourceAccessLevelId ?? 0) == generalAccessValue };
+                        resourceAccessLevelFilters.Add(basicUserAudienceFilter);
                     }
 
                     filters = resourceResult.Facets.Where(x => x.Id == "provider_ids").First().Filters;
diff --git a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
index c33908be8..d184442fb 100644
--- a/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Catalogue/Catalogues.cshtml
@@ -3,113 +3,113 @@
 @model LearningHub.Nhs.Models.Dashboard.DashboardCatalogueResponseViewModel;
 
 @{
-    ViewData["Title"] = "Learning Hub - Catalogues";
+  ViewData["Title"] = "Learning Hub - Catalogues";
 
-    var queryParams = QueryHelpers.ParseQuery(Context.Request.QueryString.ToString().ToLower());
-    var hasSearchTerm = queryParams.ContainsKey("term");
-    var searhTerm = hasSearchTerm ? queryParams["term"].ToString() : null;
+  var queryParams = QueryHelpers.ParseQuery(Context.Request.QueryString.ToString().ToLower());
+  var hasSearchTerm = queryParams.ContainsKey("term");
+  var searhTerm = hasSearchTerm ? queryParams["term"].ToString() : null;
 }
 
 @section styles{
-    <link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/catalogue.css" asp-append-version="true" />
+  <link rel="stylesheet" type="text/css" href="~/css/nhsuk/pages/catalogue.css" asp-append-version="true" />
 }
 
 <div class="nhsuk-width-container app-width-container" style="width:100%">
-    @if (hasSearchTerm)
+  @if (hasSearchTerm)
+  {
+    var parms = new Dictionary<string, string> { { "term", searhTerm } };
+    <vc:back-link asp-controller="Search" asp-action="Index" asp-all-route-data="@parms" link-text="Back to: Search results" />
+  }
+  else
+  {
+    <vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
+  }
+  <h1 class="nhsuk-u-margin-bottom-5">
+    @(hasSearchTerm ? $"Search results for {searhTerm}" : "All catalogues")
+  </h1>
+
+  <h2 class="nhsuk-u-margin-bottom-5">
+    @($"{Model.TotalCount} catalogue results")
+  </h2>
+
+
+  <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred">
+
+    @foreach (var item in Model.Catalogues)
     {
-        var parms = new Dictionary<string, string> { { "term", searhTerm } };
-        <vc:back-link asp-controller="Search" asp-action="Index" asp-all-route-data="@parms" link-text="Back to: Search results" />
-    }
-    else
-    {
-        <vc:back-link asp-controller="Home" asp-action="Index" link-text="Back to: Learning Hub" />
-    }
-    <h1 class="nhsuk-u-margin-bottom-5">
-        @(hasSearchTerm ? $"Search results for {searhTerm}" : "All catalogues")
-    </h1>
-
-    <h2 class="nhsuk-u-margin-bottom-5">
-        @($"{Model.TotalCount} catalogue results")
-    </h2>
-
-
-    <ul class="nhsuk-grid-row nhsuk-card-group nhsuk-card-group--centred">
-
-        @foreach (var item in Model.Catalogues)
-        {
-            <li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
-
-                <div class="nhsuk-card catalogue-card">
-
-                    <div class="nhsuk-card-banner-container">
-                        @if (!string.IsNullOrWhiteSpace(item.CardImageUrl))
-                        {
-                            <img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.CardImageUrl" alt="@item.Name" />
-                        }
-                        else if (!string.IsNullOrWhiteSpace(item.BannerUrl))
-                        {
-                            <img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.BannerUrl" alt="@item.Name" />
-                        }
-                        else
-                        {
-                            <div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
-                        }
-                    </div>
-
-                    <div class="nhsuk-card__content catalogue-card-content">
-
-                        <h3 class="nhsuk-card__heading nhsuk-heading-m">
-                            <a class="nhsuk-card__link line-clamp-2" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
-                        </h3>
-
-                        <div class="nhsuk-card__description catalogue-card-body">
-                            <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
-                                @Html.Raw(item.Description)
-                            </div>
-
-                            <div class="catalogue-meta">
-                                <div>
-                                    <div>
-                                        @if (item.RestrictedAccess)
-                                        {
-                                            <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@(item.HasAccess ? "Access Granted" : "Access restricted")</div>
-                                        }
-                                    </div>
-                                    <div>
-                                        <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
-                                           asp-route-bookmarked="@item.IsBookmarked"
-                                           asp-route-id="@item.BookmarkId"
-                                           asp-route-title="@item.Name.Truncate(60)"
-                                           asp-route-nodeId="@item.NodeId"
-                                           asp-route-path="@item.Url"
-                                           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
-                                            @(item.IsBookmarked ? "Remove from" : "Add to")  my bookmarks
-                                        </a>
-                                    </div>
-                                </div>
-                                <div>
-                                    @if (!string.IsNullOrEmpty(item.BadgeUrl))
-                                    {
-                                        <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+      <li class="nhsuk-grid-column-one-third-small-desktop nhsuk-card-group__item">
+
+        <div class="nhsuk-card catalogue-card">
+
+          <div class="nhsuk-card-banner-container">
+            @if (!string.IsNullOrWhiteSpace(item.CardImageUrl))
+            {
+              <img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.CardImageUrl" alt="@item.Name" />
+            }
+            else if (!string.IsNullOrWhiteSpace(item.BannerUrl))
+            {
+              <img class="nhsuk-card__img nhsuk-card-banner" src="/api/catalogue/download-image/@item.BannerUrl" alt="@item.Name" />
+            }
+            else
+            {
+              <div class="nhsuk-bg-pale-blue nhsuk-card-banner nhsuk-card-banner-empty"></div>
+            }
+          </div>
+
+          <div class="nhsuk-card__content catalogue-card-content">
+
+            <h3 class="nhsuk-card__heading nhsuk-heading-m">
+              <a class="nhsuk-card__link line-clamp-2" asp-controller="Catalogue" asp-action="Index" asp-route-reference="@item.Url">@item.Name</a>
+            </h3>
+
+            <div class="nhsuk-card__description catalogue-card-body">
+              <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
+                @Html.Raw(item.Description)
+              </div>
+
+              <div class="catalogue-meta">
+                <div>
+                  <div>
+                    @if (item.RestrictedAccess)
+                    {
+                      <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")</div>
+                    }
+                  </div>
+                  <div>
+                    <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+                     asp-route-bookmarked="@item.IsBookmarked"
+                     asp-route-id="@item.BookmarkId"
+                     asp-route-title="@item.Name.Truncate(60)"
+                     asp-route-nodeId="@item.NodeId"
+                     asp-route-path="@item.Url"
+                     asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
+                      @(item.IsBookmarked ? "Remove from" : "Add to")  my bookmarks
+                    </a>
+                  </div>
                 </div>
+                <div>
+                  @if (!string.IsNullOrEmpty(item.BadgeUrl))
+                  {
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                  }
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
 
-            </li>
-        }
-    </ul>
-
-    @if (Model.TotalCount > 9)
-    {
-        var currentPage = this.ViewBag.PageIndex;
-        int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1);
-        var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty;
-        var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}";
-        var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}";
-
-        @await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl))
+      </li>
     }
+  </ul>
+
+  @if (Model.TotalCount > 9)
+  {
+    var currentPage = this.ViewBag.PageIndex;
+    int totalPage = (Model.TotalCount / 9) + (Model.TotalCount % 9 == 0 ? 0 : 1);
+    var searchQueryParam = hasSearchTerm ? $"&term={searhTerm}" : string.Empty;
+    var prevUrl = $"/catalogues?pageindex={currentPage - 1}{searchQueryParam}";
+    var nextUrl = $"/catalogues?pageindex={currentPage + 1}{searchQueryParam}";
+
+    @await Html.PartialAsync("_Pagination", new PaginationViewModel(currentPage, totalPage, prevUrl, nextUrl))
+  }
 </div>
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
index 15976f336..735a0d209 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_CatalogueCard.cshtml
@@ -46,7 +46,7 @@
           <div class="nhsuk-u-margin-bottom-2">
             @if (Model.RestrictedAccess)
             {
-              <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@(Model.HasAccess ? "Access granted" : "Access restricted")</div>
+              <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((Model.HasAccess || this.User.IsInRole("Administrator")) ? "Access granted" : "Access restricted")</div>
             }
           </div>
           <div>
diff --git a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
index 55f0f962f..1beb6a69b 100644
--- a/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Home/_ResourceCard.cshtml
@@ -9,82 +9,82 @@
 @model Tuple<string, DashboardResourceViewModel>
 
 @{
-    bool providerExists = Model.Item2.Providers?.Count > 0;
-    string cardStyle = Model.Item1.Contains("my-learning") ? "card-provider-details--darkblank" : "card-provider-details--blank";
+  bool providerExists = Model.Item2.Providers?.Count > 0;
+  string cardStyle = Model.Item1.Contains("my-learning") ? "card-provider-details--darkblank" : "card-provider-details--blank";
 }
 
 <div class="nhsuk-card dashboard-card">
 
-    @if (providerExists)
-    {
-        <div class="card-provider-details">
-            @ProviderHelper.GetProviderString(Model.Item2.Providers.FirstOrDefault().Name)
-        </div>
-    }
-    else
-    {
-        <div class="card-provider-details @cardStyle"></div>
-    }
+  @if (providerExists)
+  {
+    <div class="card-provider-details">
+      @ProviderHelper.GetProviderString(Model.Item2.Providers.FirstOrDefault().Name)
+    </div>
+  }
+  else
+  {
+    <div class="card-provider-details @cardStyle"></div>
+  }
 
-    <div class="nhsuk-card__content dashboard-card-content">                       
-        <div>
-            <h2 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
-                <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardResourceView"
-                   asp-route-url="@("/Resource/" + Model.Item2.ResourceReferenceId)" asp-route-resourceReference="@Model.Item2.ResourceReferenceId">@UtilityHelper.StripHtmlFromString(Model.Item2.Title)</a>
-            </h2>
+  <div class="nhsuk-card__content dashboard-card-content">
+    <div>
+      <h2 class="nhsuk-card__heading nhsuk-heading-m line-clamp-2">
+        <a class="nhsuk-card__link" asp-controller="Dashboard" asp-action="RecordDashboardNavigation" asp-route-eventType="@EventTypeEnum.DashBoardResourceView"
+           asp-route-url="@("/Resource/" + Model.Item2.ResourceReferenceId)" asp-route-resourceReference="@Model.Item2.ResourceReferenceId">@UtilityHelper.StripHtmlFromString(Model.Item2.Title)</a>
+      </h2>
+    </div>
+    <div class="nhsuk-card__description dashboard-card-body">
+      <div>
+        <div class="nhsuk-body-s nhsuk-u-margin-bottom-2point5">
+          <span class="nhsuk-u-font-weight-bold">Type:</span> @UtilityHelper.GetPrettifiedResourceTypeName(Model.Item2.ResourceType, Model.Item2.DurationInMilliseconds)
+        </div>
+        <div class="nhsuk-u-margin-bottom-2point5 line-clamp-3">
+          @UtilityHelper.StripHtmlFromString(Model.Item2.Description)
         </div>
-        <div class="nhsuk-card__description dashboard-card-body">
-            <div>
-                <div class="nhsuk-body-s nhsuk-u-margin-bottom-2point5">
-                    <span class="nhsuk-u-font-weight-bold">Type:</span> @UtilityHelper.GetPrettifiedResourceTypeName(Model.Item2.ResourceType, Model.Item2.DurationInMilliseconds)
-                </div>
-                <div class="nhsuk-u-margin-bottom-2point5 line-clamp-3">
-                    @UtilityHelper.StripHtmlFromString(Model.Item2.Description)
-                </div>
 
-                @if (!string.IsNullOrEmpty(Model.Item2.CatalogueName))
-                {
-                    <div class="nhsuk-u-font-size-16 nhsuk-u-margin-bottom-2point5 line-clamp-1">
-                        <a asp-controller="Catalogue" asp-action="Index" asp-route-reference="@Model.Item2.Url">@UtilityHelper.StripHtmlFromString(Model.Item2.CatalogueName)</a>
-                    </div>
-                }
+        @if (!string.IsNullOrEmpty(Model.Item2.CatalogueName))
+        {
+          <div class="nhsuk-u-font-size-16 nhsuk-u-margin-bottom-2point5 line-clamp-1">
+            <a asp-controller="Catalogue" asp-action="Index" asp-route-reference="@Model.Item2.Url">@UtilityHelper.StripHtmlFromString(Model.Item2.CatalogueName)</a>
+          </div>
+        }
 
-                <div class="nhsuk-body-s nhsuk-u-margin-bottom-2 star-rating-container">
-                    <partial name="_StarRatingWithCount" model="@new StarRatingWithCountViewModel { AverageRating = (decimal)Model.Item2.AverageRating,
+        <div class="nhsuk-body-s nhsuk-u-margin-bottom-2 star-rating-container">
+          <partial name="_StarRatingWithCount" model="@new StarRatingWithCountViewModel { AverageRating = (decimal)Model.Item2.AverageRating,
                                                                                         RatingCount = Model.Item2.RatingCount,
                                                                                         ResourceReferenceId = Model.Item2.ResourceReferenceId }" />
-                </div>
-            </div>
+        </div>
+      </div>
 
-            <div class="catalogue-meta">
-                <div>
-                    <div class="nhsuk-u-margin-bottom-2">
-                        @if (Model.Item2.RestrictedAccess)
-                        {
-                            <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@(Model.Item2.HasAccess ? "Access granted" : "Access restricted")</div>
-                        }
-                    </div>
-                    <div>
-                        <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
-                           asp-route-bookmarked="@Model.Item2.IsBookmarked"
-                           asp-route-id="@Model.Item2.BookmarkId"
-                           asp-route-title="@Model.Item2.Title.Truncate(60)"
-                           asp-route-rri="@Model.Item2.ResourceReferenceId"
-                           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">@(Model.Item2.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
-                    </div>
-                </div>
-                <div>
-                    @if(providerExists)
-                    {
-                        var provider = @Model.Item2.Providers.First();
-                        <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
-                    }
-                    else if (!string.IsNullOrEmpty(Model.Item2.BadgeUrl))
-                    {
-                        <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="@(Model.Item2.CatalogueName)" class="catalogue-badge" />
-                    }
-                </div>
-            </div>
+      <div class="catalogue-meta">
+        <div>
+          <div class="nhsuk-u-margin-bottom-2">
+            @if (Model.Item2.RestrictedAccess)
+            {
+              <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((Model.Item2.HasAccess || this.User.IsInRole("Administrator")) ? "Access granted" : "Access restricted")</div>
+            }
+          </div>
+          <div>
+            <a class="nhsuk-u-font-size-16 nhsuk-u-margin-right-3" role="button" asp-controller="Bookmark" asp-action="BookmarkResource"
+               asp-route-bookmarked="@Model.Item2.IsBookmarked"
+               asp-route-id="@Model.Item2.BookmarkId"
+               asp-route-title="@Model.Item2.Title.Truncate(60)"
+               asp-route-rri="@Model.Item2.ResourceReferenceId"
+               asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">@(Model.Item2.IsBookmarked ? "Remove from" : "Add to")  my bookmarks</a>
+          </div>
+        </div>
+        <div>
+          @if (providerExists)
+          {
+            var provider = @Model.Item2.Providers.First();
+            <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+          }
+          else if (!string.IsNullOrEmpty(Model.Item2.BadgeUrl))
+          {
+            <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(Model.Item2.BadgeUrl))" alt="@(Model.Item2.CatalogueName)" class="catalogue-badge" />
+          }
         </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
index 8f9fe6b21..2bcfbf19c 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_CatalogueSearchResult.cshtml
@@ -4,106 +4,106 @@
 @model LearningHub.Nhs.WebUI.Models.Search.SearchResultViewModel
 
 @{
-    var catalogueResult = Model.CatalogueSearchResult;
-    var pagingModel = Model.CatalogueResultPaging;
-    var searchString = HttpUtility.UrlEncode(Model.SearchString);
-    var searchSignal = catalogueResult.Feedback?.FeedbackAction?.Payload?.SearchSignal;
-
-    string GetCatalogueUrl(string catalogueUrl, int nodePathId, int itemIndex, int catalogueId)
-    {
-        string encodedCatalogueUrl = HttpUtility.UrlEncode("/Catalogue/" + catalogueUrl);
-        string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
-        string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
-
-        var url = $@"/search/record-catalogue-click?url={encodedCatalogueUrl}&nodePathId={nodePathId}&itemIndex={itemIndex}
+  var catalogueResult = Model.CatalogueSearchResult;
+  var pagingModel = Model.CatalogueResultPaging;
+  var searchString = HttpUtility.UrlEncode(Model.SearchString);
+  var searchSignal = catalogueResult.Feedback?.FeedbackAction?.Payload?.SearchSignal;
+
+  string GetCatalogueUrl(string catalogueUrl, int nodePathId, int itemIndex, int catalogueId)
+  {
+    string encodedCatalogueUrl = HttpUtility.UrlEncode("/Catalogue/" + catalogueUrl);
+    string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
+    string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
+
+    var url = $@"/search/record-catalogue-click?url={encodedCatalogueUrl}&nodePathId={nodePathId}&itemIndex={itemIndex}
 &pageIndex={pagingModel.CurrentPage}&totalNumberOfHits={catalogueResult.TotalHits}&searchText={searchString}&catalogueId={catalogueId}
 &GroupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal?.UserQuery)}&query={searchSignalQueryEncoded}";
-        return url;
-    }
+    return url;
+  }
 }
 
 @if (pagingModel.TotalPages > 1)
 {
-    @await Html.PartialAsync("_CataloguePagination", Model)
+  @await Html.PartialAsync("_CataloguePagination", Model)
 
-    <div class="catalogue-all-link nhsuk-u-margin-bottom-3">
-        <a href="/catalogues?term=@searchString">View all catalogues</a>
-    </div>
+  <div class="catalogue-all-link nhsuk-u-margin-bottom-3">
+    <a href="/catalogues?term=@searchString">View all catalogues</a>
+  </div>
 }
 
 @if (catalogueResult.DocumentModel != null)
 {
-    var index = pagingModel.CurrentPage * pagingModel.PageSize;
-    <ul class="nhsuk-grid-row nhsuk-card-group">
-
-        @foreach (var item in catalogueResult.DocumentModel)
-        {
-            var hasBadge = !string.IsNullOrWhiteSpace(item.BadgeUrl);
-            var provider = item.Providers?.FirstOrDefault();
-
-            <li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
+  var index = pagingModel.CurrentPage * pagingModel.PageSize;
+  <ul class="nhsuk-grid-row nhsuk-card-group">
 
-                <div class="nhsuk-card nhsuk-bg-light-blue catalogue-card">
-                    @if (provider != null)
-                    {
-                        <div class="card-provider-details">
-                            @ProviderHelper.GetProviderString(provider.Name)
-                        </div>
-                    }
-                    else
+    @foreach (var item in catalogueResult.DocumentModel)
+    {
+      var hasBadge = !string.IsNullOrWhiteSpace(item.BadgeUrl);
+      var provider = item.Providers?.FirstOrDefault();
+
+      <li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
+
+        <div class="nhsuk-card nhsuk-bg-light-blue catalogue-card">
+          @if (provider != null)
+          {
+            <div class="card-provider-details">
+              @ProviderHelper.GetProviderString(provider.Name)
+            </div>
+          }
+          else
+          {
+            <div class="card-provider-details card-provider-details--blank"></div>
+          }
+          <div class="nhsuk-card__content catalogue-card-content">
+
+            <h2 class="nhsuk-card__heading nhsuk-heading-m">
+              <a class="nhsuk-card__link" href="@GetCatalogueUrl(item.Url, item.NodePathId, index, Int32.Parse(item.Id))">@item.Name</a>
+            </h2>
+
+            <div class="nhsuk-card__description catalogue-card-body">
+              <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
+                @Html.Raw(item.Description)
+              </div>
+
+              <div class="catalogue-meta">
+                <div>
+                  <div>
+                    @if (item.RestrictedAccess)
                     {
-                        <div class="card-provider-details card-provider-details--blank"></div>
+                      <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@((item.HasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")</div>
                     }
-                    <div class="nhsuk-card__content catalogue-card-content">
-
-                        <h2 class="nhsuk-card__heading nhsuk-heading-m">
-                            <a class="nhsuk-card__link" href="@GetCatalogueUrl(item.Url, item.NodePathId, index, Int32.Parse(item.Id))">@item.Name</a>
-                        </h2>
-
-                        <div class="nhsuk-card__description catalogue-card-body">
-                            <div class="line-clamp-3 nhsuk-u-margin-bottom-2point5">
-                                @Html.Raw(item.Description)
-                            </div>
-
-                            <div class="catalogue-meta">
-                                <div>
-                                    <div>
-                                        @if (item.RestrictedAccess)
-                                        {
-                                            <div class="nhsuk-u-font-size-16 nhsuk-u-font-weight-bold">@(item.HasAccess ? "Access Granted" : "Access restricted")</div>
-                                        }
-                                    </div>
-                                    <div>
-                                        <a class="nhsuk-card__link nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
-                                           asp-route-bookmarked="@item.IsBookmarked"
-                                           asp-route-id="@item.BookmarkId"
-                                           asp-route-title="@item.Name.Truncate(60)"
-                                           asp-route-nodeId="@item.Id"
-                                           asp-route-path="@item.Url"
-                                           asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
-
-                                            @(item.IsBookmarked ? "Remove from my bookmarks" : "Add to my bookmarks")
-                                        </a>
-                                    </div>
-                                </div>
-                                <div>
-                                    @if (provider != null)
-                                    {  
-                                        <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
-                                    }
-                                    else @if (hasBadge)
-                                    {
-                                        <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+                  </div>
+                  <div>
+                    <a class="nhsuk-card__link nhsuk-u-font-size-16" asp-controller="Bookmark" asp-action="BookmarkCatalogue"
+                   asp-route-bookmarked="@item.IsBookmarked"
+                   asp-route-id="@item.BookmarkId"
+                   asp-route-title="@item.Name.Truncate(60)"
+                   asp-route-nodeId="@item.Id"
+                   asp-route-path="@item.Url"
+                   asp-route-returnUrl="@(Context.Request.Path + Context.Request.QueryString)">
+
+                      @(item.IsBookmarked ? "Remove from my bookmarks" : "Add to my bookmarks")
+                    </a>
+                  </div>
                 </div>
+                <div>
+                  @if (provider != null)
+                  {
+                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="provider-badge" />
+                  }
+                  else @if (hasBadge)
+                  {
+                    <img src="@("/api/dashboard/download-image/" + Uri.EscapeDataString(item.BadgeUrl))" alt="@(item.Name)" class="catalogue-card-badge" />
+                  }
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
 
-            </li>
+      </li>
 
-            index++;
-        }
-    </ul>
+      index++;
+    }
+  </ul>
 }
\ No newline at end of file
diff --git a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
index 2b130cac3..07c2caa6e 100644
--- a/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
+++ b/LearningHub.Nhs.WebUI/Views/Search/_ResourceSearchResult.cshtml
@@ -9,96 +9,98 @@
 @using LearningHub.Nhs.WebUI.Models.Search;
 
 @{
-    var resourceResult = Model.ResourceSearchResult;
-    var pagingModel = Model.ResourceResultPaging;
-    var index = pagingModel.CurrentPage * pagingModel.PageSize;
-    var searchString = HttpUtility.UrlEncode(Model.SearchString);
-    var searchSignal = resourceResult.Feedback?.FeedbackAction?.Payload?.SearchSignal;
+  var resourceResult = Model.ResourceSearchResult;
+  var pagingModel = Model.ResourceResultPaging;
+  var index = pagingModel.CurrentPage * pagingModel.PageSize;
+  var searchString = HttpUtility.UrlEncode(Model.SearchString);
+  var searchSignal = resourceResult.Feedback?.FeedbackAction?.Payload?.SearchSignal;
 
-    string GetUrl(int resourceReferenceId, int itemIndex, int nodePathId)
-    {
-        string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
-        string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
+  string GetUrl(int resourceReferenceId, int itemIndex, int nodePathId)
+  {
+    string groupId = HttpUtility.UrlEncode(Model.GroupId.ToString());
+    string searchSignalQueryEncoded = HttpUtility.UrlEncode(HttpUtility.UrlDecode(searchSignal?.Query));
 
-        return $@"/search/record-resource-click?url=/Resource/{resourceReferenceId}&nodePathId={nodePathId}&itemIndex={itemIndex}
+    return $@"/search/record-resource-click?url=/Resource/{resourceReferenceId}&nodePathId={nodePathId}&itemIndex={itemIndex}
 &pageIndex={pagingModel.CurrentPage}&totalNumberOfHits={resourceResult.TotalHits}&searchText={searchString}&resourceReferenceId={resourceReferenceId}
 &groupId={groupId}&searchId={searchSignal?.SearchId}&timeOfSearch={searchSignal?.TimeOfSearch}&userQuery={HttpUtility.UrlEncode(searchSignal?.UserQuery)}&query={searchSignalQueryEncoded}";
-    }
+  }
 
-    bool showCatalogueFieldsInResources = ViewBag.ShowCatalogueFieldsInResources == null || ViewBag.ShowCatalogueFieldsInResources == true;
-    bool resourceAccessLevelFilterSelected = resourceResult.SearchResourceAccessLevelFilters.Any(f => f.Selected);
+  bool showCatalogueFieldsInResources = ViewBag.ShowCatalogueFieldsInResources == null || ViewBag.ShowCatalogueFieldsInResources == true;
+  bool resourceAccessLevelFilterSelected = resourceResult.SearchResourceAccessLevelFilters.Any(f => f.Selected);
 }
 
 @foreach (var item in resourceResult.DocumentModel)
 {
-    var provider = item.Providers?.FirstOrDefault();
-
-    <div class="resource-item nhsuk-list-item--border nhsuk-u-padding-bottom-4 nhsuk-u-margin-bottom-4">
-        <h2 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2">
-            <a class="nhsuk-card__link" href="@GetUrl(item.ResourceReferenceId, index, item.NodePathId??0)">@item.Title</a>
-        </h2>
+  var provider = item.Providers?.FirstOrDefault();
 
-        @if (provider != null)
-        {   
-            <div>
-                <div class="provider-details">
-                    <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="logo" />
-                    <span class="title">@ProviderHelper.GetProviderString(provider.Name)</span>
-                </div>
-            </div>
-        }
-        @if (item.CatalogueRestrictedAccess && !Model.HideRestrictedBadge && showCatalogueFieldsInResources)
-        {
-            <p class="nhsuk-body-s nhsuk-u-margin-bottom-2 nhsuk-u-font-weight-bold">@(item.CatalogueHasAccess ? "Access Granted" : "Access restricted")</p>
-        }
-
-        @if(!resourceAccessLevelFilterSelected)
-        {
-            <div class="nhsuk-body-s nhsuk-u-margin-bottom-2">
-                <div class="nhsuk-u-margin-right-4">
-                    <strong>Audience access level: </strong>
-                    @ResourceAccessLevelHelper.GetResourceAccessLevelText((ResourceAccessibilityEnum)item.ResourceAccessLevel)
-                </div>            
-            </div>
-        }
+  <div class="resource-item nhsuk-list-item--border nhsuk-u-padding-bottom-4 nhsuk-u-margin-bottom-4">
+    <h2 class="nhsuk-heading-xs nhsuk-u-margin-bottom-2">
+      <a class="nhsuk-card__link" href="@GetUrl(item.ResourceReferenceId, index, item.NodePathId??0)">@item.Title</a>
+    </h2>
 
+    @if (provider != null)
+    {
+      <div>
+        <div class="provider-details">
+          <img src="~/images/provider-logos/@provider.Logo" alt="@provider.Name" class="logo" />
+          <span class="title">@ProviderHelper.GetProviderString(provider.Name)</span>
+        </div>
+      </div>
+    }
+    @if (item.CatalogueRestrictedAccess && !Model.HideRestrictedBadge && showCatalogueFieldsInResources)
+    {
+      <p class="nhsuk-body-s nhsuk-u-margin-bottom-2 nhsuk-u-font-weight-bold">
+        @((item.CatalogueHasAccess || this.User.IsInRole("Administrator")) ? "Access Granted" : "Access restricted")
+      </p>
+    }
 
-        <div class="resource-info nhsuk-body-s nhsuk-u-margin-bottom-2">
-            <div class="nhsuk-u-margin-right-4">
-                <strong>Type: </strong>
-                @UtilityHelper.GetPrettifiedResourceTypeName(UtilityHelper.ToEnum<ResourceTypeEnum>(item.ResourceType), 0)
-            </div>
-            <div>
-                @await Html.PartialAsync("../Shared/_StarRating.cshtml", item.Rating)
-            </div>
+    @if (!resourceAccessLevelFilterSelected)
+    {
+      <div class="nhsuk-body-s nhsuk-u-margin-bottom-2">
+        <div class="nhsuk-u-margin-right-4">
+          <strong>Audience access level: </strong>
+          @ResourceAccessLevelHelper.GetResourceAccessLevelText((ResourceAccessibilityEnum)item.ResourceAccessLevel)
         </div>
+      </div>
+    }
 
-        <p class="nhsuk-body-s nhsuk-u-margin-bottom-2 resource-description line-clamp-3">
-            @item.Description
-        </p>
 
-        <div class="resource-author">
-            @if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources)
-            {
-                <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" />
-            }
+    <div class="resource-info nhsuk-body-s nhsuk-u-margin-bottom-2">
+      <div class="nhsuk-u-margin-right-4">
+        <strong>Type: </strong>
+        @UtilityHelper.GetPrettifiedResourceTypeName(UtilityHelper.ToEnum<ResourceTypeEnum>(item.ResourceType), 0)
+      </div>
+      <div>
+        @await Html.PartialAsync("../Shared/_StarRating.cshtml", item.Rating)
+      </div>
+    </div>
+
+    <p class="nhsuk-body-s nhsuk-u-margin-bottom-2 resource-description line-clamp-3">
+      @item.Description
+    </p>
 
-            @if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources)
-            {
-                <div class="nhsuk-u-margin-right-3">
-                    <a href="@("/Catalogue/" + item.CatalogueUrl)" class="catalogue-resource-search-result-name">@item.CatalogueName</a>
-                </div>
-            }
+    <div class="resource-author">
+      @if (!string.IsNullOrWhiteSpace(item.CatalogueBadgeUrl) && showCatalogueFieldsInResources)
+      {
+        <img class="resource-catalogue-badge" src="/search/image/@item.CatalogueBadgeUrl" />
+      }
 
-            <div>
-                @UtilityHelper.GetAttribution(item.Authors)
-                @if (!string.IsNullOrEmpty(item.AuthoredDate))
-                {
-                    @UtilityHelper.GetInOn(item.AuthoredDate)
-                    @: @item.AuthoredDate
-                }
-            </div>
+      @if (!string.IsNullOrEmpty(item.CatalogueName) && !this.Model.CatalogueId.HasValue && showCatalogueFieldsInResources)
+      {
+        <div class="nhsuk-u-margin-right-3">
+          <a href="@("/Catalogue/" + item.CatalogueUrl)" class="catalogue-resource-search-result-name">@item.CatalogueName</a>
         </div>
+      }
+
+      <div>
+        @UtilityHelper.GetAttribution(item.Authors)
+        @if (!string.IsNullOrEmpty(item.AuthoredDate))
+        {
+          @UtilityHelper.GetInOn(item.AuthoredDate)
+          @: @item.AuthoredDate
+        }
+      </div>
     </div>
-    index++;
+  </div>
+  index++;
 }
\ No newline at end of file