@oneuptime/common 10.0.69 → 10.0.70

package/build/dist/UI/Components/Filters/NumberFilter.js

@@ -1,29 +1,171 @@
-import Input, { InputType } from "../Input/Input";
 import FieldType from "../Types/FieldType";
-import React from "react";
+import FilterOperator from "./Types/FilterOperator";
+import OperatorSelector from "./OperatorSelector";
+import EqualTo from "../../../Types/BaseDatabase/EqualTo";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
+import GreaterThan from "../../../Types/BaseDatabase/GreaterThan";
+import LessThan from "../../../Types/BaseDatabase/LessThan";
+import GreaterThanOrEqual from "../../../Types/BaseDatabase/GreaterThanOrEqual";
+import LessThanOrEqual from "../../../Types/BaseDatabase/LessThanOrEqual";
+import InBetween from "../../../Types/BaseDatabase/InBetween";
+import IsNull from "../../../Types/BaseDatabase/IsNull";
+import NotNull from "../../../Types/BaseDatabase/NotNull";
+import React, { useEffect, useState } from "react";
+const NUMBER_OPERATORS = [
+    FilterOperator.EqualTo,
+    FilterOperator.NotEqualTo,
+    FilterOperator.GreaterThan,
+    FilterOperator.LessThan,
+    FilterOperator.GreaterThanOrEqualTo,
+    FilterOperator.LessThanOrEqualTo,
+    FilterOperator.Between,
+    FilterOperator.IsEmpty,
+    FilterOperator.IsNotEmpty,
+];
+const detectState = (rawValue) => {
+    var _a, _b;
+    if (rawValue instanceof InBetween) {
+        return {
+            operator: FilterOperator.Between,
+            value: ((_a = rawValue.startValue) !== null && _a !== void 0 ? _a : "").toString(),
+            endValue: ((_b = rawValue.endValue) !== null && _b !== void 0 ? _b : "").toString(),
+        };
+    }
+    if (rawValue instanceof EqualTo) {
+        return {
+            operator: FilterOperator.EqualTo,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof NotEqual) {
+        return {
+            operator: FilterOperator.NotEqualTo,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof GreaterThan) {
+        return {
+            operator: FilterOperator.GreaterThan,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof LessThan) {
+        return {
+            operator: FilterOperator.LessThan,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof GreaterThanOrEqual) {
+        return {
+            operator: FilterOperator.GreaterThanOrEqualTo,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof LessThanOrEqual) {
+        return {
+            operator: FilterOperator.LessThanOrEqualTo,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    if (rawValue instanceof IsNull) {
+        return { operator: FilterOperator.IsEmpty, value: "", endValue: "" };
+    }
+    if (rawValue instanceof NotNull) {
+        return { operator: FilterOperator.IsNotEmpty, value: "", endValue: "" };
+    }
+    if (typeof rawValue === "number") {
+        return {
+            operator: FilterOperator.EqualTo,
+            value: rawValue.toString(),
+            endValue: "",
+        };
+    }
+    return { operator: FilterOperator.EqualTo, value: "", endValue: "" };
+};
+const buildValue = (state) => {
+    const startNum = parseFloat(state.value);
+    const endNum = parseFloat(state.endValue);
+    const hasStart = !Number.isNaN(startNum) && state.value !== "";
+    const hasEnd = !Number.isNaN(endNum) && state.endValue !== "";
+    switch (state.operator) {
+        case FilterOperator.EqualTo:
+            return hasStart ? new EqualTo(startNum) : undefined;
+        case FilterOperator.NotEqualTo:
+            return hasStart ? new NotEqual(startNum) : undefined;
+        case FilterOperator.GreaterThan:
+            return hasStart ? new GreaterThan(startNum) : undefined;
+        case FilterOperator.LessThan:
+            return hasStart ? new LessThan(startNum) : undefined;
+        case FilterOperator.GreaterThanOrEqualTo:
+            return hasStart ? new GreaterThanOrEqual(startNum) : undefined;
+        case FilterOperator.LessThanOrEqualTo:
+            return hasStart ? new LessThanOrEqual(startNum) : undefined;
+        case FilterOperator.Between:
+            return hasStart && hasEnd ? new InBetween(startNum, endNum) : undefined;
+        case FilterOperator.IsEmpty:
+            return new IsNull();
+        case FilterOperator.IsNotEmpty:
+            return new NotNull();
+        default:
+            return undefined;
+    }
+};
 const NumberFilter = (props) => {
     const filter = props.filter;
-    const filterData = Object.assign({}, props.filterData);
-    const inputType = InputType.NUMBER;
-    if (!filter.filterDropdownOptions && filter.type === FieldType.Number) {
-        return (React.createElement(Input, { onChange: (changedValue) => {
-                if (filter.key) {
-                    if (!changedValue) {
-                        delete filterData[filter.key];
-                    }
-                    if (changedValue && filter.type === FieldType.Number) {
-                        if (typeof changedValue === "string") {
-                            changedValue = parseInt(changedValue);
-                        }
-                        filterData[filter.key] = changedValue;
-                    }
-                    if (props.onFilterChanged) {
-                        props.onFilterChanged(filterData);
-                    }
-                }
-            }, initialValue: filterData[filter.key], placeholder: `Filter by ${filter.title}`, type: inputType }));
-    }
-    return React.createElement(React.Fragment, null);
+    if (filter.filterDropdownOptions) {
+        return React.createElement(React.Fragment, null);
+    }
+    if (filter.type !== FieldType.Number) {
+        return React.createElement(React.Fragment, null);
+    }
+    const detected = detectState(props.filterData[filter.key]);
+    const [localOperator, setLocalOperator] = useState(detected.operator);
+    useEffect(() => {
+        const raw = props.filterData[filter.key];
+        if (raw !== undefined && raw !== null) {
+            setLocalOperator(detected.operator);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.filterData[filter.key]]);
+    const state = Object.assign(Object.assign({}, detected), { operator: localOperator });
+    const valuelessOperator = state.operator === FilterOperator.IsEmpty ||
+        state.operator === FilterOperator.IsNotEmpty;
+    const isBetween = state.operator === FilterOperator.Between;
+    const apply = (nextState) => {
+        var _a;
+        if (!filter.key) {
+            return;
+        }
+        setLocalOperator(nextState.operator);
+        const next = Object.assign({}, props.filterData);
+        const built = buildValue(nextState);
+        if (built === undefined) {
+            delete next[filter.key];
+        }
+        else {
+            next[filter.key] = built;
+        }
+        (_a = props.onFilterChanged) === null || _a === void 0 ? void 0 : _a.call(props, next);
+    };
+    return (React.createElement("div", { className: "flex gap-2 items-start" },
+        React.createElement(OperatorSelector, { value: state.operator, options: NUMBER_OPERATORS, onChange: (nextOperator) => {
+                apply(Object.assign(Object.assign({}, state), { operator: nextOperator }));
+            } }),
+        !valuelessOperator && (React.createElement("div", { className: isBetween ? "flex-1 flex gap-2 min-w-0" : "flex-1 min-w-0" },
+            React.createElement("div", { className: "flex-1 min-w-0" },
+                React.createElement("input", { type: "number", value: state.value, onChange: (e) => {
+                        apply(Object.assign(Object.assign({}, state), { value: e.target.value }));
+                    }, placeholder: isBetween ? "From" : `Filter by ${filter.title}`, className: "block w-full rounded-md border border-gray-300 bg-white py-2 pl-3 pr-3 text-sm placeholder-gray-500 focus:border-indigo-500 focus:text-gray-900 focus:placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-indigo-500 sm:text-sm" })),
+            isBetween && (React.createElement("div", { className: "flex-1 min-w-0" },
+                React.createElement("input", { type: "number", value: state.endValue, onChange: (e) => {
+                        apply(Object.assign(Object.assign({}, state), { endValue: e.target.value }));
+                    }, placeholder: "To", className: "block w-full rounded-md border border-gray-300 bg-white py-2 pl-3 pr-3 text-sm placeholder-gray-500 focus:border-indigo-500 focus:text-gray-900 focus:placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-indigo-500 sm:text-sm" })))))));
 };
 export default NumberFilter;
 //# sourceMappingURL=NumberFilter.js.map

package/build/dist/UI/Components/Filters/NumberFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"NumberFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/NumberFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,MAAM,YAAY,GAAyB,CACzC,KAAwB,EACV,EAAE;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,MAAM,SAAS,GAAc,SAAS,CAAC,MAAM,CAAC;IAE9C,IAAI,CAAC,MAAM,CAAC,qBAAqB,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QACtE,OAAO,CACL,oBAAC,KAAK,IACJ,QAAQ,EAAE,CAAC,YAA6B,EAAE,EAAE;gBAC1C,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;oBACf,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChC,CAAC;oBAED,IAAI,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;wBACrD,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;4BACrC,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;wBACxC,CAAC;wBAED,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;oBACxC,CAAC;oBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;wBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;YACH,CAAC,EACD,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAY,EAC/C,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,EACxC,IAAI,EAAE,SAAS,GACf,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"NumberFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/NumberFilter.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Filters/OperatorSelector.js

@@ -0,0 +1,41 @@
+import IconProp from "../../../Types/Icon/IconProp";
+import Icon, { SizeProp } from "../Icon/Icon";
+import { FilterOperatorLabel } from "./Types/FilterOperator";
+import React, { useEffect, useRef, useState } from "react";
+const OperatorSelector = (props) => {
+    const [isOpen, setIsOpen] = useState(false);
+    const containerRef = useRef(null);
+    useEffect(() => {
+        const handleClickOutside = (event) => {
+            if (containerRef.current &&
+                !containerRef.current.contains(event.target)) {
+                setIsOpen(false);
+            }
+        };
+        document.addEventListener("mousedown", handleClickOutside);
+        return () => {
+            document.removeEventListener("mousedown", handleClickOutside);
+        };
+    }, []);
+    return (React.createElement("div", { className: "relative inline-block shrink-0", ref: containerRef },
+        React.createElement("button", { type: "button", onClick: () => {
+                setIsOpen((prev) => {
+                    return !prev;
+                });
+            }, className: "inline-flex items-center justify-between gap-1.5 h-9 px-3 text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 border border-gray-300 rounded-md transition-colors focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 min-w-[130px]" },
+            React.createElement("span", { className: "truncate" }, FilterOperatorLabel[props.value]),
+            React.createElement(Icon, { icon: IconProp.ChevronDown, size: SizeProp.Smaller, className: "text-gray-400 shrink-0" })),
+        isOpen && (React.createElement("div", { className: "absolute z-20 mt-1 w-56 bg-white rounded-md shadow-lg border border-gray-200 py-1 max-h-60 overflow-auto" }, props.options.map((option) => {
+            const isSelected = option === props.value;
+            return (React.createElement("button", { key: option, type: "button", onClick: () => {
+                    props.onChange(option);
+                    setIsOpen(false);
+                }, className: isSelected
+                    ? "w-full text-left px-3 py-2 text-sm text-indigo-700 bg-indigo-50 hover:bg-indigo-100 flex items-center justify-between"
+                    : "w-full text-left px-3 py-2 text-sm text-gray-700 hover:bg-gray-50 flex items-center justify-between" },
+                React.createElement("span", null, FilterOperatorLabel[option]),
+                isSelected && (React.createElement(Icon, { icon: IconProp.Check, size: SizeProp.Smaller, className: "text-indigo-600" }))));
+        })))));
+};
+export default OperatorSelector;
+//# sourceMappingURL=OperatorSelector.js.map

package/build/dist/UI/Components/Filters/OperatorSelector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OperatorSelector.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/OperatorSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,8BAA8B,CAAC;AACpD,OAAO,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAuB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,KAAK,EAAE,EAAgB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQzE,MAAM,gBAAgB,GAA4C,CAChE,KAAqB,EACP,EAAE;IAChB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IACrD,MAAM,YAAY,GAChB,MAAM,CAAwB,IAAI,CAAC,CAAC;IAEtC,SAAS,CAAC,GAAG,EAAE;QAEb,MAAM,kBAAkB,GAA+B,CACrD,KAAiB,EACX,EAAE;YACR,IACE,YAAY,CAAC,OAAO;gBACpB,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAc,CAAC,EACpD,CAAC;gBACD,SAAS,CAAC,KAAK,CAAC,CAAC;YACnB,CAAC;QACH,CAAC,CAAC;QAEF,QAAQ,CAAC,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAC3D,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAChE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,6BAAK,SAAS,EAAC,gCAAgC,EAAC,GAAG,EAAE,YAAY;QAC/D,gCACE,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,GAAG,EAAE;gBACZ,SAAS,CAAC,CAAC,IAAa,EAAE,EAAE;oBAC1B,OAAO,CAAC,IAAI,CAAC;gBACf,CAAC,CAAC,CAAC;YACL,CAAC,EACD,SAAS,EAAC,uQAAuQ;YAEjR,8BAAM,SAAS,EAAC,UAAU,IAAE,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAQ;YACpE,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,WAAW,EAC1B,IAAI,EAAE,QAAQ,CAAC,OAAO,EACtB,SAAS,EAAC,wBAAwB,GAClC,CACK;QACR,MAAM,IAAI,CACT,6BAAK,SAAS,EAAC,0GAA0G,IACtH,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAsB,EAAE,EAAE;YAC5C,MAAM,UAAU,GAAY,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC;YACnD,OAAO,CACL,gCACE,GAAG,EAAE,MAAM,EACX,IAAI,EAAC,QAAQ,EACb,OAAO,EAAE,GAAG,EAAE;oBACZ,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACvB,SAAS,CAAC,KAAK,CAAC,CAAC;gBACnB,CAAC,EACD,SAAS,EACP,UAAU;oBACR,CAAC,CAAC,uHAAuH;oBACzH,CAAC,CAAC,qGAAqG;gBAG3G,kCAAO,mBAAmB,CAAC,MAAM,CAAC,CAAQ;gBACzC,UAAU,IAAI,CACb,oBAAC,IAAI,IACH,IAAI,EAAE,QAAQ,CAAC,KAAK,EACpB,IAAI,EAAE,QAAQ,CAAC,OAAO,EACtB,SAAS,EAAC,iBAAiB,GAC3B,CACH,CACM,CACV,CAAC;QACJ,CAAC,CAAC,CACE,CACP,CACG,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/build/dist/UI/Components/Filters/TextFilter.js

@@ -1,60 +1,137 @@
-import Input, { InputType } from "../Input/Input";
 import FieldType from "../Types/FieldType";
+import FilterOperator from "./Types/FilterOperator";
+import OperatorSelector from "./OperatorSelector";
 import Search from "../../../Types/BaseDatabase/Search";
-import DatabaseDate from "../../../Types/Database/Date";
-import OneUptimeDate from "../../../Types/Date";
-import React from "react";
+import EqualTo from "../../../Types/BaseDatabase/EqualTo";
+import NotEqual from "../../../Types/BaseDatabase/NotEqual";
+import StartsWith from "../../../Types/BaseDatabase/StartsWith";
+import EndsWith from "../../../Types/BaseDatabase/EndsWith";
+import NotContains from "../../../Types/BaseDatabase/NotContains";
+import IsNull from "../../../Types/BaseDatabase/IsNull";
+import NotNull from "../../../Types/BaseDatabase/NotNull";
+import React, { useEffect, useState } from "react";
+const TEXT_FIELD_TYPES = [
+    FieldType.Text,
+    FieldType.LongText,
+    FieldType.Email,
+    FieldType.Phone,
+    FieldType.Name,
+    FieldType.Port,
+    FieldType.URL,
+    FieldType.Hostname,
+    FieldType.ObjectID,
+];
+const TEXT_OPERATORS = [
+    FilterOperator.Contains,
+    FilterOperator.DoesNotContain,
+    FilterOperator.EqualTo,
+    FilterOperator.NotEqualTo,
+    FilterOperator.StartsWith,
+    FilterOperator.EndsWith,
+    FilterOperator.IsEmpty,
+    FilterOperator.IsNotEmpty,
+];
+const detectCurrentState = (rawValue) => {
+    if (rawValue instanceof Search) {
+        return { operator: FilterOperator.Contains, value: rawValue.value };
+    }
+    if (rawValue instanceof NotContains) {
+        return { operator: FilterOperator.DoesNotContain, value: rawValue.value };
+    }
+    if (rawValue instanceof StartsWith) {
+        return { operator: FilterOperator.StartsWith, value: rawValue.value };
+    }
+    if (rawValue instanceof EndsWith) {
+        return { operator: FilterOperator.EndsWith, value: rawValue.value };
+    }
+    if (rawValue instanceof EqualTo) {
+        return { operator: FilterOperator.EqualTo, value: rawValue.toString() };
+    }
+    if (rawValue instanceof NotEqual) {
+        return { operator: FilterOperator.NotEqualTo, value: rawValue.toString() };
+    }
+    if (rawValue instanceof IsNull) {
+        return { operator: FilterOperator.IsEmpty, value: "" };
+    }
+    if (rawValue instanceof NotNull) {
+        return { operator: FilterOperator.IsNotEmpty, value: "" };
+    }
+    if (typeof rawValue === "string" && rawValue.length > 0) {
+        // Backward compatibility for plain string values.
+        return { operator: FilterOperator.Contains, value: rawValue };
+    }
+    return { operator: FilterOperator.Contains, value: "" };
+};
+const buildQueryValue = (operator, value) => {
+    switch (operator) {
+        case FilterOperator.Contains:
+            return value ? new Search(value) : undefined;
+        case FilterOperator.DoesNotContain:
+            return value ? new NotContains(value) : undefined;
+        case FilterOperator.StartsWith:
+            return value ? new StartsWith(value) : undefined;
+        case FilterOperator.EndsWith:
+            return value ? new EndsWith(value) : undefined;
+        case FilterOperator.EqualTo:
+            return value ? new EqualTo(value) : undefined;
+        case FilterOperator.NotEqualTo:
+            return value ? new NotEqual(value) : undefined;
+        case FilterOperator.IsEmpty:
+            return new IsNull();
+        case FilterOperator.IsNotEmpty:
+            return new NotNull();
+        default:
+            return undefined;
+    }
+};
 const TextFilter = (props) => {
     const filter = props.filter;
-    const filterData = Object.assign({}, props.filterData);
-    let inputType = InputType.TEXT;
-    if (filter.type === FieldType.Date) {
-        inputType = InputType.DATE;
-    }
-    else if (filter.type === FieldType.DateTime) {
-        inputType = InputType.DATETIME_LOCAL;
-    }
-    if (!filter.filterDropdownOptions &&
-        (filter.type === FieldType.Email ||
-            filter.type === FieldType.Phone ||
-            filter.type === FieldType.Name ||
-            filter.type === FieldType.Port ||
-            filter.type === FieldType.URL ||
-            filter.type === FieldType.ObjectID ||
-            filter.type === FieldType.Text ||
-            filter.type === FieldType.LongText)) {
-        return (React.createElement(Input, { onChange: (changedValue) => {
-                if (filter.key) {
-                    if (!changedValue) {
-                        delete filterData[filter.key];
-                    }
-                    if (changedValue &&
-                        (filter.type === FieldType.Date ||
-                            filter.type === FieldType.DateTime)) {
-                        filterData[filter.key] =
-                            OneUptimeDate.asFilterDateForDatabaseQuery(changedValue);
-                    }
-                    if (changedValue && filter.type === FieldType.DateTime) {
-                        filterData[filter.key] =
-                            DatabaseDate.asDateStartOfTheDayEndOfTheDayForDatabaseQuery(changedValue);
-                    }
-                    if (changedValue &&
-                        (filter.type === FieldType.Text ||
-                            filter.type === FieldType.Email ||
-                            filter.type === FieldType.Phone ||
-                            filter.type === FieldType.Name ||
-                            filter.type === FieldType.Port ||
-                            filter.type === FieldType.URL ||
-                            filter.type === FieldType.ObjectID)) {
-                        filterData[filter.key] = new Search(changedValue.toString());
-                    }
-                    if (props.onFilterChanged) {
-                        props.onFilterChanged(filterData);
-                    }
-                }
-            }, initialValue: (filterData[filter.key] || "").toString(), placeholder: `Filter by ${filter.title}`, type: inputType }));
-    }
-    return React.createElement(React.Fragment, null);
+    if (filter.filterDropdownOptions) {
+        return React.createElement(React.Fragment, null);
+    }
+    if (!TEXT_FIELD_TYPES.includes(filter.type)) {
+        return React.createElement(React.Fragment, null);
+    }
+    const detected = detectCurrentState(props.filterData[filter.key]);
+    // Keep the operator locally so the user's choice persists even when no
+    // value has been typed yet (otherwise buildQueryValue returns undefined,
+    // the filter is deleted, and the operator resets on re-render).
+    const [localOperator, setLocalOperator] = useState(detected.operator);
+    useEffect(() => {
+        const raw = props.filterData[filter.key];
+        if (raw !== undefined && raw !== null) {
+            setLocalOperator(detected.operator);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.filterData[filter.key]]);
+    const operator = localOperator;
+    const value = detected.value;
+    const valuelessOperator = operator === FilterOperator.IsEmpty ||
+        operator === FilterOperator.IsNotEmpty;
+    const apply = (data) => {
+        var _a;
+        if (!filter.key) {
+            return;
+        }
+        setLocalOperator(data.operator);
+        const next = Object.assign({}, props.filterData);
+        const built = buildQueryValue(data.operator, data.value);
+        if (built === undefined) {
+            delete next[filter.key];
+        }
+        else {
+            next[filter.key] = built;
+        }
+        (_a = props.onFilterChanged) === null || _a === void 0 ? void 0 : _a.call(props, next);
+    };
+    return (React.createElement("div", { className: "flex gap-2 items-start" },
+        React.createElement(OperatorSelector, { value: operator, options: TEXT_OPERATORS, onChange: (nextOperator) => {
+                apply({ operator: nextOperator, value });
+            } }),
+        !valuelessOperator && (React.createElement("div", { className: "flex-1 min-w-0" },
+            React.createElement("input", { type: "text", value: value, onChange: (e) => {
+                    apply({ operator, value: e.target.value });
+                }, placeholder: `Filter by ${filter.title}`, className: "block w-full rounded-md border border-gray-300 bg-white py-2 pl-3 pr-3 text-sm placeholder-gray-500 focus:border-indigo-500 focus:text-gray-900 focus:placeholder-gray-400 focus:outline-none focus:ring-1 focus:ring-indigo-500 sm:text-sm" })))));
 };
 export default TextFilter;
 //# sourceMappingURL=TextFilter.js.map

package/build/dist/UI/Components/Filters/TextFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"TextFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/TextFilter.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TextFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/TextFilter.tsx"],"names":[],"mappings":"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"}

package/build/dist/UI/Components/Filters/Types/FilterOperator.js

@@ -0,0 +1,63 @@
+/**
+ * Operators that a user can pick in the filter UI. Not every operator is
+ * valid for every field type — use `getOperatorsForFieldType` to get the list
+ * that applies to a given field.
+ */
+var FilterOperator;
+(function (FilterOperator) {
+    // Text
+    FilterOperator["Contains"] = "contains";
+    FilterOperator["DoesNotContain"] = "does_not_contain";
+    FilterOperator["StartsWith"] = "starts_with";
+    FilterOperator["EndsWith"] = "ends_with";
+    // Comparison (shared across text / number / date)
+    FilterOperator["EqualTo"] = "equal_to";
+    FilterOperator["NotEqualTo"] = "not_equal_to";
+    FilterOperator["GreaterThan"] = "greater_than";
+    FilterOperator["LessThan"] = "less_than";
+    FilterOperator["GreaterThanOrEqualTo"] = "greater_than_or_equal_to";
+    FilterOperator["LessThanOrEqualTo"] = "less_than_or_equal_to";
+    FilterOperator["Between"] = "between";
+    // Date-specific aliases for comparison
+    FilterOperator["Before"] = "before";
+    FilterOperator["After"] = "after";
+    // Entity / single-value selection
+    FilterOperator["Is"] = "is";
+    FilterOperator["IsNot"] = "is_not";
+    // Entity array selection
+    FilterOperator["HasAnyOf"] = "has_any_of";
+    FilterOperator["HasAllOf"] = "has_all_of";
+    FilterOperator["HasNoneOf"] = "has_none_of";
+    // Presence
+    FilterOperator["IsEmpty"] = "is_empty";
+    FilterOperator["IsNotEmpty"] = "is_not_empty";
+    // Boolean
+    FilterOperator["IsTrue"] = "is_true";
+    FilterOperator["IsFalse"] = "is_false";
+})(FilterOperator || (FilterOperator = {}));
+export default FilterOperator;
+export const FilterOperatorLabel = {
+    [FilterOperator.Contains]: "contains",
+    [FilterOperator.DoesNotContain]: "does not contain",
+    [FilterOperator.StartsWith]: "starts with",
+    [FilterOperator.EndsWith]: "ends with",
+    [FilterOperator.EqualTo]: "equals",
+    [FilterOperator.NotEqualTo]: "does not equal",
+    [FilterOperator.GreaterThan]: "is greater than",
+    [FilterOperator.LessThan]: "is less than",
+    [FilterOperator.GreaterThanOrEqualTo]: "is greater than or equal to",
+    [FilterOperator.LessThanOrEqualTo]: "is less than or equal to",
+    [FilterOperator.Between]: "is between",
+    [FilterOperator.Before]: "is before",
+    [FilterOperator.After]: "is after",
+    [FilterOperator.Is]: "is",
+    [FilterOperator.IsNot]: "is not",
+    [FilterOperator.HasAnyOf]: "has any of",
+    [FilterOperator.HasAllOf]: "has all of",
+    [FilterOperator.HasNoneOf]: "has none of",
+    [FilterOperator.IsEmpty]: "is empty",
+    [FilterOperator.IsNotEmpty]: "is not empty",
+    [FilterOperator.IsTrue]: "is true",
+    [FilterOperator.IsFalse]: "is false",
+};
+//# sourceMappingURL=FilterOperator.js.map

package/build/dist/UI/Components/Filters/Types/FilterOperator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FilterOperator.js","sourceRoot":"","sources":["../../../../../../UI/Components/Filters/Types/FilterOperator.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,IAAK,cAoCJ;AApCD,WAAK,cAAc;IACjB,OAAO;IACP,uCAAqB,CAAA;IACrB,qDAAmC,CAAA;IACnC,4CAA0B,CAAA;IAC1B,wCAAsB,CAAA;IAEtB,kDAAkD;IAClD,sCAAoB,CAAA;IACpB,6CAA2B,CAAA;IAC3B,8CAA4B,CAAA;IAC5B,wCAAsB,CAAA;IACtB,mEAAiD,CAAA;IACjD,6DAA2C,CAAA;IAC3C,qCAAmB,CAAA;IAEnB,uCAAuC;IACvC,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IAEf,kCAAkC;IAClC,2BAAS,CAAA;IACT,kCAAgB,CAAA;IAEhB,yBAAyB;IACzB,yCAAuB,CAAA;IACvB,yCAAuB,CAAA;IACvB,2CAAyB,CAAA;IAEzB,WAAW;IACX,sCAAoB,CAAA;IACpB,6CAA2B,CAAA;IAE3B,UAAU;IACV,oCAAkB,CAAA;IAClB,sCAAoB,CAAA;AACtB,CAAC,EApCI,cAAc,KAAd,cAAc,QAoClB;AAED,eAAe,cAAc,CAAC;AAM9B,MAAM,CAAC,MAAM,mBAAmB,GAA2B;IACzD,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,UAAU;IACrC,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,kBAAkB;IACnD,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,aAAa;IAC1C,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,WAAW;IACtC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,QAAQ;IAClC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,gBAAgB;IAC7C,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,iBAAiB;IAC/C,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,cAAc;IACzC,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,6BAA6B;IACpE,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,0BAA0B;IAC9D,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,YAAY;IACtC,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW;IACpC,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,UAAU;IAClC,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,IAAI;IACzB,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ;IAChC,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,YAAY;IACvC,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,YAAY;IACvC,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,aAAa;IACzC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,UAAU;IACpC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,cAAc;IAC3C,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,SAAS;IAClC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,UAAU;CACrC,CAAC"}

package/build/dist/UI/Components/ModelTable/BaseModelTable.js

@@ -1,4 +1,5 @@
 import Includes from "../../../Types/BaseDatabase/Includes";
+import QueryOperator from "../../../Types/BaseDatabase/QueryOperator";
 import { API_DOCS_URL, BILLING_ENABLED, getAllEnvVars } from "../../Config";
 import API from "../../Utils/API/API";
 import { Logger } from "../../Utils/Logger";
@@ -902,6 +903,12 @@ const BaseModelTable = (props) => {
             if (Array.isArray(filterData[key])) {
                 newQuery[key] = new Includes(filterData[key]);
             }
+            // Pass any QueryOperator instance (IncludesAll, IncludesNone, StartsWith,
+            // EndsWith, NotContains, EqualTo, NotEqual, GreaterThan, LessThan,
+            // InBetween, IsNull, NotNull, ...) through to the query as-is.
+            if (filterData[key] instanceof QueryOperator) {
+                newQuery[key] = filterData[key];
+            }
         }
         setQuery(Object.assign({}, newQuery));
     };