From 59f870ee3dfac51c514f9ca0c78502c4ece7be7f Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 24 Sep 2024 16:19:30 +0530 Subject: [PATCH] fix: activity root filters (#1242) --- web/ce/components/issues/worklog/activity/filter-root.tsx | 1 + web/ee/components/issues/worklog/activity/filter-root.tsx | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/ce/components/issues/worklog/activity/filter-root.tsx b/web/ce/components/issues/worklog/activity/filter-root.tsx index 59492c36ab..747d03746c 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/ee/components/issues/worklog/activity/filter-root.tsx b/web/ee/components/issues/worklog/activity/filter-root.tsx index d81cb8eb88..1f0ed89294 100644 --- a/web/ee/components/issues/worklog/activity/filter-root.tsx +++ b/web/ee/components/issues/worklog/activity/filter-root.tsx @@ -7,7 +7,7 @@ import { TActivityFilterRoot } from "@/ce/components/issues"; // components import { ActivityFilter } from "@/components/issues"; // hooks -import { useProject, useWorkspace } from "@/hooks/store"; +import { useWorkspace } from "@/hooks/store"; // plane web constants import { TActivityFilters, @@ -19,20 +19,18 @@ import { import { useWorkspaceWorklogs } from "@/plane-web/hooks/store"; export const ActivityFilterRoot: FC = observer((props) => { - const { selectedFilters, toggleFilter , isIntakeIssue = false} = props; + const { selectedFilters, toggleFilter, isIntakeIssue = false, projectId } = props; // hooks const { currentWorkspace } = useWorkspace(); - const { currentProjectDetails } = useProject(); const { isWorklogsEnabledByProjectId } = useWorkspaceWorklogs(); // derived values const workspaceId = currentWorkspace?.id || undefined; - const projectId = currentProjectDetails?.id || undefined; const isFeatureFlagged = (projectId && isWorklogsEnabledByProjectId(projectId)) || false; const filterOptions = { ...ACTIVITY_FILTER_TYPE_OPTIONS }; if (!workspaceId || !projectId) return <>; - if((!isFeatureFlagged || isIntakeIssue) && filterOptions?.[EActivityFilterTypeEE.WORKLOG]){ + if ((!isFeatureFlagged || isIntakeIssue) && filterOptions?.[EActivityFilterTypeEE.WORKLOG]) { delete filterOptions?.[EActivityFilterTypeEE.WORKLOG as keyof typeof filterOptions]; }