Skip to content

fix(site/src/pages/AgentsPage): reset status and source filters when the last option is cleared #30010

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

Open
jakehwll wants to merge 1 commit into from
+26 −18
Open

fix(site/src/pages/AgentsPage): reset status and source filters when the last option is cleared #30010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions site/src/pages/AgentsPage/components/ChatsSidebar/ChatsSidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,19 +369,20 @@ describe("ChatsSidebar filters", () => {
});
});

it("keeps one chat status and one source selected", async () => {
it("resets a filter subset when its last option is cleared", async () => {
const user = userEvent.setup();
const onSidebarFiltersChange = vi.fn();
const sidebarFilters: AgentSidebarFilters = {
...defaultSidebarFilters,
chatStatuses: ["running"],
sources: ["shared_with_me"],
};

render(
<Wrapper>
<ChatsSidebar
{...defaultProps}
sidebarFilters={{
...defaultSidebarFilters,
chatStatuses: ["running"],
sources: ["shared_with_me"],
}}
sidebarFilters={sidebarFilters}
onSidebarFiltersChange={onSidebarFiltersChange}
/>
</Wrapper>,
Expand All @@ -392,7 +393,14 @@ describe("ChatsSidebar filters", () => {
await openFilterSubmenu(user, /Source/);
await chooseFilterOption("menuitemcheckbox", "Shared with me");

expect(onSidebarFiltersChange).not.toHaveBeenCalled();
expect(onSidebarFiltersChange).toHaveBeenNthCalledWith(1, {
...sidebarFilters,
chatStatuses: defaultSidebarFilters.chatStatuses,
});
expect(onSidebarFiltersChange).toHaveBeenNthCalledWith(2, {
...sidebarFilters,
sources: defaultSidebarFilters.sources,
});
});

it("applies the unread checkbox", async () => {
Expand Down
22 changes: 11 additions & 11 deletions site/src/pages/AgentsPage/components/ChatsSidebar/filters/FilterPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,12 @@ export const FilterPopover: FC<FilterPopoverProps> = ({
} else {
selected.delete(status);
}
if (selected.size === 0) {
return;
}
onFiltersChange({
...filters,
chatStatuses: AGENT_CHAT_STATUS_ORDER.filter((value) =>
selected.has(value),
),
chatStatuses:
selected.size === 0
? DEFAULT_AGENT_SIDEBAR_FILTERS.chatStatuses
: AGENT_CHAT_STATUS_ORDER.filter((value) => selected.has(value)),
});
};

Expand All @@ -206,11 +204,13 @@ export const FilterPopover: FC<FilterPopoverProps> = ({
)
: filters.sources.filter((value) => value !== source);

if (nextSources.length === 0) {
return;
}

onFiltersChange({ ...filters, sources: nextSources });
onFiltersChange({
...filters,
sources:
nextSources.length === 0
? DEFAULT_AGENT_SIDEBAR_FILTERS.sources
: nextSources,
});
};

const prSummary = !haveSameSelections(
Expand Down
Loading