pkp/pkp-lib#9295 remove redundant checks and fix issue with store at unmount

Author: touhidurabir

src/components/Form/fields/FieldUpload.vue

@@ -258,14 +258,12 @@ export default {
 			 * Add attributes to the hidden file input field so that labels and
 			 * descriptions can be accessed by those using assistive devices.
 			 */
-			if (this.$refs.dropzone) {
-				this.$refs.dropzone.dropzone.hiddenFileInput.id =
-					this.dropzoneHiddenFileId;
-				this.$refs.dropzone.dropzone.hiddenFileInput.setAttribute(
-					'aria-describedby',
-					this.describedByIds,
-				);
-			}
+			this.$refs.dropzone.dropzone.hiddenFileInput.id =
+				this.dropzoneHiddenFileId;
+			this.$refs.dropzone.dropzone.hiddenFileInput.setAttribute(
+				'aria-describedby',
+				this.describedByIds,
+			);
 
 			/**
 			 * Set the initial data, which can't be set in the data() function because it relies on

src/components/Form/fields/FieldUploadImage.vue

@@ -250,14 +250,12 @@ export default {
 			 * Add attributes to the hidden file input field so that labels and
 			 * descriptions can be accessed by those using assistive devices.
 			 */
-			if (this.$refs.dropzone) {
-				this.$refs.dropzone.dropzone.hiddenFileInput.id =
-					this.dropzoneHiddenFileId;
-				this.$refs.dropzone.dropzone.hiddenFileInput.setAttribute(
-					'aria-describedby',
-					this.describedByIds,
-				);
-			}
+			this.$refs.dropzone.dropzone.hiddenFileInput.id =
+				this.dropzoneHiddenFileId;
+			this.$refs.dropzone.dropzone.hiddenFileInput.setAttribute(
+				'aria-describedby',
+				this.describedByIds,
+			);
 
 			/**
 			 * Set the initial data, which can't be set in the data() function because it relies on

src/pages/workflow/components/publication/WorkflowPublicationForm.vue

@@ -73,6 +73,9 @@ async function metadataDataChange() {
 	await fetchForm();
 }
 
+// This handle the case where the issue selection done vai `Schedule For Publication` modal while at issue page
+// but not finalise the publication status(publishing or scheduling) at final step but close the modal
+// so we need to fetch the form again to update the issue selection field to reflect the changes.
 async function issueDataChange() {
 	await fetchForm();
 }
@@ -81,10 +84,13 @@ watch(
 	form,
 	async (newForm) => {
 		if (newForm && props.formName === 'issue' && isOJS()) {
-			const {initialize} = useWorkflowPublicationFormIssue(newForm);
+			const {initialize} = useWorkflowPublicationFormIssue(
+				newForm,
+				props.publicationpublication,
+			);
 			await initialize();
 		}
 	},
-	{immediate: true},
+	{immediate: false},
 );
 </script>

src/pages/workflow/composables/useWorkflowPublicationFormIssue.js

@@ -2,12 +2,10 @@ import {useFetch} from '@/composables/useFetch';
 import {useUrl} from '@/composables/useUrl';
 import {computed, watch} from 'vue';
 import {useLocalize} from '@/composables/useLocalize';
-import {useWorkflowStore} from '@/pages/workflow/workflowStore';
 import {useForm} from '@/composables/useForm';
 
-export function useWorkflowPublicationFormIssue(form) {
+export function useWorkflowPublicationFormIssue(form, selectedPublication) {
 	const {t} = useLocalize();
-	const store = useWorkflowStore();
 	const {
 		setHiddenValue,
 		getHiddenValue,
@@ -21,7 +19,7 @@ export function useWorkflowPublicationFormIssue(form) {
 	const {fetch: fetchAssignments, data: assignments} = useFetch(assignmentsUrl);
 
 	const {apiUrl: assignmentStatusUrl} = useUrl(
-		`submissions/${store.submission.id}/publications/${store.selectedPublication.id}/issueAssignmentStatus`,
+		`submissions/${selectedPublication.submissionId}/publications/${selectedPublication.id}/issueAssignmentStatus`,
 	);
 	const {fetch: fetchAssignmentStatus, data: assignmentStatus} =
 		useFetch(assignmentStatusUrl);
@@ -103,14 +101,8 @@ export function useWorkflowPublicationFormIssue(form) {
 
 		const issueIdField = getField('issueId');
 		const assignmentField = getField('assignment');
-		const statusValue = getHiddenValue('status');
 
-		return (
-			issueIdField &&
-			assignmentField &&
-			statusValue !== null &&
-			statusValue !== undefined
-		);
+		return issueIdField && assignmentField;
 	}
 
 	/**
@@ -129,13 +121,13 @@ export function useWorkflowPublicationFormIssue(form) {
 			description: t('publication.assignToIssue.issueDescription'),
 			options: [],
 			size: 'large',
-			value: store.selectedPublication?.issueId,
+			value: selectedPublication?.issueId,
 			isRequired: true,
 			showWhen: ['assignment', []],
 		});
 
 		// Set initial status - will be updated by watchers when assignmentStatus data arrives
-		setHiddenValue('status', store.selectedPublication?.status);
+		setHiddenValue('status', selectedPublication?.status);
 	}
 
 	/**
@@ -161,7 +153,7 @@ export function useWorkflowPublicationFormIssue(form) {
 						![
 							pkp.const.publication.STATUS_PUBLISHED,
 							pkp.const.publication.STATUS_SCHEDULED,
-						].includes(store.selectedPublication?.status)
+						].includes(selectedPublication?.status)
 					) {
 						setHiddenValue('status', newStatus.status);
 					}
@@ -191,7 +183,7 @@ export function useWorkflowPublicationFormIssue(form) {
 					issueIdField.showWhen = ['assignment', newShowWhenIds];
 				}
 			},
-			{immediate: true},
+			{immediate: false},
 		);
 
 		// Watch current assignment option changes and update status
@@ -209,10 +201,12 @@ export function useWorkflowPublicationFormIssue(form) {
 						[
 							pkp.const.publication.STATUS_PUBLISHED,
 							pkp.const.publication.STATUS_SCHEDULED,
-						].includes(store.selectedPublication?.status)
+						].includes(selectedPublication?.status)
 					) {
 						setHiddenValue('status', null);
 					}
+
+					isInitialDataLoad = false;
 				}
 
 				if (newOption.isPublished !== null) {
@@ -232,12 +226,6 @@ export function useWorkflowPublicationFormIssue(form) {
 			},
 			{immediate: true},
 		);
-
-		// Mark initial data load as complete after a short delay
-		// which in return all initial watchers have had a chance to run
-		setTimeout(() => {
-			isInitialDataLoad = false;
-		}, 100);
 	}
 
 	/**

src/pages/workflow/composables/useWorkflowVersionForm.js

@@ -321,7 +321,10 @@ export function useWorkflowVersionForm(
 		// it's in publish mode
 		// have issues
 		if (modeState.isPublishMode && issueCount > 0 && isOJS()) {
-			const {initialize} = useWorkflowPublicationFormIssue(form);
+			const {initialize} = useWorkflowPublicationFormIssue(
+				form,
+				store.selectedPublication,
+			);
 			await initialize();
 		}
 

src/utils/defineComponentStore.js

@@ -56,10 +56,6 @@ export function defineComponentStore(
 			storesMap[storeName].mountedCount = storesMap[storeName].mountedCount + 1;
 		});
 		onBeforeUnmount(() => {
-			if (!storesMap[storeName]) {
-				return;
-			}
-
 			storesMap[storeName].mountedCount = storesMap[storeName].mountedCount - 1;
 
 			if (storesMap[storeName].mountedCount === 0) {