pkp/pkp-lib#7495 Separate workflowPage for OJS

ipula · Oct 22, 2024 · 727c30d · 727c30d
1 parent 97d9402
commit 727c30d
Show file tree

Hide file tree

Showing 15 changed files with 310 additions and 41 deletions.
diff --git a/src/managers/ContributorManager/ContributorManager.vue b/src/managers/ContributorManager/ContributorManager.vue
@@ -13,7 +13,7 @@ const props = defineProps({
 	submission: {type: Object, required: true},
 	publication: {type: Object, required: true},
 	contributorForm: {type: Object, required: true},
-	canEditPublication: {type: Boolean, required: true},
+	canEdit: {type: Boolean, required: true},
 });
 
 const contributorManagerStore = useContributorManagerStore(props);

diff --git a/src/managers/ContributorManager/contributorManagerStore.js b/src/managers/ContributorManager/contributorManagerStore.js
@@ -23,7 +23,7 @@ export const useContributorManagerStore = defineComponentStore(
 
 		const contributorsListPanelProps = computed(() => {
 			return {
-				canEditPublication: props.canEditPublication,
+				canEditPublication: props.canEdit,
 				form: form.value,
 				id: 'contributors',
 				items: props.publication.authors,

diff --git a/src/managers/GalleyManager/GalleyManager.vue b/src/managers/GalleyManager/GalleyManager.vue
@@ -69,7 +69,7 @@ const Components = {
 const props = defineProps({
 	publication: {type: Object, required: true},
 	submission: {type: Object, required: true},
-	canEditPublication: {type: Boolean, required: true},
+	canEdit: {type: Boolean, required: true},
 });
 
 const {t} = useLocalize();

diff --git a/src/managers/GalleyManager/galleyManagerStore.js b/src/managers/GalleyManager/galleyManagerStore.js
@@ -106,7 +106,7 @@ export const useGalleyManagerStore = defineComponentStore(
 		const _galleyActionsFns = useGalleyManagerActions();
 		function getActionArgs() {
 			return {
-				canEditPublication: props.canEditPublication,
+				canEdit: props.canEdit,
 			};
 		}
 

diff --git a/src/managers/GalleyManager/useGalleyManagerActions.js b/src/managers/GalleyManager/useGalleyManagerActions.js
@@ -12,10 +12,10 @@ export const Actions = {
 export function useGalleyManagerActions() {
 	const {t} = useLocalize();
 
-	function getBottomActions({canEditPublication}) {
+	function getBottomActions({canEdit}) {
 		const actions = [];
 
-		if (!canEditPublication) {
+		if (!canEdit) {
 			return [];
 		}
 
@@ -28,9 +28,9 @@ export function useGalleyManagerActions() {
 		return actions;
 	}
 
-	function getTopItems({canEditPublication}) {
+	function getTopItems({canEdit}) {
 		const actions = [];
-		if (!canEditPublication) {
+		if (!canEdit) {
 			return [];
 		}
 
@@ -39,10 +39,10 @@ export function useGalleyManagerActions() {
 		return actions;
 	}
 
-	function getItemActions({canEditPublication}) {
+	function getItemActions({canEdit}) {
 		const actions = [];
 
-		if (!canEditPublication) {
+		if (!canEdit) {
 			return [
 				{
 					label: t('common.view'),

diff --git a/src/managers/ReviewerManager/useReviewerManagerActions.js b/src/managers/ReviewerManager/useReviewerManagerActions.js
@@ -326,6 +326,8 @@ export function useReviewerManagerActions() {
 		{submission, reviewAssignment, submissionStageId},
 		finishedCallback,
 	) {
+		// http://localhost:8000/index.php/publicknowledge/$$$call$$$/grid/users/reviewer/reviewer-grid/edit-review?submissionId=7&reviewAssignmentId=12&stageId=3
+
 		const {openLegacyModal} = useLegacyGridUrl({
 			component: 'grid.users.reviewer.ReviewerGridHandler',
 

diff --git a/src/pages/workflow/WorkflowPage.vue b/src/pages/workflow/WorkflowPage.vue
@@ -19,7 +19,7 @@
 		<template v-if="submission" #post-description>
 			<StageBubble :extended-stage="workflowStore.extendedStage">
 				<span class="text-lg-normal">
-					{{ stageLabel }}
+					{{ workflowStore.stageLabel }}
 				</span>
 			</StageBubble>
 		</template>

diff --git a/src/pages/workflow/WorkflowPageOJS.vue b/src/pages/workflow/WorkflowPageOJS.vue
@@ -0,0 +1,15 @@
+<template>
+	<WorkflowPage />
+</template>
+
+<script setup>
+import WorkflowPage from './WorkflowPage.vue';
+import {useWorkflowStore} from './workflowStoreOJS';
+
+const props = defineProps({
+	submissionId: {type: Number, required: true},
+	pageInitConfig: {type: Object, required: true},
+});
+
+useWorkflowStore(props);
+</script>
diff --git a/src/pages/workflow/composables/useWorkflowActions.js b/src/pages/workflow/composables/useWorkflowActions.js
@@ -311,13 +311,13 @@ export function useWorkflowActions({
 		});
 	}
 
+	// OMP - might be moved to separate file
 	async function workflowChangeWorktype(
 		{submission, workType},
 		finishedCallback,
 	) {
 		const {apiUrl} = useUrl(`submissions/${submission.id}`);
 
-		console.log('workType:', workType);
 		const {fetch} = useFetch(apiUrl, {method: 'PUT', body: {workType}});
 
 		await fetch();
@@ -339,6 +339,7 @@ export function useWorkflowActions({
 		workflowCreateNewVersion,
 		workflowPreviewPublication,
 		workflowChangeSubmissionLanguage,
+		// OMP
 		workflowChangeWorktype,
 	};
 }
diff --git a/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOJS.js b/src/pages/workflow/composables/useWorkflowConfig/useWorkflowConfigOJS.js
@@ -7,7 +7,7 @@ import * as ConfigEditorialShared from './workflowConfigEditorialOJS';
 import * as ConfigAuthorOJS from './workflowConfigAuthorOJS';
 import * as ConfigEditorialOJS from './workflowConfigEditorialOJS';
 
-export function useWorkflowConfigOMP({dashboardPage}) {
+export function useWorkflowConfigOJS({dashboardPage}) {
 	const {t} = useLocalize();
 
 	let Configs = null;
@@ -82,7 +82,7 @@ export function useWorkflowConfigOMP({dashboardPage}) {
 					itemsArgs,
 				) || []),
 			];
-		} else if (selectedMenuState.publicationMenu) {
+		} else if (selectedMenuState.primaryMenuItem === 'publication') {
 			const itemsArgs = {
 				submission,
 				pageInitConfig: pageInitConfig,
@@ -97,24 +97,7 @@ export function useWorkflowConfigOMP({dashboardPage}) {
 			return [
 				...(Configs.PublicationConfig?.common?.[getterFnName]?.(itemsArgs) ||
 					[]),
-				...(Configs.PublicationConfig[selectedMenuState.publicationMenu]?.[
-					getterFnName
-				]?.(itemsArgs) || []),
-			];
-		} else if (selectedMenuState.marketingMenu) {
-			const itemsArgs = {
-				submission,
-				pageInitConfig: pageInitConfig,
-				permissions,
-			};
-
-			if (!submission) {
-				return [];
-			}
-
-			return [
-				...(Configs.MarketingConfig?.common?.[getterFnName]?.(itemsArgs) || []),
-				...(Configs.MarketingConfig[selectedMenuState.marketingMenu]?.[
+				...(Configs.PublicationConfig[selectedMenuState.secondaryMenuItem]?.[
 					getterFnName
 				]?.(itemsArgs) || []),
 			];

diff --git a/src/pages/workflow/composables/useWorkflowDataSubmissionPublication.js b/src/pages/workflow/composables/useWorkflowDataSubmissionPublication.js
@@ -18,6 +18,15 @@ export function useWorkflowDataSubmissionPublication({submissionId}) {
 		if (selectedPublicationId.value !== publicationId) {
 			selectedPublicationId.value = publicationId;
 			selectedPublication.value = null;
+
+			const isPublicationInSubmission = submission.value?.publications?.find(
+				(publication) => publication.id === publicationId,
+			);
+
+			if (!isPublicationInSubmission) {
+				submission.value = null;
+				fetchSubmission();
+			}
 			fetchSelectedPublication();
 		}
 	}

diff --git a/src/pages/workflow/composables/useWorkflowNavigationConfig/useWorkflowNavigation.js b/src/pages/workflow/composables/useWorkflowNavigationConfig/useWorkflowNavigation.js
diff --git a/src/pages/workflow/composables/useWorkflowNavigationConfig/useWorkflowNavigationConfigOJS.js b/src/pages/workflow/composables/useWorkflowNavigationConfig/useWorkflowNavigationConfigOJS.js
@@ -268,6 +268,10 @@ export function useWorkflowNavigationConfigOJS(pageInitConfig) {
 	}
 
 	function getMenuItems({submission, permissions}) {
+		if (!submission) {
+			return [];
+		}
+
 		const menuItems = [
 			{
 				key: 'workflow',