Bring RC changes to tucana

.gitignore

@@ -48,3 +48,7 @@ obj
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.dbmdl
 /WebAPI/MigrationTool/LearningHub.Nhs.Migration.Staging.Database/LearningHub.Nhs.Migration.Staging.Database.jfm
 /LearningHub.Nhs.WebUI.AutomatedUiTests/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/appsettings.Development.json
+/OpenAPI/LearningHub.Nhs.OpenApi/web.config
+/AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
+/WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user

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.38" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
     <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" />

AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml

@@ -162,6 +162,11 @@
             <span class="input-validation-error keyword-maxlength" style="display: none;">The maximum length is 50 characters.</span>
           </div>
         </div>
+        <div class="row">
+          <div class="col-12">
+            <span id="keyword-error-span" class="field-validation-error" style="display: none;"></span>
+          </div>
+        </div>
 
       </div>
       <div class="col-12">
@@ -341,6 +346,9 @@
         } else {
           $('#add-keyword').removeAttr('disabled');
         }
+
+        $('#keyword-error-span').hide();
+        $('#keyword-error-span').html('');
       });
 
       $('#add-keyword').on('click', function () {
@@ -352,9 +360,11 @@
 
         // Split the input value by commas and trim each keyword
         var values = value.split(',').map(function (item) {
-          return item.trim();
+                    return item.trim().toLowerCase();
         });
 
+        var duplicateKeywords = [];
+        $('#keyword-error-span').hide();
         values.forEach(function (value) {
           if (value && keywords.indexOf(value) === -1) {
             keywords.push(value);
@@ -368,9 +378,15 @@
               $(x).attr('name', "Keywords[" + i + "]");
             });
           }
+          else
+          {
+            duplicateKeywords.push(value);
+            $('#keyword-error-span').show();
+            $('#keyword-error-span').html('The keyword(s) have already been added : ' + duplicateKeywords.join(', '))
+          }
         });
 
-        $keywordInput.val("");      
+        $keywordInput.val("");
         if (keywords.length > 4) {
           $('#add-keyword').attr('disabled', 'disabled');
           $('#add-keyword-input').attr('disabled', 'disabled');
@@ -441,4 +457,4 @@
 
   </script>
   <script src="~/js/imageInput.js"></script>
-}
+}

LearningHub.Nhs.WebUI/Controllers/CatalogueController.cs

@@ -110,6 +110,7 @@ public async Task<IActionResult> Index(int pageIndex = 1, string term = null)
                     });
 
                 catalogues.TotalCount = termCatalogues.TotalHits;
+                catalogues.GroupId = Guid.NewGuid();
                 catalogues.Catalogues = termCatalogues.DocumentModel.Select(t => new DashboardCatalogueViewModel
                 {
                     Url = t.Url,
@@ -124,6 +125,7 @@ public async Task<IActionResult> Index(int pageIndex = 1, string term = null)
                     NodeId = int.Parse(t.Id),
                     BadgeUrl = t.BadgeUrl,
                     Providers = t.Providers,
+                    ClickPayload = t.Click.Payload,
                 }).ToList();
             }
             else

LearningHub.Nhs.WebUI/Controllers/LearningSessionsController.cs

@@ -68,6 +68,7 @@ public async Task<IActionResult> Scorm(int id)
         /// <param name="filePath">filePath.</param>
         /// <returns>bool.</returns>
         //// [ResponseCache(VaryByQueryKeys = new[] { "*" }, Duration = 0, NoStore = true)] // disable caching
+        //// Removed Request.Headers["Referer"] Referer URL checking based on issue reported in TD-4283
         [AllowAnonymous]
         [Route("ScormContent/{*filePath}")]
         public async Task<IActionResult> ScormContent(string filePath)
@@ -79,12 +80,6 @@ public async Task<IActionResult> ScormContent(string filePath)
 
             try
             {
-                var referringUrl = this.Request.Headers["Referer"].ToString();
-                if (string.IsNullOrEmpty(referringUrl))
-                {
-                    throw new UnauthorizedAccessException("Referer URL is required.");
-                }
-
                 if (!this.User.Identity.IsAuthenticated)
                 {
                     throw new UnauthorizedAccessException("User is not authenticated.");

LearningHub.Nhs.WebUI/Controllers/SearchController.cs

@@ -214,8 +214,9 @@ public async Task<IActionResult> RecordCatalogueNavigation(SearchRequestViewMode
         /// <param name="timeOfSearch">time of search.</param>
         /// <param name="userQuery">user query.</param>
         /// <param name="query">search query.</param>
+        /// <param name="title">the title.</param>
         [HttpGet("record-resource-click")]
-        public void RecordResourceClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int resourceReferenceId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query)
+        public void RecordResourceClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int resourceReferenceId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query, string title)
         {
             var searchActionResourceModel = new SearchActionResourceModel
             {
@@ -230,6 +231,7 @@ public void RecordResourceClick(string url, int nodePathId, int itemIndex, int p
                 TimeOfSearch = timeOfSearch,
                 UserQuery = userQuery,
                 Query = query,
+                Title = title,
             };
 
             this.searchService.CreateResourceSearchActionAsync(searchActionResourceModel);
@@ -251,9 +253,10 @@ public void RecordResourceClick(string url, int nodePathId, int itemIndex, int p
         /// <param name="timeOfSearch">time of search.</param>
         /// <param name="userQuery">user query.</param>
         /// <param name="query">search query.</param>
+        /// <param name="name">the name.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
         [HttpGet("record-catalogue-click")]
-        public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int catalogueId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query)
+        public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId, int itemIndex, int pageIndex, int totalNumberOfHits, string searchText, int catalogueId, Guid groupId, string searchId, long timeOfSearch, string userQuery, string query, string name)
         {
             SearchActionCatalogueModel searchActionCatalogueModel = new SearchActionCatalogueModel
             {
@@ -268,6 +271,7 @@ public async Task<IActionResult> RecordCatalogueClick(string url, int nodePathId
                 TimeOfSearch = timeOfSearch,
                 UserQuery = userQuery,
                 Query = query,
+                Name = name,
             };
 
             await this.searchService.CreateCatalogueSearchActionAsync(searchActionCatalogueModel);

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.38" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.40" />
 		<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/Scripts/vuesrc/contribute-resource/ContributeAssessmentSettings.vue

@@ -65,22 +65,21 @@
 
                         <div class="d-flex">
                             <div class="selection pr-50">
-                                <div>Provide guidance for the learner at the end of this assessment.</div>
-                                <EditSaveFieldWithCharacterCount   
-                                                                    v-model="assessmentDetails.endGuidance.blocks[0].title"
-                                                                    addEditLabel="title"
-                                                                    v-bind:characterLimit="60"
-                                                                    v-bind:isH3="true" />
-                                <ckeditorwithhint v-on:blur="setEndGuidance" 
+                                <div>Provide guidance for the learner at the end of this assessment. <i v-if="!IsVisible" class="warningTriangle fas fa-exclamation-triangle warm-yellow"></i></div>
+                                <EditSaveFieldWithCharacterCount v-model="assessmentDetails.endGuidance.blocks[0].title"
+                                                                 addEditLabel="title"
+                                                                 v-bind:characterLimit="60"
+                                                                 v-bind:isH3="true" />
+                                <ckeditorwithhint v-on:blur="setEndGuidance"
                                                   v-on:inputValidity="setGuidanceValidity"
-                                                  :maxLength="1000" 
+                                                  :maxLength="1000"
                                                   :initialValue="endGuidance" />
                             </div>
                             <div class="tip">
                                 <h3>Tip</h3>
                                 You can offer guidance to the learner at the end of the assessment such as next steps or recommendations on other learning resources to try.                            </div>
                         </div>
-                        <Button class="mt-5" color="green" v-on:click="isOpen = false" :disabled="!canSaveAll">Save settings</Button>
+                        <Button class="mt-5" color="green" v-on:click="isOpen = false" :disabled="!IsVisible">Save settings</Button>
                     </div>
                 </div>
             </v-card>
@@ -132,6 +131,7 @@
                 endGuidance: "",
                 initialGuidance: "",
                 guidanceValid: true,
+                IsVisible: false,
             }
         },
         watch: {
@@ -140,7 +140,7 @@
                 {
                     this.assessmentDetails.endGuidance.addBlock(BlockTypeEnum.Text);
                 }
-                this.assessmentDetails.endGuidance.blocks[0].textBlock.content = this.endGuidance;
+                this.assessmentDetails.endGuidance.blocks[0].textBlock.content = this.endGuidance;            
             },
             ["assessmentDetails.passMark"](value){ this.assessmentDetails.passMark = this.capNumberFieldBy(value, 100)},
             ["assessmentDetails.maximumAttempts"](value){ this.assessmentDetails.maximumAttempts = this.capNumberFieldBy(value, 10)},
@@ -157,6 +157,14 @@
                 } 
 
                 this.assessmentDetails.assessmentSettingsAreValid = settingsAreValid;
+
+                if (this.endGuidance != "") {
+                    this.IsVisible = true;
+                }
+                else {
+                    this.IsVisible = false;
+                }
+
                 return settingsAreValid;
             },
         },
@@ -170,9 +178,23 @@
                 {
                     this.endGuidance = description;
                 }
+
+                if (this.endGuidance != "") {
+                    this.IsVisible = true;
+                }
+                else {
+                    this.IsVisible = false;
+                }
             },
             setGuidanceValidity(valid: boolean) {
-                this.guidanceValid = valid;
+                if (this.endGuidance == "") {
+                    this.guidanceValid = false;
+                    this.IsVisible = false;
+                }
+                else {
+                    this.guidanceValid = valid;
+                    this.IsVisible = true;
+                }
             }
         }
     });

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

@@ -4,7 +4,7 @@
         <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>
+                    <span class="text-danger">The keyword(s) have already been added : {{formattedkeywordErrorMessage}}</span>
                 </div>
                 <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
                     <span class="text-danger">
@@ -60,6 +60,7 @@
                 newKeyword: '',
                 keywordError: false,
                 keywordLengthExceeded: false,
+                keywordErrorMessage: []
             }
         },
         computed: {
@@ -69,19 +70,23 @@
             newKeywordTrimmed(): string {
                 return this.newKeyword?.trim().replace(/ +(?= )/g, '').toLowerCase();
             },
+            formattedkeywordErrorMessage(): string {
+                return this.keywordErrorMessage.join(', ');
+            },
         },
         methods: {
             keywordChange() {
                 this.keywordError = false;
                 this.keywordLengthExceeded = false;
+                this.keywordErrorMessage = [];
             },
             async addKeyword() {  
                 if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
+                    this.keywordChange();
                     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];
+                            let item = allTrimmedKeyword[i].trim();
                             if (item.length > 0 && item.length <= 50) {
                                 let newKeywordObj = new KeywordModel({
                                     keyword: item,
@@ -90,8 +95,11 @@
                                 newKeywordObj = await resourceData.addKeyword(this.resourceVersionId, newKeywordObj);
                                 if (newKeywordObj.id > 0) {
                                     this.resourceDetails.resourceKeywords.push(newKeywordObj);
-                                    this.keywordError = false;
                                     this.newKeyword = '';
+                                } else if (newKeywordObj.id == 0) {
+                                    this.newKeyword = '';
+                                    this.keywordError = true;
+                                    this.keywordErrorMessage.push(item);
                                 }
                                 else {
                                     this.keywordError = true;
@@ -103,10 +111,6 @@
                                 this.keywordLengthExceeded = true;
                             }
                         }
-                    }                    
-                    else {
-                        this.keywordError = true;
-                    }
                 }
             },
             async deleteKeyword(keywordId: number) {

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

@@ -84,7 +84,7 @@
         <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>
+                    <span class="text-danger">The keyword(s) have already been added : {{formattedkeywordErrorMessage}}</span>
                 </div>
                 <div class="col-12 mb-0 error-text" v-if="keywordLengthExceeded">
                     <span class="text-danger">
@@ -292,6 +292,7 @@
                 ResourceType,
                 resourceProviderId: null,
                 keywordLengthExceeded: false,
+                keywordErrorMessage:[]
             };
         },
         computed: {
@@ -340,6 +341,9 @@
                     return this.$store.state.userProviders.length > 0;
                 }
             },
+            formattedkeywordErrorMessage(): string {
+                return this.keywordErrorMessage.join(', ');
+            },
         },
         created() {
             this.setInitialValues();
@@ -485,6 +489,7 @@
                 keywordChange() {
                     this.keywordError = false;
                     this.keywordLengthExceeded = false;
+                    this.keywordErrorMessage = [];
                 },
                 resetSelectedLicence() {
                     this.resourceLicenceId = 0;
@@ -532,11 +537,11 @@
                 },
             async addKeyword() {
                     if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
+                        this.keywordChange();
                         let allTrimmedKeyword = this.newKeywordTrimmed.toLowerCase().split(',');
                         allTrimmedKeyword = allTrimmedKeyword.filter(e => String(e).trim());
-                        if (!this.keywords.find(_keyword => allTrimmedKeyword.includes(_keyword.keyword.toLowerCase()))) {
                             for (var i = 0; i < allTrimmedKeyword.length; i++) {
-                                let item = allTrimmedKeyword[i];
+                                let item = allTrimmedKeyword[i].trim();
                                 if (item.length > 0 && item.length <= 50) {
                                     let newkeywordObj = new KeywordModel();
                                     newkeywordObj.keyword = item;
@@ -548,22 +553,22 @@
                                         if (this.resourceDetail.resourceVersionId == 0) {
                                             this.$store.commit('setResourceVersionId', newkeywordObj.resourceVersionId)
                                         }
-                                        this.keywordError = false;
                                         this.newKeyword = '';
-                                    } else {
+                                    } else if (newkeywordObj.id == 0) {
+                                        this.newKeyword = '';
                                         this.keywordError = true;
-                                        break;
+                                        this.keywordErrorMessage.push(item);
                                     }
+                                    else {
+                                        this.keywordError = true;
+                                        break;
+                                }
                                 }
                                 else {
                                     this.keywordLengthExceeded = true;
                                     break;
                                 }
                             }
-                        }
-                        else {
-                            this.keywordError = true;
-                        }
                     }
                     else {
                         this.newKeyword = '';