pkp/pkp-lib#4787 consider case when adding new reviewer who is an exi…

…sting suggestion
pkp · Dec 24, 2024 · 6453f57 · 6453f57
1 parent d8eb252
commit 6453f57
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue b/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue
@@ -14,6 +14,11 @@
 					<!-- TODO: check alternative of v-html as v-strip-unsafe-html not working -->
 					<div v-html="suggestionReason"></div>
 				</div>
+
+				<div v-if="currentlyAssigned" class="listPanel__item--reviewer__notice">
+					<Icon icon="Error" class="me-1 h-4 w-4" :inline="true" />
+					<span class="align-middle">{{ currentlyAssignedLabel }}</span>
+				</div>
 			</div>
 
 			<div class="listPanel__itemActions">
@@ -30,6 +35,7 @@
 
 <script>
 import PkpButton from '@/components/Button/Button.vue';
+import Icon from '@/components/Icon/Icon.vue';
 import ajaxError from '@/mixins/ajaxError';
 import dialog from '@/mixins/dialog.js';
 import {useLegacyGridUrl} from '@/composables/useLegacyGridUrl';
@@ -38,6 +44,7 @@ import {useLocalize} from '@/composables/useLocalize';
 export default {
 	components: {
 		PkpButton,
+		Icon,
 	},
 	mixins: [ajaxError, dialog],
 	props: {
@@ -61,6 +68,14 @@ export default {
 			type: String,
 			required: true,
 		},
+		currentlyAssigned: {
+			type: Boolean,
+			required: true,
+		},
+		currentlyAssignedLabel: {
+			type: String,
+			required: true,
+		},
 	},
 	data() {
 		return {};
@@ -75,6 +90,10 @@ export default {
 		 * @return {Boolean}
 		 */
 		canSelect() {
+			if (this.currentlyAssigned) {
+				return false;
+			}
+
 			if (this.approvedAt === null || this.approvedAt === undefined) {
 				return true;
 			}

diff --git a/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js b/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js
@@ -17,7 +17,10 @@ export const useReviewerSuggestionManagerStore = defineComponentStore(
 		const submissionId = ref(props.submission.id);
 
 		const relativeUrl = computed(() => {
-			return `submissions/${encodeURIComponent(submissionId.value)}/reviewers/suggestions?approved=false`;
+			if (props.reviewRoundId) {
+				return `submissions/${encodeURIComponent(submissionId.value)}/reviewers/suggestions?approved=false`;
+			}
+			return `submissions/${encodeURIComponent(submissionId.value)}/reviewers/suggestions`;
 		});
 
 		const {apiUrl: reviewerSuggestionApiUrl} = useUrl(relativeUrl);
@@ -45,16 +48,20 @@ export const useReviewerSuggestionManagerStore = defineComponentStore(
 
 			const list = [];
 
-			reviewerSuggestions.value.items.forEach((reviewerSuggestion) => {
-				list.push({
-					id: reviewerSuggestion.id,
-					fullName: localize(reviewerSuggestion.fullName),
-					affiliation: localize(reviewerSuggestion.affiliation),
-					suggestionReason: localize(reviewerSuggestion.suggestionReason),
-					existingReviewerRole: reviewerSuggestion.existingReviewerRole,
-					existingUserId: reviewerSuggestion.existingUserId,
+			reviewerSuggestions.value.items
+				.filter((reviewerSuggestion) =>
+					props.reviewRoundId ? !reviewerSuggestion.reviewerId : true,
+				)
+				.forEach((reviewerSuggestion) => {
+					list.push({
+						id: reviewerSuggestion.id,
+						fullName: localize(reviewerSuggestion.fullName),
+						affiliation: localize(reviewerSuggestion.affiliation),
+						suggestionReason: localize(reviewerSuggestion.suggestionReason),
+						existingReviewerRole: reviewerSuggestion.existingReviewerRole,
+						existingUserId: reviewerSuggestion.existingUserId,
+					});
 				});
-			});
 
 			return list;
 		});