fix: updated cancelled issues count into pending issues

makeplane · Jan 13, 2025 · d0b8e9c · d0b8e9c
1 parent ade4d29
commit d0b8e9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/web/core/components/cycles/list/cycle-list-item-action.tsx b/web/core/components/cycles/list/cycle-list-item-action.tsx
@@ -81,7 +81,11 @@ export const CycleListItemAction: FC<Props> = observer((props) => {
   // derived values
   const cycleStatus = cycleDetails.status ? (cycleDetails.status.toLocaleLowerCase() as TCycleGroups) : "draft";
   const showIssueCount = useMemo(() => cycleStatus === "draft" || cycleStatus === "upcoming", [cycleStatus]);
-  const transferableIssuesCount = cycleDetails ? cycleDetails.total_issues - cycleDetails.completed_issues : 0;
+  const transferableIssuesCount = cycleDetails
+    ? cycleDetails.total_issues -
+      cycleDetails.completed_issues -
+      (cycleDetails.progress_snapshot?.cancelled_issues || 0)
+    : 0;
   const showTransferIssues = transferableIssuesCount > 0 && cycleStatus === "completed";
   const isEditingAllowed = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],

diff --git a/web/core/components/cycles/quick-actions.tsx b/web/core/components/cycles/quick-actions.tsx
@@ -42,7 +42,11 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
   const isArchived = !!cycleDetails?.archived_at;
   const isCompleted = cycleDetails?.status?.toLowerCase() === "completed";
   const isCurrentCycle = cycleDetails?.status?.toLowerCase() === "current";
-  const transferableIssuesCount = cycleDetails ? cycleDetails.total_issues - cycleDetails.completed_issues : 0;
+  const transferableIssuesCount = cycleDetails
+    ? cycleDetails.total_issues -
+      cycleDetails.completed_issues -
+      (cycleDetails.progress_snapshot?.cancelled_issues || 0)
+    : 0;
   // auth
   const isEditingAllowed = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],