From 965b9ac09ecfcfb6f6cce52111af547d06664175 Mon Sep 17 00:00:00 2001 From: sharma01ketan Date: Fri, 30 Aug 2024 13:30:46 +0530 Subject: [PATCH] Improved Code Logic --- web/core/components/project/root.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/core/components/project/root.tsx b/web/core/components/project/root.tsx index 31c7276500c..dd7db2199c9 100644 --- a/web/core/components/project/root.tsx +++ b/web/core/components/project/root.tsx @@ -30,6 +30,10 @@ const Root = observer(() => { // derived values const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Projects` : undefined; + const allowedDisplayFilters = currentWorkspaceAppliedDisplayFilters?.filter( + (filter) => filter !== "archived_projects" + ) ?? []; + const handleRemoveFilter = useCallback( (key: keyof TProjectFilters, value: string | null) => { if (!workspaceSlug) return; @@ -64,18 +68,17 @@ const Root = observer(() => { updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false }); } }, [pathname]); + return ( <>
{(calculateTotalFilters(currentWorkspaceFilters ?? {}) !== 0 || - (currentWorkspaceAppliedDisplayFilters?.length !== 0 && - !(currentWorkspaceAppliedDisplayFilters?.length==1 && - !(currentWorkspaceAppliedDisplayFilters?.indexOf("archived_projects")===-1)))) && ( + (allowedDisplayFilters.length>0)) && (
filter !== "archived_projects") ?? []} + appliedDisplayFilters={allowedDisplayFilters} handleClearAllFilters={handleClearAllFilters} handleRemoveFilter={handleRemoveFilter} handleRemoveDisplayFilter={handleRemoveDisplayFilter}