Skip to content

fix(site): allow search by label in MultiSelectComboBox #24421

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
johnstcn merged 2 commits into from
Apr 16, 2026
Merged

fix(site): allow search by label in MultiSelectComboBox #24421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9797729
fix(site): teach MultiSelectCombobox to search by label, not by UUID
johnstcn Apr 16, 2026
0bfad54
apply suggestion from copilot
johnstcn Apr 16, 2026
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
40 changes: 36 additions & 4 deletions site/src/components/MultiSelectCombobox/MultiSelectCombobox.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,43 @@ export const Default: Story = {};
export const OpenCombobox: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await userEvent.click(canvas.getByPlaceholderText("Select organization"));
const input = canvas.getByPlaceholderText("Select organization");
await userEvent.click(input);

await waitFor(() =>
expect(canvas.getByText("My Organization")).toBeInTheDocument(),
);
// Both options should be visible initially.
await waitFor(() => {
expect(
canvas.getByRole("option", { name: "My Organization" }),
).toBeInTheDocument();
expect(
canvas.getByRole("option", { name: "My Organization 2" }),
).toBeInTheDocument();
});

// Type a display name to filter — this verifies cmdk filters
// by label rather than by the underlying UUID value.
await userEvent.type(input, "My Organization 2");

await waitFor(() => {
expect(
canvas.getByRole("option", { name: "My Organization 2" }),
).toBeInTheDocument();
expect(
canvas.queryByRole("option", { name: /^My Organization$/ }),
).not.toBeInTheDocument();
});

// Clear the search and confirm both options reappear.
await userEvent.clear(input);

await waitFor(() => {
expect(
canvas.getByRole("option", { name: "My Organization" }),
).toBeInTheDocument();
expect(
canvas.getByRole("option", { name: "My Organization 2" }),
).toBeInTheDocument();
});
},
};

Expand Down
1 change: 1 addition & 0 deletions site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ export const MultiSelectCombobox: React.FC<MultiSelectComboboxProps> = ({
<CommandItem
key={option.value}
value={option.value}
keywords={[option.label]}
disabled={option.disable}
onMouseDown={(e) => {
e.preventDefault();
Expand Down
33 changes: 33 additions & 0 deletions site/src/pages/AgentsPage/AgentSettingsTemplatesPageView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,39 @@ export const TemplateAllowlist: Story = {
expect(saveBtn).toBeDisabled();
});

await step("search filters by display name", async () => {
const input = canvas.getByPlaceholderText("Select templates...");
await userEvent.click(input);

// Type a partial display name.
await userEvent.type(input, "Docker");

// The matching template should be visible.
await waitFor(() => {
expect(
canvas.getByRole("option", { name: "Docker Development" }),
).toBeVisible();
});

// A non-matching template should not be visible.
await waitFor(() => {
expect(
canvas.queryByRole("option", { name: "Kubernetes Production" }),
).not.toBeInTheDocument();
});

// Clear the search and verify the full list returns.
await userEvent.clear(input);
await waitFor(() => {
expect(
canvas.getByRole("option", { name: "Kubernetes Production" }),
).toBeVisible();
});

// Close dropdown by pressing Escape so the next step starts clean.
await userEvent.keyboard("{Escape}");
});

await step("select one template and save", async () => {
const input = canvas.getByPlaceholderText("Select templates...");
await userEvent.click(input);
Expand Down
Loading