Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
35 changes: 35 additions & 0 deletions packages/ui/src/features/inbox/components/InboxSearchFilterBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,14 @@ export function InboxSearchFilterBar({
const toggleSourceProduct = useInboxSignalsFilterStore(
(s) => s.toggleSourceProduct,
);
const clearSourceProductFilter = useInboxSignalsFilterStore(
(s) => s.clearSourceProductFilter,
);
const priorityFilter = useInboxSignalsFilterStore((s) => s.priorityFilter);
const togglePriority = useInboxSignalsFilterStore((s) => s.togglePriority);
const clearPriorityFilter = useInboxSignalsFilterStore(
(s) => s.clearPriorityFilter,
);

const activeSort = INBOX_SORT_OPTIONS.find(
(option) =>
Expand Down Expand Up @@ -73,6 +79,11 @@ export function InboxSearchFilterBar({
active={sourceProductFilter.length > 0}
>
<Flex direction="column" gap="0">
<InboxFilterAnyItem
Comment thread
pauldambra marked this conversation as resolved.
label="Any"
active={sourceProductFilter.length === 0}
onClick={clearSourceProductFilter}
/>
{INBOX_SOURCE_OPTIONS.map((option) => {
const isActive = sourceProductFilter.includes(option.value);
return (
Expand Down Expand Up @@ -132,6 +143,11 @@ export function InboxSearchFilterBar({
active={priorityFilter.length > 0}
>
<Flex direction="column" gap="0">
<InboxFilterAnyItem
label="Any"
active={priorityFilter.length === 0}
onClick={clearPriorityFilter}
/>
{INBOX_PRIORITY_OPTIONS.map((option) => {
const isActive = priorityFilter.includes(option.value);
return (
Expand Down Expand Up @@ -160,6 +176,25 @@ export function InboxSearchFilterBar({
);
}

function InboxFilterAnyItem({
label,
active,
onClick,
}: {
label: string;
Comment thread
pauldambra marked this conversation as resolved.
Outdated
active: boolean;
onClick: () => void;
}) {
return (
<button type="button" className={FILTER_ITEM_CLASS} onClick={onClick}>
<span className="truncate">{label}</span>
Comment thread
pauldambra marked this conversation as resolved.
Outdated
{active ? (
<CheckIcon size={12} className="shrink-0 text-gray-12" />
) : null}
</button>
);
}

function InboxFilterPopover({
label,
value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,34 @@ describe("inboxSignalsFilterStore", () => {
]);
});

it("clearPriorityFilter resets priorities back to Any (empty)", () => {
useInboxSignalsFilterStore.getState().setPriorityFilter(["P0", "P1"]);

useInboxSignalsFilterStore.getState().clearPriorityFilter();

expect(useInboxSignalsFilterStore.getState().priorityFilter).toEqual([]);
});

it("clearSourceProductFilter resets sources back to Any (empty)", () => {
useInboxSignalsFilterStore.getState().toggleSourceProduct("github");
useInboxSignalsFilterStore.getState().toggleSourceProduct("linear");

useInboxSignalsFilterStore.getState().clearSourceProductFilter();

expect(useInboxSignalsFilterStore.getState().sourceProductFilter).toEqual(
[],
);
});

it("toggling off the last source is equivalent to Any (empty)", () => {
Comment thread
pauldambra marked this conversation as resolved.
useInboxSignalsFilterStore.getState().toggleSourceProduct("github");
useInboxSignalsFilterStore.getState().toggleSourceProduct("github");

expect(useInboxSignalsFilterStore.getState().sourceProductFilter).toEqual(
[],
);
});

it("setPriorityFilter de-duplicates priorities", () => {
useInboxSignalsFilterStore.getState().setPriorityFilter(["P0", "P1", "P0"]);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ interface InboxSignalsFilterActions {
toggleSourceProduct: (source: SourceProduct) => void;
togglePriority: (priority: SignalReportPriority) => void;
setPriorityFilter: (priorities: SignalReportPriority[]) => void;
/** Clear the source filter back to "Any" (empty = all sources). */
clearSourceProductFilter: () => void;
/** Clear the priority filter back to "Any" (empty = all priorities). */
clearPriorityFilter: () => void;
/** Reset all filters when a deep link arrives so the linked report isn't hidden. */
resetFilters: () => void;
}
Expand Down Expand Up @@ -74,6 +78,8 @@ export const useInboxSignalsFilterStore = create<InboxSignalsFilterStore>()(
set({
priorityFilter: Array.from(new Set(priorities)),
}),
clearSourceProductFilter: () => set({ sourceProductFilter: [] }),
Comment thread
pauldambra marked this conversation as resolved.
clearPriorityFilter: () => set({ priorityFilter: [] }),
resetFilters: () =>
set({
searchQuery: "",
Expand Down
Loading