From 6566532becd426021ea16f7574487676f55cfb01 Mon Sep 17 00:00:00 2001 From: Sangeetha Date: Mon, 21 Apr 2025 20:33:21 +0530 Subject: [PATCH] [WEB-3905] fix: cancelled issues on epic analytics of a initiative (#3005) --- apiserver/plane/ee/views/app/initiative/base.py | 7 +++++++ .../main/collapsible-section/epics/epic-list-item/root.tsx | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apiserver/plane/ee/views/app/initiative/base.py b/apiserver/plane/ee/views/app/initiative/base.py index 7217ac9748..c92ec69c2f 100644 --- a/apiserver/plane/ee/views/app/initiative/base.py +++ b/apiserver/plane/ee/views/app/initiative/base.py @@ -525,6 +525,12 @@ class InitiativeEpicAnalytics(BaseAPIView): .count() ) + cancelled_issues = ( + issues.filter(id__in=issue_ids, workspace__slug=slug) + .filter(state__group="cancelled") + .count() + ) + total_issues = issues.filter(id__in=issue_ids, workspace__slug=slug).count() result.append( @@ -532,6 +538,7 @@ class InitiativeEpicAnalytics(BaseAPIView): "epic_id": epic_id, "total_issues": total_issues, "completed_issues": completed_issues, + "cancelled_issues": cancelled_issues, } ) diff --git a/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/root.tsx b/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/root.tsx index 90655417bb..9cc27d2b6f 100644 --- a/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/root.tsx +++ b/web/ee/components/initiatives/details/main/collapsible-section/epics/epic-list-item/root.tsx @@ -50,7 +50,10 @@ export const EpicListItem: React.FC = observer((props) => { const projectIdentifier = issue?.project_id ? project.getProjectIdentifierById(issue?.project_id) : ""; const issueSequenceId = issue?.sequence_id; - const progress = getProgress(initiativeEpicStats?.completed_issues, initiativeEpicStats?.total_issues); + const progress = getProgress( + (initiativeEpicStats?.completed_issues ?? 0) + (initiativeEpicStats?.cancelled_issues ?? 0), + initiativeEpicStats?.total_issues ?? 0 + ); if (!issue || !issue.project_id) return <>;