From d0b8e9c4b52a735ddb1952f6db0c5b8d912f790c Mon Sep 17 00:00:00 2001 From: Vamsi krishna Date: Mon, 13 Jan 2025 11:27:16 +0530 Subject: [PATCH] fix: updated cancelled issues count into pending issues --- web/core/components/cycles/list/cycle-list-item-action.tsx | 6 +++++- web/core/components/cycles/quick-actions.tsx | 6 +++++- 2 files changed, 10 insertions(+), 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 index 2fa3d4fd346..ba81212f8ad 100644 --- 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 = 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 index b72d7b7bd61..78ec6c0c1e7 100644 --- 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 = 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],