π₯π₯π₯ 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-3102]fix: transfer issues count (#6384)
Vamsi Krishna369d927321c5
diff --git a/apiserver/plane/app/views/cycle/base.py b/apiserver/plane/app/views/cycle/base.pyindex f30f498265..3b2985f18c 100644--- a/apiserver/plane/app/views/cycle/base.py+++ b/apiserver/plane/app/views/cycle/base.py@@ -132,6 +132,18 @@ class CycleViewSet(BaseViewSet):),))+ .annotate(+ pending_issues=Count(+ "issue_cycle__issue__id",+ distinct=True,+ filter=Q(+ issue_cycle__issue__state__group__in=["backlog", "unstarted", "started"],+ issue_cycle__issue__archived_at__isnull=True,+ issue_cycle__issue__is_draft=False,+ issue_cycle__deleted_at__isnull=True,+ ),+ )+ ).annotate(status=Case(When(@@ -214,6 +226,7 @@ class CycleViewSet(BaseViewSet):"is_favorite","total_issues","completed_issues",+ "pending_issues","assignee_ids","status","version",@@ -245,6 +258,7 @@ class CycleViewSet(BaseViewSet):# meta fields"is_favorite","total_issues",+ "pending_issues","completed_issues","assignee_ids","status",diff --git a/packages/types/src/cycle/cycle.d.ts b/packages/types/src/cycle/cycle.d.tsindex 0aa3fc2804..e325b81ad6 100644--- a/packages/types/src/cycle/cycle.d.ts+++ b/packages/types/src/cycle/cycle.d.ts@@ -104,6 +104,7 @@ export interface ICycle extends TProgressSnapshot {project_detail: IProjectDetails;progress: any[];version: number;+ pending_issues: number;}export interface CycleIssueResponse {@@ -120,9 +121,7 @@ export interface CycleIssueResponse {sub_issues_count: number;}-export type SelectCycleType =- | (ICycle & { actionType: "edit" | "delete" | "create-issue" })- | undefined;+export type SelectCycleType = (ICycle & { actionType: "edit" | "delete" | "create-issue" }) | undefined;export type CycleDateCheckData = {start_date: string;diff --git a/web/core/components/cycles/list/cycle-list-item-action.tsx b/web/core/components/cycles/list/cycle-list-item-action.tsxindex 1934acf498..a627353fb7 100644--- a/web/core/components/cycles/list/cycle-list-item-action.tsx+++ b/web/core/components/cycles/list/cycle-list-item-action.tsx@@ -82,9 +82,11 @@ export const CycleListItemAction: FC<Props> = observer((props) => {// derived valuesconst 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 showTransferIssues = routerProjectId && transferableIssuesCount > 0 && cycleStatus === "completed"; // Only available inside project view.++ const showTransferIssues = cycleDetails.pending_issues > 0 && cycleStatus === "completed";+const isEditingAllowed = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER],EUserPermissionsLevel.PROJECT,@@ -256,7 +258,7 @@ export const CycleListItemAction: FC<Props> = observer((props) => {}}><TransferIcon className="fill-custom-primary-200 w-4" />- <span>Transfer {transferableIssuesCount} issues</span>+ <span>Transfer {cycleDetails.pending_issues} issues</span></div>)}diff --git a/web/core/components/cycles/quick-actions.tsx b/web/core/components/cycles/quick-actions.tsxindex b72d7b7bd6..0f6a27979f 100644--- a/web/core/components/cycles/quick-actions.tsx+++ b/web/core/components/cycles/quick-actions.tsx@@ -42,7 +42,6 @@ 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;// authconst isEditingAllowed = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER],@@ -170,14 +169,16 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {workspaceSlug={workspaceSlug}projectId={projectId}/>- <EndCycleModal- isOpen={isEndCycleModalOpen}- handleClose={() => setEndCycleModalOpen(false)}- cycleId={cycleId}- projectId={projectId}- workspaceSlug={workspaceSlug}- transferrableIssuesCount={transferableIssuesCount}- />+ {isCurrentCycle && (+ <EndCycleModal+ isOpen={isEndCycleModalOpen}+ handleClose={() => setEndCycleModalOpen(false)}+ cycleId={cycleId}+ projectId={projectId}+ workspaceSlug={workspaceSlug}+ transferrableIssuesCount={cycleDetails.pending_issues}+ />+ )}</div>)}<ContextMenu parentRef={parentRef} items={MENU_ITEMS} />diff --git a/web/core/components/cycles/transfer-issues-modal.tsx b/web/core/components/cycles/transfer-issues-modal.tsxindex fc06968732..0e9b56c0f7 100644--- a/web/core/components/cycles/transfer-issues-modal.tsx+++ b/web/core/components/cycles/transfer-issues-modal.tsx@@ -26,7 +26,7 @@ export const TransferIssuesModal: React.FC<Props> = observer((props) => {const [query, setQuery] = useState("");// store hooks- const { currentProjectIncompleteCycleIds, getCycleById, fetchCycleDetails } = useCycle();+ const { currentProjectIncompleteCycleIds, getCycleById, fetchActiveCycleProgress } = useCycle();const {issues: { transferIssuesFromCycle },} = useIssues(EIssuesStoreType.CYCLE);@@ -57,8 +57,8 @@ export const TransferIssuesModal: React.FC<Props> = observer((props) => {/**To update issue counts in target cycle and current cycle */const getCycleDetails = async (newCycleId: string) => {const cyclesFetch = [- fetchCycleDetails(workspaceSlug.toString(), projectId.toString(), cycleId),- fetchCycleDetails(workspaceSlug.toString(), projectId.toString(), newCycleId),+ fetchActiveCycleProgress(workspaceSlug.toString(), projectId.toString(), cycleId),+ fetchActiveCycleProgress(workspaceSlug.toString(), projectId.toString(), newCycleId),];await Promise.all(cyclesFetch).catch((error) => {setToast({