Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

fix: active cycle filter (#5217)

Akshita Goyal58f203dd38b6
diff --git a/web/core/components/cycles/active-cycle/productivity.tsx b/web/core/components/cycles/active-cycle/productivity.tsx
index 0e44e66f8b..4a514f0714 100644
--- a/web/core/components/cycles/active-cycle/productivity.tsx
+++ b/web/core/components/cycles/active-cycle/productivity.tsx
@@ -56,8 +56,8 @@ export const ActiveCycleProductivity: FC<ActiveCycleProductivityProps> = observe
const completionChartDistributionData = chartDistributionData?.completion_chart || undefined;
return cycle ? (
- <div className="flex flex-col justify-center min-h-[17rem] gap-5 px-3.5 py-4 bg-custom-background-100 border border-custom-border-200 rounded-lg">
- <div className="relative flex items-center justify-between gap-4 -mt-7">
+ <div className="flex flex-col min-h-[17rem] gap-5 px-3.5 py-4 bg-custom-background-100 border border-custom-border-200 rounded-lg">
+ <div className="relative flex items-center justify-between gap-4">
<Link href={`/${workspaceSlug}/projects/${projectId}/cycles/${cycle?.id}`}>
<h3 className="text-base text-custom-text-300 font-semibold">Issue burndown</h3>
</Link>
diff --git a/web/core/store/cycle.store.ts b/web/core/store/cycle.store.ts
index e47bac6ef0..c48171e1ea 100644
--- a/web/core/store/cycle.store.ts
+++ b/web/core/store/cycle.store.ts
@@ -213,7 +213,9 @@ export class CycleStore implements ICycleStore {
const projectId = this.rootStore.router.projectId;
if (!projectId) return null;
const activeCycle = Object.keys(this.cycleMap ?? {}).find(
- (cycleId) => this.cycleMap?.[cycleId]?.project_id === projectId
+ (cycleId) =>
+ this.cycleMap?.[cycleId]?.project_id === projectId &&
+ this.cycleMap?.[cycleId]?.status?.toLowerCase() === "current"
);
return activeCycle || null;
}