Merge RC changes into virgo

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -116,6 +116,12 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -89,7 +89,7 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />

LearningHub.Nhs.WebUI/Controllers/Api/ResourceController.cs

@@ -105,7 +105,6 @@ public async Task<IActionResult> DownloadResourceAndRecordActivity(int resourceV
                     ActivityStatus = ActivityStatusEnum.Completed,
                 };
                 await this.activityService.CreateResourceActivityAsync(activity);
-
                 return this.File(file.Content, file.ContentType, fileName);
             }
             else

LearningHub.Nhs.WebUI/Controllers/BookmarkController.cs

@@ -276,6 +276,16 @@ public async Task<IActionResult> BookmarkToggle(EditBookmarkViewModel bookmark,
         {
             if (!this.ModelState.IsValid)
             {
+                this.ModelState.Remove(nameof(bookmark.Title));
+                if (bookmark.BookmarkTypeId == 1)
+                {
+                    this.ModelState.AddModelError(nameof(bookmark.Title), "You must enter a folder name");
+                }
+                else
+                {
+                    this.ModelState.AddModelError(nameof(bookmark.Title), "You must enter a bookmark name");
+                }
+
                 this.ViewBag.ReturnUrl = returnUrl;
                 return this.View("Toggle", bookmark);
             }

LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs

@@ -190,8 +190,6 @@ public async Task<IActionResult> IndexAsync(string reference, string tab, int? n
             CatalogueAccessRequestViewModel catalogueAccessRequest = null;
             if (this.ViewBag.UserAuthenticated)
             {
-                var cacheKey = $"{this.CurrentUserId}:AllRolesWithPermissions";
-                await this.cacheService.RemoveAsync(cacheKey);
                 userGroups = await this.userGroupService.GetRoleUserGroupDetailAsync();
                 catalogueAccessRequest = await this.catalogueService.GetLatestCatalogueAccessRequestAsync(catalogue.NodeId);
             }

LearningHub.Nhs.WebUI/Controllers/HomeController.cs

@@ -203,11 +203,17 @@ public async Task<IActionResult> Index(string myLearningDashboard = "my-in-progr
                 this.Logger.LogInformation("User is authenticated: User is {fullname} and userId is: {lhuserid}", this.User.Identity.GetCurrentName(), this.User.Identity.GetCurrentUserId());
                 if (this.User.IsInRole("Administrator") || this.User.IsInRole("BlueUser") || this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser"))
                 {
+                    var learningTask = this.dashboardService.GetMyAccessLearningsAsync(myLearningDashboard, 1);
+                    var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashboard, 1);
+                    var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1);
+
+                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
+
                     var model = new DashboardViewModel()
                     {
-                        MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashboard, 1),
-                        Resources = await this.dashboardService.GetResourcesAsync(resourceDashboard, 1),
-                        Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashboard, 1),
+                        MyLearnings = await learningTask,
+                        Resources = await resourcesTask,
+                        Catalogues = await cataloguesTask,
                     };
 
                     if (!string.IsNullOrEmpty(this.Request.Query["preview"]) && Convert.ToBoolean(this.Request.Query["preview"]))
@@ -271,9 +277,13 @@ public async Task<IActionResult> LoadPage(string dashBoardTray = "my-learning",
                 }
                 else
                 {
-                    model.MyLearnings = await this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
-                    model.Resources = await this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
-                    model.Catalogues = await this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
+                    var learningTask = this.dashboardService.GetMyAccessLearningsAsync(myLearningDashBoard, dashBoardTray == "my-learning" ? pageNumber : 1);
+                    var resourcesTask = this.dashboardService.GetResourcesAsync(resourceDashBoard, dashBoardTray == "resources" ? pageNumber : 1);
+                    var cataloguesTask = this.dashboardService.GetCataloguesAsync(catalogueDashBoard, dashBoardTray == "catalogues" ? pageNumber : 1);
+                    await Task.WhenAll(learningTask, resourcesTask, cataloguesTask);
+                    model.MyLearnings = await learningTask;
+                    model.Resources = await resourcesTask;
+                    model.Catalogues = await cataloguesTask;
                     return this.View("Dashboard", model);
                 }
             }

LearningHub.Nhs.WebUI/Controllers/ResourceController.cs

@@ -123,7 +123,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
 
             var resource = await this.resourceService.GetItemByIdAsync(resourceReferenceId);
 
-            if (resource.Id == 0 || (resource.Catalogue != null && resource.Catalogue.Hidden))
+            if ((resource == null && resource.Id == 0) || (resource.Catalogue != null && resource.Catalogue.Hidden))
             {
                 this.ViewBag.SupportFormUrl = this.Settings.SupportUrls.SupportForm;
                 return this.View("Unavailable");
@@ -147,7 +147,7 @@ public async Task<IActionResult> Index(int resourceReferenceId, bool? acceptSens
             var hasCatalogueAccess = false;
             if (resource.Catalogue.RestrictedAccess && this.User.Identity.IsAuthenticated)
             {
-                var userGroups = await this.userGroupService.GetRoleUserGroupDetailForUserAsync(this.CurrentUserId);
+                var userGroups = await this.userGroupService.GetRoleUserGroupDetailAsync();
 
                 hasCatalogueAccess = userGroups.Any(x => x.CatalogueNodeId == resource.Catalogue.NodeId &&
                     (x.RoleEnum == RoleEnum.LocalAdmin || x.RoleEnum == RoleEnum.Editor || x.RoleEnum == RoleEnum.Reader)) || this.User.IsInRole("Administrator");
@@ -437,12 +437,13 @@ public async Task<IActionResult> UnpublishConfirm(ResourceUnpublishConfirmViewMo
         /// View HTML resource content.
         /// </summary>
         /// <param name="resourceReferenceId">Resource reference id.</param>
+        /// <param name="currentResourceVersionId">Resource version id.</param>
         /// <param name="path">Html resource content relative path.</param>
         /// <returns>The file content.</returns>
         [HttpGet]
         [Authorize]
-        [Route("resource/html/{resourceReferenceId}/{*path}")]
-        public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, string path)
+        [Route("resource/html/{resourceReferenceId}/{CurrentResourceVersionId}/{*path}")]
+        public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, int currentResourceVersionId, string path)
         {
             if (resourceReferenceId == 0 || string.IsNullOrWhiteSpace(path))
             {
@@ -452,8 +453,14 @@ public async Task<IActionResult> HtmlResourceContent(int resourceReferenceId, st
             var userId = this.User.Identity.GetCurrentUserId();
             var cacheKey = $"HtmlContent:{userId}:{resourceReferenceId}";
             var (cacheExists, cacheValue) = await this.cacheService.TryGetAsync<string>(cacheKey);
+            var oldresourceVersionId = 0;
+            if (cacheExists)
+            {
+                var cachesplits = cacheValue.Split(":");
+                oldresourceVersionId = int.Parse(cachesplits[0]);
+            }
 
-            if (!cacheExists)
+            if (!cacheExists || (oldresourceVersionId != currentResourceVersionId))
             {
                 var resource = await this.resourceService.GetItemByIdAsync(resourceReferenceId);
 

LearningHub.Nhs.WebUI/Helpers/ViewActivityHelper.cs

@@ -115,6 +115,12 @@ public static string GetResourceTypeVerb(this ActivityDetailedItemViewModel acti
                     return "Played " + GetDurationText(activityDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }

LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj

@@ -108,7 +108,7 @@
 		<PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
 		<PackageReference Include="IdentityModel" Version="4.3.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.0" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
 		<PackageReference Include="linqtotwitter" Version="6.9.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.ApplicationInsights.EventCounterCollector" Version="2.21.0" />

LearningHub.Nhs.WebUI/Models/Bookmark/EditBookmarkViewModel.cs

@@ -30,7 +30,7 @@ public class EditBookmarkViewModel
         /// <summary>
         /// Gets or sets Title.
         /// </summary>
-        [Required(AllowEmptyStrings = false, ErrorMessage = "You must edit bookmark name")]
+        [Required(AllowEmptyStrings = false, ErrorMessage = "You must enter a bookmark name")]
         [MinLength(2, ErrorMessage = "The bookmark name must be at least 2 characters")]
         [MaxLength(60, ErrorMessage = "The bookmark name must be no more than 60 characters")]
         public string Title { get; set; }

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue

@@ -1,27 +1,29 @@
 <template>
-    <div class="key-words-editor-component">
+    <div class="common-content">
 
-        <div class="my-2 input-with-button">
-            <CharacterCount v-model="newKeyword"
-                            inputId="newKeyword"
-                            v-bind:characterLimit="50"
-                            v-bind:hasOtherError="keywordError"
-                            @input="keywordError=false">
-                <template v-slot:title>
-                    Keywords
-                </template>
-                <template v-slot:otherErrorMessage>
+        <div class="row">
+            <div class="form-group" v-bind:class="{ 'input-validation-error': keywordError }">
+                <div class="col-12 mb-0 error-text" v-if="keywordError">
                     <span class="text-danger">This keyword has already been added.</span>
-                </template>
-                <template v-slot:description>
-                    To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
-                </template>
-                <template v-slot:afterInput>
-                    <Button class="ml-3" v-on:click="addKeyword">Add</Button>
-                </template>
-            </CharacterCount>
-        </div>
+                </div>
+                <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
+                    <span class="text-danger">
+                        Each keyword must be no longer than 50 characters.
+                    </span>
+                </div>
 
+                <div class="col-12">
+                    To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
+                </div>
+                <div class="col-12 input-with-button">
+                    <input id="newKeyword" aria-labelledby="keyword-label" type="text" class="form-control" maxlength="260" v-model="newKeyword" v-bind:class="{ 'input-validation-error': keywordError }" @input="keywordError=false" @change="keywordChange" />
+                    <button type="button" class="nhsuk-button nhsuk-button--secondary ml-3 button_width nhsuk-u-margin-bottom-0" @click="addKeyword">&nbsp;Add</button>
+                </div>
+                <div class="col-12 footer-text">
+                    You can enter a maximum of 50 characters per keyword
+                </div>
+            </div>
+        </div>    
         <div class="keyword-container my-4 d-flex">
             <div class="keyword-tag" v-for="keyword in resourceDetails.resourceKeywords" :key="keyword.id">
                 <button class="btn btn-link" aria-label="Delete keyword" @click="deleteKeyword(keyword.id)">
@@ -57,6 +59,7 @@
             return {
                 newKeyword: '',
                 keywordError: false,
+                keywordLengthExceeded: false,
             }
         },
         computed: {
@@ -68,14 +71,18 @@
             },
         },
         methods: {
+            keywordChange() {
+                this.keywordError = false;
+                this.keywordLengthExceeded = false;
+            },
             async addKeyword() {  
                 if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
                     let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
                     allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
                     if (!this.resourceDetails.resourceKeywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                         for (var i = 0; i < allTrimmedKeyword.length; i++) {
                             let item = allTrimmedKeyword[i];
-                            if (item.length > 0) {
+                            if (item.length > 0 && item.length <= 50) {
                                 let newKeywordObj = new KeywordModel({
                                     keyword: item,
                                     resourceVersionId: this.resourceVersionId,
@@ -93,13 +100,10 @@
 
                             }
                             else {
-                                this.keywordError = true;
+                                this.keywordLengthExceeded = true;
                             }
                         }
-
-                    }
-
-
+                    }                    
                     else {
                         this.keywordError = true;
                     }
@@ -122,6 +126,10 @@
         display: flex;
         align-items: center;
     }
+    .button_width
+    {
+        width:15%;
+    }
 
     .input-with-button::v-deep #newKeyword {
         text-transform: lowercase;

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue

@@ -86,6 +86,12 @@
                 <div class="col-12 mb-0 error-text" v-if="keywordError">
                     <span class="text-danger">This keyword has already been added.</span>
                 </div>
+                <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
+                    <span class="text-danger">
+                        Each keyword must be no longer than 50 characters.
+                    </span>
+                </div>
+
                 <div class="col-12">
                     To help learners find this resource, type one or more relevant keywords separated by commas and click 'Add'.
                 </div>
@@ -285,6 +291,7 @@
                 editorConfig: { toolbar: CKEditorToolbar.default, versionCheck: false },
                 ResourceType,
                 resourceProviderId: null,
+                keywordLengthExceeded: false,
             };
         },
         computed: {
@@ -477,6 +484,7 @@
                 },
                 keywordChange() {
                     this.keywordError = false;
+                    this.keywordLengthExceeded = false;
                 },
                 resetSelectedLicence() {
                     this.resourceLicenceId = 0;
@@ -547,6 +555,10 @@
                                         break;
                                     }
                                 }
+                                else {
+                                    this.keywordLengthExceeded = true;
+                                    break;
+                                }
                             }
                         }
                         else {

LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue

@@ -35,6 +35,7 @@
                            :firstUnansweredQuestion="pagesProgress.map((e, i) => i < questionInFocus || e).findIndex(p => !p) === index"
                            :isQuestionInFocus="questionInFocus === index"
                            :answerInOrder="answerInOrder"
+                           :allQuestAnswered="allQuestionsAnswered"
                            @updateQuestionProgress="isComplete => pushUpdate(index, isComplete)"
                            @nextPage="$emit('nextPage')"
                            @submitAssessmentAnswers="answers => $emit(`submitAssessmentAnswers`, answers, block.blockRef)"

LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/QuestionBlock.vue

@@ -179,7 +179,8 @@
             isQuestionInFocus: { type: Boolean, default: false },
             firstUnansweredQuestion: Boolean,
             matchQuestionsState: { type: Array } as PropOptions<MatchQuestionState[]>,
-            answerInOrder: Boolean
+            answerInOrder: Boolean,
+            allQuestAnswered: { type: Boolean, default: false }
         },
         components: {
             MatchGameSubmissionView,
@@ -268,6 +269,9 @@
             },
             isQuestionInFocus(value) {
                 this.isOpen = value;
+                if (this.allQuestAnswered) {
+                    this.isOpen = false;
+                }
             }
         },
         methods: {