diff --git a/src/components/Form/Form.vue b/src/components/Form/Form.vue index cd3555845..f6991cb02 100644 --- a/src/components/Form/Form.vue +++ b/src/components/Form/Form.vue @@ -439,7 +439,8 @@ export default { */ error: function (r) { // Field validation errors - if (r.status && r.status === 400) { + // [422 --> Unprocessable Content/Entities] represent standard validation errors + if (r.status && (r.status === 400 || r.status === 422)) { pkp.eventBus.$emit( 'notify', this.t('form.errors', { diff --git a/src/components/ListPanel/users/SelectReviewerListPanel.vue b/src/components/ListPanel/users/SelectReviewerListPanel.vue index 945aec167..c0a1d6db3 100644 --- a/src/components/ListPanel/users/SelectReviewerListPanel.vue +++ b/src/components/ListPanel/users/SelectReviewerListPanel.vue @@ -487,7 +487,6 @@ export default { }, error: this.ajaxErrorCallback, success(r) { - // TODO : may be some better appraoch than this ? if (r.approvedAt) { this.suggestions.forEach((reviewerSuggestion) => { if (reviewerSuggestion.id == reviewerSuggestionId) { diff --git a/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue b/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue index 63a37fbf1..190a67e01 100644 --- a/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue +++ b/src/components/ListPanel/users/SelectReviewerSuggestionListItem.vue @@ -3,16 +3,18 @@
- - {{ fullName }} + {{ localize(item.fullName) }}
- {{ affiliation }} + {{ localize(item.affiliation) }}
-
+
@@ -100,18 +102,6 @@ export default { return false; }, - - fullName() { - return this.localize(this.item.fullName); - }, - - affiliation() { - return this.localize(this.item.affiliation); - }, - - suggestionReason() { - return this.localize(this.item.suggestionReason); - }, }, methods: { /** @@ -153,3 +143,13 @@ export default { }, }; + + \ No newline at end of file diff --git a/src/managers/ReviewerSuggestionManager/ReviewerSuggestionManager.vue b/src/managers/ReviewerSuggestionManager/ReviewerSuggestionManager.vue index 39542ff29..4bbfa6a23 100644 --- a/src/managers/ReviewerSuggestionManager/ReviewerSuggestionManager.vue +++ b/src/managers/ReviewerSuggestionManager/ReviewerSuggestionManager.vue @@ -20,7 +20,7 @@
@@ -37,16 +37,16 @@ >
-
+
diff --git a/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js b/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js index be72917d3..ff63349b6 100644 --- a/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js +++ b/src/managers/ReviewerSuggestionManager/reviewerSuggestionManagerStore.js @@ -25,17 +25,17 @@ export const useReviewerSuggestionManagerStore = defineComponentStore( const {apiUrl: reviewerSuggestionApiUrl} = useUrl(relativeUrl); - const {data: reviewerSuggestions, fetch: fetchreviewerSuggestion} = + const {data: reviewerSuggestions, fetch: fetchReviewerSuggestion} = useFetch(reviewerSuggestionApiUrl); watch(relativeUrl, () => { reviewerSuggestions.value = null; - fetchreviewerSuggestion(); + fetchReviewerSuggestion(); }); - fetchreviewerSuggestion(); + fetchReviewerSuggestion(); - const {triggerDataChange} = useDataChanged(() => fetchreviewerSuggestion()); + const {triggerDataChange} = useDataChanged(() => fetchReviewerSuggestion()); function triggerDataChangeCallback() { triggerDataChange(); @@ -56,6 +56,7 @@ export const useReviewerSuggestionManagerStore = defineComponentStore( list.push({ id: reviewerSuggestion.id, fullName: localize(reviewerSuggestion.fullName), + displayInitial: localize(reviewerSuggestion.displayInitial), affiliation: localize(reviewerSuggestion.affiliation), suggestionReason: localize(reviewerSuggestion.suggestionReason), existingReviewerRole: reviewerSuggestion.existingReviewerRole, @@ -74,7 +75,13 @@ export const useReviewerSuggestionManagerStore = defineComponentStore( const itemActions = computed(() => _actionFns.getItemActions({})); - const hasActiveReviewStage = props.reviewRoundId ? true : false; + function atActiveReviewStage() { + return props.reviewRoundId + && ( + props.submissionStageId == pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW + || props.submissionStageId == pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW + ); + } function enrichActionArg(args) { return { @@ -97,7 +104,7 @@ export const useReviewerSuggestionManagerStore = defineComponentStore( _actionFns, itemActions, reviewerSuggestionApprove, - hasActiveReviewStage, + atActiveReviewStage, }; }, );