From 32d9d2b1a5073b4832894de57a4a2baeacec1f11 Mon Sep 17 00:00:00 2001
From: Vamsi Krishna <46787868+vamsikrishnamathala@users.noreply.github.com>
Date: Thu, 19 Jun 2025 14:23:46 +0530
Subject: [PATCH] [WEB-4344]fix: epics initiative count (#3452)

* fix: initiative epics count

* fix: unselected epics in initiatives

* fix: display of un selected initiatives
---
 apiserver/plane/ee/views/app/epic/base.py      | 6 +++++-
 web/ee/components/initiatives/details/root.tsx | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apiserver/plane/ee/views/app/epic/base.py b/apiserver/plane/ee/views/app/epic/base.py
index a9d4f9ff85..8741dd0d76 100644
--- a/apiserver/plane/ee/views/app/epic/base.py
+++ b/apiserver/plane/ee/views/app/epic/base.py
@@ -175,9 +175,13 @@ class EpicViewSet(BaseViewSet):
                     ArrayAgg(
                         "initiative_epics__initiative_id",
                         distinct=True,
+                        filter=Q(
+                            initiative_epics__deleted_at__isnull=True,
+                            initiative_epics__initiative_id__isnull=False,
+                        ),
                     ),
                     Value([], output_field=ArrayField(UUIDField())),
-                ),
+                )
             )
             .prefetch_related(
                 Prefetch(
diff --git a/web/ee/components/initiatives/details/root.tsx b/web/ee/components/initiatives/details/root.tsx
index 6fe4423b17..74d15d41f2 100644
--- a/web/ee/components/initiatives/details/root.tsx
+++ b/web/ee/components/initiatives/details/root.tsx
@@ -121,9 +121,7 @@ export const InitiativeDetailRoot = observer((props: Props) => {
       <WorkspaceEpicsListModal
         workspaceSlug={workspaceSlug}
         isOpen={isEpicModalOpen}
-        searchParams={{
-          initiative_id: initiativeId,
-        }}
+        searchParams={{}}
         selectedEpicIds={getInitiativeEpicsById(initiativeId) ?? []}
         handleClose={() => setIsEpicModalOpen(false)}
         handleOnSubmit={async (data) => {