I10363 minimal review count (#563)

* pkp/pkp-lib#10363 Minimal reviews count feature messaging

* pkp/pkp-lib#10363 Adjust styling for warning dialog for minimum reviews

Author: jardakotesovec

src/composables/useSubmission.js

@@ -75,6 +75,12 @@ export const CompletedReviewAssignmentStatuses = [
 	pkp.const.REVIEW_ASSIGNMENT_STATUS_VIEWED,
 ];
 
+// Confirmed reviews
+export const ConfirmedReviewAssignmentStatuses = [
+	pkp.const.REVIEW_ASSIGNMENT_STATUS_COMPLETE,
+	pkp.const.REVIEW_ASSIGNMENT_STATUS_THANKED,
+];
+
 const IgnoredReviewAssignmentStatuses = [
 	pkp.const.REVIEW_ASSIGNMENT_STATUS_DECLINED,
 	pkp.const.REVIEW_ASSIGNMENT_STATUS_CANCELLED,
@@ -229,6 +235,13 @@ export function useSubmission() {
 		);
 	}
 
+	function getConfirmedReviewAssignments(reviewAssignments = []) {
+		return getActiveReviewAssignments(reviewAssignments).filter(
+			(reviewAssignment) =>
+				ConfirmedReviewAssignmentStatuses.includes(reviewAssignment.statusId),
+		);
+	}
+
 	function getOpenReviewAssignments(reviewAssignments) {
 		return reviewAssignments.filter(
 			(reviewAssignment) =>
@@ -265,6 +278,38 @@ export function useSubmission() {
 		);
 	}
 
+	function checkMinimumConsideredReviews(
+		submission,
+		stageId,
+		reviewRoundId,
+		minReviewsCount,
+	) {
+		if (
+			!minReviewsCount ||
+			stageId !== pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW
+		) {
+			return {
+				shouldMinimumReviewsBeConsidered: false,
+				hasMinimumReviewsCount: false,
+			};
+		}
+		const reviewAssignments = getReviewAssignmentsForRound(
+			submission.reviewAssignments,
+			reviewRoundId,
+		);
+
+		const confirmedReviewAssignments =
+			getConfirmedReviewAssignments(reviewAssignments);
+
+		const hasMinimumReviewsCount =
+			confirmedReviewAssignments.length >= minReviewsCount;
+
+		return {
+			shouldMinimumReviewsBeConsidered: true,
+			hasMinimumReviewsCount,
+		};
+	}
+
 	return {
 		getSubmissionById,
 		getActiveStage,
@@ -283,7 +328,9 @@ export function useSubmission() {
 		// review assignments
 		getReviewAssignmentsForRound,
 		getActiveReviewAssignments,
+		getConfirmedReviewAssignments,
 		getCompletedReviewAssignments,
+		checkMinimumConsideredReviews,
 		getOpenReviewAssignments,
 		getOpenReviewAssignmentsForRound,
 		getOpenAndCompletedReviewAssignmentsForRound,

src/pages/dashboard/DashboardPage.vue

@@ -93,6 +93,11 @@ const props = defineProps({
 		type: Array,
 		required: true,
 	},
+	/** Minimum reviews per submission */
+	contextMinReviewsPerSubmission: {
+		type: Number,
+		required: true,
+	},
 	/** Filters form config  */
 	filtersForm: {
 		type: Object,

src/pages/dashboard/components/DashboardTable/DashboardCellReviewAssignmentActivity/DashboardCellReviewAssignmentActivity.vue

@@ -26,9 +26,9 @@ const dashboardStore = useDashboardPageStore();
 const props = defineProps({item: {type: Object, required: true}});
 
 const cellConfig = computed(() => {
-	const config = dashboardStore.getEditorialActivityForMyReviewAssignments(
-		props.item,
-	);
+	const config = dashboardStore.getEditorialActivityForMyReviewAssignments({
+		reviewAssignment: props.item,
+	});
 	return config;
 });
 </script>

src/pages/dashboard/components/DashboardTable/DashboardCellSubmissionActivity/DashboardCellSubmissionActivity.vue

@@ -37,11 +37,15 @@ const props = defineProps({item: {type: Object, required: true}});
 
 const cellConfig = computed(() => {
 	if (dashboardStore.dashboardPage === DashboardPageTypes.EDITORIAL_DASHBOARD) {
-		return dashboardStore.getEditorialActivityForEditorialDashboard(props.item);
+		return dashboardStore.getEditorialActivityForEditorialDashboard({
+			submission: props.item,
+		});
 	} else if (
 		dashboardStore.dashboardPage === DashboardPageTypes.MY_SUBMISSIONS
 	) {
-		return dashboardStore.getEditorialActivityForMySubmissions(props.item);
+		return dashboardStore.getEditorialActivityForMySubmissions({
+			submission: props.item,
+		});
 	}
 
 	return [];

src/pages/dashboard/composables/useDashboardConfigEditorialActivity.js

@@ -20,6 +20,7 @@ const {
 	getActiveReviewAssignments,
 	getReviewAssignmentsForRound,
 	getStageLabel,
+	checkMinimumConsideredReviews,
 } = useSubmission();
 
 const {
@@ -28,7 +29,10 @@ const {
 } = useCurrentUser();
 
 export function useDashboardConfigEditorialActivity() {
-	function getEditorialActivityForEditorialDashboard(submission) {
+	function getEditorialActivityForEditorialDashboard({
+		submission,
+		contextMinReviewsPerSubmission,
+	}) {
 		const activeStage = getActiveStage(submission);
 
 		if (submission.status === pkp.const.STATUS_DECLINED) {
@@ -119,6 +123,15 @@ export function useDashboardConfigEditorialActivity() {
 			const activeRound = getCurrentReviewRound(submission, activeStage.id);
 			let activeRoundStatusId = activeRound.statusId;
 
+			// #10363 Calculate additional status for minimum reviews
+			const {shouldMinimumReviewsBeConsidered, hasMinimumReviewsCount} =
+				checkMinimumConsideredReviews(
+					submission,
+					activeStage.id,
+					activeRound.id,
+					contextMinReviewsPerSubmission,
+				);
+
 			// Workaround to customise deciding editor messaging, until we have way to provide personalised on backend
 			if (activeStage.isCurrentUserDecidingEditor) {
 				// Avoid overloading deciding editor with details about review assignments
@@ -323,7 +336,9 @@ export function useDashboardConfigEditorialActivity() {
 					},
 				];
 			} else if (
-				activeRoundStatusId === pkp.const.REVIEW_ROUND_STATUS_REVIEWS_COMPLETED
+				activeRoundStatusId ===
+					pkp.const.REVIEW_ROUND_STATUS_REVIEWS_COMPLETED &&
+				!shouldMinimumReviewsBeConsidered
 			) {
 				return [
 					{
@@ -343,6 +358,25 @@ export function useDashboardConfigEditorialActivity() {
 						},
 					},
 				];
+			} else if (shouldMinimumReviewsBeConsidered && hasMinimumReviewsCount) {
+				return [
+					{
+						component: 'DashboardCellSubmissionActivityActionAlert',
+						props: {
+							alert: t('dashboard.minimumReviewsConfirmedDecisionNeeded'),
+						},
+					},
+					{
+						component: 'DashboardCellSubmissionActivityReviews',
+						props: {
+							submissionId: submission.id,
+							reviewAssignments: getCurrentReviewAssignments(
+								submission,
+								activeStage.id,
+							),
+						},
+					},
+				];
 			} else {
 				return [
 					{
@@ -392,7 +426,7 @@ export function useDashboardConfigEditorialActivity() {
 		return {};
 	}
 
-	function getEditorialActivityForMySubmissions(submission) {
+	function getEditorialActivityForMySubmissions({submission}) {
 		const activeStage = getActiveStage(submission);
 
 		// Not checking for submission stage, as OPS does not have it
@@ -496,7 +530,7 @@ export function useDashboardConfigEditorialActivity() {
 		return {};
 	}
 
-	function getEditorialActivityForMyReviewAssignments(reviewAssignment) {
+	function getEditorialActivityForMyReviewAssignments({reviewAssignment}) {
 		// When declined always show the same status regardless of the stage
 		if (
 			reviewAssignment.status === pkp.const.REVIEW_ASSIGNMENT_STATUS_DECLINED

src/pages/dashboard/dashboardPageStore.js

@@ -51,6 +51,13 @@ export const useDashboardPageStore = defineComponentStore(
 		const extender = useExtender();
 
 		const dashboardPage = pageInitConfig.dashboardPage;
+
+		/**
+		 * Minimal reviews count feature
+		 */
+		const contextMinReviewsPerSubmission =
+			pageInitConfig.contextMinReviewsPerSubmission;
+
 		/**
 		 * ModalStore
 		 */
@@ -433,6 +440,7 @@ export const useDashboardPageStore = defineComponentStore(
 				{
 					...args,
 					dashboardPage,
+					contextMinReviewsPerSubmission,
 				},
 			);
 		}
@@ -576,6 +584,9 @@ export const useDashboardPageStore = defineComponentStore(
 			getReviewActivityIndicatorProps,
 			getReviewActivityIndicatorPopoverProps,
 
+			// Minimal reviews count feature
+			contextMinReviewsPerSubmission,
+
 			// Expose component forms, so managers and other dashboard/workflow component can access them
 			componentForms: pageInitConfig.componentForms,
 

src/pages/workflow/components/action/WorkflowRecommendOnlyControls.vue

@@ -46,7 +46,6 @@ import {useWorkflowStore} from '@/pages/workflow/workflowStore';
 import {useSubmission} from '@/composables/useSubmission';
 
 import {Actions as DecisionActions} from '../../composables/useWorkflowDecisions';
-import {Actions as WorkflowActions} from '../../composables/useWorkflowActions';
 
 const {t} = useLocalize();
 
@@ -88,7 +87,7 @@ function getRecommendationActions() {
 	if (props.stageId === pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW) {
 		actions.push({
 			label: t('editor.submission.recommend.revisions'),
-			action: WorkflowActions.WORKFLOW_RECOMMEND_REVISION,
+			action: DecisionActions.DECISION_RECOMMEND_REVISION,
 		});
 
 		actions.push({

src/pages/workflow/components/primary/WorkflowSubmissionStatus.vue

@@ -3,6 +3,7 @@
 		<h3 v-if="message.heading" class="mb-2 text-lg-bold text-heading">
 			{{ message.heading }}
 		</h3>
+		<p v-if="message.body1" class="mb-2 text-sm-normal">{{ message.body1 }}</p>
 		<p v-if="message.body" class="text-sm-normal">{{ message.body }}</p>
 	</div>
 </template>
@@ -18,6 +19,7 @@ const props = defineProps({
 	},
 	selectedStageId: {type: Number, required: true},
 	selectedReviewRoundId: {type: Number, required: false, default: null},
+	contextMinReviewsPerSubmission: {type: Number, required: true},
 });
 
 const {t, tk} = useLocalize();
@@ -26,6 +28,7 @@ const {
 	hasNotSubmissionStartedStage,
 	hasSubmissionPassedStage,
 	getCurrentReviewRound,
+	checkMinimumConsideredReviews,
 } = useSubmission();
 
 //const activeStage = computed(() => getActiveStage(props.submission));
@@ -98,10 +101,47 @@ const message = computed(() => {
 			};
 		}
 
+		// #10363 Add minimum reviewers status
+		const {shouldMinimumReviewsBeConsidered, hasMinimumReviewsCount} =
+			checkMinimumConsideredReviews(
+				props.submission,
+				props.selectedStageId,
+				props.selectedReviewRoundId,
+				props.contextMinReviewsPerSubmission,
+			);
+
+		if (
+			// only for these statuses the minimum reviews completed status should take precedence
+			shouldMinimumReviewsBeConsidered &&
+			hasMinimumReviewsCount &&
+			[
+				pkp.const.REVIEW_ROUND_STATUS_PENDING_REVIEWERS,
+				pkp.const.REVIEW_ROUND_STATUS_PENDING_REVIEWS,
+				pkp.const.REVIEW_ROUND_STATUS_REVIEWS_READY,
+				pkp.const.REVIEW_ROUND_STATUS_REVIEWS_COMPLETED,
+				pkp.const.REVIEW_ROUND_STATUS_REVIEWS_OVERDUE,
+			].includes(currentReviewRound.statusId)
+		) {
+			return {
+				heading: t('notification.type.roundStatusTitle', {
+					round: currentReviewRound.round,
+				}),
+				body1: t('dashboard.minimumConfirmedReviewsRequired', {
+					number: props.contextMinReviewsPerSubmission,
+				}),
+				body: t('dashboard.minimumReviewsConfirmedDecisionNeeded'),
+			};
+		}
+
 		return {
 			heading: t('notification.type.roundStatusTitle', {
 				round: currentReviewRound.round,
 			}),
+			body1: shouldMinimumReviewsBeConsidered
+				? t('dashboard.minimumConfirmedReviewsRequired', {
+						number: props.contextMinReviewsPerSubmission,
+					})
+				: null,
 			body: currentReviewRound.status,
 		};
 	} else if (props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_PRODUCTION) {