Skip to content

[WEB-2029] fix: active cycle filter #5217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SatishGandham merged 1 commit into from
Jul 24, 2024
Merged

[WEB-2029] fix: active cycle filter #5217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/core/components/cycles/active-cycle/productivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion web/core/store/cycle.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down