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 filters for type/TextLike (#64045)

Alexander Polyankin48376d3f63a6
diff --git a/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js b/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
index 86c2ca2c4f6..fa01775b310 100644
--- a/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
@@ -1,5 +1,9 @@
const { H } = cy;
-import { SAMPLE_DB_ID, USER_GROUPS } from "e2e/support/cypress_data";
+import {
+ SAMPLE_DB_ID,
+ USER_GROUPS,
+ WRITABLE_DB_ID,
+} from "e2e/support/cypress_data";
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
import * as FieldFilter from "./helpers/e2e-field-filter-helpers";
@@ -1272,3 +1276,30 @@ describe("issue 58061", () => {
});
});
});
+
+describe("issue 63537", () => {
+ beforeEach(() => {
+ H.restore("postgres-writable");
+ H.resetTestTable({ type: "postgres", table: "many_data_types" });
+ cy.signInAsAdmin();
+ H.resyncDatabase({ dbId: WRITABLE_DB_ID, tableName: "many_data_types" });
+ });
+
+ it("should allow to use postgres enums in field filters (metabase#63537)", () => {
+ H.startNewNativeQuestion({ database: WRITABLE_DB_ID });
+ H.NativeEditor.type("SELECT * FROM many_data_types WHERE {{f}}");
+ SQLFilter.openTypePickerFromDefaultFilterType();
+ SQLFilter.chooseType("Field Filter");
+ FieldFilter.mapTo({
+ table: "Many Data Types",
+ field: "Enum",
+ });
+ H.filterWidget().click();
+ H.popover().within(() => {
+ cy.findByText("beta").click();
+ cy.button("Add filter").click();
+ });
+ H.runNativeQuery();
+ H.assertQueryBuilderRowCount(2);
+ });
+});
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/filters.ts b/frontend/src/metabase-lib/v1/parameters/utils/filters.ts
index d5a3f458552..7a3287c6067 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/filters.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/filters.ts
@@ -68,7 +68,7 @@ export function fieldFilterForParameter(
): (field: Field) => boolean {
return (field) =>
isParameterCompatibleWithColumn(parameter, {
- isString: field.isString(),
+ isString: field.isString() || field.isStringLike(),
isNumeric: field.isNumeric(),
isBoolean: field.isBoolean(),
isTemporal: field.isDate(),
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/filters.unit.spec.ts b/frontend/src/metabase-lib/v1/parameters/utils/filters.unit.spec.ts
index 7ac9d583358..05c7f0084bb 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/filters.unit.spec.ts
+++ b/frontend/src/metabase-lib/v1/parameters/utils/filters.unit.spec.ts
@@ -20,6 +20,7 @@ describe("parameters/utils/field-filters", () => {
isCountry: () => false,
isNumeric: () => false,
isString: () => false,
+ isStringLike: () => false,
isBoolean: () => false,
isAddress: () => false,
isCoordinate: () => false,
@@ -106,6 +107,17 @@ describe("parameters/utils/field-filters", () => {
}),
},
],
+ [
+ { type: "string/=" },
+ {
+ type: "string",
+ field: () => ({
+ ...field,
+ isString: () => false,
+ isStringLike: () => true,
+ }),
+ },
+ ],
].forEach(([parameter, dimension]) => {
it(`should return a predicate that evaluates to true for a ${dimension.type} dimension when given a ${parameter.type} parameter`, () => {
const predicate = dimensionFilterForParameter(
diff --git a/frontend/src/metabase-lib/v1/parameters/utils/template-tag-options.unit.spec.js b/frontend/src/metabase-lib/v1/parameters/utils/template-tag-options.unit.spec.js
index 2336d70fb5c..220f461c1e9 100644
--- a/frontend/src/metabase-lib/v1/parameters/utils/template-tag-options.unit.spec.js
+++ b/frontend/src/metabase-lib/v1/parameters/utils/template-tag-options.unit.spec.js
@@ -49,6 +49,7 @@ describe("parameters/utils/template-tag-options", () => {
isCountry: () => false,
isNumeric: () => false,
isString: () => false,
+ isStringLike: () => false,
isBoolean: () => false,
isAddress: () => false,
};
@@ -89,5 +90,18 @@ describe("parameters/utils/template-tag-options", () => {
availableOptions.every((option) => option.type.startsWith("string")),
).toBe(true);
});
+
+ it("should return string options for a TextLike field", () => {
+ const enumField = {
+ ...field,
+ isString: () => false,
+ isStringLike: () => true,
+ };
+ const availableOptions = getParameterOptionsForField(enumField);
+ expect(
+ availableOptions.length > 0 &&
+ availableOptions.every((option) => option.type.startsWith("string")),
+ ).toBe(true);
+ });
});
});