The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Extract UI components for QB filter widgets (#69051)
Alexander Polyankine10dfc7cfc78
diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/use-action-input-searchable-options.tsx b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/use-action-input-searchable-options.tsxindex 71588a44a47..f38b6df63e6 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/use-action-input-searchable-options.tsx+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/inputs/use-action-input-searchable-options.tsx@@ -5,7 +5,7 @@ import {useSearchFieldValuesQuery,} from "metabase/api/field";import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";-import { getFieldOptions } from "metabase/querying/filters/components/FilterValuePicker/utils";+import { getFieldOptions } from "metabase/querying/common/utils";import type { FieldValue, RowValue } from "metabase-types/api";const SEARCH_LIMIT_DEFAULT = 20;diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsxindex 9dcfc0bdf67..b171174192b 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/RunFilterBar.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { RelativeIntervalDirection } from "metabase/querying/filters/types";+import type { RelativeIntervalDirection } from "metabase/querying/common/types";import { Group } from "metabase/ui";import type {Transform,diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsxindex 4a51eced8ed..82ba5bcde4e 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/RunListPage/RunFilterBar/TimeFilterWidget/TimeFilterWidget.tsx@@ -3,7 +3,7 @@ import { useDisclosure } from "@mantine/hooks";import type {DatePickerShortcut,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { SearchFilterDateDisplay } from "metabase/search/components/SearchFilterDateDisplay";import { SearchFilterDatePicker } from "metabase/search/components/SearchFilterDatePicker";import { Popover } from "metabase/ui";diff --git a/frontend/src/metabase-lib/filter.ts b/frontend/src/metabase-lib/filter.tsindex 5be513a5cf9..f7fd774a5c3 100644--- a/frontend/src/metabase-lib/filter.ts+++ b/frontend/src/metabase-lib/filter.ts@@ -15,6 +15,7 @@ import type {ExpressionClause,FilterClause,FilterOperator,+ FilterOperatorVariant,FilterParts,Filterable,NumberFilterParts,@@ -38,12 +39,6 @@ export function filterableColumns(return ML.filterable_columns(query, stageIndex, opts);}-export function filterableColumnOperators(- column: ColumnMetadata,-): FilterOperator[] {- return ML.filterable_column_operators(column);-}-export function filter(query: Query,stageIndex: number,@@ -350,3 +345,10 @@ export function updateTemporalFilter(end,);}++export function describeFilterOperator(+ operator: FilterOperator,+ variant: FilterOperatorVariant = "default",+): string {+ return ML.describe_filter_operator(operator, variant);+}diff --git a/frontend/src/metabase-lib/types.ts b/frontend/src/metabase-lib/types.tsindex 4799bb4fd04..063c1456c47 100644--- a/frontend/src/metabase-lib/types.ts+++ b/frontend/src/metabase-lib/types.ts@@ -304,10 +304,7 @@ export type ExpressionOptions = {mode?: DatetimeMode;};-declare const FilterOperatorSymbol: unique symbol;-export type FilterOperator = unknown & { _opaque: typeof FilterOperatorSymbol };--export type FilterOperatorName =+export type FilterOperator =| StringFilterOperator| NumberFilterOperator| BooleanFilterOperator@@ -315,6 +312,8 @@ export type FilterOperatorName =| ExcludeDateFilterOperator| CoordinateFilterOperator;+export type FilterOperatorVariant = "default" | "number" | "temporal";+export type StringFilterOperator =| "="| "!="@@ -382,7 +381,7 @@ export type DatetimeMode =| "unix-nanoseconds";export type FilterOperatorDisplayInfo = {- shortName: FilterOperatorName;+ shortName: FilterOperator;displayName: string;longDisplayName: string;default?: boolean;diff --git a/frontend/src/metabase/parameters/components/widgets/TemporalUnitWidget/TemporalUnitWidget.tsx b/frontend/src/metabase/parameters/components/widgets/TemporalUnitWidget/TemporalUnitWidget.tsxindex 17774a9af46..47ce85433b5 100644--- a/frontend/src/metabase/parameters/components/widgets/TemporalUnitWidget/TemporalUnitWidget.tsx+++ b/frontend/src/metabase/parameters/components/widgets/TemporalUnitWidget/TemporalUnitWidget.tsx@@ -1,4 +1,4 @@-import { TemporalUnitPicker } from "metabase/querying/filters/components/TemporalUnitPicker";+import { TemporalUnitPicker } from "metabase/querying/common/components/TemporalUnitPicker";import * as Lib from "metabase-lib";import type { Parameter, TemporalUnit } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.tsx b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsxsimilarity index 88%rename from frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.tsxrename to frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsxindex cb07db1e130..c87c7793800 100644--- a/frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.tsx+++ b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.tsx@@ -4,13 +4,13 @@ import { forwardRef, useLayoutEffect, useState } from "react";import { type NumberValue, parseNumber } from "metabase/lib/number";import { TextInput, type TextInputProps } from "metabase/ui";-type NumberFilterInputProps = Omit<TextInputProps, "value" | "onChange"> & {+type BigIntNumberInputProps = Omit<TextInputProps, "value" | "onChange"> & {value: NumberValue | null;onChange: (value: NumberValue | null) => void;};-export const NumberFilterInput = forwardRef(function NumberFilterInput(- { value, onChange, onFocus, onBlur, ...props }: NumberFilterInputProps,+export const BigIntNumberInput = forwardRef(function BigIntNumberInput(+ { value, onChange, onFocus, onBlur, ...props }: BigIntNumberInputProps,ref: Ref<HTMLInputElement>,) {const [inputValue, setInputValue] = useState(formatValue(value));diff --git a/frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.unit.spec.tsx b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsxsimilarity index 92%rename from frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsxindex 7235cc60614..4a0744063ed 100644--- a/frontend/src/metabase/querying/filters/components/NumberFilterInput/NumberFilterInput.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/BigIntNumberInput/BigIntNumberInput.unit.spec.tsx@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";import type { NumberValue } from "metabase/lib/number";-import { NumberFilterInput } from "./NumberFilterInput";+import { BigIntNumberInput } from "./BigIntNumberInput";type SetupOpts = {value?: NumberValue | null;@@ -11,13 +11,13 @@ type SetupOpts = {function setup({ value = null }: SetupOpts = {}) {const onChange = jest.fn();- renderWithProviders(<NumberFilterInput value={value} onChange={onChange} />);+ renderWithProviders(<BigIntNumberInput value={value} onChange={onChange} />);const input = screen.getByRole("textbox");return { input, onChange };}-describe("NumberFilterInput", () => {+describe("BigIntNumberInput", () => {it("should display an empty value", () => {const { input } = setup({ value: null });expect(input).toHaveDisplayValue("");diff --git a/frontend/src/metabase/querying/common/components/BigIntNumberInput/index.ts b/frontend/src/metabase/querying/common/components/BigIntNumberInput/index.tsnew file mode 100644index 00000000000..161b396dcae--- /dev/null+++ b/frontend/src/metabase/querying/common/components/BigIntNumberInput/index.ts@@ -0,0 +1 @@+export * from "./BigIntNumberInput";diff --git a/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsx b/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsxsimilarity index 96%rename from frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsxrename to frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsxindex d00fab7a077..66398573a2f 100644--- a/frontend/src/metabase/querying/filters/components/BooleanPicker/BooleanPicker.tsx+++ b/frontend/src/metabase/querying/common/components/BooleanPicker/BooleanPicker.tsx@@ -1,7 +1,7 @@import { useState } from "react";import { t } from "ttag";-import type { BooleanFilterValue } from "metabase/querying/filters/types";+import type { BooleanFilterValue } from "metabase/querying/common/types";import { Button, Icon, Radio, Stack } from "metabase/ui";type BooleanPickerProps = {diff --git a/frontend/src/metabase/querying/filters/components/BooleanPicker/index.ts b/frontend/src/metabase/querying/common/components/BooleanPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/BooleanPicker/index.tsrename to frontend/src/metabase/querying/common/components/BooleanPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsxsimilarity index 96%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsxindex 1fa213f3fd5..40e9b7425e0 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.tsx@@ -3,7 +3,7 @@ import { useMemo } from "react";import type {DatePickerOperator,DatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Select } from "metabase/ui";import { getAvailableOptions, getOptionType, setOptionType } from "./utils";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsxsimilarity index 89%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsxindex 239fcc51534..d1aa39802b0 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/DateOperatorPicker.unit.spec.tsx@@ -1,11 +1,11 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { DATE_PICKER_OPERATORS } from "metabase/querying/filters/constants";+import { DATE_PICKER_OPERATORS } from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { DateOperatorPicker } from "./DateOperatorPicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/types.tssimilarity index 86%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/types.tsindex 69bc79b5134..23521f0641c 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/types.ts@@ -1,7 +1,7 @@import type {DatePickerOperator,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";export type OptionType =| "none"diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.tssimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.tsindex 808a18caaf2..601a25dd39b 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.ts@@ -1,7 +1,7 @@import type {DatePickerOperator,DatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { getExcludeOperatorValue } from "../ExcludeDatePicker/utils";import {diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.unit.spec.tssimilarity index 99%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.unit.spec.tsindex ba6da04cbb4..bc9438d071c 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateOperatorPicker/utils.unit.spec.ts@@ -1,4 +1,4 @@-import { DATE_PICKER_OPERATORS } from "metabase/querying/filters/constants";+import { DATE_PICKER_OPERATORS } from "metabase/querying/common/constants";import type {DatePickerTruncationUnit,DatePickerValue,@@ -6,7 +6,7 @@ import type {RelativeDatePickerValue,SpecificDatePickerOperator,SpecificDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { OPERATOR_OPTIONS } from "./constants";import type { OptionType } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.stories.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.stories.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DatePicker.stories.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DatePicker.tsxindex 0443864be21..c788db0bde8 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.tsx@@ -5,14 +5,14 @@ import {DATE_PICKER_OPERATORS,DATE_PICKER_SHORTCUTS,DATE_PICKER_UNITS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerShortcut,DatePickerUnit,DatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { DateShortcutPicker } from "./DateShortcutPicker";import { ExcludeDatePicker } from "./ExcludeDatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DatePicker.unit.spec.tsxindex 461b872c1f6..a13114b8fe8 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DatePicker.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { DatePickerValue } from "metabase/querying/filters/types";+import type { DatePickerValue } from "metabase/querying/common/types";import { DatePicker } from "./DatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.css b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.csssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.cssrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.module.cssdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsxindex 486ba92930c..8dbcd6adde3 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.tsx@@ -6,7 +6,7 @@ import type {DatePickerValueType,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Box, Button, Divider } from "metabase/ui";import { MIN_WIDTH } from "../constants";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsxindex 85d770db685..4636459e469 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/DateShortcutPicker.unit.spec.tsx@@ -5,12 +5,12 @@ import {DATE_PICKER_DIRECTIONS,DATE_PICKER_OPERATORS,DATE_PICKER_SHORTCUTS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerShortcut,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { DateShortcutPicker } from "./DateShortcutPicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/constants.tssimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/constants.tsindex aa6e3883b1a..b9d871a3abc 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/constants.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/constants.ts@@ -1,6 +1,6 @@import { t } from "ttag";-import type { ShortcutOption } from "metabase/querying/filters/types";+import type { ShortcutOption } from "metabase/querying/common/types";import type { TypeOption } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/types.tssimilarity index 80%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/types.tsindex d103f2faf40..ab2278cd37c 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/types.ts@@ -1,7 +1,7 @@import type {DatePickerOperator,DatePickerValueType,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";export interface TypeOption {label: string;diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/utils.tssimilarity index 95%rename from frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/utils.tsindex 34c09e98f3f..2f452c8b94b 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/DateShortcutPicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/DateShortcutPicker/utils.ts@@ -3,7 +3,7 @@ import type {DatePickerShortcut,RelativeIntervalDirection,ShortcutOption,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { SHORTCUT_OPTION_GROUPS, TYPE_OPTIONS } from "./constants";import type { TypeOption } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsxsimilarity index 99%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsxindex 6c16923f7db..885afbae0b3 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.tsx@@ -8,7 +8,7 @@ import type {DatePickerUnit,ExcludeDatePickerOperator,ExcludeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import type { PopoverBackButtonProps } from "metabase/ui";import {Box,diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsxindex a2bc698cfd9..66d239274de 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/ExcludeDatePicker.unit.spec.tsx@@ -6,12 +6,12 @@ import { renderWithProviders, screen } from "__support__/ui";import {DATE_PICKER_EXTRACTION_UNITS,DATE_PICKER_OPERATORS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerExtractionUnit,DatePickerOperator,ExcludeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { createMockState } from "metabase-types/store/mocks";import type { DatePickerSubmitButtonProps } from "../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/types.tssimilarity index 88%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/types.tsindex 0fc8c9e5b21..7b430e8d325 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/types.ts@@ -1,7 +1,7 @@import type {DatePickerExtractionUnit,ExcludeDatePickerOperator,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";export interface ExcludeUnitOption {unit: DatePickerExtractionUnit;diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/utils.tssimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/utils.tsindex 36b64b5e538..8fe509075f3 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/ExcludeDatePicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/ExcludeDatePicker/utils.ts@@ -8,7 +8,7 @@ import type {DatePickerUnit,ExcludeDatePickerOperator,ExcludeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import type { DateFormattingSettings } from "metabase-types/api/settings";import { EXCLUDE_OPERATOR_OPTIONS, EXCLUDE_UNIT_OPTIONS } from "./constants";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/NumberInputWithFallbackValue/NumberInputWithFallbackValue.tsx b/frontend/src/metabase/querying/common/components/DatePicker/NumberInputWithFallbackValue/NumberInputWithFallbackValue.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/NumberInputWithFallbackValue/NumberInputWithFallbackValue.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/NumberInputWithFallbackValue/NumberInputWithFallbackValue.tsxdiff --git a/frontend/src/metabase/querying/common/components/DatePicker/NumberInputWithFallbackValue/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/NumberInputWithFallbackValue/index.tsnew file mode 100644index 00000000000..16b4fdba32c--- /dev/null+++ b/frontend/src/metabase/querying/common/components/DatePicker/NumberInputWithFallbackValue/index.ts@@ -0,0 +1 @@+export * from "./NumberInputWithFallbackValue";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsxindex d79d7d5b91b..9a7537640ec 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.tsx@@ -4,7 +4,7 @@ import type {DatePickerTruncationUnit,DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Button, Group, Stack, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsxsimilarity index 92%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsxindex 70f923fe5af..22e6a26e597 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/CurrentDatePicker.unit.spec.tsx@@ -1,11 +1,11 @@import _userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { DATE_PICKER_UNITS } from "metabase/querying/filters/constants";+import { DATE_PICKER_UNITS } from "metabase/querying/common/constants";import type {DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { CurrentDatePicker } from "./CurrentDatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.tssimilarity index 91%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.tsindex 78c1c4e7901..43851cf097f 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/constants.ts@@ -1,4 +1,4 @@-import type { DatePickerTruncationUnit } from "metabase/querying/filters/types";+import type { DatePickerTruncationUnit } from "metabase/querying/common/types";export const UNIT_GROUPS: DatePickerTruncationUnit[][] = [["day", "week", "month"],diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.tssimilarity index 91%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.tsindex 968a241858a..53d2790eadd 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/CurrentDatePicker/utils.ts@@ -2,7 +2,7 @@ import type {DatePickerTruncationUnit,DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { UNIT_GROUPS } from "./constants";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsxindex ba37afee5d5..8059b9c9c49 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.tsx@@ -4,7 +4,7 @@ import { t } from "ttag";import type {DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import {Button,Divider,@@ -16,7 +16,7 @@ import {Tooltip,} from "metabase/ui";-import { NumberInputWithFallbackValue } from "../../NumberInputWithFallbackValue/NumberInputWithFallbackValue";+import { NumberInputWithFallbackValue } from "../../NumberInputWithFallbackValue";import type { DatePickerSubmitButtonProps } from "../../types";import { renderDefaultSubmitButton } from "../../utils";import { IncludeCurrentSwitch } from "../IncludeCurrentSwitch";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsxindex dd9170b5399..eddfb854d17 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/DateIntervalPicker.unit.spec.tsx@@ -2,12 +2,12 @@ import userEvent from "@testing-library/user-event";import type { ReactNode } from "react";import { renderWithProviders, screen } from "__support__/ui";-import { DATE_PICKER_UNITS } from "metabase/querying/filters/constants";+import { DATE_PICKER_UNITS } from "metabase/querying/common/constants";import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import type { DatePickerSubmitButtonProps } from "../../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsxsimilarity index 89%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsxindex 076f1033128..c67ada5e4d1 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.tsx@@ -1,12 +1,12 @@import { t } from "ttag";-import { NumberInputWithFallbackValue } from "metabase/querying/filters/components/DatePicker/NumberInputWithFallbackValue/NumberInputWithFallbackValue";import type {DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Group, Select } from "metabase/ui";+import { NumberInputWithFallbackValue } from "../../../NumberInputWithFallbackValue";import { IncludeCurrentSwitch } from "../../IncludeCurrentSwitch";import { getInterval, getUnitOptions, setInterval } from "../../utils";import { setUnit } from "../utils";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsxindex 97eaca419f6..ce759493de5 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/SimpleDateIntervalPicker.unit.spec.tsx@@ -1,12 +1,12 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import { DATE_PICKER_UNITS } from "metabase/querying/filters/constants";+import { DATE_PICKER_UNITS } from "metabase/querying/common/constants";import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { SimpleDateIntervalPicker } from "./SimpleDateIntervalPicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/SimpleDateIntervalPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.tssimilarity index 93%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.tsindex a495a98d0c2..943ce07f8c9 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/constants.ts@@ -1,4 +1,4 @@-import type { DatePickerTruncationUnit } from "metabase/querying/filters/types";+import type { DatePickerTruncationUnit } from "metabase/querying/common/types";export const DEFAULT_OFFSETS: Record<DatePickerTruncationUnit, number> = {minute: 60,diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.tssimilarity index 96%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.tsindex fbafbb876e1..43f1cf50f5e 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateIntervalPicker/utils.ts@@ -1,7 +1,7 @@import type {DatePickerTruncationUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import * as Lib from "metabase-lib";import { DEFAULT_OFFSETS } from "./constants";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.module.css b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.module.csssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.module.cssrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.module.cssdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsxsimilarity index 97%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsxindex a423ef42a60..8492c0f2589 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.tsx@@ -4,10 +4,10 @@ import { t } from "ttag";import type {DatePickerUnit,RelativeDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Box, Button, Divider, Group, Icon, Select, Text } from "metabase/ui";-import { NumberInputWithFallbackValue } from "../../NumberInputWithFallbackValue/NumberInputWithFallbackValue";+import { NumberInputWithFallbackValue } from "../../NumberInputWithFallbackValue";import type { DatePickerSubmitButtonProps } from "../../types";import { renderDefaultSubmitButton } from "../../utils";import {diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsxindex cb10ca9c988..b0fe5edbe50 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/DateOffsetIntervalPicker.unit.spec.tsx@@ -2,12 +2,12 @@ import _userEvent from "@testing-library/user-event";import type { ReactNode } from "react";import { renderWithProviders, screen } from "__support__/ui";-import { DATE_PICKER_UNITS } from "metabase/querying/filters/constants";+import { DATE_PICKER_UNITS } from "metabase/querying/common/constants";import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import type { DatePickerSubmitButtonProps } from "../../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.tssimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.tsindex 178fe11c894..2c4ae0b6c1a 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/DateOffsetIntervalPicker/utils.ts@@ -5,7 +5,7 @@ import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import * as Lib from "metabase-lib";import { getAvailableTruncationUnits, getDirection } from "../utils";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsxindex 9118acf7861..9ee5e7f4d58 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/IncludeCurrentSwitch.tsx@@ -1,6 +1,6 @@import { t } from "ttag";-import type { RelativeDatePickerValue } from "metabase/querying/filters/types";+import type { RelativeDatePickerValue } from "metabase/querying/common/types";import { Switch } from "metabase/ui";import {diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/IncludeCurrentSwitch/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.module.css b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.module.csssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.module.cssrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.module.cssdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsxindex af5b3c7b388..4e1a2f3e849 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.tsx@@ -4,7 +4,7 @@ import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Box, Divider, Flex, PopoverBackButton, Tabs } from "metabase/ui";import type { DatePickerSubmitButtonProps } from "../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsxindex d5a578ca400..6dece5b5f2c 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/RelativeDatePicker.unit.spec.tsx@@ -4,12 +4,12 @@ import { renderWithProviders, screen } from "__support__/ui";import {DATE_PICKER_DIRECTIONS,DATE_PICKER_UNITS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { RelativeDatePicker } from "./RelativeDatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/types.tssimilarity index 89%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/types.tsindex b27c20371db..0d93859c4e5 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/types.ts@@ -1,4 +1,4 @@-import type { RelativeIntervalDirection } from "metabase/querying/filters/types";+import type { RelativeIntervalDirection } from "metabase/querying/common/types";export interface Tab {label: string;diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.tssimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.tsindex f26e63293b7..0051fc5c5f0 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.ts@@ -1,11 +1,11 @@-import { DATE_PICKER_TRUNCATION_UNITS } from "metabase/querying/filters/constants";+import { DATE_PICKER_TRUNCATION_UNITS } from "metabase/querying/common/constants";import type {DatePickerTruncationUnit,DatePickerUnit,DatePickerValue,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import * as Lib from "metabase-lib";import { DEFAULT_VALUE, TABS } from "./constants";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.unit.spec.tssimilarity index 99%rename from frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.tsrename to frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.unit.spec.tsindex c9e5a33af56..1c2c0840eb6 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/RelativeDatePicker/utils.unit.spec.ts@@ -2,7 +2,7 @@ import type {DatePickerTruncationUnit,RelativeDatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { CURRENT_TAB, LAST_TAB, NEXT_TAB } from "./constants";import type { Tab } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsxsimilarity index 94%rename from frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsxindex 5ddd176606b..abfd8d521f6 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.tsx@@ -2,12 +2,12 @@ import type { FormEvent } from "react";import { useState } from "react";import { t } from "ttag";-import { DATE_PICKER_OPERATORS } from "metabase/querying/filters/constants";+import { DATE_PICKER_OPERATORS } from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerUnit,DatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Button, Stack } from "metabase/ui";import { DateOperatorPicker } from "../DateOperatorPicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsxsimilarity index 96%rename from frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsxindex b442e326556..c0c213a3015 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/SimpleDatePicker.unit.spec.tsx@@ -4,12 +4,12 @@ import { renderWithProviders, screen } from "__support__/ui";import {DATE_PICKER_OPERATORS,DATE_PICKER_UNITS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerUnit,DatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { SimpleDatePicker } from "./SimpleDatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SimpleDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SimpleDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.module.css b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.module.csssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.module.cssrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.module.cssdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/DateRangePickerBody.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/DateRangePickerBody/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/SimpleDateRangePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/SimpleDateRangePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/types.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker/types.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsxindex e3d9542dcee..eff189db18d 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.tsx@@ -1,4 +1,4 @@-import type { SpecificDatePickerValue } from "metabase/querying/filters/types";+import type { SpecificDatePickerValue } from "metabase/querying/common/types";import type { DateRangePickerValue } from "../DateRangePicker";import { SimpleDateRangePicker } from "../DateRangePicker/SimpleDateRangePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsxindex 88b8ec522f9..a3623f28705 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/SimpleSpecificDatePicker.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { SpecificDatePickerValue } from "metabase/querying/filters/types";+import type { SpecificDatePickerValue } from "metabase/querying/common/types";import { SimpleSpecificDatePicker } from "./SimpleSpecificDatePicker";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SimpleSpecificDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/SimpleSingleDatePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SimpleSingleDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/SingleDatePickerBody.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/SingleDatePickerBody/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/types.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker/types.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.module.css b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.module.csssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.module.cssrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.module.cssdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsxindex 4471b7ad851..79d8078ce35 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.tsx@@ -4,7 +4,7 @@ import type {DatePickerOperator,DatePickerUnit,SpecificDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { Divider, Flex, PopoverBackButton, Tabs } from "metabase/ui";import type { DatePickerSubmitButtonProps } from "../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsxindex 66820394bca..3d75e3d2141 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/SpecificDatePicker.unit.spec.tsx@@ -5,12 +5,12 @@ import { renderWithProviders, screen, within } from "__support__/ui";import {DATE_PICKER_OPERATORS,DATE_PICKER_UNITS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {DatePickerOperator,DatePickerUnit,SpecificDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import type { DatePickerSubmitButtonProps } from "../types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsx b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/TimeToggle.tsxdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/TimeToggle/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/TimeToggle/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/types.tssimilarity index 88%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/types.tsindex b79a7ffd692..6606599e570 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/types.ts@@ -1,4 +1,4 @@-import type { SpecificDatePickerOperator } from "metabase/querying/filters/types";+import type { SpecificDatePickerOperator } from "metabase/querying/common/types";export interface Tab {label: string;diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/utils.ts b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/utils.tssimilarity index 98%rename from frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/utils.tsrename to frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/utils.tsindex b85c4773133..46a71c886de 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/SpecificDatePicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/SpecificDatePicker/utils.ts@@ -6,7 +6,7 @@ import type {DatePickerValue,SpecificDatePickerOperator,SpecificDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { TABS } from "./constants";import type { Tab } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/constants.ts b/frontend/src/metabase/querying/common/components/DatePicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/constants.tsrename to frontend/src/metabase/querying/common/components/DatePicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/index.ts b/frontend/src/metabase/querying/common/components/DatePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/index.tsrename to frontend/src/metabase/querying/common/components/DatePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/DatePicker/types.ts b/frontend/src/metabase/querying/common/components/DatePicker/types.tssimilarity index 57%rename from frontend/src/metabase/querying/filters/components/DatePicker/types.tsrename to frontend/src/metabase/querying/common/components/DatePicker/types.tsindex 144beebf88c..34ef851ef6e 100644--- a/frontend/src/metabase/querying/filters/components/DatePicker/types.ts+++ b/frontend/src/metabase/querying/common/components/DatePicker/types.ts@@ -1,4 +1,4 @@-import type { DatePickerValue } from "metabase/querying/filters/types";+import type { DatePickerValue } from "metabase/querying/common/types";export type DatePickerSubmitButtonProps = {value: DatePickerValue;diff --git a/frontend/src/metabase/querying/filters/components/DatePicker/utils.tsx b/frontend/src/metabase/querying/common/components/DatePicker/utils.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/DatePicker/utils.tsxrename to frontend/src/metabase/querying/common/components/DatePicker/utils.tsxdiff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx b/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsxnew file mode 100644index 00000000000..17560928d81--- /dev/null+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/FieldValuePicker.tsx@@ -0,0 +1,107 @@+import { t } from "ttag";++import { Center, type ComboboxProps, Loader } from "metabase/ui";++import { ListValuePicker } from "./ListValuePicker";+import { SearchValuePicker } from "./SearchValuePicker";+import { StaticValuePicker } from "./StaticValuePicker";+import type {+ UseGetFieldValuesArgs,+ UseGetFieldValuesResult,+ UseGetRemappedFieldValueArgs,+ UseGetRemappedFieldValueResult,+ UseSearchFieldValuesArgs,+ UseSearchFieldValuesResult,+} from "./types";+import { canShowListPicker, canShowSearchPicker } from "./utils";++export interface FieldValuePickerProps {+ values: string[];+ placeholder?: string;+ searchPlaceholder?: string;+ nothingFoundMessage?: string;+ autoFocus?: boolean;+ canListValues?: boolean;+ canSearchValues?: boolean;+ canRemapValues?: boolean;+ comboboxProps?: ComboboxProps;+ parseValue?: (rawValue: string) => string | null;+ useGetFieldValues: (args: UseGetFieldValuesArgs) => UseGetFieldValuesResult;+ useSearchFieldValues: (+ args: UseSearchFieldValuesArgs,+ ) => UseSearchFieldValuesResult;+ useGetRemappedFieldValue: (+ args: UseGetRemappedFieldValueArgs,+ ) => UseGetRemappedFieldValueResult;+ onChange: (newValues: string[]) => void;+}++export function FieldValuePicker({+ values: selectedValues,+ placeholder,+ searchPlaceholder,+ nothingFoundMessage,+ autoFocus = false,+ canListValues = false,+ canSearchValues = false,+ canRemapValues = false,+ comboboxProps,+ parseValue,+ useGetFieldValues,+ useSearchFieldValues,+ useGetRemappedFieldValue,+ onChange,+}: FieldValuePickerProps) {+ const { data: fieldData, isLoading } = useGetFieldValues({+ skip: !canListValues,+ });++ if (isLoading) {+ return (+ <Center h="2.5rem">+ <Loader data-testid="loading-indicator" />+ </Center>+ );+ }++ if (fieldData && canShowListPicker(fieldData)) {+ return (+ <ListValuePicker+ fieldValues={fieldData.values}+ selectedValues={selectedValues}+ placeholder={t`Search the list`}+ autoFocus={autoFocus}+ onChange={onChange}+ />+ );+ }++ if (canShowSearchPicker(canListValues, canSearchValues, fieldData)) {+ return (+ <SearchValuePicker+ canRemapValues={canRemapValues}+ fieldValues={fieldData?.values ?? []}+ selectedValues={selectedValues}+ placeholder={searchPlaceholder}+ nothingFoundMessage={nothingFoundMessage}+ autoFocus={autoFocus}+ comboboxProps={comboboxProps}+ parseValue={parseValue}+ useSearchFieldValues={useSearchFieldValues}+ useGetRemappedFieldValue={useGetRemappedFieldValue}+ onChange={onChange}+ />+ );+ }++ return (+ <StaticValuePicker+ selectedValues={selectedValues}+ placeholder={placeholder}+ autoFocus={autoFocus}+ comboboxProps={comboboxProps}+ parseValue={parseValue}+ onChange={onChange}+ />+ );+}diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsx b/frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/ListValuePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.tsxrename to frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/ListValuePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/index.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/index.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/utils.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/utils.tssimilarity index 94%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/utils.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/utils.tsindex 3a7a7910394..6834331cb50 100644--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/utils.ts+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/ListValuePicker/utils.ts@@ -1,8 +1,7 @@+import { getFieldOptions } from "metabase/querying/common/utils";import type { ComboboxItem } from "metabase/ui";import type { FieldValue } from "metabase-types/api";-import { getFieldOptions } from "../utils";-export function searchOptions(options: ComboboxItem[],searchText: string,diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/SearchValuePicker.tsx b/frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/SearchValuePicker.tsxsimilarity index 67%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/SearchValuePicker.tsxrename to frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/SearchValuePicker.tsxindex d332829249f..39f47302e2b 100644--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/SearchValuePicker.tsx+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/SearchValuePicker.tsx@@ -3,9 +3,9 @@ import { useDebounce } from "react-use";import { t } from "ttag";import {- useGetRemappedFieldValueQuery,- useSearchFieldValuesQuery,-} from "metabase/api";+ getFieldOption,+ getFieldOptions,+} from "metabase/querying/common/utils";import {type ComboboxItem,type ComboboxProps,@@ -14,16 +14,20 @@ import {MultiAutocompleteOption,MultiAutocompleteValue,} from "metabase/ui";-import type { FieldId, FieldValue } from "metabase-types/api";+import type { FieldValue } from "metabase-types/api";-import { getFieldOption, getFieldOptions } from "../utils";+import type {+ UseGetRemappedFieldValueArgs,+ UseGetRemappedFieldValueResult,+ UseSearchFieldValuesArgs,+ UseSearchFieldValuesResult,+} from "../types";import { SEARCH_DEBOUNCE, SEARCH_LIMIT } from "./constants";import { getEmptyResultsMessage, shouldSearch } from "./utils";type SearchValuePickerProps = {- fieldId: FieldId;- searchFieldId: FieldId;+ canRemapValues: boolean;fieldValues: FieldValue[];selectedValues: string[];placeholder?: string;@@ -31,12 +35,17 @@ type SearchValuePickerProps = {autoFocus?: boolean;comboboxProps?: ComboboxProps;parseValue?: (rawValue: string) => string | null;+ useSearchFieldValues: (+ args: UseSearchFieldValuesArgs,+ ) => UseSearchFieldValuesResult;+ useGetRemappedFieldValue: (+ args: UseGetRemappedFieldValueArgs,+ ) => UseGetRemappedFieldValueResult;onChange: (newValues: string[]) => void;};export function SearchValuePicker({- fieldId,- searchFieldId,+ canRemapValues,fieldValues: initialFieldValues,selectedValues,placeholder,@@ -44,31 +53,26 @@ export function SearchValuePicker({autoFocus,comboboxProps,parseValue,+ useSearchFieldValues,+ useGetRemappedFieldValue,onChange,}: SearchValuePickerProps) {const [searchValue, setSearchValue] = useState("");const [searchQuery, setSearchQuery] = useState(searchValue);const canSearch = searchQuery.length > 0;- const isRemapped = fieldId !== searchFieldId;const {- data: searchFieldValues = [],+ data: searchFieldValues,error: searchError,isFetching: isSearching,- } = useSearchFieldValuesQuery(- {- fieldId,- searchFieldId,- value: searchQuery,- limit: SEARCH_LIMIT,- },- {- skip: !canSearch,- },- );+ } = useSearchFieldValues({+ value: searchQuery,+ limit: SEARCH_LIMIT,+ skip: !canSearch,+ });const searchOptions = canSearch- ? getFieldOptions(searchFieldValues)+ ? getFieldOptions(searchFieldValues ?? []): getFieldOptions(initialFieldValues);const emptyResultsMessage = getEmptyResultsMessage(nothingFoundMessage,@@ -85,7 +89,7 @@ export function SearchValuePicker({};const handleSearchTimeout = () => {- if (shouldSearch(searchValue, searchQuery, searchFieldValues)) {+ if (shouldSearch(searchValue, searchQuery, searchFieldValues ?? [])) {setSearchQuery(searchValue);}};@@ -105,14 +109,13 @@ export function SearchValuePicker({parseValue={parseValue}renderValue={({ value }) => (<RemappedValue- fieldId={fieldId}- searchFieldId={searchFieldId}value={value}- isRemapped={isRemapped}+ canRemapValues={canRemapValues}+ useGetRemappedFieldValue={useGetRemappedFieldValue}/>)}renderOption={({ option }) => (- <RemappedOption option={option} isRemapped={isRemapped} />+ <RemappedOption option={option} canRemapValues={canRemapValues} />)}onChange={onChange}onSearchChange={handleSearchChange}@@ -121,28 +124,22 @@ export function SearchValuePicker({}type RemappedValueProps = {- fieldId: FieldId;- searchFieldId: FieldId;value: string;- isRemapped: boolean;+ canRemapValues: boolean;+ useGetRemappedFieldValue: (+ args: UseGetRemappedFieldValueArgs,+ ) => UseGetRemappedFieldValueResult;};function RemappedValue({- fieldId,- searchFieldId,value,- isRemapped,+ canRemapValues,+ useGetRemappedFieldValue,}: RemappedValueProps) {- const { data: remappedValue } = useGetRemappedFieldValueQuery(- {- fieldId,- remappedFieldId: searchFieldId,- value,- },- {- skip: !isRemapped,- },- );+ const { data: remappedValue } = useGetRemappedFieldValue({+ value,+ skip: !canRemapValues,+ });if (remappedValue == null) {return value;@@ -154,11 +151,11 @@ function RemappedValue({type RemappedOptionProps = {option: ComboboxItem;- isRemapped: boolean;+ canRemapValues: boolean;};-function RemappedOption({ option, isRemapped }: RemappedOptionProps) {- if (!isRemapped) {+function RemappedOption({ option, canRemapValues }: RemappedOptionProps) {+ if (!canRemapValues) {return option.label;}diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/constants.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/constants.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/constants.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/constants.tsdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/index.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/index.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/utils.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/utils.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/SearchValuePicker/utils.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/SearchValuePicker/utils.tsdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/StaticValuePicker/StaticValuePicker.tsx b/frontend/src/metabase/querying/common/components/FieldValuePicker/StaticValuePicker/StaticValuePicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/StaticValuePicker/StaticValuePicker.tsxrename to frontend/src/metabase/querying/common/components/FieldValuePicker/StaticValuePicker/StaticValuePicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/StaticValuePicker/index.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/StaticValuePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/StaticValuePicker/index.tsrename to frontend/src/metabase/querying/common/components/FieldValuePicker/StaticValuePicker/index.tsdiff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/index.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/index.tsnew file mode 100644index 00000000000..85b6cf65266--- /dev/null+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/index.ts@@ -0,0 +1,2 @@+export * from "./FieldValuePicker";+export * from "./types";diff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/types.tsnew file mode 100644index 00000000000..f1f6da0d718--- /dev/null+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/types.ts@@ -0,0 +1,36 @@+import type { FieldValue } from "metabase-types/api";++export interface FieldValuesResponse {+ values: FieldValue[];+ has_more_values: boolean;+}++export type UseGetFieldValuesArgs = {+ skip?: boolean;+};++export type UseGetFieldValuesResult = {+ data?: FieldValuesResponse | undefined;+ isLoading: boolean;+};++export type UseSearchFieldValuesArgs = {+ value: string;+ limit: number;+ skip?: boolean;+};++export type UseSearchFieldValuesResult = {+ data?: FieldValue[];+ error?: unknown;+ isFetching: boolean;+};++export type UseGetRemappedFieldValueArgs = {+ value: string;+ skip?: boolean;+};++export type UseGetRemappedFieldValueResult = {+ data?: FieldValue | undefined;+};diff --git a/frontend/src/metabase/querying/common/components/FieldValuePicker/utils.ts b/frontend/src/metabase/querying/common/components/FieldValuePicker/utils.tsnew file mode 100644index 00000000000..1822cd1f55f--- /dev/null+++ b/frontend/src/metabase/querying/common/components/FieldValuePicker/utils.ts@@ -0,0 +1,16 @@+import type { FieldValuesResponse } from "./types";++export function canShowListPicker({+ values,+ has_more_values,+}: FieldValuesResponse): boolean {+ return values.length > 0 && !has_more_values;+}++export function canShowSearchPicker(+ canListValues: boolean,+ canSearchValues: boolean,+ fieldData: FieldValuesResponse | undefined,+): boolean {+ return (canListValues && !!fieldData?.has_more_values) || canSearchValues;+}diff --git a/frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.tsx b/frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.tsxsimilarity index 90%rename from frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.tsxrename to frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.tsxindex c92c7f2144c..696e0f51298 100644--- a/frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.tsx+++ b/frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.tsx@@ -1,6 +1,6 @@import dayjs from "dayjs";-import type { MonthYearPickerValue } from "metabase/querying/filters/types";+import type { MonthYearPickerValue } from "metabase/querying/common/types";import { Box, type DateValue, MonthPicker } from "metabase/ui";type MonthYearPickerProps = {diff --git a/frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.unit.spec.tsxsimilarity index 93%rename from frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.unit.spec.tsxindex fb7d03c219c..9092f66496b 100644--- a/frontend/src/metabase/querying/filters/components/MonthYearPicker/MonthYearPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/MonthYearPicker/MonthYearPicker.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { render, screen } from "__support__/ui";-import type { MonthYearPickerValue } from "metabase/querying/filters/types";+import type { MonthYearPickerValue } from "metabase/querying/common/types";import { MonthYearPicker } from "./MonthYearPicker";diff --git a/frontend/src/metabase/querying/filters/components/MonthYearPicker/index.ts b/frontend/src/metabase/querying/common/components/MonthYearPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/MonthYearPicker/index.tsrename to frontend/src/metabase/querying/common/components/MonthYearPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.tsx b/frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.tsxsimilarity index 90%rename from frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.tsxrename to frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.tsxindex 39a713440de..6b294fc9782 100644--- a/frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.tsx+++ b/frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.tsx@@ -1,6 +1,6 @@import dayjs from "dayjs";-import type { QuarterYearPickerValue } from "metabase/querying/filters/types";+import type { QuarterYearPickerValue } from "metabase/querying/common/types";import { Box, type DateValue, QuarterPicker } from "metabase/ui";type QuarterYearPickerProps = {diff --git a/frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsxsimilarity index 94%rename from frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsxindex 9fe0b0d864d..b83c029bb59 100644--- a/frontend/src/metabase/querying/filters/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/QuarterYearPicker/QuarterYearPicker.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { render, screen } from "__support__/ui";-import type { QuarterYearPickerValue } from "metabase/querying/filters/types";+import type { QuarterYearPickerValue } from "metabase/querying/common/types";import { QuarterYearPicker } from "./QuarterYearPicker";diff --git a/frontend/src/metabase/querying/filters/components/QuarterYearPicker/index.ts b/frontend/src/metabase/querying/common/components/QuarterYearPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/QuarterYearPicker/index.tsrename to frontend/src/metabase/querying/common/components/QuarterYearPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsxsimilarity index 99%rename from frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsxrename to frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsxindex d379ae8b5bd..c0ed0126d40 100644--- a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx+++ b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.tsx@@ -1,6 +1,6 @@import { isMatching } from "ts-pattern";-import type { RelativeDatePickerValue } from "metabase/querying/filters/types";+import type { RelativeDatePickerValue } from "metabase/querying/common/types";import { Button, Divider, SimpleGrid, Stack, Title } from "metabase/ui";import type { Shortcut } from "./types";diff --git a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsxsimilarity index 98%rename from frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsxindex ccc82945881..e1c208f3e5f 100644--- a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/RelativeDateShortcutPicker.unit.spec.tsx@@ -1,7 +1,7 @@import userEvent from "@testing-library/user-event";import { renderWithProviders, screen } from "__support__/ui";-import type { RelativeDatePickerValue } from "metabase/querying/filters/types";+import type { RelativeDatePickerValue } from "metabase/querying/common/types";import { RelativeDateShortcutPicker } from "./RelativeDateShortcutPicker";diff --git a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/index.ts b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/index.tsrename to frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/types.ts b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/types.tssimilarity index 93%rename from frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/types.tsrename to frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/types.tsindex 280c4fc0e09..10db6641865 100644--- a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/types.ts+++ b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/types.ts@@ -1,4 +1,4 @@-import type { RelativeDatePickerValue } from "metabase/querying/filters/types";+import type { RelativeDatePickerValue } from "metabase/querying/common/types";export type ShortcutGroup = {label?: string;diff --git a/frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/utils.ts b/frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/utils.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/RelativeDateShortcutPicker/utils.tsrename to frontend/src/metabase/querying/common/components/RelativeDateShortcutPicker/utils.tsdiff --git a/frontend/src/metabase/querying/filters/components/TemporalUnitPicker/TemporalUnitPicker.tsx b/frontend/src/metabase/querying/common/components/TemporalUnitPicker/TemporalUnitPicker.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/TemporalUnitPicker/TemporalUnitPicker.tsxrename to frontend/src/metabase/querying/common/components/TemporalUnitPicker/TemporalUnitPicker.tsxdiff --git a/frontend/src/metabase/querying/filters/components/TemporalUnitPicker/TemporalUnitPicker.unit.spec.tsx b/frontend/src/metabase/querying/common/components/TemporalUnitPicker/TemporalUnitPicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/TemporalUnitPicker/TemporalUnitPicker.unit.spec.tsxrename to frontend/src/metabase/querying/common/components/TemporalUnitPicker/TemporalUnitPicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/TemporalUnitPicker/index.ts b/frontend/src/metabase/querying/common/components/TemporalUnitPicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/TemporalUnitPicker/index.tsrename to frontend/src/metabase/querying/common/components/TemporalUnitPicker/index.tsdiff --git a/frontend/src/metabase/querying/common/constants.ts b/frontend/src/metabase/querying/common/constants.tsnew file mode 100644index 00000000000..c4e471dfbaa--- /dev/null+++ b/frontend/src/metabase/querying/common/constants.ts@@ -0,0 +1,56 @@+export const SPECIFIC_DATE_PICKER_OPERATORS = [+ "=" as const,+ "<" as const,+ ">" as const,+ "between" as const,+];++export const EXCLUDE_DATE_PICKER_OPERATORS = [+ "!=" as const,+ "is-null" as const,+ "not-null" as const,+];++export const DATE_PICKER_OPERATORS = [+ ...SPECIFIC_DATE_PICKER_OPERATORS,+ ...EXCLUDE_DATE_PICKER_OPERATORS,+];++export const DATE_PICKER_SHORTCUTS = [+ "today" as const,+ "yesterday" as const,+ "previous-week" as const,+ "previous-7-days" as const,+ "previous-30-days" as const,+ "previous-month" as const,+ "previous-3-months" as const,+ "previous-12-months" as const,+];++export const DATE_PICKER_TRUNCATION_UNITS = [+ "minute" as const,+ "hour" as const,+ "day" as const,+ "week" as const,+ "month" as const,+ "quarter" as const,+ "year" as const,+];++export const DATE_PICKER_EXTRACTION_UNITS = [+ "hour-of-day" as const,+ "day-of-week" as const,+ "month-of-year" as const,+ "quarter-of-year" as const,+];++export const DATE_PICKER_UNITS = [+ ...DATE_PICKER_TRUNCATION_UNITS,+ ...DATE_PICKER_EXTRACTION_UNITS,+];++export const DATE_PICKER_DIRECTIONS = [+ "past" as const,+ "current" as const,+ "future" as const,+];diff --git a/frontend/src/metabase/querying/common/types.ts b/frontend/src/metabase/querying/common/types.tsnew file mode 100644index 00000000000..b0a98a20168--- /dev/null+++ b/frontend/src/metabase/querying/common/types.ts@@ -0,0 +1,94 @@+import type {+ DATE_PICKER_DIRECTIONS,+ DATE_PICKER_EXTRACTION_UNITS,+ DATE_PICKER_SHORTCUTS,+ DATE_PICKER_TRUNCATION_UNITS,+ EXCLUDE_DATE_PICKER_OPERATORS,+ SPECIFIC_DATE_PICKER_OPERATORS,+} from "./constants";++export type DatePickerOperator =+ | SpecificDatePickerOperator+ | ExcludeDatePickerOperator;++export type SpecificDatePickerOperator =+ (typeof SPECIFIC_DATE_PICKER_OPERATORS)[number];++export type ExcludeDatePickerOperator =+ (typeof EXCLUDE_DATE_PICKER_OPERATORS)[number];++export type DatePickerShortcut = (typeof DATE_PICKER_SHORTCUTS)[number];++export type DatePickerUnit =+ | DatePickerExtractionUnit+ | DatePickerTruncationUnit;++export type DatePickerExtractionUnit =+ (typeof DATE_PICKER_EXTRACTION_UNITS)[number];++export type DatePickerTruncationUnit =+ (typeof DATE_PICKER_TRUNCATION_UNITS)[number];++export interface SpecificDatePickerValue {+ type: "specific";+ operator: SpecificDatePickerOperator;+ values: Date[];+ hasTime: boolean;+}++export interface RelativeDatePickerValue {+ type: "relative";+ unit: DatePickerTruncationUnit;+ value: number;+ offsetUnit?: DatePickerTruncationUnit;+ offsetValue?: number;+ options?: RelativeDatePickerOptions;+}++export interface RelativeDatePickerOptions {+ includeCurrent?: boolean;+}++export interface ExcludeDatePickerValue {+ type: "exclude";+ operator: ExcludeDatePickerOperator;+ unit?: DatePickerExtractionUnit;+ values: number[];+}++export type DatePickerValue =+ | SpecificDatePickerValue+ | RelativeDatePickerValue+ | ExcludeDatePickerValue;++export type DatePickerValueType = DatePickerValue["type"];++export type RelativeIntervalDirection = (typeof DATE_PICKER_DIRECTIONS)[number];++export interface ShortcutOption {+ label: string;+ shortcut: DatePickerShortcut;+ direction: RelativeIntervalDirection;+ value: RelativeDatePickerValue;+}++export type MonthYearPickerValue = {+ type: "month";+ year: number;+ /** 1-12 */+ month: number;+};++export type QuarterYearPickerValue = {+ type: "quarter";+ year: number;+ /** 1-4 */+ quarter: number;+};++export type DateFilterValue =+ | DatePickerValue+ | MonthYearPickerValue+ | QuarterYearPickerValue;++export type BooleanFilterValue = "true" | "false" | "is-null" | "not-null";diff --git a/frontend/src/metabase/querying/common/utils.ts b/frontend/src/metabase/querying/common/utils.tsnew file mode 100644index 00000000000..c8fcde725f3--- /dev/null+++ b/frontend/src/metabase/querying/common/utils.ts@@ -0,0 +1,13 @@+import type { ComboboxItem } from "metabase/ui";+import type { FieldValue } from "metabase-types/api";++export function getFieldOption([value, label]: FieldValue): ComboboxItem {+ return {+ value: String(value),+ label: String(label ?? value),+ };+}++export function getFieldOptions(fieldValues: FieldValue[]): ComboboxItem[] {+ return fieldValues.filter(([value]) => value != null).map(getFieldOption);+}diff --git a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsxindex 93bacbea66a..d358d89c576 100644--- a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx@@ -1,11 +1,11 @@import { useMemo, useState } from "react";import { useTranslateContent } from "metabase/i18n/hooks";+import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";import { Popover } from "metabase/ui";import * as Lib from "metabase-lib";-import { FilterPicker } from "../../FilterPicker";import { FilterPill } from "../FilterPill";interface FilterPanelPopoverProps {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsxindex 9214fcd7bc6..6c1199f17c1 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/BooleanFilterPicker/BooleanFilterPicker.tsx@@ -1,11 +1,11 @@import type { FormEvent } from "react";import { useMemo } from "react";-import { BooleanPicker } from "metabase/querying/filters/components/BooleanPicker";+import { BooleanPicker } from "metabase/querying/common/components/BooleanPicker";+import { useBooleanFilter } from "metabase/querying/filters/hooks/use-boolean-filter";import { Box } from "metabase/ui";import * as Lib from "metabase-lib";-import { useBooleanFilter } from "../../../hooks/use-boolean-filter";import { FilterPickerFooter } from "../FilterPickerFooter";import { FilterPickerHeader } from "../FilterPickerHeader";import { WIDTH } from "../constants";diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsxindex c4a80663659..b9579981291 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/CoordinateFilterPicker/CoordinateFilterPicker.tsx@@ -3,6 +3,7 @@ import { useMemo } from "react";import { t } from "ttag";import { isNotNull } from "metabase/lib/types";+import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";import {type NumberOrEmptyValue,useCoordinateFilter,@@ -10,11 +11,10 @@ import {import { Box, Flex, Stack, Text } from "metabase/ui";import * as Lib from "metabase-lib";-import { NumberFilterValuePicker } from "../../FilterValuePicker";-import { NumberFilterInput } from "../../NumberFilterInput";import { FilterOperatorPicker } from "../FilterOperatorPicker";import { FilterPickerFooter } from "../FilterPickerFooter";import { FilterPickerHeader } from "../FilterPickerHeader";+import { NumberFilterValuePicker } from "../FilterValuePicker";import { COMBOBOX_PROPS, WIDTH } from "../constants";import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";@@ -172,7 +172,7 @@ function CoordinateValueInput({if (valueCount === 1) {return (<Flex p="md">- <NumberFilterInput+ <BigIntNumberInputvalue={values[0]}placeholder={t`Enter a number`}autoFocus={autoFocus}@@ -187,14 +187,14 @@ function CoordinateValueInput({if (valueCount === 2) {return (<Flex align="center" justify="center" p="md">- <NumberFilterInput+ <BigIntNumberInputvalue={values[0]}placeholder={t`Min`}autoFocus={autoFocus}onChange={(newValue) => onChange([newValue, values[1]])}/><Text mx="sm">{t`and`}</Text>- <NumberFilterInput+ <BigIntNumberInputvalue={values[1]}placeholder={t`Max`}onChange={(newValue) => onChange([values[0], newValue])}@@ -206,7 +206,7 @@ function CoordinateValueInput({if (valueCount === 4) {return (<Stack align="center" justify="center" gap="sm" p="md">- <NumberFilterInput+ <BigIntNumberInputlabel={t`Upper latitude`}value={values[0]}placeholder="90"@@ -216,7 +216,7 @@ function CoordinateValueInput({}/><Flex align="center" justify="center" gap="sm">- <NumberFilterInput+ <BigIntNumberInputlabel={t`Left longitude`}value={values[1]}placeholder="-180"@@ -224,7 +224,7 @@ function CoordinateValueInput({onChange([values[0], newValue, values[2], values[3]])}/>- <NumberFilterInput+ <BigIntNumberInputlabel={t`Right longitude`}value={values[3]}placeholder="180"@@ -233,7 +233,7 @@ function CoordinateValueInput({}/></Flex>- <NumberFilterInput+ <BigIntNumberInputlabel={t`Lower latitude`}value={values[2]}placeholder="-90"diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsxindex 6810b7b8595..a9d74639f6a 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx@@ -1,11 +1,11 @@import { useMemo } from "react";+import { DatePicker } from "metabase/querying/common/components/DatePicker";+import type { DatePickerValue } from "metabase/querying/common/types";import { useDateFilter } from "metabase/querying/filters/hooks/use-date-filter";-import type { DatePickerValue } from "metabase/querying/filters/types";import { PopoverBackButton } from "metabase/ui";import * as Lib from "metabase-lib";-import { DatePicker } from "../../DatePicker";import { FilterSubmitButton } from "../FilterSubmitButton";import type { FilterPickerWidgetProps } from "../types";@@ -25,13 +25,12 @@ export function DateFilterPicker({return Lib.displayInfo(query, stageIndex, column);}, [query, stageIndex, column]);- const { value, availableOperators, availableUnits, getFilterClause } =- useDateFilter({- query,- stageIndex,- column,- filter,- });+ const { value, availableUnits, getFilterClause } = useDateFilter({+ query,+ stageIndex,+ column,+ filter,+ });const handleChange = (value: DatePickerValue) => {onChange(getFilterClause(value), { run: true });@@ -45,7 +44,6 @@ export function DateFilterPicker({<div data-testid="date-filter-picker"><DatePickervalue={value}- availableOperators={availableOperators}availableUnits={availableUnits}renderSubmitButton={({ value, isDisabled }) => {if (!withSubmitButton) {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsxindex 8343613d295..ab6fd3b4935 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker/SimpleDateFilterPicker.tsx@@ -1,6 +1,6 @@-import { SimpleDatePicker } from "metabase/querying/filters/components/DatePicker/SimpleDatePicker";+import { SimpleDatePicker } from "metabase/querying/common/components/DatePicker/SimpleDatePicker";+import type { DatePickerValue } from "metabase/querying/common/types";import { useDateFilter } from "metabase/querying/filters/hooks/use-date-filter";-import type { DatePickerValue } from "metabase/querying/filters/types";import type * as Lib from "metabase-lib";interface SimpleDateFilterPickerProps {@@ -18,13 +18,12 @@ export function SimpleDateFilterPicker({filter,onChange,}: SimpleDateFilterPickerProps) {- const { value, availableOperators, availableUnits, getFilterClause } =- useDateFilter({- query,- stageIndex,- column,- filter,- });+ const { value, availableUnits, getFilterClause } = useDateFilter({+ query,+ stageIndex,+ column,+ filter,+ });const handleChange = (value: DatePickerValue | undefined) => {if (value) {@@ -38,7 +37,6 @@ export function SimpleDateFilterPicker({<div data-testid="date-filter-picker"><SimpleDatePickervalue={value}- availableOperators={availableOperators}availableUnits={availableUnits}onChange={handleChange}/>diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsxindex 7f21cddde17..f74df006660 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DefaultFilterPicker/DefaultFilterPicker.tsx@@ -80,7 +80,7 @@ export function DefaultFilterPicker({<Radiokey={option.operator}value={option.operator}- label={option.name}+ label={option.displayName}pb={6}size="xs"/>diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.cssindex 8831c0df81c..16887e6cfd3 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.module.css@@ -1,3 +1,3 @@-.Root {+.root {flex-shrink: 0;}diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsxindex a070417dde9..e836c95ac77 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterOperatorPicker/FilterOperatorPicker.tsx@@ -1,21 +1,18 @@import { t } from "ttag";+import type { FilterOperatorOption } from "metabase/querying/filters/types";import { Button, Icon, Menu } from "metabase/ui";+import type * as Lib from "metabase-lib";-import Styles from "./FilterOperatorPicker.module.css";+import S from "./FilterOperatorPicker.module.css";-type Option<T> = {- name: string;- operator: T;-};--interface FilterOperatorPickerProps<T> {+interface FilterOperatorPickerProps<T extends Lib.FilterOperator> {value: T;- options: Option<T>[];+ options: FilterOperatorOption<T>[];onChange: (operator: T) => void;}-export function FilterOperatorPicker<T extends string>({+export function FilterOperatorPicker<T extends Lib.FilterOperator>({value,options,onChange,@@ -29,17 +26,15 @@ export function FilterOperatorPicker<T extends string>({fw="normal"rightSection={<Icon name="chevrondown" />}aria-label={t`Filter operator`}- classNames={{- root: Styles.Root,- }}+ className={S.root}>- {selectedOption?.name ?? t`Select operator`}+ {selectedOption?.displayName ?? t`Select operator`}</Button></Menu.Target><Menu.Dropdown>{options.map((option, index) => (<Menu.Item key={index} onClick={() => onChange(option.operator)}>- {option.name}+ {option.displayName}</Menu.Item>))}</Menu.Dropdown>diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsxnew file mode 100644index 00000000000..ef37768c7f0--- /dev/null+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.tsx@@ -0,0 +1,169 @@+import { skipToken } from "@reduxjs/toolkit/query/react";+import { useMemo } from "react";++import {+ useGetFieldValuesQuery,+ useGetRemappedFieldValueQuery,+ useSearchFieldValuesQuery,+} from "metabase/api";+import { parseNumber } from "metabase/lib/number";+import {+ FieldValuePicker,+ type UseGetFieldValuesArgs,+ type UseGetRemappedFieldValueArgs,+ type UseSearchFieldValuesArgs,+} from "metabase/querying/common/components/FieldValuePicker";+import type { ComboboxProps } from "metabase/ui";+import * as Lib from "metabase-lib";++import {+ canListFieldValues,+ canRemapFieldValues,+ canSearchFieldValues,+ getNothingFoundMessage,+ getSearchPlaceholder,+ getStaticPlaceholder,+} from "./utils";++type FilterValuePickerProps<T> = {+ query: Lib.Query;+ stageIndex: number;+ column: Lib.ColumnMetadata;+ values: T[];+ autoFocus?: boolean;+ comboboxProps?: ComboboxProps;+ onChange: (newValues: T[]) => void;+};++type FilterValuePickerOwnProps = {+ query: Lib.Query;+ stageIndex: number;+ column: Lib.ColumnMetadata;+ values: string[];+ autoFocus?: boolean;+ comboboxProps?: ComboboxProps;+ parseValue?: (rawValue: string) => string | null;+ onChange: (newValues: string[]) => void;+};++function FilterValuePicker({+ query,+ stageIndex,+ column,+ values,+ autoFocus,+ comboboxProps,+ parseValue,+ onChange,+}: FilterValuePickerOwnProps) {+ const fieldInfo = useMemo(+ () => Lib.fieldValuesSearchInfo(query, column),+ [query, column],+ );++ const searchColumnName = useMemo(() => {+ return fieldInfo.searchField+ ? Lib.displayInfo(query, stageIndex, fieldInfo.searchField).displayName+ : undefined;+ }, [query, stageIndex, fieldInfo.searchField]);++ const canListValues = canListFieldValues(fieldInfo);+ const canSearchValues = canSearchFieldValues(fieldInfo);+ const canRemapValues = canRemapFieldValues(fieldInfo);++ const useGetFieldValues = ({ skip }: UseGetFieldValuesArgs) => {+ return useGetFieldValuesQuery(+ fieldInfo.fieldId == null || skip ? skipToken : fieldInfo.fieldId,+ );+ };++ const useSearchFieldValues = ({+ value,+ limit,+ skip,+ }: UseSearchFieldValuesArgs) => {+ return useSearchFieldValuesQuery(+ fieldInfo.fieldId == null || fieldInfo.searchFieldId == null || skip+ ? skipToken+ : {+ fieldId: fieldInfo.fieldId,+ searchFieldId: fieldInfo.searchFieldId,+ value,+ limit,+ },+ );+ };++ const useGetRemappedFieldValue = ({+ value,+ skip,+ }: UseGetRemappedFieldValueArgs) => {+ return useGetRemappedFieldValueQuery(+ fieldInfo.fieldId == null || fieldInfo.searchFieldId == null || skip+ ? skipToken+ : {+ fieldId: fieldInfo.fieldId,+ remappedFieldId: fieldInfo.searchFieldId,+ value,+ },+ );+ };++ return (+ <FieldValuePicker+ values={values}+ placeholder={getStaticPlaceholder(column)}+ searchPlaceholder={+ searchColumnName+ ? getSearchPlaceholder(column, searchColumnName)+ : undefined+ }+ nothingFoundMessage={+ searchColumnName ? getNothingFoundMessage(searchColumnName) : undefined+ }+ autoFocus={autoFocus}+ canListValues={canListValues}+ canSearchValues={canSearchValues}+ canRemapValues={canRemapValues}+ comboboxProps={comboboxProps}+ parseValue={parseValue}+ useGetFieldValues={useGetFieldValues}+ useSearchFieldValues={useSearchFieldValues}+ useGetRemappedFieldValue={useGetRemappedFieldValue}+ onChange={onChange}+ />+ );+}++type StringFilterValuePickerProps = FilterValuePickerProps<string>;++export function StringFilterValuePicker(props: StringFilterValuePickerProps) {+ return <FilterValuePicker {...props} />;+}++type NumberFilterValuePickerProps =+ FilterValuePickerProps<Lib.NumberFilterValue>;++export function NumberFilterValuePicker({+ values,+ onChange,+ ...props+}: NumberFilterValuePickerProps) {+ const parseValue = (rawValue: string) => {+ const number = parseNumber(rawValue);+ return number != null ? String(number) : null;+ };++ const handleChange = (newValues: string[]) => {+ onChange(newValues.map(parseNumber).filter((value) => value != null));+ };++ return (+ <FilterValuePicker+ {...props}+ values={values.map(String)}+ parseValue={parseValue}+ onChange={handleChange}+ />+ );+}diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/FilterValuePicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/FilterValuePicker.unit.spec.tsxrename to frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/FilterValuePicker.unit.spec.tsxdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/index.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/index.tssimilarity index 100%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/index.tsrename to frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/index.tsdiff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/utils.ts b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/utils.tssimilarity index 52%rename from frontend/src/metabase/querying/filters/components/FilterValuePicker/utils.tsrename to frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/utils.tsindex e438d1074bb..38d73fb4833 100644--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/utils.ts+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterValuePicker/utils.ts@@ -1,45 +1,27 @@import { t } from "ttag";-import type { ComboboxItem } from "metabase/ui";import type { FieldValuesSearchInfo } from "metabase-lib";import * as Lib from "metabase-lib";-import type { FieldValue, GetFieldValuesResponse } from "metabase-types/api";-export function canLoadFieldValues({+export function canListFieldValues({fieldId,hasFieldValues,}: FieldValuesSearchInfo): boolean {return fieldId != null && hasFieldValues === "list";}-export function canListFieldValues({- values,- has_more_values,-}: GetFieldValuesResponse): boolean {- return values.length > 0 && !has_more_values;-}--export function canSearchFieldValues(- { fieldId, searchFieldId, hasFieldValues }: FieldValuesSearchInfo,- fieldData: GetFieldValuesResponse | undefined,-): boolean {- return (- fieldId != null &&- searchFieldId != null &&- ((hasFieldValues === "list" && fieldData?.has_more_values) ||- hasFieldValues === "search")- );-}--export function getFieldOption([value, label]: FieldValue): ComboboxItem {- return {- value: String(value),- label: String(label ?? value),- };+export function canSearchFieldValues({+ searchFieldId,+ hasFieldValues,+}: FieldValuesSearchInfo): boolean {+ return searchFieldId != null && hasFieldValues === "search";}-export function getFieldOptions(fieldValues: FieldValue[]): ComboboxItem[] {- return fieldValues.filter(([value]) => value != null).map(getFieldOption);+export function canRemapFieldValues({+ fieldId,+ searchFieldId,+}: FieldValuesSearchInfo): boolean {+ return fieldId != null && searchFieldId != null && fieldId !== searchFieldId;}export function getStaticPlaceholder(column: Lib.ColumnMetadata) {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsxindex 0c6e20b9c9a..5eff5913bb8 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/NumberFilterPicker/NumberFilterPicker.tsx@@ -3,6 +3,7 @@ import { useMemo } from "react";import { t } from "ttag";import { isNotNull } from "metabase/lib/types";+import { BigIntNumberInput } from "metabase/querying/common/components/BigIntNumberInput";import {type NumberOrEmptyValue,useNumberFilter,@@ -10,11 +11,10 @@ import {import { Box, Flex, Text } from "metabase/ui";import * as Lib from "metabase-lib";-import { NumberFilterValuePicker } from "../../FilterValuePicker";-import { NumberFilterInput } from "../../NumberFilterInput";import { FilterOperatorPicker } from "../FilterOperatorPicker";import { FilterPickerFooter } from "../FilterPickerFooter";import { FilterPickerHeader } from "../FilterPickerHeader";+import { NumberFilterValuePicker } from "../FilterValuePicker";import { COMBOBOX_PROPS, WIDTH } from "../constants";import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";@@ -156,7 +156,7 @@ function NumberValueInput({if (valueCount === 1) {return (<Flex p="md">- <NumberFilterInput+ <BigIntNumberInputvalue={values[0]}placeholder={t`Enter a number`}autoFocus={autoFocus}@@ -171,14 +171,14 @@ function NumberValueInput({if (valueCount === 2) {return (<Flex align="center" justify="center" p="md">- <NumberFilterInput+ <BigIntNumberInputvalue={values[0]}placeholder={t`Min`}autoFocus={autoFocus}onChange={(newValue) => onChange([newValue, values[1]])}/><Text mx="sm">{t`and`}</Text>- <NumberFilterInput+ <BigIntNumberInputvalue={values[1]}placeholder={t`Max`}onChange={(newValue) => onChange([values[0], newValue])}diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsxindex bea8c42fe45..0b944f9bb04 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/StringFilterPicker/StringFilterPicker.tsx@@ -9,10 +9,10 @@ import {import { Box, Checkbox, Flex, MultiAutocomplete } from "metabase/ui";import * as Lib from "metabase-lib";-import { StringFilterValuePicker } from "../../FilterValuePicker";import { FilterOperatorPicker } from "../FilterOperatorPicker";import { FilterPickerFooter } from "../FilterPickerFooter";import { FilterPickerHeader } from "../FilterPickerHeader";+import { StringFilterValuePicker } from "../FilterValuePicker";import { COMBOBOX_PROPS, WIDTH } from "../constants";import type { FilterChangeOpts, FilterPickerWidgetProps } from "../types";diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/FilterValuePicker.tsx b/frontend/src/metabase/querying/filters/components/FilterValuePicker/FilterValuePicker.tsxdeleted file mode 100644index 94d93beff30..00000000000--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/FilterValuePicker.tsx+++ /dev/null@@ -1,135 +0,0 @@-import { skipToken } from "@reduxjs/toolkit/query/react";-import { useMemo } from "react";-import { t } from "ttag";--import { useGetFieldValuesQuery } from "metabase/api";-import { parseNumber } from "metabase/lib/number";-import { checkNotNull, isNotNull } from "metabase/lib/types";-import { Center, type ComboboxProps, Loader } from "metabase/ui";-import * as Lib from "metabase-lib";--import { ListValuePicker } from "./ListValuePicker";-import { SearchValuePicker } from "./SearchValuePicker";-import { StaticValuePicker } from "./StaticValuePicker";-import {- canListFieldValues,- canLoadFieldValues,- canSearchFieldValues,- getNothingFoundMessage,- getSearchPlaceholder,- getStaticPlaceholder,-} from "./utils";--interface FilterValuePickerProps<T> {- query: Lib.Query;- stageIndex: number;- column: Lib.ColumnMetadata;- values: T[];- autoFocus?: boolean;- comboboxProps?: ComboboxProps;- parseValue?: (rawValue: string) => string | null;- onChange: (newValues: T[]) => void;-}--function FilterValuePicker({- query,- stageIndex,- column,- values: selectedValues,- autoFocus = false,- comboboxProps,- parseValue,- onChange,-}: FilterValuePickerProps<string>) {- const fieldInfo = useMemo(- () => Lib.fieldValuesSearchInfo(query, column),- [query, column],- );-- const { data: fieldData, isLoading } = useGetFieldValuesQuery(- fieldInfo.fieldId ?? skipToken,- { skip: !canLoadFieldValues(fieldInfo) },- );-- if (isLoading) {- return (- <Center h="2.5rem">- <Loader data-testid="loading-indicator" />- </Center>- );- }-- if (fieldData && canListFieldValues(fieldData)) {- return (- <ListValuePicker- fieldValues={fieldData.values}- selectedValues={selectedValues}- placeholder={t`Search the list`}- autoFocus={autoFocus}- onChange={onChange}- />- );- }-- if (canSearchFieldValues(fieldInfo, fieldData)) {- const searchColumn = checkNotNull(fieldInfo.searchField);- const searchColumInfo = Lib.displayInfo(query, stageIndex, searchColumn);- const searchColumName = searchColumInfo.displayName;-- return (- <SearchValuePicker- fieldId={checkNotNull(fieldInfo.fieldId)}- searchFieldId={checkNotNull(fieldInfo.searchFieldId)}- fieldValues={fieldData?.values ?? []}- selectedValues={selectedValues}- placeholder={getSearchPlaceholder(column, searchColumName)}- nothingFoundMessage={getNothingFoundMessage(searchColumName)}- autoFocus={autoFocus}- comboboxProps={comboboxProps}- parseValue={parseValue}- onChange={onChange}- />- );- }-- return (- <StaticValuePicker- selectedValues={selectedValues}- placeholder={getStaticPlaceholder(column)}- autoFocus={autoFocus}- comboboxProps={comboboxProps}- parseValue={parseValue}- onChange={onChange}- />- );-}--export function StringFilterValuePicker(props: FilterValuePickerProps<string>) {- return <FilterValuePicker {...props} />;-}--export function NumberFilterValuePicker({- column,- values,- onChange,- ...props-}: FilterValuePickerProps<Lib.NumberFilterValue>) {- const parseValue = (rawValue: string) => {- const number = parseNumber(rawValue);- return number != null ? String(number) : null;- };-- const handleChange = (newValues: string[]) => {- onChange(newValues.map(parseNumber).filter(isNotNull));- };-- return (- <FilterValuePicker- {...props}- column={column}- values={values.map((value) => String(value))}- parseValue={parseValue}- onChange={handleChange}- />- );-}diff --git a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.unit.spec.tsxdeleted file mode 100644index 8dbc4c38698..00000000000--- a/frontend/src/metabase/querying/filters/components/FilterValuePicker/ListValuePicker/ListValuePicker.unit.spec.tsx+++ /dev/null@@ -1,116 +0,0 @@-import userEvent from "@testing-library/user-event";--import { renderWithProviders, screen } from "__support__/ui";-import type { FieldValue } from "metabase-types/api";-import { PRODUCT_CATEGORY_VALUES } from "metabase-types/api/mocks/presets";--import { ListValuePicker } from "./ListValuePicker";--type SetupOpts = {- fieldValues?: FieldValue[];- selectedValues?: string[];- placeholder?: string;- autoFocus?: boolean;-};--function setup({- fieldValues = [],- selectedValues = [],- placeholder = "Search the list",- autoFocus,-}: SetupOpts) {- const onChange = jest.fn();-- renderWithProviders(- <ListValuePicker- fieldValues={fieldValues}- selectedValues={selectedValues}- placeholder={placeholder}- autoFocus={autoFocus}- onChange={onChange}- />,- );-- return { onChange };-}--describe("ListValuePicker", () => {- const allOptions = PRODUCT_CATEGORY_VALUES.values;- const allValues = allOptions.map(([value]) => String(value));-- it("should allow to select all options", async () => {- const { onChange } = setup({- fieldValues: allOptions,- selectedValues: [],- });-- const checkbox = screen.getByLabelText("Select all");- expect(checkbox).not.toBeChecked();- await userEvent.click(checkbox);-- expect(onChange).toHaveBeenCalledWith(allValues);- });-- it("should allow to select all options when some are selected", async () => {- const { onChange } = setup({- fieldValues: allOptions,- selectedValues: [allValues[0]],- });-- const checkbox = screen.getByLabelText("Select all");- expect(checkbox).not.toBeChecked();- await userEvent.click(checkbox);-- expect(onChange).toHaveBeenCalledWith(allValues);- });-- it("should allow to select only visible options after search", async () => {- const { onChange } = setup({- fieldValues: allOptions,- selectedValues: ["Doohickey", "Gadget"],- });-- await userEvent.type(screen.getByPlaceholderText("Search the list"), "get");- expect(screen.getByLabelText("Gadget")).toBeInTheDocument();- expect(screen.getByLabelText("Widget")).toBeInTheDocument();- expect(screen.queryByLabelText("Gizmo")).not.toBeInTheDocument();- expect(screen.queryByLabelText("Doohickey")).not.toBeInTheDocument();-- const checkbox = screen.getByLabelText("Select these");- expect(checkbox).not.toBeChecked();- await userEvent.click(checkbox);- expect(onChange).toHaveBeenCalledWith(["Doohickey", "Gadget", "Widget"]);- });-- it("should allow to deselect all options", async () => {- const { onChange } = setup({- fieldValues: allOptions,- selectedValues: allValues,- });-- const checkbox = screen.getByLabelText("Select all");- expect(checkbox).toBeChecked();- await userEvent.click(checkbox);-- expect(onChange).toHaveBeenCalledWith([]);- });-- it("should allow to deselect only visible options after search", async () => {- const { onChange } = setup({- fieldValues: allOptions,- selectedValues: ["Doohickey", "Gadget", "Widget"],- });-- await userEvent.type(- screen.getByPlaceholderText("Search the list"),- "Gadget",- );- expect(screen.getByLabelText("Gadget")).toBeInTheDocument();- expect(screen.queryByLabelText("Widget")).not.toBeInTheDocument();-- const checkbox = screen.getByLabelText("Select these");- expect(checkbox).toBeChecked();- await userEvent.click(checkbox);- expect(onChange).toHaveBeenCalledWith(["Doohickey", "Widget"]);- });-});diff --git a/frontend/src/metabase/querying/filters/components/NumberFilterInput/index.ts b/frontend/src/metabase/querying/filters/components/NumberFilterInput/index.tsdeleted file mode 100644index fdb09a639c4..00000000000--- a/frontend/src/metabase/querying/filters/components/NumberFilterInput/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./NumberFilterInput";diff --git a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.tsx b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.tsxindex 09cc4ede24c..3a20fe071d1 100644--- a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesBucketPicker/TimeseriesBucketPicker.tsx@@ -1,12 +1,11 @@import { useMemo, useState } from "react";import { t } from "ttag";+import { TemporalUnitPicker } from "metabase/querying/common/components/TemporalUnitPicker";import { Button, Icon, Popover } from "metabase/ui";import * as Lib from "metabase-lib";import type { TemporalUnit } from "metabase-types/api";-import { TemporalUnitPicker } from "../../TemporalUnitPicker";-interface TimeseriesBucketPickerProps {query: Lib.Query;stageIndex: number;diff --git a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsxindex 7fc51b09386..16c82a987c9 100644--- a/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/TimeseriesChrome/TimeseriesFilterPicker/TimeseriesFilterPicker.tsx@@ -1,11 +1,10 @@import { useMemo, useState } from "react";import { t } from "ttag";+import { SimpleDateFilterPicker } from "metabase/querying/filters/components/FilterPicker/DateFilterPicker/SimpleDateFilterPicker";import { Button, Icon, Popover } from "metabase/ui";import * as Lib from "metabase-lib";-import { SimpleDateFilterPicker } from "../../FilterPicker/DateFilterPicker/SimpleDateFilterPicker";-export interface TimeseriesFilterPickerProps {query: Lib.Query;stageIndex: number;diff --git a/frontend/src/metabase/querying/filters/constants.ts b/frontend/src/metabase/querying/filters/constants.tsindex c4e471dfbaa..e69de29bb2d 100644--- a/frontend/src/metabase/querying/filters/constants.ts+++ b/frontend/src/metabase/querying/filters/constants.ts@@ -1,56 +0,0 @@-export const SPECIFIC_DATE_PICKER_OPERATORS = [- "=" as const,- "<" as const,- ">" as const,- "between" as const,-];--export const EXCLUDE_DATE_PICKER_OPERATORS = [- "!=" as const,- "is-null" as const,- "not-null" as const,-];--export const DATE_PICKER_OPERATORS = [- ...SPECIFIC_DATE_PICKER_OPERATORS,- ...EXCLUDE_DATE_PICKER_OPERATORS,-];--export const DATE_PICKER_SHORTCUTS = [- "today" as const,- "yesterday" as const,- "previous-week" as const,- "previous-7-days" as const,- "previous-30-days" as const,- "previous-month" as const,- "previous-3-months" as const,- "previous-12-months" as const,-];--export const DATE_PICKER_TRUNCATION_UNITS = [- "minute" as const,- "hour" as const,- "day" as const,- "week" as const,- "month" as const,- "quarter" as const,- "year" as const,-];--export const DATE_PICKER_EXTRACTION_UNITS = [- "hour-of-day" as const,- "day-of-week" as const,- "month-of-year" as const,- "quarter-of-year" as const,-];--export const DATE_PICKER_UNITS = [- ...DATE_PICKER_TRUNCATION_UNITS,- ...DATE_PICKER_EXTRACTION_UNITS,-];--export const DATE_PICKER_DIRECTIONS = [- "past" as const,- "current" as const,- "future" as const,-];diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.tsindex 7bfcc762dba..f2194d0ab68 100644--- a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/use-boolean-filter.unit.spec.ts@@ -1,7 +1,7 @@import { act, renderHook } from "@testing-library/react";import { createMockMetadata } from "__support__/metadata";-import type { BooleanFilterValue } from "metabase/querying/filters/types";+import type { BooleanFilterValue } from "metabase/querying/common/types";import * as Lib from "metabase-lib";import { columnFinder, createQuery } from "metabase-lib/test-helpers";import { createMockField } from "metabase-types/api/mocks";diff --git a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.tsindex cea246ddf19..35b9bb62508 100644--- a/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-boolean-filter/utils.ts@@ -1,4 +1,4 @@-import type { BooleanFilterValue } from "metabase/querying/filters/types";+import type { BooleanFilterValue } from "metabase/querying/common/types";import * as Lib from "metabase-lib";export function getFilterValue(diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.tsindex 6bd8aa2c5b7..fd72f518c63 100644--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/constants.ts@@ -1,10 +1,10 @@import type * as Lib from "metabase-lib";-import type { OperatorOption } from "./types";+import type { CoordinateFilterOperatorInfo } from "./types";-export const OPERATOR_OPTIONS: Record<+export const OPERATORS: Record<Lib.CoordinateFilterOperator,- OperatorOption+ CoordinateFilterOperatorInfo> = {"=": {operator: "=",diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.tsindex 6bb01753a9e..892f64e665e 100644--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/types.ts@@ -11,10 +11,13 @@ type CoordinatePickerOperator =| ">="| "<=";-export interface OperatorOption- extends FilterOperatorOption<CoordinatePickerOperator> {+export type CoordinateFilterOperatorOption =+ FilterOperatorOption<CoordinatePickerOperator>;++export type CoordinateFilterOperatorInfo = {+ operator: CoordinatePickerOperator;valueCount: number;hasMultipleValues?: boolean;-}+};export type NumberOrEmptyValue = Lib.NumberFilterValue | null;diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.tsindex 4fd35c0abe5..cf21694cdc5 100644--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/use-coordinate-filter.ts@@ -34,10 +34,7 @@ export function useCoordinateFilter({[query, stageIndex, filter],);- const availableOptions = useMemo(- () => getAvailableOptions(query, stageIndex, column),- [query, stageIndex, column],- );+ const availableOptions = useMemo(() => getAvailableOptions(), []);const availableColumns = useMemo(() => getAvailableColumns(query, stageIndex, column),@@ -45,7 +42,7 @@ export function useCoordinateFilter({);const [operator, setOperator] = useState(- filterParts ? filterParts.operator : getDefaultOperator(availableOptions),+ filterParts ? filterParts.operator : getDefaultOperator(),);const [values, setValues] = useState(getDefaultValues(operator, filterParts ? filterParts.values : []),diff --git a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.tsindex e24cd618e8b..5307e2a1491 100644--- a/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-coordinate-filter/utils.ts@@ -1,34 +1,25 @@import { isNotNull } from "metabase/lib/types";-import {- getAvailableOperatorOptions,- getDefaultAvailableOperator,-} from "metabase/querying/filters/utils/operators";import * as Lib from "metabase-lib";-import { OPERATOR_OPTIONS } from "./constants";-import type { NumberOrEmptyValue, OperatorOption } from "./types";+import { OPERATORS } from "./constants";+import type {+ CoordinateFilterOperatorOption,+ NumberOrEmptyValue,+} from "./types";-export function getAvailableOptions(- query: Lib.Query,- stageIndex: number,- column: Lib.ColumnMetadata,-) {- return getAvailableOperatorOptions(- query,- stageIndex,- column,- OPERATOR_OPTIONS,- );+export function getAvailableOptions(): CoordinateFilterOperatorOption[] {+ return Object.values(OPERATORS).map(({ operator }) => ({+ operator,+ displayName: Lib.describeFilterOperator(operator),+ }));}export function getOptionByOperator(operator: Lib.CoordinateFilterOperator) {- return OPERATOR_OPTIONS[operator];+ return OPERATORS[operator];}-export function getDefaultOperator(- availableOptions: OperatorOption[],-): Lib.CoordinateFilterOperator {- return getDefaultAvailableOperator(availableOptions, "between");+export function getDefaultOperator(): Lib.CoordinateFilterOperator {+ return "between";}export function getAvailableColumns(@@ -63,7 +54,7 @@ export function getDefaultValues(operator: Lib.CoordinateFilterOperator,values: NumberOrEmptyValue[],): NumberOrEmptyValue[] {- const { valueCount, hasMultipleValues } = OPERATOR_OPTIONS[operator];+ const { valueCount, hasMultipleValues } = OPERATORS[operator];if (hasMultipleValues) {return values.filter(isNotNull);}diff --git a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.tsindex 74ad13222e5..66d938dce74 100644--- a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.ts@@ -1,9 +1,8 @@import { useMemo } from "react";-import type { DatePickerValue } from "metabase/querying/filters/types";+import type { DatePickerValue } from "metabase/querying/common/types";import {getDateFilterClause,- getDatePickerOperators,getDatePickerUnits,getDatePickerValue,} from "metabase/querying/filters/utils/dates";@@ -25,18 +24,12 @@ export function useDateFilter({const value = useMemo(() => {return filter && getDatePickerValue(query, stageIndex, filter);}, [query, stageIndex, filter]);-- const availableOperators = useMemo(() => {- return getDatePickerOperators(query, stageIndex, column);- }, [query, stageIndex, column]);-const availableUnits = useMemo(() => {return getDatePickerUnits(query, stageIndex, column);}, [query, stageIndex, column]);return {value,- availableOperators,availableUnits,getFilterClause: (value: DatePickerValue) =>getDateFilterClause(column, value),diff --git a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts b/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.tsindex e32c0a61f4b..ba09550b9fc 100644--- a/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-date-filter/use-date-filter.unit.spec.ts@@ -1,6 +1,6 @@import { renderHook } from "@testing-library/react";-import type { DatePickerValue } from "metabase/querying/filters/types";+import type { DatePickerValue } from "metabase/querying/common/types";import * as Lib from "metabase-lib";import {columnFinder,@@ -61,7 +61,7 @@ describe("useDateFilter", () => {},);- it("should return available operators and units for a regular column", () => {+ it("should return available units for a regular column", () => {const { result } = renderHook(() =>useDateFilter({query: defaultQuery,@@ -70,12 +70,11 @@ describe("useDateFilter", () => {}),);- const { availableOperators, availableUnits } = result.current;- expect(availableOperators.length).toBeGreaterThan(0);+ const { availableUnits } = result.current;expect(availableUnits.length).toBeGreaterThan(0);});- it("should return available operators and units for a custom column", () => {+ it("should return available units for a custom column", () => {const query = createQueryWithClauses({query: defaultQuery,expressions: [@@ -99,8 +98,7 @@ describe("useDateFilter", () => {}),);- const { availableOperators, availableUnits } = result.current;- expect(availableOperators.length).toBeGreaterThan(0);+ const { availableUnits } = result.current;expect(availableUnits.length).toBe(0);});});diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.tsindex d3a595af843..827b1341ebf 100644--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-default-filter/constants.ts@@ -1,10 +1,10 @@import type * as Lib from "metabase-lib";-import type { OperatorOption } from "./types";+import type { DefaultFilterOperatorInfo } from "./types";-export const OPERATOR_OPTIONS: Record<+export const OPERATORS: Record<Lib.DefaultFilterOperator,- OperatorOption+ DefaultFilterOperatorInfo> = {"is-null": {operator: "is-null",diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/types.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/types.tsindex f934cb5a08c..800142a5031 100644--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/types.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-default-filter/types.ts@@ -1,4 +1,9 @@import type { FilterOperatorOption } from "metabase/querying/filters/types";import type * as Lib from "metabase-lib";-export type OperatorOption = FilterOperatorOption<Lib.DefaultFilterOperator>;+export type DefaultFilterOperatorOption =+ FilterOperatorOption<Lib.DefaultFilterOperator>;++export type DefaultFilterOperatorInfo = {+ operator: Lib.DefaultFilterOperator;+};diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.tsindex f3b4c489d3d..75f022c02ed 100644--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-default-filter/use-default-filter.ts@@ -28,15 +28,10 @@ export function useDefaultFilter({[query, stageIndex, filter],);- const availableOptions = useMemo(- () => getAvailableOptions(query, stageIndex, column),- [query, stageIndex, column],- );+ const availableOptions = useMemo(() => getAvailableOptions(), []);const [operator, setOperator] = useState(- filterParts- ? filterParts.operator- : getDefaultOperator(availableOptions, hasInitialOperator),+ filterParts ? filterParts.operator : getDefaultOperator(hasInitialOperator),);return {diff --git a/frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.tsindex 308fc041880..87e0ca97470 100644--- a/frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-default-filter/utils.ts@@ -1,32 +1,19 @@-import {- getAvailableOperatorOptions,- getDefaultAvailableOperator,-} from "metabase/querying/filters/utils/operators";import * as Lib from "metabase-lib";-import { OPERATOR_OPTIONS } from "./constants";-import type { OperatorOption } from "./types";+import { OPERATORS } from "./constants";+import type { DefaultFilterOperatorOption } from "./types";-export function getAvailableOptions(- query: Lib.Query,- stageIndex: number,- column: Lib.ColumnMetadata,-) {- return getAvailableOperatorOptions(- query,- stageIndex,- column,- OPERATOR_OPTIONS,- );+export function getAvailableOptions(): DefaultFilterOperatorOption[] {+ return Object.values(OPERATORS).map(({ operator }) => ({+ operator,+ displayName: Lib.describeFilterOperator(operator),+ }));}export function getDefaultOperator(- availableOptions: OperatorOption[],hasInitialOperator: boolean,): Lib.DefaultFilterOperator | undefined {- return hasInitialOperator- ? getDefaultAvailableOperator(availableOptions)- : undefined;+ return hasInitialOperator ? "is-null" : undefined;}export function getFilterClause(diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.tsindex 95d5e4a5871..6141f3a8b97 100644--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-number-filter/constants.ts@@ -1,10 +1,10 @@import type * as Lib from "metabase-lib";-import type { OperatorOption } from "./types";+import type { NumberFilterOperatorInfo } from "./types";-export const OPERATOR_OPTIONS: Record<+export const OPERATORS: Record<Lib.NumberFilterOperator,- OperatorOption+ NumberFilterOperatorInfo> = {"=": {operator: "=",diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/types.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/types.tsindex 1a02bb277ee..861d4f8e2a9 100644--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/types.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-number-filter/types.ts@@ -1,10 +1,13 @@import type { FilterOperatorOption } from "metabase/querying/filters/types";import type * as Lib from "metabase-lib";-export interface OperatorOption- extends FilterOperatorOption<Lib.NumberFilterOperator> {+export type NumberFilterOperatorOption =+ FilterOperatorOption<Lib.NumberFilterOperator>;++export type NumberFilterOperatorInfo = {+ operator: Lib.NumberFilterOperator;valueCount: number;hasMultipleValues?: boolean;-}+};export type NumberOrEmptyValue = Lib.NumberFilterValue | null;diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.tsindex 87781a147e3..e6a4daef436 100644--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-number-filter/use-number-filter.ts@@ -30,15 +30,10 @@ export function useNumberFilter({[query, stageIndex, filter],);- const availableOptions = useMemo(- () => getAvailableOptions(query, stageIndex, column),- [query, stageIndex, column],- );+ const availableOptions = useMemo(() => getAvailableOptions(column), [column]);const [operator, setOperator] = useState(() =>- filterParts- ? filterParts.operator- : getDefaultOperator(query, column, availableOptions),+ filterParts ? filterParts.operator : getDefaultOperator(query, column),);const [values, setValues] = useState(() =>diff --git a/frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.tsindex 169c91181e6..a92201de4ba 100644--- a/frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-number-filter/utils.ts@@ -1,51 +1,43 @@import { isNotNull } from "metabase/lib/types";-import {- getAvailableOperatorOptions,- getDefaultAvailableOperator,-} from "metabase/querying/filters/utils/operators";import * as Lib from "metabase-lib";-import { OPERATOR_OPTIONS } from "./constants";-import type { NumberOrEmptyValue, OperatorOption } from "./types";+import { OPERATORS } from "./constants";+import type { NumberFilterOperatorOption, NumberOrEmptyValue } from "./types";export function getAvailableOptions(- query: Lib.Query,- stageIndex: number,column: Lib.ColumnMetadata,-) {- return getAvailableOperatorOptions(- query,- stageIndex,- column,- OPERATOR_OPTIONS,- );+): NumberFilterOperatorOption[] {+ const isKey = Lib.isPrimaryKey(column) || Lib.isForeignKey(column);+ const variant = isKey ? "default" : "number";++ return Object.values(OPERATORS).map(({ operator }) => ({+ operator,+ displayName: Lib.describeFilterOperator(operator, variant),+ }));}export function getOptionByOperator(operator: Lib.NumberFilterOperator) {- return OPERATOR_OPTIONS[operator];+ return OPERATORS[operator];}export function getDefaultOperator(query: Lib.Query,column: Lib.ColumnMetadata,- availableOptions: OperatorOption[],): Lib.NumberFilterOperator {const fieldValuesInfo = Lib.fieldValuesSearchInfo(query, column);- const desiredOperator =- Lib.isPrimaryKey(column) ||+ return Lib.isPrimaryKey(column) ||Lib.isForeignKey(column) ||fieldValuesInfo.hasFieldValues !== "none"- ? "="- : "between";- return getDefaultAvailableOperator(availableOptions, desiredOperator);+ ? "="+ : "between";}export function getDefaultValues(operator: Lib.NumberFilterOperator,values: NumberOrEmptyValue[],): NumberOrEmptyValue[] {- const { valueCount, hasMultipleValues } = OPERATOR_OPTIONS[operator];+ const { valueCount, hasMultipleValues } = OPERATORS[operator];if (hasMultipleValues) {return values.filter(isNotNull);}diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.tsindex 50af776f9af..16e269eac8d 100644--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-string-filter/constants.ts@@ -1,10 +1,10 @@import type * as Lib from "metabase-lib";-import type { OperatorOption } from "./types";+import type { StringFilterOperatorInfo } from "./types";-export const OPERATOR_OPTIONS: Record<+export const OPERATORS: Record<Lib.StringFilterOperator,- OperatorOption+ StringFilterOperatorInfo> = {"=": {operator: "=",diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/types.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/types.tsindex 1074f54be07..b21278402a2 100644--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/types.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-string-filter/types.ts@@ -3,7 +3,10 @@ import type * as Lib from "metabase-lib";export type OperatorType = "exact" | "partial" | "empty";-export interface OperatorOption- extends FilterOperatorOption<Lib.StringFilterOperator> {+export type StringFilterOperatorOption =+ FilterOperatorOption<Lib.StringFilterOperator>;++export type StringFilterOperatorInfo = {+ operator: Lib.StringFilterOperator;type: OperatorType;-}+};diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.tsindex 8b341bce6ee..cdc2740fb20 100644--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-string-filter/use-string-filter.ts@@ -29,15 +29,10 @@ export function useStringFilter({[query, stageIndex, filter],);- const availableOptions = useMemo(- () => getAvailableOptions(query, stageIndex, column),- [query, stageIndex, column],- );+ const availableOptions = useMemo(() => getAvailableOptions(column), [column]);const [operator, setOperator] = useState(() =>- filterParts- ? filterParts.operator- : getDefaultOperator(query, column, availableOptions),+ filterParts ? filterParts.operator : getDefaultOperator(query, column),);const [values, setValues] = useState(() =>diff --git a/frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.tsindex 83a664ecf2a..45b177242dc 100644--- a/frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-string-filter/utils.ts@@ -1,54 +1,52 @@-import {- getAvailableOperatorOptions,- getDefaultAvailableOperator,-} from "metabase/querying/filters/utils/operators";import * as Lib from "metabase-lib";-import { OPERATOR_OPTIONS } from "./constants";-import type { OperatorOption } from "./types";+import { OPERATORS } from "./constants";+import type { StringFilterOperatorOption } from "./types";function isNotEmpty(value: string) {return value.length > 0;}export function getAvailableOptions(- query: Lib.Query,- stageIndex: number,column: Lib.ColumnMetadata,-) {- return getAvailableOperatorOptions(- query,- stageIndex,- column,- OPERATOR_OPTIONS,- );+): StringFilterOperatorOption[] {+ const isStringLike = Lib.isStringLike(column);++ return Object.values(OPERATORS)+ .filter(({ type }) => !isStringLike || type !== "partial")+ .map(({ operator }) => ({+ operator,+ displayName: Lib.describeFilterOperator(operator),+ }));}export function getOptionByOperator(operator: Lib.StringFilterOperator) {- return OPERATOR_OPTIONS[operator];+ return OPERATORS[operator];}export function getDefaultOperator(query: Lib.Query,column: Lib.ColumnMetadata,- availableOptions: OperatorOption[],): Lib.StringFilterOperator {const fieldValuesInfo = Lib.fieldValuesSearchInfo(query, column);- const desiredOperator =+ if (Lib.isPrimaryKey(column) ||Lib.isForeignKey(column) ||+ Lib.isStringLike(column) ||fieldValuesInfo.hasFieldValues !== "none"- ? "="- : "contains";- return getDefaultAvailableOperator(availableOptions, desiredOperator);+ ) {+ return "=";+ }++ return "contains";}export function getDefaultValues(operator: Lib.StringFilterOperator,values: string[],): string[] {- const { type } = OPERATOR_OPTIONS[operator];+ const { type } = OPERATORS[operator];return type !== "empty" ? values.filter(isNotEmpty) : [];}@@ -77,7 +75,7 @@ function getFilterParts(values: string[],options: Lib.StringFilterOptions,): Lib.StringFilterParts | undefined {- const { type } = OPERATOR_OPTIONS[operator];+ const { type } = OPERATORS[operator];if (values.length === 0 && type !== "empty") {return undefined;}diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.tsindex e62091d08d4..ce2e3922668 100644--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-time-filter/constants.ts@@ -1,8 +1,8 @@import type * as Lib from "metabase-lib";-import type { OperatorOption } from "./types";+import type { TimeFilterOperatorInfo } from "./types";-export const OPERATOR_OPTIONS: Record<Lib.TimeFilterOperator, OperatorOption> =+export const OPERATORS: Record<Lib.TimeFilterOperator, TimeFilterOperatorInfo> ={"<": {operator: "<",diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/types.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/types.tsindex 16134c7acc6..09ee55dfc35 100644--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/types.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-time-filter/types.ts@@ -1,9 +1,12 @@import type { FilterOperatorOption } from "metabase/querying/filters/types";import type * as Lib from "metabase-lib";-export interface OperatorOption- extends FilterOperatorOption<Lib.TimeFilterOperator> {+export type TimeFilterOperatorOption =+ FilterOperatorOption<Lib.TimeFilterOperator>;++export type TimeFilterOperatorInfo = {+ operator: Lib.TimeFilterOperator;valueCount: number;-}+};export type TimeValue = Date | null;diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.tsindex 63f3a4cd5bd..4222cd87b85 100644--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-time-filter/use-time-filter.ts@@ -29,13 +29,10 @@ export function useTimeFilter({return filter ? Lib.timeFilterParts(query, stageIndex, filter) : null;}, [query, stageIndex, filter]);- const availableOptions = useMemo(- () => getAvailableOptions(query, stageIndex, column),- [query, stageIndex, column],- );+ const availableOptions = useMemo(() => getAvailableOptions(), []);const [operator, setOperator] = useState(- filterParts ? filterParts.operator : getDefaultOperator(availableOptions),+ filterParts ? filterParts.operator : getDefaultOperator(),);const [values, setValues] = useState(() =>getDefaultValues(operator, filterParts ? filterParts.values : []),diff --git a/frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.ts b/frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.tsindex 70fbfb959fe..c798584996c 100644--- a/frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.ts+++ b/frontend/src/metabase/querying/filters/hooks/use-time-filter/utils.ts@@ -1,36 +1,24 @@import dayjs from "dayjs";import { isNotNull } from "metabase/lib/types";-import {- getAvailableOperatorOptions,- getDefaultAvailableOperator,-} from "metabase/querying/filters/utils/operators";import * as Lib from "metabase-lib";-import { OPERATOR_OPTIONS } from "./constants";-import type { OperatorOption, TimeValue } from "./types";+import { OPERATORS } from "./constants";+import type { TimeFilterOperatorOption, TimeValue } from "./types";-export function getAvailableOptions(- query: Lib.Query,- stageIndex: number,- column: Lib.ColumnMetadata,-) {- return getAvailableOperatorOptions(- query,- stageIndex,- column,- OPERATOR_OPTIONS,- );+export function getAvailableOptions(): TimeFilterOperatorOption[] {+ return Object.values(OPERATORS).map(({ operator }) => ({+ operator,+ displayName: Lib.describeFilterOperator(operator, "temporal"),+ }));}export function getOptionByOperator(operator: Lib.TimeFilterOperator) {- return OPERATOR_OPTIONS[operator];+ return OPERATORS[operator];}-export function getDefaultOperator(- availableOptions: OperatorOption[],-): Lib.TimeFilterOperator {- return getDefaultAvailableOperator(availableOptions, "<");+export function getDefaultOperator(): Lib.TimeFilterOperator {+ return "<";}function getDefaultValue() {@@ -41,7 +29,7 @@ export function getDefaultValues(operator: Lib.TimeFilterOperator,values: TimeValue[],): TimeValue[] {- const { valueCount } = OPERATOR_OPTIONS[operator];+ const { valueCount } = OPERATORS[operator];return Array(valueCount).fill(getDefaultValue())diff --git a/frontend/src/metabase/querying/filters/types.ts b/frontend/src/metabase/querying/filters/types.tsindex c90159456ba..9996d531b54 100644--- a/frontend/src/metabase/querying/filters/types.ts+++ b/frontend/src/metabase/querying/filters/types.ts@@ -1,113 +1,13 @@import type * as Lib from "metabase-lib";import type { DateFormattingSettings } from "metabase-types/api";-import type {- DATE_PICKER_DIRECTIONS,- DATE_PICKER_EXTRACTION_UNITS,- DATE_PICKER_SHORTCUTS,- DATE_PICKER_TRUNCATION_UNITS,- EXCLUDE_DATE_PICKER_OPERATORS,- SPECIFIC_DATE_PICKER_OPERATORS,-} from "./constants";--export interface ColumnItem {- column: Lib.ColumnMetadata;- displayName: string;- stageIndex: number;-}--export type FilterOperatorOption<T extends Lib.FilterOperatorName> = {+export type FilterOperatorOption<T extends Lib.FilterOperator> = {operator: T;+ displayName: string;};-export type DatePickerOperator =- | SpecificDatePickerOperator- | ExcludeDatePickerOperator;--export type SpecificDatePickerOperator =- (typeof SPECIFIC_DATE_PICKER_OPERATORS)[number];--export type ExcludeDatePickerOperator =- (typeof EXCLUDE_DATE_PICKER_OPERATORS)[number];--export type DatePickerShortcut = (typeof DATE_PICKER_SHORTCUTS)[number];--export type DatePickerUnit =- | DatePickerExtractionUnit- | DatePickerTruncationUnit;--export type DatePickerExtractionUnit =- (typeof DATE_PICKER_EXTRACTION_UNITS)[number];--export type DatePickerTruncationUnit =- (typeof DATE_PICKER_TRUNCATION_UNITS)[number];--export interface SpecificDatePickerValue {- type: "specific";- operator: SpecificDatePickerOperator;- values: Date[];- hasTime: boolean;-}--export interface RelativeDatePickerValue {- type: "relative";- unit: DatePickerTruncationUnit;- value: number;- offsetUnit?: DatePickerTruncationUnit;- offsetValue?: number;- options?: RelativeDatePickerOptions;-}--export interface RelativeDatePickerOptions {- includeCurrent?: boolean;-}--export interface ExcludeDatePickerValue {- type: "exclude";- operator: ExcludeDatePickerOperator;- unit?: DatePickerExtractionUnit;- values: number[];-}--export type DatePickerValue =- | SpecificDatePickerValue- | RelativeDatePickerValue- | ExcludeDatePickerValue;--export type DatePickerValueType = DatePickerValue["type"];--export type RelativeIntervalDirection = (typeof DATE_PICKER_DIRECTIONS)[number];--export interface ShortcutOption {- label: string;- shortcut: DatePickerShortcut;- direction: RelativeIntervalDirection;- value: RelativeDatePickerValue;-}--export type MonthYearPickerValue = {- type: "month";- year: number;- /** 1-12 */- month: number;-};--export type QuarterYearPickerValue = {- type: "quarter";- year: number;- /** 1-4 */- quarter: number;-};--export type DateFilterValue =- | DatePickerValue- | MonthYearPickerValue- | QuarterYearPickerValue;-export type DateFilterDisplayOpts = {// whether to include `On` prefix for a single date filterwithPrefix?: boolean;formattingSettings?: DateFormattingSettings;};--export type BooleanFilterValue = "true" | "false" | "is-null" | "not-null";diff --git a/frontend/src/metabase/querying/filters/utils/dates.ts b/frontend/src/metabase/querying/filters/utils/dates.tsindex 225c4f4ddc8..cac9bcacd84 100644--- a/frontend/src/metabase/querying/filters/utils/dates.ts+++ b/frontend/src/metabase/querying/filters/utils/dates.ts@@ -7,9 +7,8 @@ import {DATE_PICKER_EXTRACTION_UNITS,DATE_PICKER_OPERATORS,DATE_PICKER_TRUNCATION_UNITS,-} from "metabase/querying/filters/constants";+} from "metabase/querying/common/constants";import type {- DateFilterDisplayOpts,DateFilterValue,DatePickerExtractionUnit,DatePickerOperator,@@ -21,7 +20,8 @@ import type {QuarterYearPickerValue,RelativeDatePickerValue,SpecificDatePickerValue,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";+import type { DateFilterDisplayOpts } from "metabase/querying/filters/types";import type { ExcludeDateFilterUnit } from "metabase-lib";import * as Lib from "metabase-lib";import type { DateFormattingSettings } from "metabase-types/api";@@ -51,16 +51,6 @@ export function isDatePickerExtractionUnit(return units.includes(unit);}-export function getDatePickerOperators(- query: Lib.Query,- stageIndex: number,- column: Lib.ColumnMetadata,-): DatePickerOperator[] {- return Lib.filterableColumnOperators(column)- .map((operator) => Lib.displayInfo(query, stageIndex, operator).shortName)- .filter(isDatePickerOperator);-}-export function getDatePickerUnits(query: Lib.Query,stageIndex: number,diff --git a/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts b/frontend/src/metabase/querying/filters/utils/dates.unit.spec.tsindex a4c77e8e84b..577e84e480d 100644--- a/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts+++ b/frontend/src/metabase/querying/filters/utils/dates.unit.spec.ts@@ -1,5 +1,5 @@import { setLocalization } from "metabase/lib/i18n";-import type { DateFilterValue } from "metabase/querying/filters/types";+import type { DateFilterValue } from "metabase/querying/common/types";import * as Lib from "metabase-lib";import { columnFinder, createQuery } from "metabase-lib/test-helpers";import type { DateFormattingSettings } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/filters/utils/operators.ts b/frontend/src/metabase/querying/filters/utils/operators.tsdeleted file mode 100644index d4220ea10f1..00000000000--- a/frontend/src/metabase/querying/filters/utils/operators.ts+++ /dev/null@@ -1,34 +0,0 @@-import type { FilterOperatorOption } from "metabase/querying/filters/types";-import * as Lib from "metabase-lib";--export function getAvailableOperatorOptions<- T extends FilterOperatorOption<Lib.FilterOperatorName>,->(- query: Lib.Query,- stageIndex: number,- column: Lib.ColumnMetadata,- options: Record<string, T>,-) {- const operatorInfoByName = Object.fromEntries(- Lib.filterableColumnOperators(column)- .map((operator) => Lib.displayInfo(query, stageIndex, operator))- .map((operatorInfo) => [operatorInfo.shortName, operatorInfo]),- );-- return Object.values(options)- .filter((option) => operatorInfoByName[option.operator] != null)- .map((option) => ({- name: operatorInfoByName[option.operator].longDisplayName,- ...option,- }));-}--export function getDefaultAvailableOperator<T extends Lib.FilterOperatorName>(- options: FilterOperatorOption<T>[],- desiredOperator?: T,-): T {- return (- options.find((option) => option.operator === desiredOperator)?.operator ??- options[0].operator- );-}diff --git a/frontend/src/metabase/querying/parameters/components/BooleanWidget/BooleanWidget.tsx b/frontend/src/metabase/querying/parameters/components/BooleanWidget/BooleanWidget.tsxindex 7d8061e9ada..7fffe7704dc 100644--- a/frontend/src/metabase/querying/parameters/components/BooleanWidget/BooleanWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/BooleanWidget/BooleanWidget.tsx@@ -2,8 +2,8 @@ import { type FormEvent, useState } from "react";import { match } from "ts-pattern";import { t } from "ttag";-import { BooleanPicker } from "metabase/querying/filters/components/BooleanPicker";-import type { BooleanFilterValue } from "metabase/querying/filters/types";+import { BooleanPicker } from "metabase/querying/common/components/BooleanPicker";+import type { BooleanFilterValue } from "metabase/querying/common/types";import { deserializeBooleanParameterValue } from "metabase/querying/parameters/utils/parsing";import { Box } from "metabase/ui";import type { ParameterValueOrArray } from "metabase-types/api";diff --git a/frontend/src/metabase/querying/parameters/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateAllOptionsWidget/DateAllOptionsWidget.tsxindex 95787b3eee7..d579028c1bf 100644--- a/frontend/src/metabase/querying/parameters/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx@@ -2,13 +2,13 @@ import { useMemo } from "react";import { P, match } from "ts-pattern";import { t } from "ttag";-import { DatePicker } from "metabase/querying/filters/components/DatePicker";+import { DatePicker } from "metabase/querying/common/components/DatePicker";import type {DatePickerOperator,DatePickerShortcut,DatePickerValue,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/components/DateMonthYearWidget/DateMonthYearWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateMonthYearWidget/DateMonthYearWidget.tsxindex f022423394b..e401735df67 100644--- a/frontend/src/metabase/querying/parameters/components/DateMonthYearWidget/DateMonthYearWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateMonthYearWidget/DateMonthYearWidget.tsx@@ -1,8 +1,8 @@import { useMemo } from "react";import { match } from "ts-pattern";-import { MonthYearPicker } from "metabase/querying/filters/components/MonthYearPicker";-import type { MonthYearPickerValue } from "metabase/querying/filters/types";+import { MonthYearPicker } from "metabase/querying/common/components/MonthYearPicker";+import type { MonthYearPickerValue } from "metabase/querying/common/types";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/components/DateQuarterYearWidget/DateQuarterYearWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateQuarterYearWidget/DateQuarterYearWidget.tsxindex b233397cce6..25bbca969cb 100644--- a/frontend/src/metabase/querying/parameters/components/DateQuarterYearWidget/DateQuarterYearWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateQuarterYearWidget/DateQuarterYearWidget.tsx@@ -1,8 +1,8 @@import { useMemo } from "react";import { match } from "ts-pattern";-import { QuarterYearPicker } from "metabase/querying/filters/components/QuarterYearPicker";-import type { QuarterYearPickerValue } from "metabase/querying/filters/types";+import { QuarterYearPicker } from "metabase/querying/common/components/QuarterYearPicker";+import type { QuarterYearPickerValue } from "metabase/querying/common/types";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/components/DateRangeWidget/DateRangeWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateRangeWidget/DateRangeWidget.tsxindex 346c6362ad9..e99ba62bd7d 100644--- a/frontend/src/metabase/querying/parameters/components/DateRangeWidget/DateRangeWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateRangeWidget/DateRangeWidget.tsx@@ -6,7 +6,7 @@ import { t } from "ttag";import {DateRangePicker,type DateRangePickerValue,-} from "metabase/querying/filters/components/DatePicker/SpecificDatePicker/DateRangePicker";+} from "metabase/querying/common/components/DatePicker/SpecificDatePicker/DateRangePicker";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/components/DateRelativeWidget/DateRelativeWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateRelativeWidget/DateRelativeWidget.tsxindex 0f3f18387ea..7e360b89bf6 100644--- a/frontend/src/metabase/querying/parameters/components/DateRelativeWidget/DateRelativeWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateRelativeWidget/DateRelativeWidget.tsx@@ -1,8 +1,8 @@import { useMemo } from "react";import { match } from "ts-pattern";-import { RelativeDateShortcutPicker } from "metabase/querying/filters/components/RelativeDateShortcutPicker";-import type { RelativeDatePickerValue } from "metabase/querying/filters/types";+import { RelativeDateShortcutPicker } from "metabase/querying/common/components/RelativeDateShortcutPicker";+import type { RelativeDatePickerValue } from "metabase/querying/common/types";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/components/DateSingleWidget/DateSingleWidget.tsx b/frontend/src/metabase/querying/parameters/components/DateSingleWidget/DateSingleWidget.tsxindex 09d8e9ae395..d3e8fef17ef 100644--- a/frontend/src/metabase/querying/parameters/components/DateSingleWidget/DateSingleWidget.tsx+++ b/frontend/src/metabase/querying/parameters/components/DateSingleWidget/DateSingleWidget.tsx@@ -6,7 +6,7 @@ import { t } from "ttag";import {SingleDatePicker,type SingleDatePickerValue,-} from "metabase/querying/filters/components/DatePicker/SpecificDatePicker/SingleDatePicker";+} from "metabase/querying/common/components/DatePicker/SpecificDatePicker/SingleDatePicker";import {deserializeDateParameterValue,serializeDateParameterValue,diff --git a/frontend/src/metabase/querying/parameters/utils/parsing.ts b/frontend/src/metabase/querying/parameters/utils/parsing.tsindex 8f84a1b73f2..779160c6322 100644--- a/frontend/src/metabase/querying/parameters/utils/parsing.ts+++ b/frontend/src/metabase/querying/parameters/utils/parsing.ts@@ -2,7 +2,7 @@ import dayjs from "dayjs";import { parseNumber } from "metabase/lib/number";import { isNotNull } from "metabase/lib/types";-import type { DateFilterValue } from "metabase/querying/filters/types";+import type { DateFilterValue } from "metabase/querying/common/types";import { isDatePickerTruncationUnit } from "metabase/querying/filters/utils/dates";import * as Lib from "metabase-lib";import type {diff --git a/frontend/src/metabase/querying/parameters/utils/parsing.unit.spec.ts b/frontend/src/metabase/querying/parameters/utils/parsing.unit.spec.tsindex 954c92ef9cc..b9d8965a89b 100644--- a/frontend/src/metabase/querying/parameters/utils/parsing.unit.spec.ts+++ b/frontend/src/metabase/querying/parameters/utils/parsing.unit.spec.ts@@ -1,4 +1,4 @@-import type { DateFilterValue } from "metabase/querying/filters/types";+import type { DateFilterValue } from "metabase/querying/common/types";import type { ParameterValueOrArray } from "metabase-types/api";import {diff --git a/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsx b/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsxindex 6f8e7dd4410..bc6a9377381 100644--- a/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsx+++ b/frontend/src/metabase/search/components/SearchFilterDatePicker/SearchFilterDatePicker.tsx@@ -2,7 +2,7 @@ import type {DatePickerOperator,DatePickerShortcut,RelativeIntervalDirection,-} from "metabase/querying/filters/types";+} from "metabase/querying/common/types";import { DateAllOptionsWidget } from "metabase/querying/parameters/components/DateAllOptionsWidget";const OPERATORS: DatePickerOperator[] = ["=", ">", "<", "between"];diff --git a/src/metabase/lib/core.cljc b/src/metabase/lib/core.cljcindex 99864e2a79d..474be8a8e18 100644--- a/src/metabase/lib/core.cljc+++ b/src/metabase/lib/core.cljc@@ -290,10 +290,8 @@filterfiltersfilterable-columns- filterable-column-operators- filter-clause- filter-operatorfilter-parts+ describe-filter-operatorandornotdiff --git a/src/metabase/lib/drill_thru/column_filter.cljc b/src/metabase/lib/drill_thru/column_filter.cljcindex d606aac00a5..e159182dbf4 100644--- a/src/metabase/lib/drill_thru/column_filter.cljc+++ b/src/metabase/lib/drill_thru/column_filter.cljc@@ -23,20 +23,18 @@(:require[metabase.lib.drill-thru.common :as lib.drill-thru.common][metabase.lib.filter :as lib.filter]- [metabase.lib.filter.operator :as lib.filter.operator][metabase.lib.schema :as lib.schema][metabase.lib.schema.drill-thru :as lib.schema.drill-thru][metabase.lib.schema.metadata :as lib.schema.metadata][metabase.lib.schema.ref :as lib.schema.ref][metabase.lib.stage :as lib.stage]- [metabase.lib.types.isa :as lib.types.isa][metabase.lib.util :as lib.util][metabase.util.malli :as mu]))(mu/defn prepare-query-for-drill-addition :- [:maybe [:map[:query ::lib.schema/query][:stage-number :int]- [:column lib.filter/ColumnWithOperators]]]+ [:column [:ref ::lib.schema.metadata/column]]]]"If the column we're filtering on is an aggregation, the filtering must happen in a later stage. This function returnsa map with that possibly-updated `:query` and `:stage-number`, plus the `:column` for filtering in that stage (withfilter operators, as returned by [[lib.filter/filterable-columns]]).@@ -93,20 +91,14 @@(nil? value));; When the column we would be filtering on is an aggregation, it can't be filtered without adding a stage.(when-let [drill-details (prepare-query-for-drill-addition query stage-number column column-ref :filter)]- (let [initial-op (when-not (lib.types.isa/temporal? column) ; Date fields have special handling in the FE.- (-> (lib.filter.operator/filter-operators column)- first- (assoc :lib/type :operator/filter)))]- (merge- drill-details- {:lib/type :metabase.lib.drill-thru/drill-thru- :type :drill-thru/column-filter- :initial-op initial-op})))))+ (merge+ drill-details+ {:lib/type :metabase.lib.drill-thru/drill-thru+ :type :drill-thru/column-filter}))))(defmethod lib.drill-thru.common/drill-thru-info-method :drill-thru/column-filter- [_query _stage-number {:keys [initial-op]}]- {:type :drill-thru/column-filter- :initial-op initial-op})+ [_query _stage-number _drill-thru]+ {:type :drill-thru/column-filter})(mu/defmethod lib.drill-thru.common/drill-thru-method :drill-thru/column-filter :- ::lib.schema/query[query :- ::lib.schema/querydiff --git a/src/metabase/lib/drill_thru/fk_details.cljc b/src/metabase/lib/drill_thru/fk_details.cljcindex f6ae48e378c..1436b3c6a93 100644--- a/src/metabase/lib/drill_thru/fk_details.cljc+++ b/src/metabase/lib/drill_thru/fk_details.cljc@@ -80,7 +80,7 @@(when-let [fk-column-table (lib.metadata/table query (:table-id fk-column))](let [other-fk-filters (for [filter-clause (lib.filter/filters query stage-number):let [parts (lib.filter/filter-parts query stage-number filter-clause)]- :when (= (:short (:operator parts)) :=)+ :when (= (:operator parts) :=):let [other-fk-target (some->> parts:column:fk-target-field-iddiff --git a/src/metabase/lib/fe_util.cljc b/src/metabase/lib/fe_util.cljcindex e247ab9c323..5f112fe3f98 100644--- a/src/metabase/lib/fe_util.cljc+++ b/src/metabase/lib/fe_util.cljc@@ -8,7 +8,6 @@[metabase.lib.common :as lib.common][metabase.lib.dispatch :as lib.dispatch][metabase.lib.expression :as lib.expression]- [metabase.lib.filter :as lib.filter][metabase.lib.hierarchy :as lib.hierarchy][metabase.lib.metadata :as lib.metadata][metabase.lib.metadata.calculation :as lib.metadata.calculation]@@ -93,8 +92,7 @@(defn- column-metadata-from-ref[query stage-number a-ref]- (-> (lib.metadata.calculation/metadata query stage-number a-ref)- lib.filter/add-column-operators))+ (lib.metadata.calculation/metadata query stage-number a-ref))(defmulti expression-parts-method"Builds the expression parts by dispatching on the type of the argument."diff --git a/src/metabase/lib/filter.cljc b/src/metabase/lib/filter.cljcindex e1d04115e3a..fd22005a349 100644--- a/src/metabase/lib/filter.cljc+++ b/src/metabase/lib/filter.cljc@@ -3,11 +3,9 @@#?(:clj doseq) #?(:clj for)])(:require[inflections.core :as inflections]- [medley.core :as m][metabase.lib.common :as lib.common][metabase.lib.dispatch :as lib.dispatch][metabase.lib.equality :as lib.equality]- [metabase.lib.filter.operator :as lib.filter.operator][metabase.lib.hierarchy :as lib.hierarchy][metabase.lib.metadata.calculation :as lib.metadata.calculation][metabase.lib.options :as lib.options]@@ -431,24 +429,6 @@stage-number :- [:maybe :int]](perf/not-empty (:filters (lib.util/query-stage query (clojure.core/or stage-number -1))))))-(def ColumnWithOperators- "Malli schema for ColumnMetadata extended with the list of applicable operators."- [:merge- [:ref ::lib.schema.metadata/column]- [:map- [:operators {:optional true} [:sequential [:ref ::lib.schema.filter/operator]]]]])--(mu/defn filterable-column-operators :- [:maybe [:sequential ::lib.schema.filter/operator]]- "Returns the operators for which `filterable-column` is applicable."- [filterable-column :- ColumnWithOperators]- (:operators filterable-column))--(mu/defn add-column-operators :- ColumnWithOperators- "Extend the column metadata with the available operators if any."- [column :- ::lib.schema.metadata/column]- (let [operators (lib.filter.operator/filter-operators column)]- (m/assoc-some column :operators (perf/not-empty operators))))-(defn- leading-ref"Returns the first argument of `a-filter` if it is a reference clause, nil otherwise."[a-filter]@@ -457,7 +437,7 @@(when (lib.util/ref-clause? leading-arg)leading-arg)))-(mu/defn filterable-columns :- [:maybe [:sequential ColumnWithOperators]]+(mu/defn filterable-columns :- [:maybe [:sequential [:ref ::lib.schema.metadata/column]]]"Get column metadata for all the columns that can be filtered inthe stage number `stage-number` of the query `query`If `stage-number` is omitted, the last stage is used.@@ -482,10 +462,7 @@([query :- ::lib.schema/querystage-number :- :intoptions :- [:maybe ::lib.metadata.calculation/visible-columns.options]]- (let [columns (sequence- (comp (map add-column-operators)- (clojure.core/filter :operators))- (lib.metadata.calculation/visible-columns query stage-number options))+ (let [columns (lib.metadata.calculation/visible-columns query stage-number options)existing-filters (filters query stage-number)](cond(empty? columns)@@ -517,29 +494,12 @@(lib.options/ensure-uuid (into [tag {} (lib.common/->op-arg column)](map lib.common/->op-arg args)))))-(mu/defn filter-operator :- ::lib.schema.filter/operator- "Return the filter operator of the boolean expression `filter-clause`- at `stage-number` in `query`.- If `stage-number` is omitted, the last stage is used."- ([query a-filter-clause]- (filter-operator query -1 a-filter-clause))-- ([query :- ::lib.schema/query- stage-number :- :int- a-filter-clause :- ::lib.schema.expression/boolean]- (let [[op _ first-arg] a-filter-clause- columns (lib.metadata.calculation/visible-columns query stage-number)- col (lib.equality/find-matching-column query stage-number first-arg columns)]- (clojure.core/or (m/find-first #(clojure.core/= (:short %) op)- (lib.filter.operator/filter-operators col))- (lib.filter.operator/operator-def op)))))-(def ^:private FilterParts[:map[:lib/type [:= :mbql/filter-parts]]- [:operator ::lib.schema.filter/operator]+ [:operator :keyword][:options ::lib.schema.common/options]- [:column [:maybe ColumnWithOperators]]+ [:column [:maybe [:ref ::lib.schema.metadata/column]]][:args [:sequential :any]]])(mu/defn filter-parts :- FilterParts@@ -555,9 +515,44 @@columns (lib.metadata.calculation/visible-columns query stage-number)col (lib.equality/find-matching-column query stage-number first-arg columns)]{:lib/type :mbql/filter-parts- :operator (clojure.core/or (m/find-first #(clojure.core/= (:short %) op)- (lib.filter.operator/filter-operators col))- (lib.filter.operator/operator-def op))+ :operator op:options options- :column (some-> col add-column-operators)+ :column col:args (vec rest-args)})))++(mu/defn describe-filter-operator :- :string+ "Returns a human-readable display name for a filter `operator` keyword.++ `variant` controls how certain operators are displayed:+ - `:default` (the default) — uses \"Is\" / \"Is not\", \"Greater than\" / \"Less than\"+ - `:number` — uses \"Equal to\" / \"Not equal to\" for `:=` and `:!=`+ - `:temporal` — uses \"After\" / \"Before\" for `:>` and `:<`"+ ([operator :- :keyword]+ (describe-filter-operator operator :default))+ ([operator :- :keyword+ variant :- [:enum :default :number :temporal]]+ (clojure.core/case operator+ := (if (clojure.core/= variant :number)+ (i18n/tru "Equal to")+ (i18n/tru "Is"))+ :!= (if (clojure.core/= variant :number)+ (i18n/tru "Not equal to")+ (i18n/tru "Is not"))+ :contains (i18n/tru "Contains")+ :does-not-contain (i18n/tru "Does not contain")+ :starts-with (i18n/tru "Starts with")+ :ends-with (i18n/tru "Ends with")+ :is-empty (i18n/tru "Is empty")+ :not-empty (i18n/tru "Not empty")+ :> (if (clojure.core/= variant :temporal)+ (i18n/tru "After")+ (i18n/tru "Greater than"))+ :< (if (clojure.core/= variant :temporal)+ (i18n/tru "Before")+ (i18n/tru "Less than"))+ :between (i18n/tru "Between")+ :>= (i18n/tru "Greater than or equal to")+ :<= (i18n/tru "Less than or equal to")+ :is-null (i18n/tru "Is empty")+ :not-null (i18n/tru "Not empty")+ :inside (i18n/tru "Inside"))))diff --git a/src/metabase/lib/filter/operator.cljc b/src/metabase/lib/filter/operator.cljcdeleted file mode 100644index c2dbf8bc0f2..00000000000--- a/src/metabase/lib/filter/operator.cljc+++ /dev/null@@ -1,177 +0,0 @@-(ns metabase.lib.filter.operator- (:require- [metabase.lib.metadata.calculation :as lib.metadata.calculation]- [metabase.lib.schema.common :as lib.schema.common]- [metabase.lib.schema.filter :as lib.schema.filter]- [metabase.lib.schema.metadata :as lib.schema.metadata]- [metabase.lib.types.isa :as lib.types.isa]- [metabase.util :as u]- [metabase.util.i18n :as i18n]- [metabase.util.malli :as mu]))--(mu/defn operator-def :- ::lib.schema.filter/operator- "Get a filter operator definition for the MBQL filter with `tag`, e.g. `:=`. In some cases various tags have alternate- display names used for different situations e.g. for numbers vs temporal values; pass in the- `display-name-style` to choose a non-default display-name."- ([tag]- (operator-def tag :default))-- ([tag display-name-style]- {:lib/type :operator/filter- :short tag- :display-name-variant display-name-style}))--(def ^:private numeric-key-operators- [(operator-def :=)- (operator-def :!=)- (operator-def :>)- (operator-def :<)- (operator-def :between)- (operator-def :>=)- (operator-def :<=)- (operator-def :is-null :is-empty)- (operator-def :not-null :not-empty)])--(def ^:private temporal-operators- [(operator-def :!= :excludes)- (operator-def :=)- (operator-def :< :before)- (operator-def :> :after)- (operator-def :between)- (operator-def :is-null :is-empty)- (operator-def :not-null :not-empty)])--(def ^:private coordinate-operators- [(operator-def :=)- (operator-def :!=)- (operator-def :inside)- (operator-def :>)- (operator-def :<)- (operator-def :between)- (operator-def :>=)- (operator-def :<=)])--(def ^:private number-operators- [(operator-def := :equal-to)- (operator-def :!= :not-equal-to)- (operator-def :>)- (operator-def :<)- (operator-def :between)- (operator-def :>=)- (operator-def :<=)- (operator-def :is-null :is-empty)- (operator-def :not-null :not-empty)])--(def ^:private text-operators- [(operator-def :=)- (operator-def :!=)- (operator-def :contains)- (operator-def :does-not-contain)- (operator-def :is-empty)- (operator-def :not-empty)- (operator-def :starts-with)- (operator-def :ends-with)])--(def ^:private text-like-operators- [(operator-def :=)- (operator-def :!=)- (operator-def :is-empty)- (operator-def :not-empty)])--(def ^:private boolean-operators- [(operator-def :=)- (operator-def :is-null :is-empty)- (operator-def :not-null :not-empty)])--(def ^:private default-operators- [(operator-def :is-null :is-empty)- (operator-def :not-null :not-empty)])--(mu/defn filter-operators :- [:sequential ::lib.schema.filter/operator]- "The list of available filter operators.- The order of operators is relevant for the front end.- There are slight differences between names and ordering for the different base types."- [column :- ::lib.schema.metadata/column]- ;; The order of these clauses is important since we want to match the most relevant type- ;; filters need to operate on the effective-type rather than the semantic-type, eg boolean and number cannot become- ;; string if semantic type is type/Category- (condp lib.types.isa/field-type? column- :metabase.lib.types.constants/temporal temporal-operators- :metabase.lib.types.constants/coordinate coordinate-operators- :metabase.lib.types.constants/number (if ((some-fn lib.types.isa/primary-key? lib.types.isa/foreign-key?) column)- numeric-key-operators- number-operators)- :metabase.lib.types.constants/boolean boolean-operators- :metabase.lib.types.constants/string text-operators- :metabase.lib.types.constants/string_like text-like-operators- ;; default- default-operators))--(mu/defn- filter-operator-long-display-name :- ::lib.schema.common/non-blank-string- [tag :- :keyword- display-name-variant :- :keyword]- (case tag- := (case display-name-variant- :equal-to (i18n/tru "Equal to")- :default (i18n/tru "Is"))- :!= (case display-name-variant- :not-equal-to (i18n/tru "Not equal to")- :excludes (i18n/tru "Excludes")- :default (i18n/tru "Is not"))- :> (case display-name-variant- :after (i18n/tru "After")- :default (i18n/tru "Greater than"))- :< (case display-name-variant- :before (i18n/tru "Before")- :default (i18n/tru "Less than"))- :>= (case display-name-variant- :default (i18n/tru "Greater than or equal to"))- :<= (case display-name-variant- :default (i18n/tru "Less than or equal to"))- :between (case display-name-variant- :default (i18n/tru "Between"))- :is-null (case display-name-variant- :is-empty (i18n/tru "Is empty")- :default (i18n/tru "Is null"))- :not-null (case display-name-variant- :not-empty (i18n/tru "Not empty")- :default (i18n/tru "Not null"))- :is-empty (case display-name-variant- :default (i18n/tru "Is empty"))- :not-empty (case display-name-variant- :default (i18n/tru "Not empty"))- :contains (case display-name-variant- :default (i18n/tru "Contains"))- :does-not-contain (case display-name-variant- :default (i18n/tru "Does not contain"))- :starts-with (case display-name-variant- :default (i18n/tru "Starts with"))- :ends-with (case display-name-variant- :default (i18n/tru "Ends with"))- :inside (case display-name-variant- :default (i18n/tru "Inside"))))--(mu/defn- filter-operator-display-name :- ::lib.schema.common/non-blank-string- [tag :- :keyword- display-name-variant :- :keyword]- (case tag- := "="- :!= "≠"- :> ">"- :< "<"- :>= "≥"- :<= "≤"- (filter-operator-long-display-name tag display-name-variant)))--(defmethod lib.metadata.calculation/display-name-method :operator/filter- [_query _stage-number {short-name :short, :keys [display-name-variant]} display-name-style]- (case display-name-style- :default (filter-operator-display-name short-name display-name-variant)- :long (filter-operator-long-display-name short-name display-name-variant)))--(defmethod lib.metadata.calculation/display-info-method :operator/filter- [_query _stage-number {short-name :short, :keys [display-name-variant default]}]- (cond-> {:short-name (u/qualified-name short-name)- :display-name (filter-operator-display-name short-name display-name-variant)- :long-display-name (filter-operator-long-display-name short-name display-name-variant)}- default (assoc :default true)))diff --git a/src/metabase/lib/join.cljc b/src/metabase/lib/join.cljcindex 7c95cd2cbaf..a50f2ddb8ec 100644--- a/src/metabase/lib/join.cljc+++ b/src/metabase/lib/join.cljc@@ -12,7 +12,6 @@[metabase.lib.equality :as lib.equality][metabase.lib.field.util :as lib.field.util][metabase.lib.filter :as lib.filter]- [metabase.lib.filter.operator :as lib.filter.operator][metabase.lib.hierarchy :as lib.hierarchy][metabase.lib.join.util :as lib.join.util][metabase.lib.metadata :as lib.metadata]@@ -1020,7 +1019,7 @@(m/distinct-by #(-> % ::target :id))not-empty))(filter-clause [x y]- (lib.filter/filter-clause (lib.filter.operator/operator-def :=) x y))]+ (lib.filter/= x y))](or;; find cases where we have FK(s) pointing to joinable. Our column goes on the LHS.(when-let [fks (fks ::current-stage joinable)]diff --git a/src/metabase/lib/js.cljs b/src/metabase/lib/js.cljsindex 10f3b600964..1e1acdbc417 100644--- a/src/metabase/lib/js.cljs+++ b/src/metabase/lib/js.cljs@@ -948,32 +948,6 @@(fn [_](to-array (lib.core/filterable-columns a-query stage-number opts)))))))-(defn ^:export filterable-column-operators- "Returns the filter operators which can be used in a filter for `filterable-column`.-- `filterable-column` must be column coming from [[filterable-columns]]; this won't work with columns from other sources- like [[visible-columns]].-- > **Code health:** Healthy"- [filterable-column]- (to-array (lib.core/filterable-column-operators filterable-column)))--(defn ^:export filter-clause- "Given a `filter-operator`, `column`, and 0 or more extra arguments, returns a standalone filter clause.-- `filter-operator` comes from [[filterable-column-operators]], and `column` from [[filterable-columns]].-- > **Code health:** Healthy"- [filter-operator column & args]- (apply lib.core/filter-clause filter-operator column args))--(defn ^:export filter-operator- "Returns the filter operator used in `a-filter-clause`.-- > **Code health:** Healthy"- [a-query stage-number a-filter-clause]- (lib.core/filter-operator a-query stage-number a-filter-clause))-(defn ^:export filter"Adds `a-filter-clause` as a filter on `a-query`."[a-query stage-number a-filter-clause]@@ -990,6 +964,18 @@[a-query stage-number](to-array (lib.core/filters a-query stage-number)))+(defn ^:export describe-filter-operator+ "Returns a human-readable display name for a filter operator.++ `operator` is a string like \"=\", \"!=\", \"contains\", etc.+ `variant` is an optional string: \"default\" or \"equal-to\". Defaults to \"default\".++ > **Code health:** Healthy"+ ([operator]+ (lib.core/describe-filter-operator (keyword operator)))+ ([operator variant]+ (lib.core/describe-filter-operator (keyword operator) (keyword variant))))+;; # Expressions;; Custom expressions are parsed from a string by a TS library, which returns legacy MBQL clauses. That may get ported;; to Clojure someday, but perhaps not - it's quite standalone and there's no use case for that logic in the BE.diff --git a/src/metabase/lib/schema/drill_thru.cljc b/src/metabase/lib/schema/drill_thru.cljcindex 6ec158f3ad3..769102e8860 100644--- a/src/metabase/lib/schema/drill_thru.cljc+++ b/src/metabase/lib/schema/drill_thru.cljc@@ -10,7 +10,6 @@[metabase.lib.schema.common :as lib.schema.common][metabase.lib.schema.expression :as lib.schema.expression][metabase.lib.schema.extraction :as lib.schema.extraction]- [metabase.lib.schema.filter :as lib.schema.filter][metabase.lib.schema.id :as lib.schema.id][metabase.lib.schema.metadata :as lib.schema.metadata][metabase.lib.schema.order-by :as lib.schema.order-by]@@ -161,7 +160,6 @@::drill-thru.common.with-column[:map[:type [:= :drill-thru/column-filter]]- [:initial-op [:maybe ::lib.schema.filter/operator]][:column [:ref ::lib.schema.metadata/column]][:query [:ref ::lib.schema/query]][:stage-number number?]]])diff --git a/test/metabase/lib/drill_thru/column_filter_test.cljc b/test/metabase/lib/drill_thru/column_filter_test.cljcindex 1462092faad..fc2d42577fd 100644--- a/test/metabase/lib/drill_thru/column_filter_test.cljc+++ b/test/metabase/lib/drill_thru/column_filter_test.cljc@@ -22,51 +22,14 @@(and (= click :header)(not (:native? test-case)))))))-(def ^:private key-ops- [{:lib/type :operator/filter, :short :=, :display-name-variant :default}- {:lib/type :operator/filter, :short :!=, :display-name-variant :default}- {:lib/type :operator/filter, :short :>, :display-name-variant :default}- {:lib/type :operator/filter, :short :<, :display-name-variant :default}- {:lib/type :operator/filter, :short :between, :display-name-variant :default}- {:lib/type :operator/filter, :short :>=, :display-name-variant :default}- {:lib/type :operator/filter, :short :<=, :display-name-variant :default}- {:lib/type :operator/filter, :short :is-null, :display-name-variant :is-empty}- {:lib/type :operator/filter, :short :not-null, :display-name-variant :not-empty}])--(def ^:private number-ops- (-> key-ops- (assoc-in [0 :display-name-variant] :equal-to)- (assoc-in [1 :display-name-variant] :not-equal-to)))--(def ^:private temporal-ops- [{:lib/type :operator/filter, :short :!=, :display-name-variant :excludes}- {:lib/type :operator/filter, :short :=, :display-name-variant :default}- {:lib/type :operator/filter, :short :<, :display-name-variant :before}- {:lib/type :operator/filter, :short :>, :display-name-variant :after}- {:lib/type :operator/filter, :short :between, :display-name-variant :default}- {:lib/type :operator/filter, :short :is-null, :display-name-variant :is-empty}- {:lib/type :operator/filter, :short :not-null, :display-name-variant :not-empty}])--(def ^:private text-ops- [{:lib/type :operator/filter, :short :=, :display-name-variant :default}- {:lib/type :operator/filter, :short :!=, :display-name-variant :default}- {:lib/type :operator/filter, :short :>, :display-name-variant :default}- {:lib/type :operator/filter, :short :<, :display-name-variant :default}- {:lib/type :operator/filter, :short :between, :display-name-variant :default}- {:lib/type :operator/filter, :short :>=, :display-name-variant :default}- {:lib/type :operator/filter, :short :<=, :display-name-variant :default}- {:lib/type :operator/filter, :short :is-null, :display-name-variant :is-empty}- {:lib/type :operator/filter, :short :not-null, :display-name-variant :not-empty}])-(deftest ^:parallel returns-column-filter-test-1(lib.drill-thru.tu/test-returns-drill{:drill-type :drill-thru/column-filter:click-type :header:query-type :unaggregated:column-name "ID"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators key-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "ID"}}}))(deftest ^:parallel returns-column-filter-test-2(lib.drill-thru.tu/test-returns-drill@@ -74,9 +37,8 @@:click-type :header:query-type :unaggregated:column-name "USER_ID"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators key-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "USER_ID"}}}))(deftest ^:parallel returns-column-filter-test-3(lib.drill-thru.tu/test-returns-drill@@ -84,9 +46,8 @@:click-type :header:query-type :unaggregated:column-name "TAX"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators number-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "TAX"}}}))(deftest ^:parallel returns-column-filter-test-4(lib.drill-thru.tu/test-returns-drill@@ -94,9 +55,8 @@:click-type :header:query-type :unaggregated:column-name "DISCOUNT"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators number-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "DISCOUNT"}}}))(deftest ^:parallel returns-column-filter-test-5(lib.drill-thru.tu/test-returns-drill@@ -104,9 +64,8 @@:click-type :header:query-type :unaggregated:column-name "CREATED_AT"- :expected {:type :drill-thru/column-filter- :initial-op nil- :column {:operators temporal-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "CREATED_AT"}}}))(deftest ^:parallel returns-column-filter-test-6(lib.drill-thru.tu/test-returns-drill@@ -114,9 +73,8 @@:click-type :header:query-type :unaggregated:column-name "QUANTITY"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators number-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "QUANTITY"}}}))(deftest ^:parallel returns-column-filter-test-7(lib.drill-thru.tu/test-returns-drill@@ -124,9 +82,8 @@:click-type :header:query-type :aggregated:column-name "PRODUCT_ID"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators key-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "PRODUCT_ID"}}}))(deftest ^:parallel returns-column-filter-test-8(lib.drill-thru.tu/test-returns-drill@@ -134,9 +91,8 @@:click-type :header:query-type :aggregated:column-name "PRODUCT_ID"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators key-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "PRODUCT_ID"}}}))(deftest ^:parallel returns-column-filter-test-9(lib.drill-thru.tu/test-returns-drill@@ -144,9 +100,8 @@:click-type :header:query-type :aggregated:column-name "CREATED_AT"- :expected {:type :drill-thru/column-filter- :initial-op nil- :column {:operators temporal-ops}}}))+ :expected {:type :drill-thru/column-filter+ :column {:name "CREATED_AT"}}}))(deftest ^:parallel returns-column-filter-test-10(testing "column-filter should be available for aggregated query metric column (#34223)"@@ -155,9 +110,8 @@:click-type :header:query-type :aggregated:column-name "count"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators number-ops}}})))+ :expected {:type :drill-thru/column-filter+ :column {:name "count"}}})))(deftest ^:parallel returns-column-filter-test-11(testing "column-filter should be available for aggregated query metric column (#34223)"@@ -166,9 +120,8 @@:click-type :header:query-type :aggregated:column-name "max"- :expected {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators number-ops}}})))+ :expected {:type :drill-thru/column-filter+ :column {:name "max"}}})))(deftest ^:parallel column-filter-not-returned-for-nil-dimension-test(testing "column-filter should not be returned for nil dimension values (#49740, #51741)"@@ -228,12 +181,9 @@:type :drill-thru/column-filter:query query:stage-number -1- ;; The filterable-columns counterpart is returned, not the plain column.:column {:lib/type :metadata/column:name "SUBTOTAL"- :id (meta/id :orders :subtotal)- :operators (fn [ops]- (every? (every-pred map? #(= (:lib/type %) :operator/filter)) ops))}}+ :id (meta/id :orders :subtotal)}}(->> {:column subtotal:column-ref (lib/ref subtotal):value nil}@@ -254,7 +204,7 @@(deftest ^:parallel native-models-with-renamed-columns-test(testing "Generate sane queries for native query models with renamed columns (#22715 #36583)"(let [metadata-provider (-> {:name "Card 5"- :result-metadata [{:description "This is a unique ID for the product. It is also called the “Invoice number” or “Confirmation number” in customer facing emails and screens."+ :result-metadata [{:description "This is a unique ID for the product. It is also called the \"Invoice number\" or \"Confirmation number\" in customer facing emails and screens.":semantic_type :type/PK:name "ID":settings nil@@ -304,14 +254,7 @@(lib/available-drill-thrus query context))](is (=? {:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column {:name "ALIAS_CREATED_AT"- :operators [{:short :!=}- {:short :=}- {:short :<}- {:short :>}- {:short :between}- {:short :is-null}- {:short :not-null}]}}+ :column {:name "ALIAS_CREATED_AT"}}drill))(testing "VERY IMPORTANT! UPDATED QUERY NEEDS TO USE A NOMINAL FIELD LITERAL REF, SINCE COLUMN NAME IS DIFFERENT!"(is (=? {:stages [{:source-card 5@@ -340,7 +283,7 @@(is (some? (:column colfilter))))))(deftest ^:parallel string-pk-filters-test- (testing "string PKs and FKs should get the same filter options as a regular string column (#40665)"+ (testing "string PKs and FKs should be returned as filterable columns (#40665)"(let [provider (lib.tu/merged-mock-metadata-providermeta/metadata-provider{:fields [{:id (meta/id :orders :id)@@ -358,49 +301,12 @@drills (lib/available-drill-thrus query -1 context)](m/find-first #(= (:type %) :drill-thru/column-filter) drills)))](is (=? {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators text-ops}}+ :column {:name "ID"}}(colfilter pk)))(is (=? {:type :drill-thru/column-filter- :initial-op {:short :=}- :column {:operators text-ops}}+ :column {:name "PRODUCT_ID"}}(colfilter fk))))))-(deftest ^:parallel structured-column-operators-test- (testing "different structured column types get appropriate operators"- (let [provider (lib.tu/merged-mock-metadata-provider- meta/metadata-provider- {:fields [{:id (meta/id :products :vendor)- :base-type :type/Text- :semantic-type :type/SerializedJSON} ; text-based JSON (base type = text)- {:id (meta/id :products :category)- :base-type :type/JSON ; native JSON type- :effective-type :type/JSON- :semantic-type nil}]})- query (lib/query provider (meta/table-metadata :products))- columns (lib/returned-columns query)-- serialized-json-col (m/find-first #(= (:name %) "VENDOR") columns)- native-json-col (m/find-first #(= (:name %) "CATEGORY") columns)-- get-drill-operators (fn [column]- (let [context {:column column- :column-ref (lib/ref column)- :value nil}- drill (->> (lib/available-drill-thrus query -1 context)- (m/find-first #(= (:type %) :drill-thru/column-filter)))]- (when drill- (->> (:column drill)- :operators- (mapv :short)))))]- (testing "SerializedJSON (string-based) gets full text operators"- (is (= #{:= :!= :contains :does-not-contain :is-empty :not-empty :starts-with :ends-with}- (set (get-drill-operators serialized-json-col)))))-- (testing "native JSON gets only default operators"- (is (= #{:is-null :not-null}- (set (get-drill-operators native-json-col))))))))-(deftest ^:parallel applies-column-filter-test-structured(testing "applying column-filter to structured JSON columns"(lib.drill-thru.tu/test-drill-application@@ -410,7 +316,6 @@:column-name "VENDOR":drill-type :drill-thru/column-filter:expected {:type :drill-thru/column-filter- :initial-op {:short :=}:column {:lib/type :metadata/column:name "VENDOR"}}:drill-args ["contains" "Acme"]@@ -448,5 +353,4 @@:column-name "ID_2":custom-query query:expected {:type :drill-thru/column-filter- :initial-op {:short :=}:column {:lib/type :metadata/column}}}))))diff --git a/test/metabase/lib/drill_thru_test.cljc b/test/metabase/lib/drill_thru_test.cljcindex d1c58008575..f69face54c1 100644--- a/test/metabase/lib/drill_thru_test.cljc+++ b/test/metabase/lib/drill_thru_test.cljc@@ -76,10 +76,7 @@(case (:type drill);; filter-op value:drill-thru/column-filter- (concat- (when-let [initial-op (:initial-op drill)]- [[(:short initial-op) 1]])- [["!=" 2]])+ [["!=" 2]]:drill-thru/summarize-column(for [ag (:aggregations drill)]@@ -128,8 +125,7 @@(let [context (basic-context (meta/field-metadata :orders :id) nil)](is (=? [{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column (meta/field-metadata :orders :id)- :initial-op {:short := :display-name-variant :default}}+ :column (meta/field-metadata :orders :id)}{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/sort:column (meta/field-metadata :orders :id)@@ -147,8 +143,7 @@(let [context (basic-context (meta/field-metadata :orders :user-id) nil)](is (=? [{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column (meta/field-metadata :orders :user-id)- :initial-op {:short := :display-name-variant :default}}+ :column (meta/field-metadata :orders :user-id)}{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/distribution:column (meta/field-metadata :orders :user-id)}@@ -169,8 +164,7 @@(let [context (basic-context (meta/field-metadata :orders :subtotal) nil)](is (=? [{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column (meta/field-metadata :orders :subtotal)- :initial-op {:short := :display-name-variant :equal-to}}+ :column (meta/field-metadata :orders :subtotal)}{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/distribution:column (meta/field-metadata :orders :subtotal)}@@ -196,8 +190,7 @@(let [context (basic-context (meta/field-metadata :orders :created-at) nil)](is (=? [{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column (meta/field-metadata :orders :created-at)- :initial-op nil}+ :column (meta/field-metadata :orders :created-at)}{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/distribution:column (meta/field-metadata :orders :created-at)}@@ -222,8 +215,7 @@(testing "a sorted column"(let [expected [{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/column-filter- :column (meta/field-metadata :orders :subtotal)- :initial-op {:short := :display-name-variant :equal-to}}+ :column (meta/field-metadata :orders :subtotal)}{:lib/type :metabase.lib.drill-thru/drill-thru:type :drill-thru/distribution:column (meta/field-metadata :orders :subtotal)}@@ -508,9 +500,7 @@:column-ref (lib/ref count-col):value nil}](is (=? [{:type :drill-thru/column-filter- :column {:name "count"}- :initial-op {:display-name-variant :equal-to- :short :=}}+ :column {:name "count"}}{:type :drill-thru/sort:column {:name "count"}}](lib/available-drill-thrus query -1 context)))@@ -524,9 +514,7 @@:column-ref (lib/ref max-of-discount-col):value nil}](is (=? [{:type :drill-thru/column-filter,- :column {:display-name "Max of Discount"}- :initial-op {:display-name-variant :equal-to- :short :=}}+ :column {:display-name "Max of Discount"}}{:type :drill-thru/sort:column {:display-name "Max of Discount"}}](lib/available-drill-thrus query -1 context)))@@ -685,7 +673,7 @@{:click-type :header:query-type :unaggregated:column-name "ID"- :expected [{:type :drill-thru/column-filter, :initial-op {:short :=}}+ :expected [{:type :drill-thru/column-filter}{:type :drill-thru/sort, :sort-directions [:asc :desc]}{:type :drill-thru/summarize-column, :aggregations [:distinct]}]}))@@ -696,7 +684,7 @@{:click-type :header:query-type :unaggregated:column-name "PRODUCT_ID"- :expected [{:type :drill-thru/column-filter, :initial-op {:short :=}}+ :expected [{:type :drill-thru/column-filter}{:type :drill-thru/distribution}{:type :drill-thru/sort, :sort-directions [:asc :desc]}{:type :drill-thru/summarize-column, :aggregations [:distinct]}]}@@ -713,7 +701,7 @@{:click-type :header:query-type :unaggregated:column-name "SUBTOTAL"- :expected [{:type :drill-thru/column-filter, :initial-op {:short :=}}+ :expected [{:type :drill-thru/column-filter}{:type :drill-thru/distribution}{:type :drill-thru/sort, :sort-directions [:asc :desc]}{:type :drill-thru/summarize-column, :aggregations [:distinct :sum :avg]}@@ -724,7 +712,7 @@{:click-type :header:query-type :unaggregated:column-name "CREATED_AT"- :expected [{:type :drill-thru/column-filter, :initial-op nil}+ :expected [{:type :drill-thru/column-filter}{:type :drill-thru/distribution}{:type :drill-thru/sort, :sort-directions [:asc :desc]}{:type :drill-thru/summarize-column, :aggregations [:distinct]}@@ -814,7 +802,7 @@{:click-type :header:query-type :aggregated:column-name "count"- :expected [{:initial-op {:short :=}, :type :drill-thru/column-filter}+ :expected [{:type :drill-thru/column-filter}{:sort-directions [:asc :desc], :type :drill-thru/sort}]})));; FIXME: for some reason the results for aggregated query are not correct (#34223, #34341)@@ -824,7 +812,7 @@{:click-type :header:query-type :aggregated:column-name "PRODUCT_ID"- :expected [{:initial-op {:short :=}, :type :drill-thru/column-filter}+ :expected [{:type :drill-thru/column-filter}{:sort-directions [:asc :desc], :type :drill-thru/sort}]})));; FIXME: for some reason the results for aggregated query are not correct (#34223, #34341)@@ -834,8 +822,7 @@{:click-type :header:query-type :aggregated:column-name "CREATED_AT"- :expected [{:type :drill-thru/column-filter- :initial-op {:short :=}}+ :expected [{:type :drill-thru/column-filter}{:type :drill-thru/sort:sort-directions [:asc :desc]}]})))diff --git a/test/metabase/lib/fe_util_test.cljc b/test/metabase/lib/fe_util_test.cljcindex 05f254b0ae5..775fe277542 100644--- a/test/metabase/lib/fe_util_test.cljc+++ b/test/metabase/lib/fe_util_test.cljc@@ -17,6 +17,11 @@[metabase.util.number :as u.number][metabase.util.time :as u.time]))+(def ^:private all-filter-operators+ [:= :!= :> :< :>= :<= :between :inside+ :contains :does-not-contain :starts-with :ends-with+ :is-null :not-null :is-empty :not-empty])+(deftest ^:parallel basic-filter-parts-test(let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :users))(lib/join (-> (lib/join-clause (meta/table-metadata :checkins)@@ -30,9 +35,8 @@(meta/field-metadata :venues :id))])(lib/with-join-fields :all))))](doseq [col (lib/filterable-columns query)- op (lib/filterable-column-operators col)- :let [short-op (:short op)- expression-clause (case short-op+ short-op all-filter-operators+ :let [expression-clause (case short-op:between (lib/expression-clause short-op [col col col] {})(:contains :does-not-contain :starts-with :ends-with) (lib/expression-clause short-op [col "123"] {})(:is-null :not-null :is-empty :not-empty) (lib/expression-clause short-op [col] {})@@ -98,7 +102,7 @@:lib/source-uuid string?:effective-type :type/Integer:metabase.lib.field/binning {:strategy :default}- :operators (comp vector? not-empty)+:active true:id (:id checkins-user-id-col):display-name "User ID: Auto binned"@@ -113,7 +117,7 @@[{:lib/type :metadata/column:lib/source-uuid string?:effective-type :type/Date- :operators (comp vector? not-empty)+:id (:id checkins-date-col):metabase.lib.field/temporal-unit :day:display-name "Date: Day"diff --git a/test/metabase/lib/filter_test.cljc b/test/metabase/lib/filter_test.cljcindex b6e730dd87e..5107f85a429 100644--- a/test/metabase/lib/filter_test.cljc+++ b/test/metabase/lib/filter_test.cljc@@ -7,7 +7,6 @@[metabase.lib.expression :as lib.expression][metabase.lib.field.util :as lib.field.util][metabase.lib.filter :as lib.filter]- [metabase.lib.filter.operator :as lib.filter.operator][metabase.lib.options :as lib.options][metabase.lib.test-metadata :as meta][metabase.lib.test-util :as lib.tu]@@ -238,11 +237,7 @@(lib/with-join-fields :all))))columns (into [](lib.field.util/add-source-and-desired-aliases-xform query)- (lib/filterable-columns query))- pk-operators [:= :!= :> :< :between :>= :<= :is-null :not-null]- temporal-operators [:!= := :< :> :between :is-null :not-null]- coordinate-operators [:= :!= :inside :> :< :between :>= :<=]- text-operators [:= :!= :contains :does-not-contain :is-empty :not-empty :starts-with :ends-with]]+ (lib/filterable-columns query))](is (= ["ID""NAME""LAST_LOGIN"@@ -258,164 +253,7 @@"Venues__PRICE""CATEGORIES__via__CATEGORY_ID__via__Venues__ID""CATEGORIES__via__CATEGORY_ID__via__Venues__NAME"]- (map :lib/desired-column-alias columns)))- (testing "Operators are attached to proper columns"- (is (=? {"ID" pk-operators,- "NAME" text-operators,- "Venues__PRICE" pk-operators- "Venues__LATITUDE" coordinate-operators- "LAST_LOGIN" temporal-operators}- (into {} (for [col columns]- [(:lib/desired-column-alias col) (mapv :short (lib/filterable-column-operators col))])))))- (testing "Type specific display names"- (let [display-info-by-type-and-op (->> columns- (map (juxt :lib/desired-column-alias- (fn [col]- (->> col- lib/filterable-column-operators- (map (comp (juxt :short-name identity)- #(lib/display-info query %)))- (into {})))))- (into {}))]- (is (=? {"ID" {"=" {:display-name "=", :long-display-name "Is"}- "is-null" {:display-name "Is empty", :long-display-name "Is empty"}- ">" {:display-name ">", :long-display-name "Greater than"}- ">=" {:display-name "≥", :long-display-name "Greater than or equal to"}}- "NAME" {"=" {:display-name "=", :long-display-name "Is"}- "is-empty" {:display-name "Is empty", :long-display-name "Is empty"}}- "LAST_LOGIN" {"!=" {:display-name "≠", :long-display-name "Excludes"}- ">" {:display-name ">", :long-display-name "After"}}- "Venues__PRICE" {"=" {:display-name "=", :long-display-name "Equal to"}- "is-null" {:display-name "Is empty", :long-display-name "Is empty"}}}- display-info-by-type-and-op))))))--(deftest ^:parallel filter-clause-test- (let [query (lib/query meta/metadata-provider (meta/table-metadata :users))- [first-col] (lib/filterable-columns query)- new-filter (lib/filter-clause- (first (lib/filterable-column-operators first-col))- first-col- 515)]- (is (=? [[:= {} [:field {} (meta/id :users :id)] 515]]- (-> query- (lib/filter new-filter)- lib/filters))))- (testing "standalone clause"- (let [query (lib.tu/venues-query)- [id-col] (lib/filterable-columns query)- [eq-op] (lib/filterable-column-operators id-col)- filter-clause (lib/filter-clause eq-op id-col 123)]- (is (=? [:= {} [:field {} (meta/id :venues :id)] 123]- filter-clause)))))--(deftest ^:parallel filter-clause-support-keywords-and-strings-test- (are [tag] (=? [:= {} [:field {} (meta/id :venues :id)] 1]- (lib/filter-clause tag (meta/field-metadata :venues :id) 1))- :=- "="))--(deftest ^:parallel filter-operator-test- (let [query (-> (lib/query meta/metadata-provider (meta/table-metadata :users))- (lib/join (-> (lib/join-clause (meta/table-metadata :checkins)- [(lib/=- (meta/field-metadata :checkins :user-id)- (meta/field-metadata :users :id))])- (lib/with-join-fields :all)))- (lib/join (-> (lib/join-clause (meta/table-metadata :venues)- [(lib/=- (meta/field-metadata :checkins :venue-id)- (meta/field-metadata :venues :id))])- (lib/with-join-fields :all))))]- (doseq [col (lib/filterable-columns query)- op (lib/filterable-column-operators col)- :let [filter-clause (case (:short op)- :between (lib/filter-clause op col col col)- (:contains :does-not-contain :starts-with :ends-with) (lib/filter-clause op col "123")- (:is-null :not-null :is-empty :not-empty) (lib/filter-clause op col)- :inside (lib/filter-clause op col 12 34 56 78 90)- (:< :>) (lib/filter-clause op col col)- (lib/filter-clause op col 123))]]- (testing (str (:short op) " with " (:name col))- (is (= op- (lib/filter-operator query filter-clause)))))))--(deftest ^:parallel filter-operators-test- (testing "Boolean category"- (is (= [{:lib/type :operator/filter, :short :=, :display-name-variant :default}- {:lib/type :operator/filter, :short :is-null, :display-name-variant :is-empty}- {:lib/type :operator/filter, :short :not-null, :display-name-variant :not-empty}]- (lib.filter.operator/filter-operators- {:description nil,- :lib/type :metadata/column,- :base-type :type/Boolean,- :semantic-type :type/Category,- :table-id 7,- :name "TRIAL_CONVERTED",- :coercion-strategy nil,- :lib/source :source/table-defaults,- :lib/source-column-alias "TRIAL_CONVERTED",- :settings nil,- :lib/source-uuid "ad9a276f-3af8-4e5a-b17e-d8170273ec0a",- :nfc-path nil,- :database-type "BOOLEAN",- :effective-type :type/Boolean,- :fk-target-field-id nil,- :id 14,- :parent-id nil,- :visibility-type :normal,- :lib/desired-column-alias "TRIAL_CONVERTED",- :display-name "Trial Converted",- :position 10,- :fingerprint {:global {:distinct-count 2, :nil% 0.0}}}))))- (testing "should return text-like operators for text-like PKs and FKs"- (doseq [semantic-type [:type/PK :type/FK]- :let [column {:description nil,- :lib/type :metadata/column,- :base-type :type/MongoBSONID,- :semantic-type semantic-type- :table-id 7,- :name "ID",- :coercion-strategy nil,- :lib/source :source/table-defaults,- :lib/source-column-alias "ID",- :settings nil,- :lib/source-uuid "ad9a276f-3af8-4e5a-b17e-d8170273ec0a",- :nfc-path nil,- :database-type "STRING",- :effective-type :type/MongoBSONID,- :fk-target-field-id nil,- :id 14,- :parent-id nil,- :visibility-type :normal,- :lib/desired-column-alias "ID",- :display-name "ID",- :position 10}]]- (is (= [:= :!= :is-empty :not-empty]- (mapv :short (lib.filter.operator/filter-operators column)))))))--(deftest ^:parallel replace-filter-clause-test- (testing "Make sure we are able to replace a filter clause using the lib functions for manipulating filters."- (let [query (lib/query meta/metadata-provider (meta/table-metadata :users))- [first-col] (lib/filterable-columns query)- query (lib/filter query (lib/filter-clause- (first (lib/filterable-column-operators first-col))- first-col- 515))- [filter-clause] (lib/filters query)- external-op (lib/external-op filter-clause)]- (is (=? {:stages [{:filters [[:= {} [:field {} (meta/id :users :id)] 515]]}]}- query))- (is (=? [:= {} [:field {} (meta/id :users :id)] 515]- filter-clause))- (is (=? {:operator "="- :lib/type :lib/external-op- :args [[:field {} (meta/id :users :id)]- 515]}- external-op))- (let [external-op' (assoc external-op :operator "!=")- query' (lib/replace-clause query filter-clause external-op')]- (is (=? {:stages [{:filters [[:!= {} [:field {} (meta/id :users :id)] 515]]}]}- query'))))))+ (map :lib/desired-column-alias columns)))))(def ^:private last-online-time(assoc (meta/field-metadata :people :birth-date)@@ -861,8 +699,6 @@(let [col (matrix/find-first query desired (lib/filterable-columns query))query' (lib/filter query (lib/= col v))parts (lib/expression-parts query' (first (lib/filters query')))]- (is (=? (lib.filter.operator/filter-operators {:lib/type :metadata/column :name "expected" :base-type column-type})- (lib/filterable-column-operators col)))(is (=? [[:= {} (lib.options/update-options (lib/ref col) dissoc :lib/uuid) v]](lib/filters query')))(is (=? {:operator :=@@ -932,3 +768,44 @@:lib/uuid "1fe5dc66-54af-4368-9e4a-1e64a1fbe484"}"CREATED_AT"]"2023-01-01T00:00:00Z"])))))++(deftest ^:parallel describe-filter-operator-test+ (testing "default variant"+ (are [expected operator] (= expected (lib/describe-filter-operator operator))+ "Is" :=+ "Is not" :!=+ "Contains" :contains+ "Does not contain" :does-not-contain+ "Starts with" :starts-with+ "Ends with" :ends-with+ "Is empty" :is-empty+ "Not empty" :not-empty+ "Greater than" :>+ "Less than" :<+ "Between" :between+ "Greater than or equal to" :>=+ "Less than or equal to" :<=+ "Is empty" :is-null+ "Not empty" :not-null+ "Inside" :inside))+ (testing "explicit :default variant"+ (are [expected operator] (= expected (lib/describe-filter-operator operator :default))+ "Is" :=+ "Is not" :!=+ "Greater than" :>+ "Less than" :<))+ (testing ":number variant"+ (are [expected operator] (= expected (lib/describe-filter-operator operator :number))+ "Equal to" :=+ "Not equal to" :!=+ "Greater than" :>+ "Less than" :<))+ (testing ":temporal variant"+ (are [expected operator] (= expected (lib/describe-filter-operator operator :temporal))+ "Is" :=+ "Is not" :!=+ "After" :>+ "Before" :<+ "Between" :between+ "Is empty" :is-null+ "Not empty" :not-null)))diff --git a/test/metabase/lib/test_util/generators.cljc b/test/metabase/lib/test_util/generators.cljcindex f22692fe80e..48e2d412544 100644--- a/test/metabase/lib/test_util/generators.cljc+++ b/test/metabase/lib/test_util/generators.cljc@@ -13,8 +13,7 @@[metabase.lib.test-util.generators.util :as gen.u][metabase.lib.types.isa :as lib.types.isa][metabase.test.util.random :as tu.rng]- [metabase.util :as u]- [metabase.util.malli :as mu]))+ [metabase.util :as u]));; NOTE: Being able to *execute* these queries and grok the results would actually be really powerful, if we can;; achieve it with moderate cost. I think we can, at least for most queries. Some temporal stuff is a huge PITA,@@ -236,13 +235,7 @@(testing "adds it to the end of the list"(is (= (count after-filters)(inc (count before-filters))))- (is (=? filter-clause (last after-filters))))- (testing (str `lib/filter-operator " returns the right op")- ;; TODO: The generator will happily build multiple joins- (when-let [op (mu/disable-enforcement- (lib/filter-operator after stage-number (last after-filters)))]- (is (= (first filter-clause)- (:short op))))))))))+ (is (=? filter-clause (last after-filters)))))))));; Expressions ===================================================================================;; We only support a few basic expressions for now. It would be good to exercise all the expression types eventually,diff --git a/test/metabase/lib/test_util/generators/filters.cljc b/test/metabase/lib/test_util/generators/filters.cljcindex 1297dae4c6e..83338faaf45 100644--- a/test/metabase/lib/test_util/generators/filters.cljc+++ b/test/metabase/lib/test_util/generators/filters.cljc@@ -92,7 +92,7 @@(defmulti ^:private gen-filter-clause{:arglists '([column operator])}(fn [_column operator]- (:short operator)))+ operator));; Binary operators like :<(doseq [[op f] [[:< lib/<]@@ -128,9 +128,6 @@(defmethod gen-filter-clause op [column _op](f column)))-(defn- skipped-operator? [op]- (#{:inside} (:short op)))-(defn- units-from [min-unit](drop-while #(not= % min-unit) lib.schema.temporal-bucketing/ordered-datetime-truncation-units))@@ -252,10 +249,26 @@;; TODO: There's actually no difference right now. Clean this up?(gen-filter:date column))+(defn- operators-for-column+ "Returns a list of operators for the given column, based on its type."+ [column]+ (cond+ (lib.types.isa/boolean? column)+ [:= :is-null :not-null]++ (lib.types.isa/numeric? column)+ [:= :!= :> :< :between :>= :<= :is-null :not-null]++ (lib.types.isa/string-or-string-like? column)+ [:= :!= :contains :does-not-contain :starts-with :ends-with :is-empty :not-empty]++ :else+ [:is-null :not-null]))+(defn- gen-filter:generic [column]- (when-let [operator (some->> (:operators column)- (remove skipped-operator?)- tu.rng/rand-nth)]+ (when-let [operator (some-> (operators-for-column column)+ seq+ tu.rng/rand-nth)](gen-filter-clause column operator)))(defn- gen-filter:inside [col1 col2]@@ -290,9 +303,9 @@:else(let [result (gen-filter:generic column)];; Sometimes we pick a column with no filter operators, and result is nil. Recur in that case to roll again.- (if (= result ::no-operators)+ (if (nil? result)(if (>= recursion-depth 20)- (throw (ex-info "Deep recusion in gen-filter* - no filterable columns, or none with valid :operators?"+ (throw (ex-info "Deep recursion in gen-filter* - no filterable columns, or none with valid operators?"{:filterable-columns *filterable-columns*}))(recur (inc recursion-depth)))result))))))