From 237d067e195c27c44037625c533c03f83d323214 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Mon, 23 Sep 2024 18:08:13 +0530 Subject: [PATCH 1/2] fix: activity filters --- web/ce/components/issues/worklog/activity/filter-root.tsx | 1 + .../components/issues/issue-detail/issue-activity/root.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/ce/components/issues/worklog/activity/filter-root.tsx b/web/ce/components/issues/worklog/activity/filter-root.tsx index 59492c36ab4..747d03746c8 100644 --- a/web/ce/components/issues/worklog/activity/filter-root.tsx +++ b/web/ce/components/issues/worklog/activity/filter-root.tsx @@ -10,6 +10,7 @@ export type TActivityFilterRoot = { selectedFilters: TActivityFilters[]; toggleFilter: (filter: TActivityFilters) => void; isIntakeIssue?: boolean; + projectId?: string; }; export const ActivityFilterRoot: FC = (props) => { diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx index 819b8a844b2..8bb15b9731b 100644 --- a/web/core/components/issues/issue-detail/issue-activity/root.tsx +++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx @@ -123,7 +123,12 @@ export const IssueActivity: FC = observer((props) => { disabled={disabled} /> )} - + From 3b8089d02bac65a935bd0e5e04e81e4cec5b3fb8 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia Date: Tue, 24 Sep 2024 15:38:07 +0530 Subject: [PATCH 2/2] chore: code refactor --- web/ce/components/issues/worklog/activity/filter-root.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ce/components/issues/worklog/activity/filter-root.tsx b/web/ce/components/issues/worklog/activity/filter-root.tsx index 747d03746c8..2d11ae34148 100644 --- a/web/ce/components/issues/worklog/activity/filter-root.tsx +++ b/web/ce/components/issues/worklog/activity/filter-root.tsx @@ -9,8 +9,8 @@ import { TActivityFilters, ACTIVITY_FILTER_TYPE_OPTIONS, TActivityFilterOption } export type TActivityFilterRoot = { selectedFilters: TActivityFilters[]; toggleFilter: (filter: TActivityFilters) => void; + projectId: string; isIntakeIssue?: boolean; - projectId?: string; }; export const ActivityFilterRoot: FC = (props) => {