From 4bb99d5fbfe87653225af7b55a1e027fa6c539a0 Mon Sep 17 00:00:00 2001
From: Lakhan Baheti <94619783+1akhanBaheti@users.noreply.github.com>
Date: Wed, 13 Dec 2023 23:06:38 +0530
Subject: [PATCH] fix: cycle delete & active cycle loading (#3088)

---
 .../cycles/active-cycle-details.tsx           | 28 +++++++++----------
 web/store/cycle/cycles.store.ts               | 13 +++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/web/components/cycles/active-cycle-details.tsx b/web/components/cycles/active-cycle-details.tsx
index 64ed76132..ea982099f 100644
--- a/web/components/cycles/active-cycle-details.tsx
+++ b/web/components/cycles/active-cycle-details.tsx
@@ -75,7 +75,7 @@ export const ActiveCycleDetails: React.FC<IActiveCycleDetails> = observer((props
 
   const { setToastAlert } = useToast();
 
-  useSWR(
+  const { isLoading } = useSWR(
     workspaceSlug && projectId ? `ACTIVE_CYCLE_ISSUE_${projectId}_CURRENT` : null,
     workspaceSlug && projectId ? () => cycleStore.fetchCycles(workspaceSlug, projectId, "current") : null
   );
@@ -94,7 +94,7 @@ export const ActiveCycleDetails: React.FC<IActiveCycleDetails> = observer((props
   //     : null
   // ) as { data: IIssue[] | undefined };
 
-  if (!cycle)
+  if (!cycle && isLoading)
     return (
       <Loader>
         <Loader.Item height="250px" />
@@ -187,12 +187,12 @@ export const ActiveCycleDetails: React.FC<IActiveCycleDetails> = observer((props
                         cycleStatus === "current"
                           ? "#09A953"
                           : cycleStatus === "upcoming"
-                            ? "#F7AE59"
-                            : cycleStatus === "completed"
-                              ? "#3F76FF"
-                              : cycleStatus === "draft"
-                                ? "rgb(var(--color-text-200))"
-                                : ""
+                          ? "#F7AE59"
+                          : cycleStatus === "completed"
+                          ? "#3F76FF"
+                          : cycleStatus === "draft"
+                          ? "rgb(var(--color-text-200))"
+                          : ""
                       }`}
                     />
                   </span>
@@ -207,12 +207,12 @@ export const ActiveCycleDetails: React.FC<IActiveCycleDetails> = observer((props
                       cycleStatus === "current"
                         ? "bg-green-600/5 text-green-600"
                         : cycleStatus === "upcoming"
-                          ? "bg-orange-300/5 text-orange-300"
-                          : cycleStatus === "completed"
-                            ? "bg-blue-500/5 text-blue-500"
-                            : cycleStatus === "draft"
-                              ? "bg-neutral-400/5 text-neutral-400"
-                              : ""
+                        ? "bg-orange-300/5 text-orange-300"
+                        : cycleStatus === "completed"
+                        ? "bg-blue-500/5 text-blue-500"
+                        : cycleStatus === "draft"
+                        ? "bg-neutral-400/5 text-neutral-400"
+                        : ""
                     }`}
                   >
                     {cycleStatus === "current" ? (
diff --git a/web/store/cycle/cycles.store.ts b/web/store/cycle/cycles.store.ts
index 8e233c8f8..96122ec14 100644
--- a/web/store/cycle/cycles.store.ts
+++ b/web/store/cycle/cycles.store.ts
@@ -295,6 +295,19 @@ export class CycleStore implements ICycleStore {
       const _response = await this.cycleService.deleteCycle(workspaceSlug, projectId, cycleId);
 
       const _currentView = this.cycleView === "active" ? "current" : this.cycleView;
+
+      runInAction(() => {
+        ["all", "current", "completed", "upcoming", "draft"].forEach((view) => {
+          this.cycles = {
+            ...this.cycles,
+            [projectId]: {
+              ...this.cycles[projectId],
+              [view]: this.cycles[projectId][view]?.filter((c) => c.id !== cycleId),
+            },
+          };
+        });
+      });
+
       this.fetchCycles(workspaceSlug, projectId, _currentView);
 
       return _response;