Merge pull request #621 from TechnologyEnhancedLearning/Develop/Fixes/TD-4430-Issue-duplicate-keywords

TD-4430: Duplicate keywords issue

Author: ArunimaGeorge

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

@@ -360,7 +360,7 @@
 
         // 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 = [];
@@ -386,7 +386,7 @@
           }
         });
 
-        $keywordInput.val("");      
+        $keywordInput.val("");
         if (keywords.length > 4) {
           $('#add-keyword').attr('disabled', 'disabled');
           $('#add-keyword-input').attr('disabled', 'disabled');
@@ -457,4 +457,4 @@
 
   </script>
   <script src="~/js/imageInput.js"></script>
-}
+}

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

@@ -82,10 +82,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());
                         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,
@@ -96,6 +97,7 @@
                                     this.resourceDetails.resourceKeywords.push(newKeywordObj);
                                     this.newKeyword = '';
                                 } else if (newKeywordObj.id == 0) {
+                                    this.newKeyword = '';
                                     this.keywordError = true;
                                     this.keywordErrorMessage.push(item);
                                 }

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

@@ -537,10 +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());
                             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;
@@ -554,6 +555,7 @@
                                         }
                                         this.newKeyword = '';
                                     } else if (newkeywordObj.id == 0) {
+                                        this.newKeyword = '';
                                         this.keywordError = true;
                                         this.keywordErrorMessage.push(item);
                                     }