pkp/pkp-lib#5160 Fix dropped data during publishing process in workflow

NateWr · Oct 23, 2019 · e0da221 · e0da221
1 parent 8d993f8
commit e0da221
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/components/Container/WorkflowContainer.vue b/src/components/Container/WorkflowContainer.vue
@@ -127,7 +127,7 @@ export default {
 							self.isLoadingVersion = false;
 						} else {
 							setTimeout(() => {
-								self.isLoadingVersion = true;
+								self.isLoadingVersion = false;
 							}, timeDiff);
 						}
 					});
@@ -319,7 +319,7 @@ export default {
 				success(submission) {
 					// Store some publication data and discard the rest
 					submission.publications.forEach(publication =>
-						self.updatePublication(publication)
+						self.updatePublicationInList(publication)
 					);
 					delete submission.publications;
 					self.submission = {};
@@ -407,7 +407,7 @@ export default {
 				success(r) {
 					self.workingPublication = {};
 					self.workingPublication = r;
-					self.updatePublication(r);
+					self.updatePublicationInList(r);
 					self.$nextTick(() => {
 						self.setFocusIn(self.$refs.publication);
 						self.isLoadingVersion = false;
@@ -440,7 +440,7 @@ export default {
 				success(r) {
 					self.workingPublication = {};
 					self.workingPublication = r;
-					self.updatePublication(r);
+					self.updatePublicationInList(r);
 					self.isLoadingVersion = false;
 					self.setFocusIn(self.$refs.publication);
 					self.refreshSubmission();
@@ -449,24 +449,18 @@ export default {
 		},
 
 		/**
-		 * Update a publication's details
+		 * Update a publication's details in the publication list
+		 *
+		 * @param {Object} newPublication
 		 */
-		updatePublication(newPublication) {
+		updatePublicationInList(newPublication) {
 			this.publicationList.forEach(publication => {
 				if (publication.id === newPublication.id) {
 					(publication.id = newPublication.id),
 						(publication.datePublished = newPublication.datePublished);
 					publication.status = newPublication.status;
 				}
 			});
-			if (this.workingPublication.id === newPublication.id) {
-				this.workingPublication = {};
-				this.workingPublication = newPublication;
-			}
-			if (this.currentPublication.id === newPublication.id) {
-				this.currentPublication = {};
-				this.currentPublication = newPublication;
-			}
 		}
 	},
 	watch: {
@@ -486,12 +480,16 @@ export default {
 		 */
 		pkp.eventBus.$on('form-success', (formId, newPublication) => {
 			if (this.publicationFormIds.includes(formId)) {
-				this.updatePublication(newPublication);
+				this.workingPublication = {};
+				this.workingPublication = newPublication;
 			}
 
 			// Update the submission's status when the publish form is completed
 			if (formId === pkp.const.FORM_PUBLISH) {
 				this.setPublicationForms(newPublication);
+				this.currentPublication = {};
+				this.currentPublication = newPublication;
+				this.submission.currentPublicationId = newPublication.id;
 				this.refreshSubmission();
 			}
 		});
@@ -506,7 +504,9 @@ export default {
 					this.submissionApiUrl + '/publications/' + this.workingPublication.id,
 				type: 'GET',
 				success(publication) {
-					self.updatePublication(publication);
+					self.workingPublication = {};
+					self.workingPublication = publication;
+					self.updatePublicationInList(publication);
 				}
 			});
 		});