From 6fa4697dbd7dbe6c8da1610ddd19d9842da66059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jarda=20Kot=C4=9B=C5=A1ovec?= <jarda.kotesovec@gmail.com>
Date: Thu, 28 Nov 2024 12:54:06 +0100
Subject: [PATCH] pkp/pkp-lib#10618 Refine submission status, clean up
 inherited configurations, various fixes

---
 src/managers/FileManager/fileManagerStore.js  |  21 +-
 .../primary/WorkflowReviewRoundStatus.vue     |  17 --
 .../primary/WorkflowSubmissionStatus.vue      | 125 ++++++++---
 .../useWorkflowConfig/useWorkflowConfigOPS.js |   8 +-
 .../workflowConfigAuthorOJS.js                | 106 ++++------
 .../workflowConfigAuthorOMP.js                | 153 +-------------
 .../workflowConfigAuthorOPS.js                | 107 ----------
 .../workflowConfigEditorialOJS.js             | 110 +++-------
 .../workflowConfigEditorialOMP.js             | 154 --------------
 .../workflowConfigEditorialOPS.js             | 198 ------------------
 src/pages/workflow/workflowStoreOJS.js        |   2 -
 src/pages/workflow/workflowStoreOMP.js        |   2 -
 12 files changed, 195 insertions(+), 808 deletions(-)
 delete mode 100644 src/pages/workflow/components/primary/WorkflowReviewRoundStatus.vue

diff --git a/src/managers/FileManager/fileManagerStore.js b/src/managers/FileManager/fileManagerStore.js
index a44afdd00..a7868d363 100644
--- a/src/managers/FileManager/fileManagerStore.js
+++ b/src/managers/FileManager/fileManagerStore.js
@@ -1,6 +1,6 @@
 import {defineComponentStore} from '@/utils/defineComponentStore';
 
-import {ref, computed} from 'vue';
+import {ref, computed, watch} from 'vue';
 import {useFetch} from '@/composables/useFetch';
 import {useUrl} from '@/composables/useUrl';
 import {useFileManagerActions} from './useFileManagerActions';
@@ -26,16 +26,25 @@ export const useFileManagerStore = defineComponentStore(
 			`submissions/${submissionId.value}/files`,
 		);
 
+		const queryParams = computed(() => ({
+			fileStages: managerConfig.value.fileStage,
+			reviewRoundIds: props.reviewRoundId ? props.reviewRoundId : undefined,
+		}));
+
 		const {data, fetch: fetchFiles} = useFetch(filesApiUrl, {
-			query: {
-				fileStages: managerConfig.value.fileStage,
-				reviewRoundIds: props.reviewRoundId ? props.reviewRoundId : undefined,
-			},
+			query: queryParams,
 		});
 
 		const files = computed(() => data.value?.items || []);
 
-		fetchFiles();
+		watch(
+			[filesApiUrl, queryParams],
+			() => {
+				files.value = null;
+				fetchFiles();
+			},
+			{immediate: true},
+		);
 
 		/** Reload files when data on screen changes */
 		const {triggerDataChange} = useDataChanged(() => fetchFiles());
diff --git a/src/pages/workflow/components/primary/WorkflowReviewRoundStatus.vue b/src/pages/workflow/components/primary/WorkflowReviewRoundStatus.vue
deleted file mode 100644
index 79d44f948..000000000
--- a/src/pages/workflow/components/primary/WorkflowReviewRoundStatus.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-	<div class="border border-light p-4">
-		<h2 class="lg-bold text-heading">
-			{{ t('notification.type.roundStatusTitle', {round: reviewRound.round}) }}
-		</h2>
-		<p class="text-sm-normal">{{ props.reviewRound.status }}</p>
-	</div>
-</template>
-
-<script setup>
-import {useLocalize} from '@/composables/useLocalize';
-
-const props = defineProps({
-	reviewRound: {type: Object, required: true},
-});
-const {t} = useLocalize();
-</script>
diff --git a/src/pages/workflow/components/primary/WorkflowSubmissionStatus.vue b/src/pages/workflow/components/primary/WorkflowSubmissionStatus.vue
index 61fc8a2bf..cb3108850 100644
--- a/src/pages/workflow/components/primary/WorkflowSubmissionStatus.vue
+++ b/src/pages/workflow/components/primary/WorkflowSubmissionStatus.vue
@@ -1,40 +1,117 @@
 <template>
-	<div class="border border-light p-5">
-		<h2 class="text-lg-bold text-heading">{{ texts.heading }}</h2>
-		<p v-if="description" class="text-base-normal">{{ texts.description }}</p>
+	<div v-if="message" class="border border-light p-4">
+		<h3 v-if="message.heading" class="mb-2 text-lg-bold text-heading">
+			{{ message.heading }}
+		</h3>
+		<p v-if="message.body" class="text-sm-normal">{{ message.body }}</p>
 	</div>
 </template>
-
 <script setup>
 import {computed} from 'vue';
+import {useSubmission} from '@/composables/useSubmission.js';
 import {useLocalize} from '@/composables/useLocalize';
 
 const props = defineProps({
-	submission: {type: Object, required: true},
+	submission: {
+		type: String,
+		required: true,
+	},
+	selectedStageId: {type: Number, required: true},
+	selectedReviewRoundId: {type: Number, required: false},
 });
 
-const {t} = useLocalize();
+const {t, tk} = useLocalize();
+const {
+	getActiveStage,
+	hasNotSubmissionStartedStage,
+	hasSubmissionPassedStage,
+	getCurrentReviewRound,
+} = useSubmission();
+
+//const activeStage = computed(() => getActiveStage(props.submission));
+
+const StageNames = {
+	[pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW]: tk(
+		'workflow.review.internalReview',
+	),
+	[pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW]: tk(
+		'workflow.review.externalReview',
+	),
+	[pkp.const.WORKFLOW_STAGE_ID_EDITING]: tk('submission.copyediting'),
+	[pkp.const.WORKFLOW_STAGE_ID_PRODUCTION]: tk('submission.production'),
+};
 
-const texts = computed(() => {
-	switch (props.submission.stageId) {
-		case pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW:
+const message = computed(() => {
+	// not initiated yet
+	if (hasNotSubmissionStartedStage(props.submission, props.selectedStageId)) {
+		return {
+			heading: t('common.status'),
+			body: t('workflow.stageNotStarted', {
+				stage: t(StageNames[props.selectedStageId]),
+			}),
+		};
+		// submission is in some future stage
+	} else if (
+		hasSubmissionPassedStage(props.submission, props.selectedStageId)
+	) {
+		const activeStage = getActiveStage(props.submission);
+
+		// more detailed messaging for review rounds that has been moved to the next review round
+		if (
+			props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW ||
+			props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW
+		) {
+			const currentReviewRound = getCurrentReviewRound(
+				props.submission,
+				props.selectedStageId,
+			);
+
+			if (props.selectedReviewRoundId < currentReviewRound.id) {
+				return {
+					heading: t('common.status'),
+					body: t('workflow.submissionNextReviewRoundInFutureStage', {
+						stage: t(StageNames[activeStage.id]),
+					}),
+				};
+			}
+		}
+		return {
+			heading: t('common.status'),
+			body: t('workflow.submissionInFutureStage', {
+				stage: t(StageNames[activeStage.id]),
+			}),
+		};
+		// when active stage is review stage
+	} else if (
+		props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW ||
+		props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW
+	) {
+		const currentReviewRound = getCurrentReviewRound(
+			props.submission,
+			props.selectedStageId,
+		);
+
+		if (props.selectedReviewRoundId < currentReviewRound.id) {
 			return {
-				heading: t('editor.submission.workflowDecision.submission.underReview'),
+				heading: t('common.status'),
+				body: t('workflow.submissionInNextReviewRound'),
 			};
-		case pkp.const.WORKFLOW_STAGE_ID_EDITING:
-			return {heading: 'todo'};
-		case pkp.const.WORKFLOW_STAGE_ID_PRODUCTION:
-			switch (props.submission.status) {
-				case pkp.const.STATUS_QUEUED:
-					return {heading: 'todo'};
-				case pkp.const.STATUS_SCHEDULED:
-					return {heading: 'todo'};
-				case pkp.const.STATUS_PUBLISHED:
-					return {heading: 'todo'};
-				case pkp.const.STATUS_DECLINED:
-					return {heading: 'todo'};
-			}
+		}
+
+		return {
+			heading: t('notification.type.roundStatusTitle', {
+				round: currentReviewRound.round,
+			}),
+			body: currentReviewRound.status,
+		};
+	} else if (props.selectedStageId === pkp.const.WORKFLOW_STAGE_ID_PRODUCTION) {
+		if (props.submission.status === pkp.const.STATUS_PUBLISHED) {
+			return {
+				heading: t('common.status'),
+				body: t('editor.submission.workflowDecision.submission.published'),
+			};
+		}
 	}
-	return '';
+	return null;
 });
 </script>
diff --git a/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOPS.js b/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOPS.js
index 4b56a47fa..db57cfe0b 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOPS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOPS.js
@@ -1,4 +1,8 @@
 import {DashboardPageTypes} from '@/pages/dashboard/dashboardPageStore';
+import {deepMerge} from '@/utils/deepMerge';
+
+import * as ConfigAuthorOJS from './workflowConfigAuthorOJS';
+import * as ConfigEditorialOJS from './workflowConfigEditorialOJS';
 
 import * as ConfigAuthorOPS from './workflowConfigAuthorOPS';
 import * as ConfigEditorialOPS from './workflowConfigEditorialOPS';
@@ -9,9 +13,9 @@ export function useWorkflowConfigOPS({dashboardPage}) {
 	let Configs = null;
 
 	if (dashboardPage === DashboardPageTypes.EDITORIAL_DASHBOARD) {
-		Configs = ConfigEditorialOPS;
+		Configs = deepMerge(deepMerge({}, ConfigEditorialOJS), ConfigEditorialOPS);
 	} else {
-		Configs = ConfigAuthorOPS;
+		Configs = deepMerge(deepMerge({}, ConfigAuthorOJS), ConfigAuthorOPS);
 	}
 
 	function _getItems(
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
index da38a4ae3..90cd20bfe 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOJS.js
@@ -2,8 +2,11 @@ import {useLocalize} from '@/composables/useLocalize';
 import {Actions} from '../useWorkflowActions';
 import {useSubmission} from '@/composables/useSubmission';
 
-const {hasSubmissionPassedStage, getOpenReviewAssignmentsForRound} =
-	useSubmission();
+const {
+	hasSubmissionPassedStage,
+	getOpenReviewAssignmentsForRound,
+	hasNotSubmissionStartedStage,
+} = useSubmission();
 
 const {t} = useLocalize();
 
@@ -31,13 +34,18 @@ export function getHeaderItems({
 
 export const WorkflowConfig = {
 	common: {
-		getPrimaryItems: ({submission, permissions, selectedStageId}) => {
+		getPrimaryItems: ({
+			submission,
+			permissions,
+			selectedStageId,
+			selectedReviewRound,
+		}) => {
 			if (!permissions.accessibleStages.includes(selectedStageId)) {
 				return {
 					shouldContinue: false,
 					items: [
 						{
-							component: 'PrimaryBasicMetadata',
+							component: 'WorkflowPrimaryBasicMetadata',
 							props: {
 								body: t('user.authorization.accessibleWorkflowStage'),
 							},
@@ -46,17 +54,33 @@ export const WorkflowConfig = {
 				};
 			}
 
+			const items = [];
+
+			items.push({
+				component: 'WorkflowChangeSubmissionLanguage',
+				props: {
+					submission,
+					canChangeSubmissionLanguage: false,
+				},
+			});
+
+			const shouldContinue = !hasNotSubmissionStartedStage(
+				submission,
+				selectedStageId,
+			);
+
+			items.push({
+				component: 'WorkflowSubmissionStatus',
+				props: {
+					submission,
+					selectedStageId,
+					selectedReviewRoundId: selectedReviewRound?.id,
+				},
+			});
+
 			return {
-				shouldContinue: true,
-				items: [
-					{
-						component: 'WorkflowChangeSubmissionLanguage',
-						props: {
-							submission,
-							canChangeSubmissionLanguage: false,
-						},
-					},
-				],
+				shouldContinue,
+				items,
 			};
 		},
 	},
@@ -94,38 +118,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (!selectedReviewRound) {
-				return [
-					{
-						component: 'WorkflowPrimaryBasicMetadata',
-						props: {body: t('editor.review.notInitiated')},
-					},
-				];
-			}
-			const {getCurrentReviewRound} = useSubmission();
-
-			const currentReviewRound = getCurrentReviewRound(
-				submission,
-				selectedStageId,
-			);
-
-			if (selectedReviewRound.round < currentReviewRound.round) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t(
-							'editor.submission.workflowDecision.submission.reviewRound',
-						),
-					},
-				});
-			}
-
-			if (selectedReviewRound.id === currentReviewRound.id) {
-				items.push({
-					component: 'WorkflowReviewRoundStatus',
-					props: {reviewRound: selectedReviewRound},
-				});
-			}
 
 			items.push({
 				component: 'WorkflowListingEmails',
@@ -172,20 +164,6 @@ export const WorkflowConfig = {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
 
-			if (
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EDITING,
-				)
-			) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.production'),
-					},
-				});
-			}
-
 			items.push({
 				component: 'DiscussionManager',
 				props: {
@@ -209,14 +187,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_PRODUCTION]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (submission.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.published'),
-					},
-				});
-			}
 
 			items.push({
 				component: 'DiscussionManager',
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
index ff3a7974e..5019eac46 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOMP.js
@@ -5,8 +5,6 @@ import {useSubmission} from '@/composables/useSubmission';
 const {hasSubmissionPassedStage, getOpenReviewAssignmentsForRound} =
 	useSubmission();
 
-const {t} = useLocalize();
-
 export function getHeaderItems({
 	submission,
 	selectedPublication,
@@ -65,39 +63,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (!selectedReviewRound) {
-				return [
-					{
-						component: 'WorkflowPrimaryBasicMetadata',
-						props: {body: t('editor.review.notInitiated')},
-					},
-				];
-			}
-			const {getCurrentReviewRound} = useSubmission();
-
-			const currentReviewRound = getCurrentReviewRound(
-				submission,
-				selectedStageId,
-			);
-
-			if (selectedReviewRound.round < currentReviewRound.round) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t(
-							'editor.submission.workflowDecision.submission.reviewRound',
-						),
-					},
-				});
-			}
-
-			if (selectedReviewRound.id === currentReviewRound.id) {
-				items.push({
-					component: 'WorkflowReviewRoundStatus',
-					props: {reviewRound: selectedReviewRound},
-				});
-			}
-
 			if (
 				getOpenReviewAssignmentsForRound(
 					submission.reviewAssignments,
@@ -138,20 +103,6 @@ export const WorkflowConfig = {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
 
-			if (
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EDITING,
-				)
-			) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.production'),
-					},
-				});
-			}
-
 			items.push({
 				component: 'DiscussionManager',
 				props: {
@@ -173,16 +124,8 @@ export const WorkflowConfig = {
 		},
 	},
 	[pkp.const.WORKFLOW_STAGE_ID_PRODUCTION]: {
-		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
+		getPrimaryItems: ({submission, selectedStageId}) => {
 			const items = [];
-			if (submission.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.published'),
-					},
-				});
-			}
 
 			items.push({
 				component: 'WorkflowNotificationDisplay',
@@ -203,44 +146,6 @@ export const WorkflowConfig = {
 };
 
 export const PublicationConfig = {
-	titleAbstract: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'titleAbstract',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	contributors: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'ContributorManager',
-					props: {
-						submission: submission,
-						publication: selectedPublication,
-					},
-				},
-			];
-		},
-	},
 	chapters: {
 		getPrimaryItems: ({
 			submission,
@@ -259,60 +164,4 @@ export const PublicationConfig = {
 			];
 		},
 	},
-
-	metadata: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'metadata',
-						submission,
-						publication: selectedPublication,
-						noFieldsMessage: 'No metadata fields are currently enabled.',
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	citations: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'reference',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	galleys: {
-		getPrimaryItems: ({submission, selectedPublication, permissions}) => {
-			return [
-				{
-					component: 'GalleyManager',
-					props: {
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 };
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOPS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOPS.js
index 3f821e3dc..81d6a2335 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOPS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigAuthorOPS.js
@@ -27,20 +27,6 @@ export const WorkflowConfig = {};
 
 export const PublicationConfig = {
 	common: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublicationId,
-			selectedPublication,
-		}) => {
-			const items = [];
-			if (selectedPublication.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPublicationEditDisabled',
-					props: {},
-				});
-			}
-			return {items, shouldContinue: true};
-		},
 		getPublicationControlsLeft: ({
 			submission,
 			selectedPublicationId,
@@ -65,99 +51,6 @@ export const PublicationConfig = {
 			return items;
 		},
 	},
-	titleAbstract: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'titleAbstract',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	contributors: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'ContributorManager',
-					props: {
-						submission: submission,
-						publication: selectedPublication,
-					},
-				},
-			];
-		},
-	},
-	metadata: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'metadata',
-						submission,
-						publication: selectedPublication,
-						noFieldsMessage: 'No metadata fields are currently enabled.',
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	citations: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'reference',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	galleys: {
-		getPrimaryItems: ({submission, selectedPublication, permissions}) => {
-			return [
-				{
-					component: 'GalleyManager',
-					props: {
-						submission,
-						publication: selectedPublication,
-						canEditPublication: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 	discussions: {
 		getPrimaryItems: ({submission, selectedPublication, permissions}) => {
 			return [
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
index f328e5cf3..c6e462e7a 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOJS.js
@@ -9,6 +9,7 @@ const {
 	getActiveStage,
 	getStageById,
 	isDecisionAvailable,
+	hasNotSubmissionStartedStage,
 } = useSubmission();
 const {t} = useLocalize();
 
@@ -63,13 +64,18 @@ export function getHeaderItems({
 
 export const WorkflowConfig = {
 	common: {
-		getPrimaryItems: ({submission, permissions, selectedStageId}) => {
+		getPrimaryItems: ({
+			submission,
+			permissions,
+			selectedStageId,
+			selectedReviewRound,
+		}) => {
 			if (!permissions.accessibleStages.includes(selectedStageId)) {
 				return {
 					shouldContinue: false,
 					items: [
 						{
-							component: 'PrimaryBasicMetadata',
+							component: 'WorkflowPrimaryBasicMetadata',
 							props: {
 								body: t('user.authorization.accessibleWorkflowStage'),
 							},
@@ -78,17 +84,33 @@ export const WorkflowConfig = {
 				};
 			}
 
+			const items = [];
+
+			items.push({
+				component: 'WorkflowChangeSubmissionLanguage',
+				props: {
+					submission,
+					canChangeSubmissionLanguage: false,
+				},
+			});
+
+			const shouldContinue = !hasNotSubmissionStartedStage(
+				submission,
+				selectedStageId,
+			);
+
+			items.push({
+				component: 'WorkflowSubmissionStatus',
+				props: {
+					submission,
+					selectedStageId,
+					selectedReviewRoundId: selectedReviewRound?.id,
+				},
+			});
+
 			return {
-				shouldContinue: true,
-				items: [
-					{
-						component: 'WorkflowChangeSubmissionLanguage',
-						props: {
-							submission,
-							canChangeSubmissionLanguage: false,
-						},
-					},
-				],
+				shouldContinue,
+				items,
 			};
 		},
 	},
@@ -96,15 +118,6 @@ export const WorkflowConfig = {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
 
-			if (
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_SUBMISSION,
-				)
-			) {
-				items.push({component: 'SubmissionStatus', props: {submission}});
-			}
-
 			items.push({
 				component: 'FileManager',
 				props: {
@@ -202,38 +215,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (!selectedReviewRound) {
-				return [
-					{
-						component: 'WorkflowPrimaryBasicMetadata',
-						props: {body: t('editor.review.notInitiated')},
-					},
-				];
-			}
-			const {getCurrentReviewRound} = useSubmission();
-
-			const currentReviewRound = getCurrentReviewRound(
-				submission,
-				selectedStageId,
-			);
-
-			if (selectedReviewRound.round < currentReviewRound.round) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t(
-							'editor.submission.workflowDecision.submission.reviewRound',
-						),
-					},
-				});
-			}
-
-			if (selectedReviewRound.id === currentReviewRound.id) {
-				items.push({
-					component: 'WorkflowReviewRoundStatus',
-					props: {reviewRound: selectedReviewRound},
-				});
-			}
 
 			items.push({
 				component: 'FileManager',
@@ -437,20 +418,6 @@ export const WorkflowConfig = {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
 
-			if (
-				hasSubmissionPassedStage(
-					submission,
-					pkp.const.WORKFLOW_STAGE_ID_EDITING,
-				)
-			) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.production'),
-					},
-				});
-			}
-
 			items.push({
 				component: 'WorkflowNotificationDisplay',
 				props: {submission: submission},
@@ -536,15 +503,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_PRODUCTION]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (submission.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.published'),
-					},
-				});
-			}
-
 			items.push({
 				component: 'WorkflowNotificationDisplay',
 				props: {submission: submission},
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
index e760e6306..3582047ba 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOMP.js
@@ -140,38 +140,6 @@ export const WorkflowConfig = {
 	[pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (!selectedReviewRound) {
-				return [
-					{
-						component: 'WorkflowPrimaryBasicMetadata',
-						props: {body: t('editor.review.notInitiated')},
-					},
-				];
-			}
-			const {getCurrentReviewRound} = useSubmission();
-
-			const currentReviewRound = getCurrentReviewRound(
-				submission,
-				selectedStageId,
-			);
-
-			if (selectedReviewRound.round < currentReviewRound.round) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t(
-							'editor.submission.workflowDecision.submission.reviewRound',
-						),
-					},
-				});
-			}
-
-			if (selectedReviewRound.id === currentReviewRound.id) {
-				items.push({
-					component: 'WorkflowReviewRoundStatus',
-					props: {reviewRound: selectedReviewRound},
-				});
-			}
 
 			items.push({
 				component: 'FileManager',
@@ -499,45 +467,6 @@ export const PublicationConfig = {
 			return {items, shouldContinue: true};
 		},
 	},
-	titleAbstract: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'titleAbstract',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	contributors: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'ContributorManager',
-					props: {
-						submission: submission,
-						publication: selectedPublication,
-						canEditPublication: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 	chapters: {
 		getPrimaryItems: ({
 			submission,
@@ -557,68 +486,6 @@ export const PublicationConfig = {
 		},
 	},
 
-	metadata: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'metadata',
-						submission,
-						publication: selectedPublication,
-						noFieldsMessage: 'No metadata fields are currently enabled.',
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-
-	citations: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'reference',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	identifiers: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'identifier',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 	publicationFormats: {
 		getPrimaryItems: ({
 			submission,
@@ -658,25 +525,4 @@ export const PublicationConfig = {
 			];
 		},
 	},
-
-	license: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'permissionDisclosure',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 };
diff --git a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
index 5284300f1..ed635faf0 100644
--- a/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
+++ b/src/pages/workflow/composables/useWorkflowConfig/workflowConfigEditorialOPS.js
@@ -51,47 +51,9 @@ export function getHeaderItems({
 }
 
 export const WorkflowConfig = {
-	common: {
-		getPrimaryItems: ({submission, permissions, selectedStageId}) => {
-			if (!permissions.accessibleStages.includes(selectedStageId)) {
-				return {
-					shouldContinue: false,
-					items: [
-						{
-							component: 'PrimaryBasicMetadata',
-							props: {
-								body: t('user.authorization.accessibleWorkflowStage'),
-							},
-						},
-					],
-				};
-			}
-
-			return {
-				shouldContinue: true,
-				items: [
-					{
-						component: 'WorkflowChangeSubmissionLanguage',
-						props: {
-							submission,
-							canChangeSubmissionLanguage: false,
-						},
-					},
-				],
-			};
-		},
-	},
 	[pkp.const.WORKFLOW_STAGE_ID_PRODUCTION]: {
 		getPrimaryItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
-			if (submission.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPrimaryBasicMetadata',
-					props: {
-						body: t('editor.submission.workflowDecision.submission.published'),
-					},
-				});
-			}
 
 			items.push({
 				component: 'WorkflowNotificationDisplay',
@@ -108,18 +70,6 @@ export const WorkflowConfig = {
 
 			return items;
 		},
-		getSecondaryItems: ({submission, selectedReviewRound, selectedStageId}) => {
-			const items = [];
-			items.push({
-				component: 'ParticipantManager',
-				props: {
-					submission,
-					submissionStageId: selectedStageId,
-				},
-			});
-
-			return items;
-		},
 
 		getActionItems: ({submission, selectedStageId, selectedReviewRound}) => {
 			const items = [];
@@ -175,20 +125,6 @@ export const WorkflowConfig = {
 
 export const PublicationConfig = {
 	common: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublicationId,
-			selectedPublication,
-		}) => {
-			const items = [];
-			if (selectedPublication.status === pkp.const.STATUS_PUBLISHED) {
-				items.push({
-					component: 'WorkflowPublicationEditDisabled',
-					props: {},
-				});
-			}
-			return {items, shouldContinue: true};
-		},
 		getPublicationControlsLeft: ({
 			submission,
 			selectedPublicationId,
@@ -313,140 +249,6 @@ export const PublicationConfig = {
 			return {items, shouldContinue: true};
 		},
 	},
-	titleAbstract: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'titleAbstract',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	contributors: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'ContributorManager',
-					props: {
-						submission: submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	metadata: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'metadata',
-						submission,
-						publication: selectedPublication,
-						noFieldsMessage: 'No metadata fields are currently enabled.',
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	citations: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'reference',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	identifiers: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'identifier',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	galleys: {
-		getPrimaryItems: ({submission, selectedPublication, permissions}) => {
-			return [
-				{
-					component: 'GalleyManager',
-					props: {
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
-	license: {
-		getPrimaryItems: ({
-			submission,
-			selectedPublication,
-			pageInitConfig,
-			permissions,
-		}) => {
-			return [
-				{
-					component: 'WorkflowPublicationForm',
-					props: {
-						formName: 'permissionDisclosure',
-						submission,
-						publication: selectedPublication,
-						canEdit: permissions.canEditPublication,
-					},
-				},
-			];
-		},
-	},
 	preprintEntry: {
 		getPrimaryItems: ({
 			submission,
diff --git a/src/pages/workflow/workflowStoreOJS.js b/src/pages/workflow/workflowStoreOJS.js
index 4bb9b1a03..9103a4f14 100644
--- a/src/pages/workflow/workflowStoreOJS.js
+++ b/src/pages/workflow/workflowStoreOJS.js
@@ -41,7 +41,6 @@ import WorkflowPublicationJats from './components/publication/WorkflowPublicatio
 import WorkflowPublicationVersionControl from './components/publication/WorkflowPublicationVersionControl.vue';
 import WorkflowChangeSubmissionLanguage from './components/publication/WorkflowChangeSubmissionLanguage.vue';
 import WorkflowPrimaryBasicMetadata from './components/primary/WorkflowPrimaryBasicMetadata.vue';
-import WorkflowReviewRoundStatus from './components/primary/WorkflowReviewRoundStatus.vue';
 import WorkflowSubmissionStatus from './components/primary/WorkflowSubmissionStatus.vue';
 import WorkflowPublicationEditDisabled from './components/publication/WorkflowPublicationEditDisabled.vue';
 
@@ -207,7 +206,6 @@ export const useWorkflowStore = defineComponentStore('workflow', (props) => {
 		WorkflowListingEmails,
 		WorkflowPaymentDropdown,
 		WorkflowPrimaryBasicMetadata,
-		WorkflowReviewRoundStatus,
 		WorkflowPublicationForm,
 		WorkflowPublicationJats,
 		WorkflowPublicationVersionControl,
diff --git a/src/pages/workflow/workflowStoreOMP.js b/src/pages/workflow/workflowStoreOMP.js
index 5614e05d2..62d4da1b5 100644
--- a/src/pages/workflow/workflowStoreOMP.js
+++ b/src/pages/workflow/workflowStoreOMP.js
@@ -44,7 +44,6 @@ import WorkflowPublicationForm from './components/publication/WorkflowPublicatio
 import WorkflowPublicationVersionControl from './components/publication/WorkflowPublicationVersionControl.vue';
 import WorkflowChangeSubmissionLanguage from './components/publication/WorkflowChangeSubmissionLanguage.vue';
 import WorkflowPrimaryBasicMetadata from './components/primary/WorkflowPrimaryBasicMetadata.vue';
-import WorkflowReviewRoundStatus from './components/primary/WorkflowReviewRoundStatus.vue';
 import WorkflowSubmissionStatus from './components/primary/WorkflowSubmissionStatus.vue';
 import WorkflowPublicationEditDisabled from './components/publication/WorkflowPublicationEditDisabled.vue';
 
@@ -212,7 +211,6 @@ export const useWorkflowStore = defineComponentStore('workflow', (props) => {
 		WorkflowNotificationDisplay,
 		WorkflowListingEmails,
 		WorkflowPrimaryBasicMetadata,
-		WorkflowReviewRoundStatus,
 		WorkflowPublicationForm,
 		WorkflowPublicationVersionControl,
 		WorkflowChangeSubmissionLanguage,