From fa6c915f75e933520214aecade06c835b45513c4 Mon Sep 17 00:00:00 2001
From: ajnyga <ajnyga@gmail.com>
Date: Wed, 14 Dec 2022 18:48:05 +0200
Subject: [PATCH] pkp/pkp-lib#1813 Add Cancel Submission Decision

---
 src/components/Container/WorkflowPage.vue         |  4 ++++
 .../ListPanel/submissions/SubmissionsListItem.vue | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/Container/WorkflowPage.vue b/src/components/Container/WorkflowPage.vue
index 3bd151fe3..dea9b739a 100644
--- a/src/components/Container/WorkflowPage.vue
+++ b/src/components/Container/WorkflowPage.vue
@@ -736,6 +736,10 @@ export default {
 	}
 }
 
+.pkpWorkflow__moreActions .pkpDropdown__content {
+	right: 0.25rem;
+}
+
 // Integrate the grids in the publication tab
 .pkpWorkflow__contributors,
 #representations-grid {
diff --git a/src/components/ListPanel/submissions/SubmissionsListItem.vue b/src/components/ListPanel/submissions/SubmissionsListItem.vue
index 9f3c05d17..e8e0ea702 100644
--- a/src/components/ListPanel/submissions/SubmissionsListItem.vue
+++ b/src/components/ListPanel/submissions/SubmissionsListItem.vue
@@ -101,7 +101,7 @@
 							:stage="isArchived ? '' : currentStage"
 							:isPrimary="isScheduled"
 							:isSuccess="isPublished"
-							:isWarnable="isDeclined"
+							:isWarnable="isDeclinedOrCanceled"
 							@click="filterByStage(activeStage.id)"
 						>
 							{{ currentStageLabel }}
@@ -280,7 +280,8 @@ export default {
 					pkp.const.ROLE_ID_MANAGER,
 					pkp.const.ROLE_ID_SITE_ADMIN
 				]) &&
-				this.item.status === pkp.const.STATUS_DECLINED
+				(this.item.status === pkp.const.STATUS_DECLINED ||
+					this.item.status === pkp.const.STATUS_CANCELED)
 			) {
 				return true;
 			} else if (
@@ -476,17 +477,21 @@ export default {
 			return (
 				this.item.status === pkp.const.STATUS_SCHEDULED ||
 				this.item.status === pkp.const.STATUS_PUBLISHED ||
+				this.item.status === pkp.const.STATUS_CANCELED ||
 				this.item.status === pkp.const.STATUS_DECLINED
 			);
 		},
 
 		/**
-		 * Has this submission been declined?
+		 * Has this submission been declined or canceled?
 		 *
 		 * @return {Boolean}
 		 */
-		isDeclined() {
-			return this.item.status === pkp.const.STATUS_DECLINED;
+		isDeclinedOrCanceled() {
+			return (
+				this.item.status === pkp.const.STATUS_CANCELED ||
+				this.item.status === pkp.const.STATUS_DECLINED
+			);
 		},
 
 		/**