Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-13 05:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: activity root filters (#1242)

Browse Source
This commit is contained in:
Anmol Singh Bhatia
2024-09-24 16:19:30 +05:30
committed by GitHub
parent 8715e7ebfe
commit 59f870ee3d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/ce/components/issues/worklog/activity/filter-root.tsx
View File

@@ -10,6 +10,7 @@ export type TActivityFilterRoot = {
selectedFilters: TActivityFilters[];
toggleFilter: (filter: TActivityFilters) => void;
isIntakeIssue?: boolean;
projectId?: string;
};
export const ActivityFilterRoot: FC<TActivityFilterRoot> = (props) => {

8
web/ee/components/issues/worklog/activity/filter-root.tsx
View File

@@ -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<TActivityFilterRoot> = 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];
}