diff --git a/apps/web/core/components/cycles/applied-filters/root.tsx b/apps/web/core/components/cycles/applied-filters/root.tsx index 5f1ef09744..5d340c8dc5 100644 --- a/apps/web/core/components/cycles/applied-filters/root.tsx +++ b/apps/web/core/components/cycles/applied-filters/root.tsx @@ -8,9 +8,9 @@ import { observer } from "mobx-react"; // plane imports import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; import type { TCycleFilters } from "@plane/types"; -import { Tag } from "@plane/ui"; import { replaceUnderscoreIfSnakeCase } from "@plane/utils"; // hooks import { useUserPermissions } from "@/hooks/store/user"; @@ -50,7 +50,10 @@ export const CycleAppliedFiltersList = observer(function CycleAppliedFiltersList if (Array.isArray(value) && value.length === 0) return; return ( - +
{replaceUnderscoreIfSnakeCase(filterKey)}
{filterKey === "status" && ( @@ -77,16 +80,18 @@ export const CycleAppliedFiltersList = observer(function CycleAppliedFiltersList )}
- +
); })} {isEditingAllowed && ( - + } + onClick={handleClearAllFilters} + /> )} ); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/date.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/date.tsx index 53cf70989b..47269b4416 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/date.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/date.tsx @@ -8,11 +8,7 @@ import { observer } from "mobx-react"; import { PAST_DURATION_FILTER_OPTIONS } from "@plane/constants"; import { CloseIcon } from "@plane/propel/icons"; import type { TInboxIssueFilterDateKeys } from "@plane/types"; -// helpers -import { Tag } from "@plane/ui"; import { renderFormattedDate } from "@plane/utils"; -// constants -// hooks import { useProjectInbox } from "@/hooks/store/use-project-inbox"; type InboxIssueAppliedFiltersDate = { @@ -45,7 +41,7 @@ export const InboxIssueAppliedFiltersDate = observer(function InboxIssueAppliedF if (filteredValues.length === 0) return <>; return ( - +
{label}
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -69,6 +65,6 @@ export const InboxIssueAppliedFiltersDate = observer(function InboxIssueAppliedF >
-
+ ); }); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/label.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/label.tsx index 1fd33cbe80..ef7d4511da 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/label.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/label.tsx @@ -7,7 +7,6 @@ import { observer } from "mobx-react"; // hooks import { CloseIcon } from "@plane/propel/icons"; -import { Tag } from "@plane/ui"; import { useLabel } from "@/hooks/store/use-label"; import { useProjectInbox } from "@/hooks/store/use-project-inbox"; @@ -30,7 +29,7 @@ export const InboxIssueAppliedFiltersLabel = observer(function InboxIssueApplied if (filteredValues.length === 0) return <>; return ( - +
Label
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -57,6 +56,6 @@ export const InboxIssueAppliedFiltersLabel = observer(function InboxIssueApplied >
-
+ ); }); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/member.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/member.tsx index 4148f4af3f..4542fd123f 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/member.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/member.tsx @@ -10,7 +10,7 @@ import { observer } from "mobx-react"; import { CloseIcon } from "@plane/propel/icons"; import type { TInboxIssueFilterMemberKeys } from "@plane/types"; // plane ui -import { Avatar, Tag } from "@plane/ui"; +import { Avatar } from "@plane/ui"; // helpers import { getFileURL } from "@plane/utils"; // hooks @@ -40,7 +40,7 @@ export const InboxIssueAppliedFiltersMember = observer(function InboxIssueApplie if (filteredValues.length === 0) return <>; return ( - +
{label}
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -72,6 +72,6 @@ export const InboxIssueAppliedFiltersMember = observer(function InboxIssueApplie >
-
+ ); }); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx index 38a12602a0..f100bccfb4 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/priority.tsx @@ -9,7 +9,6 @@ import { ISSUE_PRIORITIES } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; import { PriorityIcon, CloseIcon } from "@plane/propel/icons"; import type { TIssuePriorities } from "@plane/types"; -import { Tag } from "@plane/ui"; // hooks import { useProjectInbox } from "@/hooks/store/use-project-inbox"; @@ -29,7 +28,7 @@ export const InboxIssueAppliedFiltersPriority = observer(function InboxIssueAppl if (filteredValues.length === 0) return <>; return ( - +
{t("common.priority")}
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -56,6 +55,6 @@ export const InboxIssueAppliedFiltersPriority = observer(function InboxIssueAppl >
-
+ ); }); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx index f8b94c9bcf..746e4e0841 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/state.tsx @@ -7,7 +7,6 @@ import { observer } from "mobx-react"; import { EIconSize } from "@plane/constants"; import { StateGroupIcon, CloseIcon } from "@plane/propel/icons"; -import { Tag } from "@plane/ui"; // hooks import { useProjectInbox } from "@/hooks/store/use-project-inbox"; import { useProjectState } from "@/hooks/store/use-project-state"; @@ -27,7 +26,7 @@ export const InboxIssueAppliedFiltersState = observer(function InboxIssueApplied if (filteredValues.length === 0) return <>; return ( - +
State
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -54,6 +53,6 @@ export const InboxIssueAppliedFiltersState = observer(function InboxIssueApplied >
-
+ ); }); diff --git a/apps/web/core/components/inbox/inbox-filter/applied-filters/status.tsx b/apps/web/core/components/inbox/inbox-filter/applied-filters/status.tsx index ccc7c31ae7..b0161b7bfa 100644 --- a/apps/web/core/components/inbox/inbox-filter/applied-filters/status.tsx +++ b/apps/web/core/components/inbox/inbox-filter/applied-filters/status.tsx @@ -9,9 +9,6 @@ import { INBOX_STATUS } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; import { CloseIcon } from "@plane/propel/icons"; import type { TInboxIssueStatus } from "@plane/types"; -// constants -import { Tag } from "@plane/ui"; -// hooks import { useProjectInbox } from "@/hooks/store/use-project-inbox"; import { InboxStatusIcon } from "../../inbox-status-icon"; @@ -28,7 +25,7 @@ export const InboxIssueAppliedFiltersStatus = observer(function InboxIssueApplie if (filteredValues.length === 0) return <>; return ( - +
Status
{filteredValues.map((value) => { const optionDetail = currentOptionDetail(value); @@ -50,6 +47,6 @@ export const InboxIssueAppliedFiltersStatus = observer(function InboxIssueApplie
); })} -
+ ); }); diff --git a/apps/web/core/components/modules/applied-filters/root.tsx b/apps/web/core/components/modules/applied-filters/root.tsx index 510e5afe6a..5852f4b6ec 100644 --- a/apps/web/core/components/modules/applied-filters/root.tsx +++ b/apps/web/core/components/modules/applied-filters/root.tsx @@ -5,10 +5,11 @@ */ import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; import type { TModuleDisplayFilters, TModuleFilters } from "@plane/types"; // components -import { Header, EHeaderVariant, Tag } from "@plane/ui"; +import { Header, EHeaderVariant } from "@plane/ui"; import { replaceUnderscoreIfSnakeCase } from "@plane/utils"; import { AppliedDateFilters, AppliedMembersFilters, AppliedStatusFilters } from "@/components/modules"; // helpers @@ -54,7 +55,10 @@ export function ModuleAppliedFiltersList(props: Props) { if (Array.isArray(value) && value.length === 0) return; return ( - +
{replaceUnderscoreIfSnakeCase(filterKey)} {filterKey === "status" && ( @@ -88,7 +92,7 @@ export function ModuleAppliedFiltersList(props: Props) { )}
- +
); })} {!isArchived && isFavoriteFilterApplied && ( @@ -119,12 +123,14 @@ export function ModuleAppliedFiltersList(props: Props) { )} {isEditingAllowed && ( - + } + onClick={handleClearAllFilters} + /> )} diff --git a/apps/web/core/components/pages/list/applied-filters/root.tsx b/apps/web/core/components/pages/list/applied-filters/root.tsx index 3329de2b3c..cacadc7693 100644 --- a/apps/web/core/components/pages/list/applied-filters/root.tsx +++ b/apps/web/core/components/pages/list/applied-filters/root.tsx @@ -5,10 +5,10 @@ */ import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; // plane imports import type { TPageFilterProps } from "@plane/types"; -import { Tag } from "@plane/ui"; import { replaceUnderscoreIfSnakeCase } from "@plane/utils"; // components import { AppliedDateFilters } from "@/components/common/applied-filters/date"; @@ -42,7 +42,10 @@ export function PageAppliedFiltersList(props: Props) { if (Array.isArray(value) && value.length === 0) return; return ( - +
{replaceUnderscoreIfSnakeCase(filterKey)} {DATE_FILTERS.includes(filterKey) && ( @@ -69,16 +72,18 @@ export function PageAppliedFiltersList(props: Props) { )}
- +
); })} {isEditingAllowed && ( - + } + onClick={handleClearAllFilters} + /> )} ); diff --git a/apps/web/core/components/project/applied-filters/root.tsx b/apps/web/core/components/project/applied-filters/root.tsx index ba0ade6a42..cc1afd2208 100644 --- a/apps/web/core/components/project/applied-filters/root.tsx +++ b/apps/web/core/components/project/applied-filters/root.tsx @@ -5,11 +5,12 @@ */ import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; // plane imports import { Tooltip } from "@plane/propel/tooltip"; import type { TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types"; -import { EHeaderVariant, Header, Tag } from "@plane/ui"; +import { EHeaderVariant, Header } from "@plane/ui"; import { replaceUnderscoreIfSnakeCase } from "@plane/utils"; // local imports import { AppliedAccessFilters } from "./access"; @@ -60,7 +61,10 @@ export function ProjectAppliedFiltersList(props: Props) { if (Array.isArray(value) && value.length === 0) return; return ( - +
{replaceUnderscoreIfSnakeCase(filterKey)} {filterKey === "access" && ( )} - +
); })} {/* Applied display filters */} {appliedDisplayFilters.length > 0 && ( - +
{t("common.projects")} handleRemoveDisplayFilter(key)} /> - +
)} {isEditingAllowed && ( - + } + onClick={handleClearAllFilters} + /> )} diff --git a/apps/web/core/components/views/applied-filters/root.tsx b/apps/web/core/components/views/applied-filters/root.tsx index 7f59b090a3..0999e373d5 100644 --- a/apps/web/core/components/views/applied-filters/root.tsx +++ b/apps/web/core/components/views/applied-filters/root.tsx @@ -5,10 +5,10 @@ */ import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; // plane imports import type { EViewAccess, TViewFilterProps } from "@plane/types"; -import { Tag } from "@plane/ui"; import { replaceUnderscoreIfSnakeCase } from "@plane/utils"; // components import { AppliedDateFilters } from "@/components/common/applied-filters/date"; @@ -45,7 +45,10 @@ export function ViewAppliedFiltersList(props: Props) { if (Array.isArray(value) && value.length === 0) return; return ( - +
{replaceUnderscoreIfSnakeCase(filterKey)} {VIEW_ACCESS_FILTERS.includes(filterKey) && ( )} - +
); })} {isEditingAllowed && ( - + } + onClick={handleClearAllFilters} + /> )} ); diff --git a/apps/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx b/apps/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx index c78bae48ee..bd47d333d1 100644 --- a/apps/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx +++ b/apps/web/core/components/workspace-notifications/sidebar/filters/applied-filter.tsx @@ -8,8 +8,9 @@ import { observer } from "mobx-react"; // plane imports import { ENotificationFilterType, FILTER_TYPE_OPTIONS } from "@plane/constants"; import { useTranslation } from "@plane/i18n"; +import { PillButton } from "@makeplane/propel/components/pill"; import { CloseIcon } from "@plane/propel/icons"; -import { Header, EHeaderVariant, Tag } from "@plane/ui"; +import { Header, EHeaderVariant } from "@plane/ui"; // hooks import { useWorkspaceNotifications } from "@/hooks/store/notifications"; @@ -47,24 +48,25 @@ export const AppliedFilters = observer(function AppliedFilters(props: TAppliedFi const isSelected = filters?.type?.[filter?.value] || false; if (!isSelected) return <>; return ( - } onClick={() => handleFilterTypeChange(filter?.value, !isSelected)} - > -
{t(filter.i18n_label)}
-
- -
-
+ /> ); })} - + } + onClick={handleClearFilters} + /> );