π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-1715] chore: issue filters indicator enhancement (#5027)
Anmol Singh Bhatiaaf51992eba84
diff --git a/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsxindex 2855cc129a..f29e6ff284 100644--- a/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx+++ b/web/app/[workspaceSlug]/(projects)/profile/[userId]/mobile-header.tsx@@ -20,7 +20,7 @@ import {ISSUE_LAYOUTS,} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel } from "@/hooks/store";@@ -108,8 +108,6 @@ export const ProfileIssuesMobileHeader = observer(() => {[workspaceSlug, updateFilters, userId]);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="flex justify-evenly border-b border-custom-border-200 py-2 md:hidden"><CustomMenu@@ -146,7 +144,7 @@ export const ProfileIssuesMobileHeader = observer(() => {<ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" /></span>}- isFiltersApplied={isFiltersApplied}+ isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionlayoutDisplayFiltersOptions={diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsxindex c12e4b07ac..2b7f541fb9 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/header.tsx@@ -24,7 +24,7 @@ import {import { EUserProjectRoles } from "@/constants/project";// helpersimport { cn } from "@/helpers/common.helper";-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";import { truncateText } from "@/helpers/string.helper";// hooksimport {@@ -152,7 +152,6 @@ export const CycleIssuesHeader: React.FC = observer(() => {const canUserCreateIssue =currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;const issuesCount = getGroupIssueCount(undefined, undefined, false);return (@@ -248,7 +247,11 @@ export const CycleIssuesHeader: React.FC = observer(() => {onChange={(layout) => handleLayoutChange(layout)}selectedLayout={activeLayout}/>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown+ title="Filters"+ placement="bottom-end"+ isFiltersApplied={isIssueFilterActive(issueFilters)}+ ><FilterSelectionfilters={issueFilters?.filters ?? {}}handleFiltersUpdate={handleFiltersUpdate}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsxindex 3735fd5311..27e33e2c2c 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/cycles/(detail)/mobile-header.tsx@@ -12,9 +12,15 @@ import { CustomMenu } from "@plane/ui";import { ProjectAnalyticsModal } from "@/components/analytics";import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";// constants-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";+import {+ EIssueFilterType,+ EIssueLayoutTypes,+ EIssuesStoreType,+ ISSUE_DISPLAY_FILTERS_BY_LAYOUT,+ ISSUE_LAYOUTS,+} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useCycle, useProjectState, useLabel, useMember, useProject } from "@/hooks/store";@@ -109,8 +115,6 @@ export const CycleIssuesMobileHeader = () => {[workspaceSlug, projectId, cycleId, updateFilters]);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<><ProjectAnalyticsModal@@ -150,7 +154,7 @@ export const CycleIssuesMobileHeader = () => {<ChevronDown className="text-custom-text-200 h-4 w-4 ml-2" /></span>}- isFiltersApplied={isFiltersApplied}+ isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsxindex 1cede3ee38..49816bad74 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/header.tsx@@ -18,7 +18,7 @@ import {ISSUE_DISPLAY_FILTERS_BY_LAYOUT,} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";import { usePlatformOS } from "@/hooks/use-platform-os";@@ -90,8 +90,6 @@ export const ProjectDraftIssueHeader: FC = observer(() => {: currentProjectDetails.draft_issues: undefined;- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="relative z-10 flex h-[3.75rem] w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4"><div className="flex w-full flex-grow items-center gap-2 overflow-ellipsis whitespace-nowrap">@@ -140,7 +138,7 @@ export const ProjectDraftIssueHeader: FC = observer(() => {onChange={(layout) => handleLayoutChange(layout)}selectedLayout={activeLayout}/>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}handleFiltersUpdate={handleFiltersUpdate}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsxindex b4d7d4bcd3..9fccc44883 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/header.tsx@@ -23,7 +23,7 @@ import {import { EUserProjectRoles } from "@/constants/project";// helpersimport { SPACE_BASE_PATH, SPACE_BASE_URL } from "@/helpers/common.helper";-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport {useEventTracker,@@ -113,7 +113,6 @@ export const ProjectIssuesHeader = observer(() => {const canUserCreateIssue =currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;const issuesCount = getGroupIssueCount(undefined, undefined, false);return (@@ -193,7 +192,7 @@ export const ProjectIssuesHeader = observer(() => {onChange={(layout) => handleLayoutChange(layout)}selectedLayout={activeLayout}/>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}handleFiltersUpdate={handleFiltersUpdate}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsxindex 444e33a61d..5d6adcfbe9 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(list)/mobile-header.tsx@@ -13,9 +13,15 @@ import { CustomMenu } from "@plane/ui";import { ProjectAnalyticsModal } from "@/components/analytics";import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues/issue-layouts";// constants-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";+import {+ EIssueFilterType,+ EIssueLayoutTypes,+ EIssuesStoreType,+ ISSUE_DISPLAY_FILTERS_BY_LAYOUT,+ ISSUE_LAYOUTS,+} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";@@ -88,8 +94,6 @@ export const ProjectIssuesMobileHeader = observer(() => {[workspaceSlug, projectId, updateFilters]);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<><ProjectAnalyticsModal@@ -129,7 +133,7 @@ export const ProjectIssuesMobileHeader = observer(() => {<ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" /></span>}- isFiltersApplied={isFiltersApplied}+ isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsxindex 16372e19cf..8afde92ef4 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/header.tsx@@ -24,7 +24,7 @@ import {import { EUserProjectRoles } from "@/constants/project";// helpersimport { cn } from "@/helpers/common.helper";-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";import { truncateText } from "@/helpers/string.helper";// hooksimport {@@ -152,7 +152,6 @@ export const ModuleIssuesHeader: React.FC = observer(() => {const canUserCreateIssue =currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;const issuesCount = getGroupIssueCount(undefined, undefined, false);return (@@ -249,7 +248,11 @@ export const ModuleIssuesHeader: React.FC = observer(() => {onChange={(layout) => handleLayoutChange(layout)}selectedLayout={activeLayout}/>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown+ title="Filters"+ placement="bottom-end"+ isFiltersApplied={isIssueFilterActive(issueFilters)}+ ><FilterSelectionfilters={issueFilters?.filters ?? {}}handleFiltersUpdate={handleFiltersUpdate}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsxindex af34457c7f..f67df642c7 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/modules/(detail)/mobile-header.tsx@@ -13,9 +13,15 @@ import { CustomMenu } from "@plane/ui";import { ProjectAnalyticsModal } from "@/components/analytics";import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/components/issues";// constants-import { EIssueFilterType, EIssueLayoutTypes, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, ISSUE_LAYOUTS } from "@/constants/issue";+import {+ EIssueFilterType,+ EIssueLayoutTypes,+ EIssuesStoreType,+ ISSUE_DISPLAY_FILTERS_BY_LAYOUT,+ ISSUE_LAYOUTS,+} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel, useMember, useModule, useProject, useProjectState } from "@/hooks/store";@@ -90,8 +96,6 @@ export const ModuleIssuesMobileHeader = observer(() => {[workspaceSlug, projectId, moduleId, updateFilters]);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="block md:hidden"><ProjectAnalyticsModal@@ -131,7 +135,7 @@ export const ModuleIssuesMobileHeader = observer(() => {<ChevronDown className="ml-2 h-4 w-4 text-custom-text-200" /></span>}- isFiltersApplied={isFiltersApplied}+ isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsxindex 7629812fd8..7647633bcf 100644--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/views/(detail)/[viewId]/header.tsx@@ -22,7 +22,7 @@ import {import { EUserProjectRoles } from "@/constants/project";import { EViewAccess } from "@/constants/views";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";import { truncateText } from "@/helpers/string.helper";// hooksimport {@@ -133,8 +133,6 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {const canUserCreateIssue =currentProjectRole && [EUserProjectRoles.ADMIN, EUserProjectRoles.MEMBER].includes(currentProjectRole);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="relative z-[15] flex h-[3.75rem] w-full items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 p-4"><div className="flex items-center gap-2">@@ -233,7 +231,7 @@ export const ProjectViewIssuesHeader: React.FC = observer(() => {title="Filters"placement="bottom-end"disabled={!canUserCreateIssue}- isFiltersApplied={isFiltersApplied}+ isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters ?? {}}diff --git a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsxindex 1d3e95f94c..72e9ed43e9 100644--- a/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx+++ b/web/app/[workspaceSlug]/(projects)/workspace-views/header.tsx@@ -15,7 +15,7 @@ import { CreateUpdateWorkspaceViewModal } from "@/components/workspace";import { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";import { EUserWorkspaceRoles } from "@/constants/workspace";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useLabel, useMember, useUser, useIssues, useGlobalView } from "@/hooks/store";@@ -98,7 +98,6 @@ export const GlobalIssuesHeader = observer(() => {const isAuthorizedUser = !!currentWorkspaceRole && currentWorkspaceRole >= EUserWorkspaceRoles.MEMBER;- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;const isLocked = viewDetails?.is_locked;return (@@ -118,7 +117,11 @@ export const GlobalIssuesHeader = observer(() => {<div className="flex items-center gap-2">{!isLocked && (<>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown+ title="Filters"+ placement="bottom-end"+ isFiltersApplied={isIssueFilterActive(issueFilters)}+ ><FilterSelectionlayoutDisplayFiltersOptions={ISSUE_DISPLAY_FILTERS_BY_LAYOUT.my_issues.spreadsheet}filters={issueFilters?.filters ?? {}}diff --git a/web/core/components/issues/archived-issues-header.tsx b/web/core/components/issues/archived-issues-header.tsxindex 80daadfee4..3926f08720 100644--- a/web/core/components/issues/archived-issues-header.tsx+++ b/web/core/components/issues/archived-issues-header.tsx@@ -9,7 +9,7 @@ import { DisplayFiltersSelection, FilterSelection, FiltersDropdown } from "@/com// constantsimport { EIssueFilterType, EIssuesStoreType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT } from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel, useMember, useProject, useProjectState } from "@/hooks/store";@@ -63,8 +63,6 @@ export const ArchivedIssuesHeader: FC = observer(() => {updateFilters(workspaceSlug.toString(), projectId.toString(), EIssueFilterType.DISPLAY_PROPERTIES, property);};- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="group relative flex border-b border-custom-border-200"><div className="flex w-full items-center overflow-x-auto px-4 gap-2 horizontal-scrollbar scrollbar-sm">@@ -72,7 +70,7 @@ export const ArchivedIssuesHeader: FC = observer(() => {</div>{/* filter options */}<div className="flex items-center gap-2 px-8">- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionfilters={issueFilters?.filters || {}}handleFiltersUpdate={handleFiltersUpdate}diff --git a/web/core/components/profile/profile-issues-filter.tsx b/web/core/components/profile/profile-issues-filter.tsxindex cbacf33c63..aaaa153613 100644--- a/web/core/components/profile/profile-issues-filter.tsx+++ b/web/core/components/profile/profile-issues-filter.tsx@@ -6,9 +6,14 @@ import { IIssueDisplayFilterOptions, IIssueDisplayProperties, IIssueFilterOption// componentsimport { DisplayFiltersSelection, FilterSelection, FiltersDropdown, LayoutSelection } from "@/components/issues";// constants-import { EIssuesStoreType, EIssueFilterType, ISSUE_DISPLAY_FILTERS_BY_LAYOUT, EIssueLayoutTypes } from "@/constants/issue";+import {+ EIssuesStoreType,+ EIssueFilterType,+ ISSUE_DISPLAY_FILTERS_BY_LAYOUT,+ EIssueLayoutTypes,+} from "@/constants/issue";// helpers-import { calculateTotalFilters } from "@/helpers/filter.helper";+import { isIssueFilterActive } from "@/helpers/filter.helper";// hooksimport { useIssues, useLabel } from "@/hooks/store";@@ -95,8 +100,6 @@ export const ProfileIssuesFilter = observer(() => {[workspaceSlug, updateFilters, userId]);- const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0;-return (<div className="relative flex items-center justify-end gap-2"><LayoutSelection@@ -105,7 +108,7 @@ export const ProfileIssuesFilter = observer(() => {selectedLayout={activeLayout}/>- <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isFiltersApplied}>+ <FiltersDropdown title="Filters" placement="bottom-end" isFiltersApplied={isIssueFilterActive(issueFilters)}><FilterSelectionlayoutDisplayFiltersOptions={activeLayout ? ISSUE_DISPLAY_FILTERS_BY_LAYOUT.profile_issues[activeLayout] : undefineddiff --git a/web/helpers/filter.helper.ts b/web/helpers/filter.helper.tsindex 42c140ce3b..85aade101b 100644--- a/web/helpers/filter.helper.ts+++ b/web/helpers/filter.helper.ts@@ -1,5 +1,6 @@import differenceInCalendarDays from "date-fns/differenceInCalendarDays";// helpers+import { IIssueFilters } from "@plane/types";import { getDate } from "./date-time.helper";// import { IIssueFilterOptions } from "@plane/types";@@ -61,3 +62,17 @@ export const satisfiesDateFilter = (date: Date, filter: string): boolean => {return false;};++/**+ * @description checks if the issue filter is active+ * @param {IIssueFilters} issueFilters+ * @returns {boolean}+ */+export const isIssueFilterActive = (issueFilters: IIssueFilters | undefined): boolean => {+ if (!issueFilters) return false;++ const issueType = issueFilters?.displayFilters?.type;+ const isFiltersApplied = calculateTotalFilters(issueFilters?.filters ?? {}) !== 0 || !!issueType;++ return isFiltersApplied;+};