fix: transfer issues count fixed

makeplane · Jan 10, 2025 · 78f9643 · 78f9643
1 parent 1f51b24
commit 78f9643
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/packages/types/src/cycle/cycle.d.ts b/packages/types/src/cycle/cycle.d.ts
@@ -58,6 +58,7 @@ export type TCycleProgress = {
 
 export type TProgressSnapshot = {
   total_issues: number;
+  pending_issues: number;
   completed_issues: number;
   backlog_issues: number;
   started_issues: number;
@@ -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/ce/components/cycles/end-cycle/modal.tsx b/web/ce/components/cycles/end-cycle/modal.tsx
@@ -6,7 +6,7 @@ interface Props {
   cycleId: string;
   projectId: string;
   workspaceSlug: string;
-  transferrableIssuesCount: number;
+  pendingIssues: number;
 }
 
 export const EndCycleModal: React.FC<Props> = () => <></>;
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,8 +81,7 @@ 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 showTransferIssues = transferableIssuesCount > 0 && cycleStatus === "completed";
+  const showTransferIssues = cycleDetails.pending_issues > 0 && cycleStatus === "completed";
   const isEditingAllowed = allowPermissions(
     [EUserPermissions.ADMIN, EUserPermissions.MEMBER],
     EUserPermissionsLevel.PROJECT,
@@ -254,7 +253,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.tsx
@@ -176,7 +176,7 @@ export const CycleQuickActions: React.FC<Props> = observer((props) => {
             cycleId={cycleId}
             projectId={projectId}
             workspaceSlug={workspaceSlug}
-            transferrableIssuesCount={transferableIssuesCount}
+            pendingIssues={cycleDetails.pending_issues}
           />
         </div>
       )}