π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-3235]fix: transfer issues button mutation (#6549)
Vamsi Krishna8efe692c802b
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.pyindex c6682c15c3..84a161619b 100644--- a/apiserver/plane/app/views/cycle/base.py+++ b/apiserver/plane/app/views/cycle/base.py@@ -134,11 +134,11 @@ class CycleViewSet(BaseViewSet):)).annotate(- pending_issues=Count(+ cancelled_issues=Count("issue_cycle__issue__id",distinct=True,filter=Q(- issue_cycle__issue__state__group__in=["backlog", "unstarted", "started"],+ issue_cycle__issue__state__group__in=["cancelled"],issue_cycle__issue__archived_at__isnull=True,issue_cycle__issue__is_draft=False,issue_cycle__deleted_at__isnull=True,@@ -227,7 +227,7 @@ class CycleViewSet(BaseViewSet):"is_favorite","total_issues","completed_issues",- "pending_issues",+ "cancelled_issues","assignee_ids","status","version",@@ -259,7 +259,7 @@ class CycleViewSet(BaseViewSet):# meta fields"is_favorite","total_issues",- "pending_issues",+ "cancelled_issues","completed_issues","assignee_ids","status",diff --git a/packages/types/src/cycle/cycle.d.ts b/packages/types/src/cycle/cycle.d.tsindex e325b81ad6..638d974e64 100644--- a/packages/types/src/cycle/cycle.d.ts+++ b/packages/types/src/cycle/cycle.d.ts@@ -104,7 +104,6 @@ export interface ICycle extends TProgressSnapshot {project_detail: IProjectDetails;progress: any[];version: number;- pending_issues: number;}export interface CycleIssueResponse {diff --git a/web/core/components/cycles/list/cycle-list-item-action.tsx b/web/core/components/cycles/list/cycle-list-item-action.tsxindex a5b98ca5d5..f44b9bd6c1 100644--- a/web/core/components/cycles/list/cycle-list-item-action.tsx+++ b/web/core/components/cycles/list/cycle-list-item-action.tsx@@ -86,7 +86,11 @@ export const CycleListItemAction: FC<Props> = observer((props) => {const showIssueCount = useMemo(() => cycleStatus === "draft" || cycleStatus === "upcoming", [cycleStatus]);- const showTransferIssues = routerProjectId && cycleDetails.pending_issues > 0 && cycleStatus === "completed";+ const transferableIssuesCount = cycleDetails+ ? cycleDetails.total_issues - (cycleDetails.cancelled_issues + cycleDetails.completed_issues)+ : 0;++ const showTransferIssues = routerProjectId && transferableIssuesCount > 0 && cycleStatus === "completed";const isEditingAllowed = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER],@@ -258,7 +262,7 @@ export const CycleListItemAction: FC<Props> = observer((props) => {}}><TransferIcon className="fill-custom-primary-200 w-4" />- <span>Transfer {cycleDetails.pending_issues} work items</span>+ <span>Transfer {transferableIssuesCount} work items</span></div>)}diff --git a/web/core/components/cycles/quick-actions.tsx b/web/core/components/cycles/quick-actions.tsxindex 5d27cfe107..436ed0cdda 100644--- a/web/core/components/cycles/quick-actions.tsx+++ b/web/core/components/cycles/quick-actions.tsx@@ -44,6 +44,9 @@ 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 transferrableIssuesCount = cycleDetails+ ? cycleDetails.total_issues - (cycleDetails.cancelled_issues + cycleDetails.completed_issues)+ : 0;// authconst isEditingAllowed = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER],@@ -178,7 +181,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {cycleId={cycleId}projectId={projectId}workspaceSlug={workspaceSlug}- transferrableIssuesCount={cycleDetails.pending_issues}+ transferrableIssuesCount={transferrableIssuesCount}cycleName={cycleDetails.name}/>)}