Skip to content

TD-4430 : Issue when adding duplicate keywords on 'Keywords' section when contributing resources and on Admin section #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2024
Merged

TD-4430 : Issue when adding duplicate keywords on 'Keywords' section when contributing resources and on Admin section #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Views/Catalogue/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -341,6 +346,9 @@
} else {
$('#add-keyword').removeAttr('disabled');
}

$('#keyword-error-span').hide();
$('#keyword-error-span').html('');
});

$('#add-keyword').on('click', function () {
Expand All @@ -355,6 +363,8 @@
return item.trim();
});

var duplicateKeywords = [];
$('#keyword-error-span').hide();
values.forEach(function (value) {
if (value && keywords.indexOf(value) === -1) {
keywords.push(value);
Expand All @@ -368,6 +378,12 @@
$(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("");
Expand Down
16 changes: 9 additions & 7 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute-resource/components/KeyWordsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -60,6 +60,7 @@
newKeyword: '',
keywordError: false,
keywordLengthExceeded: false,
keywordErrorMessage: []
}
},
computed: {
Expand All @@ -69,17 +70,20 @@
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) {
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 && item.length <= 50) {
Expand All @@ -90,8 +94,10 @@
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.keywordError = true;
this.keywordErrorMessage.push(item);
}
else {
this.keywordError = true;
Expand All @@ -103,10 +109,6 @@
this.keywordLengthExceeded = true;
}
}
}
else {
this.keywordError = true;
}
}
},
async deleteKeyword(keywordId: number) {
Expand Down
21 changes: 12 additions & 9 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -292,6 +292,7 @@
ResourceType,
resourceProviderId: null,
keywordLengthExceeded: false,
keywordErrorMessage:[]
};
},
computed: {
Expand Down Expand Up @@ -340,6 +341,9 @@
return this.$store.state.userProviders.length > 0;
}
},
formattedkeywordErrorMessage(): string {
return this.keywordErrorMessage.join(', ');
},
},
created() {
this.setInitialValues();
Expand Down Expand Up @@ -485,6 +489,7 @@
keywordChange() {
this.keywordError = false;
this.keywordLengthExceeded = false;
this.keywordErrorMessage = [];
},
resetSelectedLicence() {
this.resourceLicenceId = 0;
Expand Down Expand Up @@ -534,7 +539,6 @@
if (this.newKeyword && this.newKeywordTrimmed.length > 0) {
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];
if (item.length > 0 && item.length <= 50) {
Expand All @@ -548,22 +552,21 @@
if (this.resourceDetail.resourceVersionId == 0) {
this.$store.commit('setResourceVersionId', newkeywordObj.resourceVersionId)
}
this.keywordError = false;
this.newKeyword = '';
} else {
} else if (newkeywordObj.id == 0) {
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 = '';
Expand Down
3 changes: 2 additions & 1 deletion WebAPI/LearningHub.Nhs.Services/ResourceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,8 @@ public async Task<LearningHubValidationResult> AddResourceVersionKeywordAsync(Re
bool doesKeywordAlreadyExist = await this.resourceVersionKeywordRepository.DoesResourceVersionKeywordAlreadyExistAsync(rvk.ResourceVersionId, rvk.Keyword);
if (doesKeywordAlreadyExist)
{
return new LearningHubValidationResult(false, "This keyword has already been added.");
retVal.CreatedId = 0;
return retVal;
}

retVal.CreatedId = await this.resourceVersionKeywordRepository.CreateAsync(userId, rvk);
Expand Down