From 3a400e4e452abf440650b197ddb57b7bc755181f Mon Sep 17 00:00:00 2001
From: Alexander Polyankin <alexander.polyankin@metabase.com>
Date: Fri, 22 Apr 2022 20:20:32 +0300
Subject: [PATCH] Allow using some string filters for fields without special
type (#21920)
---
frontend/src/metabase/parameters/utils/filters.js | 7 +------
.../src/metabase/parameters/utils/filters.unit.spec.js | 2 ++
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/frontend/src/metabase/parameters/utils/filters.js b/frontend/src/metabase/parameters/utils/filters.js
index 51f290c67c1..01105c3e49a 100644
--- a/frontend/src/metabase/parameters/utils/filters.js
+++ b/frontend/src/metabase/parameters/utils/filters.js
@@ -4,7 +4,6 @@ import { TemplateTagVariable } from "metabase-lib/lib/Variable";
export function fieldFilterForParameter(parameter) {
const type = getParameterType(parameter);
- const subtype = getParameterSubType(parameter);
switch (type) {
case "date":
return field => field.isDate();
@@ -17,11 +16,7 @@ export function fieldFilterForParameter(parameter) {
case "number":
return field => field.isNumber() && !field.isCoordinate();
case "string":
- return field => {
- return subtype === "=" || subtype === "!="
- ? field.isCategory() && !field.isLocation()
- : field.isString() && !field.isLocation();
- };
+ return field => field.isString() && !field.isLocation();
}
return () => false;
diff --git a/frontend/src/metabase/parameters/utils/filters.unit.spec.js b/frontend/src/metabase/parameters/utils/filters.unit.spec.js
index aefc12ab6ed..fe2c1bf26d2 100644
--- a/frontend/src/metabase/parameters/utils/filters.unit.spec.js
+++ b/frontend/src/metabase/parameters/utils/filters.unit.spec.js
@@ -71,6 +71,7 @@ describe("parameters/utils/field-filters", () => {
type: "category",
field: () => ({
...field,
+ isString: () => true,
isCategory: () => true,
}),
},
@@ -81,6 +82,7 @@ describe("parameters/utils/field-filters", () => {
type: "category",
field: () => ({
...field,
+ isString: () => true,
isCategory: () => true,
}),
},
--
GitLab