Skip to content

[WEB-2462] [WEB-2461] fix: project intake filters #5645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SatishGandham merged 3 commits into from
Sep 18, 2024
Merged

[WEB-2462] [WEB-2461] fix: project intake filters #5645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cb1731
chore: intake order by options updated
anmolsinghbhatia Sep 18, 2024
c5334b0
fix: intake filters icon and spacing
anmolsinghbhatia Sep 18, 2024
ac6a07b
chore: code refactor
anmolsinghbhatia Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions web/core/components/inbox/inbox-filter/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,30 @@ import { cn } from "@plane/editor";
import { getButtonStyling } from "@plane/ui";
import { InboxIssueFilterSelection, InboxIssueOrderByDropdown } from "@/components/inbox/inbox-filter";
import { FiltersDropdown } from "@/components/issues";
import useSize from "@/hooks/use-window-size";

const smallButton = <ListFilter className="h-3 " />;
const largeButton = (
<div className={cn(getButtonStyling("neutral-primary", "sm"), "text-custom-text-300")}>
<ListFilter className="h-3 " />
<span className="hidden xl:flex">Filters</span>
const smallButton = <ListFilter className="size-3 " />;

<ChevronDown className="h-3 w-3" strokeWidth={2} />
const largeButton = (
<div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
<ListFilter className="size-3 " />
<span>Filters</span>
<ChevronDown className="size-3" strokeWidth={2} />
</div>
);
export const FiltersRoot: FC = () => (
<div className="relative flex items-center gap-2">
<div>
<FiltersDropdown
menuButton={
<>
<div className="hidden xl:flex">{largeButton}</div>
<div className="flex xl:hidden">{smallButton}</div>
</>
}
title=""
placement="bottom-end"
>
<InboxIssueFilterSelection />
</FiltersDropdown>
</div>
<div>
<InboxIssueOrderByDropdown />
export const FiltersRoot: FC = () => {
const windowSize = useSize();

return (
<div className="relative flex items-center gap-2">
<div>
<FiltersDropdown menuButton={windowSize[0] > 1280 ? largeButton : smallButton} title="" placement="bottom-end">
<InboxIssueFilterSelection />
</FiltersDropdown>
</div>
<div>
<InboxIssueOrderByDropdown />
</div>
</div>
</div>
);
);
};
27 changes: 14 additions & 13 deletions web/core/components/inbox/inbox-filter/sorting/order-by.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,35 @@ import { INBOX_ISSUE_ORDER_BY_OPTIONS, INBOX_ISSUE_SORT_BY_OPTIONS } from "@/con
import { cn } from "@/helpers/common.helper";
// hooks
import { useProjectInbox } from "@/hooks/store";
import useSize from "@/hooks/use-window-size";

export const InboxIssueOrderByDropdown: FC = observer(() => {
// hooks
const windowSize = useSize();
const { inboxSorting, handleInboxIssueSorting } = useProjectInbox();
const orderByDetails =
INBOX_ISSUE_ORDER_BY_OPTIONS.find((option) => inboxSorting?.order_by?.includes(option.key)) || undefined;
const smallButton =
inboxSorting?.sort_by === "asc" ? <ArrowUpWideNarrow className="h-3 " /> : <ArrowDownWideNarrow className="h-3 " />;
inboxSorting?.sort_by === "asc" ? (
<ArrowUpWideNarrow className="size-3 " />
) : (
<ArrowDownWideNarrow className="size-3 " />
);
const largeButton = (
<div className={cn(getButtonStyling("neutral-primary", "sm"), "text-custom-text-300")}>
<div className={cn(getButtonStyling("neutral-primary", "sm"), "px-2 text-custom-text-300")}>
{inboxSorting?.sort_by === "asc" ? (
<ArrowUpWideNarrow className="h-3 " />
<ArrowUpWideNarrow className="size-3 " />
) : (
<ArrowDownWideNarrow className="h-3 " />
<ArrowDownWideNarrow className="size-3 " />
)}
{orderByDetails?.label || "Order By"}

<ChevronDown className="h-3 w-3" strokeWidth={2} />
<ChevronDown className="size-3" strokeWidth={2} />
</div>
);
return (
<CustomMenu
customButton={
<>
<div className="hidden xl:flex">{largeButton}</div>
<div className="flex xl:hidden">{smallButton}</div>
</>
}
customButton={windowSize[0] > 1280 ? largeButton : smallButton}
placement="bottom-end"
maxHeight="lg"
closeOnSelect
Expand All @@ -49,7 +50,7 @@ export const InboxIssueOrderByDropdown: FC = observer(() => {
onClick={() => handleInboxIssueSorting("order_by", option.key)}
>
{option.label}
{inboxSorting?.order_by?.includes(option.key) && <Check className="h-3 w-3" />}
{inboxSorting?.order_by?.includes(option.key) && <Check className="size-3" />}
</CustomMenu.MenuItem>
))}
<hr className="my-2 border-custom-border-200" />
Expand All @@ -60,7 +61,7 @@ export const InboxIssueOrderByDropdown: FC = observer(() => {
onClick={() => handleInboxIssueSorting("sort_by", option.key)}
>
{option.label}
{inboxSorting?.sort_by?.includes(option.key) && <Check className="h-3 w-3" />}
{inboxSorting?.sort_by?.includes(option.key) && <Check className="size-3" />}
</CustomMenu.MenuItem>
))}
</CustomMenu>
Expand Down
4 changes: 2 additions & 2 deletions web/core/constants/inbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ export const INBOX_ISSUE_SOURCE = "in-app";
export const INBOX_ISSUE_ORDER_BY_OPTIONS: { key: TInboxIssueSortingOrderByKeys; label: string }[] = [
{
key: "issue__created_at",
label: "Date created",
label: "Created at",
},
{
key: "issue__updated_at",
label: "Date updated",
label: "Updated at",
},
{
key: "issue__sequence_id",
Expand Down