Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix Field Filter when there are no search results (#74832)

Nick Fitzpatrickdca533be7038
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
index 4c3a68896da..3d349eff5b0 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.tsx
@@ -89,6 +89,8 @@ export const DataSelectorFieldPicker = ({
maxHeight={Infinity}
width="100%"
searchable={hasFiltering}
+ // keep the search box + "no results" state visible when a search matches no fields
+ globalSearch={hasFiltering}
onChange={(item: { field: Field }) => onChangeField(item.field)}
itemIsSelected={checkIfItemIsSelected}
itemIsClickable={(item: FieldWithName) => Boolean(item.field)}
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
index 248984f9f2a..b892158df43 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorFieldPicker/DataSelectorFieldPicker.unit.spec.tsx
@@ -73,5 +73,29 @@ describe("DataSelectorFieldPicker", () => {
expect(screen.getByText("Product ID")).toBeInTheDocument();
expect(screen.getByLabelText("More info")).toBeInTheDocument();
});
+
+ it("keeps the search box visible and shows an empty state when no field matches the search (metabase#74670)", () => {
+ render(
+ <DataSelectorFieldPicker
+ {...props}
+ selectedTable={{ display_name: "Orders" } as Table}
+ fields={[
+ checkNotNull(metadata.field(ORDERS.ID)),
+ checkNotNull(metadata.field(ORDERS.TOTAL)),
+ ]}
+ />,
+ );
+
+ fireEvent.change(screen.getByPlaceholderText("Find..."), {
+ target: { value: "xyznonexistent" },
+ });
+
+ // the search box must stay visible so the user can correct the query
+ expect(screen.getByPlaceholderText("Find...")).toBeInTheDocument();
+ // and an empty state should explain why no fields are shown
+ expect(screen.getByText("Didn't find any results")).toBeInTheDocument();
+ expect(screen.queryByText("ID")).not.toBeInTheDocument();
+ expect(screen.queryByText("Total")).not.toBeInTheDocument();
+ });
});
});