@oneuptime/common 10.0.68 → 10.0.70

package/build/dist/Types/Kubernetes/KubernetesInventoryExtractor.js

@@ -145,11 +145,16 @@ export function extractInventoryResource(data) {
     if (!metadata || !metadata.name) {
         return null;
     }
-    // Pod-specific hot column
+    // Pod-specific hot columns
     let phase = null;
+    let containerCount = null;
     if (kind === "Pod") {
         const podStatus = parsed.status;
         phase = (podStatus === null || podStatus === void 0 ? void 0 : podStatus.phase) || null;
+        const podSpec = parsed.spec;
+        containerCount = Array.isArray(podSpec === null || podSpec === void 0 ? void 0 : podSpec.containers)
+            ? podSpec.containers.length
+            : 0;
     }
     // Node-specific hot columns
     let nodeFlags = {
@@ -192,6 +197,7 @@ export function extractInventoryResource(data) {
             }
             : null,
         spec: anyParsed.spec || null,
+        containerCount,
         status: anyParsed.status || null,
         lastSeenAt: data.lastSeenAt,
         resourceCreationTimestamp: parseCreationTimestamp(metadata.creationTimestamp),

package/build/dist/Types/Kubernetes/KubernetesInventoryExtractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"KubernetesInventoryExtractor.js","sourceRoot":"","sources":["../../../../Types/Kubernetes/KubernetesInventoryExtractor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"KubernetesInventoryExtractor.js","sourceRoot":"","sources":["../../../../Types/Kubernetes/KubernetesInventoryExtractor.ts"],"names":[],"mappings":"AACA,OAAO,EAeL,cAAc,EACd,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,kBAAkB,EAClB,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,cAAc,EACd,cAAc,EACd,wBAAwB,GACzB,MAAM,0BAA0B,CAAC;AA+DlC;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,YAAoB;IACvD,MAAM,GAAG,GAA2B;QAClC,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,WAAW;QACvB,WAAW,EAAE,YAAY;QACzB,YAAY,EAAE,aAAa;QAC3B,UAAU,EAAE,WAAW;QACvB,IAAI,EAAE,KAAK;QACX,QAAQ,EAAE,SAAS;QACnB,sBAAsB,EAAE,uBAAuB;QAC/C,iBAAiB,EAAE,kBAAkB;QACrC,wBAAwB,EAAE,yBAAyB;QACnD,sBAAsB,EAAE,uBAAuB;KAChD,CAAC;IACF,OAAO,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAA0B;IAC/D,MAAM;IACN,OAAO;IACP,YAAY;IACZ,aAAa;IACb,cAAc;IACd,YAAY;IACZ,MAAM;IACN,UAAU;IACV,wBAAwB;IACxB,mBAAmB;IACnB,0BAA0B;IAC1B,wBAAwB;CACzB,CAAC;AAEF,SAAS,sBAAsB,CAAC,KAAyB;IACvD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACH,MAAM,CAAC,GAAS,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,UAAkD;IAOlD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO;YACL,OAAO,EAAE,IAAI;YACb,iBAAiB,EAAE,IAAI;YACvB,eAAe,EAAE,IAAI;YACrB,cAAc,EAAE,IAAI;SACrB,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,GAAmB,IAAI,CAAC;IACnC,IAAI,WAAW,GAAmB,IAAI,CAAC;IACvC,IAAI,YAAY,GAAmB,IAAI,CAAC;IACxC,IAAI,WAAW,GAAmB,IAAI,CAAC;IAEvC,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAY,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC;QAC5C,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACvB,OAAO,GAAG,MAAM,CAAC;QACnB,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACvC,WAAW,GAAG,MAAM,CAAC;QACvB,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;YACrC,YAAY,GAAG,MAAM,CAAC;QACxB,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACpC,WAAW,GAAG,MAAM,CAAC;QACvB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,OAAO;QACP,iBAAiB,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW;QAC7D,eAAe,EAAE,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY;QAC7D,cAAc,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW;KAC3D,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,YAAoB,EACpB,MAAkB;IAElB,QAAQ,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;QACnC,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,OAAO;YACV,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;QACjC,KAAK,YAAY;YACf,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,KAAK,aAAa;YAChB,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACvC,KAAK,cAAc;YACjB,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACxC,KAAK,YAAY;YACf,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtC,KAAK,MAAM;YACT,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,UAAU;YACb,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,wBAAwB;YAC3B,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,mBAAmB;YACtB,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;QAC/B,KAAK,0BAA0B;YAC7B,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAChC,KAAK,wBAAwB;YAC3B,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;QAChC;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAIxC;IACC,MAAM,IAAI,GAAkB,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACpE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAsB,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAA+B,mBAAmB,CAC5D,IAAI,CAAC,YAAY,EACjB,MAAM,CACP,CAAC;IACF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAA6B,MAAM,CAAC,QAAQ,CAAC;IAC3D,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2BAA2B;IAC3B,IAAI,KAAK,GAAkB,IAAI,CAAC;IAChC,IAAI,cAAc,GAAkB,IAAI,CAAC;IACzC,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,MAAM,SAAS,GACb,MACD,CAAC,MAAM,CAAC;QACT,KAAK,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,KAAI,IAAI,CAAC;QACjC,MAAM,OAAO,GACX,MACD,CAAC,IAAI,CAAC;QACP,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC;YACjD,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM;YAC3B,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,4BAA4B;IAC5B,IAAI,SAAS,GAAgD;QAC3D,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,IAAI;QACvB,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,IAAI;KACrB,CAAC;IACF,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,UAAU,GACd,MACD,CAAC,MAAM,CAAC;QACT,SAAS,GAAG,wBAAwB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,CAAC;IAC/D,CAAC;IAED;;;;;;OAMG;IACH,MAAM,SAAS,GAGX,MAGH,CAAC;IAEF,OAAO;QACL,IAAI;QACJ,YAAY,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE;QACtC,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,IAAI;QACzB,KAAK;QACL,OAAO,EAAE,SAAS,CAAC,OAAO;QAC1B,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;QAC9C,eAAe,EAAE,SAAS,CAAC,eAAe;QAC1C,cAAc,EAAE,SAAS,CAAC,cAAc;QACxC,MAAM,EACJ,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;YACxD,CAAC,CAAE,QAAQ,CAAC,MAAqB;YACjC,CAAC,CAAC,IAAI;QACV,WAAW,EACT,QAAQ,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC;YAClE,CAAC,CAAE,QAAQ,CAAC,WAA0B;YACtC,CAAC,CAAC,IAAI;QACV,eAAe,EACb,QAAQ,CAAC,eAAe,IAAI,QAAQ,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YAC7D,CAAC,CAAE;gBACC,KAAK,EAAE,QAAQ,CAAC,eAAe;aACN;YAC7B,CAAC,CAAC,IAAI;QACV,IAAI,EAAG,SAAS,CAAC,IAA+B,IAAI,IAAI;QACxD,cAAc;QACd,MAAM,EAAG,SAAS,CAAC,MAAiC,IAAI,IAAI;QAC5D,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,yBAAyB,EAAE,sBAAsB,CAC/C,QAAQ,CAAC,iBAAiB,CAC3B;KACF,CAAC;AACJ,CAAC"}

package/build/dist/Types/SerializableObjectDictionary.js

@@ -7,6 +7,11 @@ import GreaterThan from "./BaseDatabase/GreaterThan";
 import GreaterThanOrEqual from "./BaseDatabase/GreaterThanOrEqual";
 import InBetween from "./BaseDatabase/InBetween";
 import Includes from "./BaseDatabase/Includes";
+import IncludesAll from "./BaseDatabase/IncludesAll";
+import IncludesNone from "./BaseDatabase/IncludesNone";
+import StartsWith from "./BaseDatabase/StartsWith";
+import EndsWith from "./BaseDatabase/EndsWith";
+import NotContains from "./BaseDatabase/NotContains";
 import IsNull from "./BaseDatabase/IsNull";
 import LessThan from "./BaseDatabase/LessThan";
 import LessThanOrEqual from "./BaseDatabase/LessThanOrEqual";
@@ -63,6 +68,11 @@ const SerializableObjectDictionary = {
     [ObjectType.HashedString]: HashedString,
     [ObjectType.InBetween]: InBetween,
     [ObjectType.Includes]: Includes,
+    [ObjectType.IncludesAll]: IncludesAll,
+    [ObjectType.IncludesNone]: IncludesNone,
+    [ObjectType.StartsWith]: StartsWith,
+    [ObjectType.EndsWith]: EndsWith,
+    [ObjectType.NotContains]: NotContains,
     [ObjectType.NotNull]: NotNull,
     [ObjectType.IsNull]: IsNull,
     [ObjectType.Recurring]: Recurring,

package/build/dist/Types/SerializableObjectDictionary.js.map

@@ -1 +1 @@
-{"version":3,"file":"SerializableObjectDictionary.js","sourceRoot":"","sources":["../../../Types/SerializableObjectDictionary.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SerializableObjectDictionary.js","sourceRoot":"","sources":["../../../Types/SerializableObjectDictionary.ts"],"names":[],"mappings":"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"}

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

@@ -27,7 +27,7 @@ const BooleanFilter = (props) => {
                 if (props.onFilterChanged) {
                     props.onFilterChanged(filterData);
                 }
-            }, placeholder: `Filter by ${filter.title}` }));
+            }, placeholder: `Filter by ${filter.title}`, className: "relative rounded-md w-full overflow-visible" }));
     }
     return React.createElement(React.Fragment, null);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"BooleanFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/BooleanFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,QAA2B,MAAM,sBAAsB,CAAC;AAC/D,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,MAAM,aAAa,GAA0B,CAC3C,KAAwB,EACV,EAAE;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;QACtC,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,KAAK;iBACb;gBACD;oBACE,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,IAAI;iBACZ;aACF,EACD,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACnB,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,EACD,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,GACxC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"BooleanFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/BooleanFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,QAA2B,MAAM,sBAAsB,CAAC;AAC/D,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,MAAM,aAAa,GAA0B,CAC3C,KAAwB,EACV,EAAE;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,OAAO,EAAE,CAAC;QACtC,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,KAAK;iBACb;gBACD;oBACE,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,IAAI;iBACZ;aACF,EACD,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACnB,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,EACD,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,EACxC,SAAS,EAAC,6CAA6C,GACvD,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

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

@@ -1,23 +1,167 @@
-import StartAndEndDate, { StartAndEndDateType } from "../Date/StartAndEndDate";
+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 InBetween from "../../../Types/BaseDatabase/InBetween";
+import GreaterThan from "../../../Types/BaseDatabase/GreaterThan";
+import LessThan from "../../../Types/BaseDatabase/LessThan";
+import EqualTo from "../../../Types/BaseDatabase/EqualTo";
+import IsNull from "../../../Types/BaseDatabase/IsNull";
+import NotNull from "../../../Types/BaseDatabase/NotNull";
+import OneUptimeDate from "../../../Types/Date";
+import React, { useEffect, useState } from "react";
+const DATE_OPERATORS = [
+    FilterOperator.Is,
+    FilterOperator.Before,
+    FilterOperator.After,
+    FilterOperator.Between,
+    FilterOperator.IsEmpty,
+    FilterOperator.IsNotEmpty,
+];
+const toDate = (value) => {
+    if (!value) {
+        return null;
+    }
+    if (value instanceof Date) {
+        return value;
+    }
+    try {
+        return OneUptimeDate.fromString(value);
+    }
+    catch (_a) {
+        return null;
+    }
+};
+const detectState = (rawValue) => {
+    if (rawValue instanceof InBetween) {
+        const start = toDate(rawValue.startValue);
+        const end = toDate(rawValue.endValue);
+        // If start/end match the bounds of a single day, treat as "Is".
+        if (start && end) {
+            const startOfDay = OneUptimeDate.getStartOfDay(start);
+            const endOfDay = OneUptimeDate.getEndOfDay(start);
+            if (start.getTime() === startOfDay.getTime() &&
+                end.getTime() === endOfDay.getTime()) {
+                return { operator: FilterOperator.Is, start, end: null };
+            }
+        }
+        return { operator: FilterOperator.Between, start, end };
+    }
+    if (rawValue instanceof GreaterThan) {
+        return {
+            operator: FilterOperator.After,
+            start: toDate(rawValue.value),
+            end: null,
+        };
+    }
+    if (rawValue instanceof LessThan) {
+        return {
+            operator: FilterOperator.Before,
+            start: toDate(rawValue.value),
+            end: null,
+        };
+    }
+    if (rawValue instanceof EqualTo) {
+        return {
+            operator: FilterOperator.Is,
+            start: toDate(rawValue.value),
+            end: null,
+        };
+    }
+    if (rawValue instanceof IsNull) {
+        return { operator: FilterOperator.IsEmpty, start: null, end: null };
+    }
+    if (rawValue instanceof NotNull) {
+        return { operator: FilterOperator.IsNotEmpty, start: null, end: null };
+    }
+    return { operator: FilterOperator.Is, start: null, end: null };
+};
+const buildValue = (state, isDateTime) => {
+    switch (state.operator) {
+        case FilterOperator.Is: {
+            if (!state.start) {
+                return undefined;
+            }
+            if (isDateTime) {
+                return new EqualTo(state.start);
+            }
+            return new InBetween(OneUptimeDate.getStartOfDay(state.start), OneUptimeDate.getEndOfDay(state.start));
+        }
+        case FilterOperator.Before:
+            return state.start ? new LessThan(state.start) : undefined;
+        case FilterOperator.After:
+            return state.start ? new GreaterThan(state.start) : undefined;
+        case FilterOperator.Between: {
+            if (!state.start || !state.end) {
+                return undefined;
+            }
+            return new InBetween((isDateTime
+                ? state.start
+                : OneUptimeDate.getStartOfDay(state.start)), (isDateTime
+                ? state.end
+                : OneUptimeDate.getEndOfDay(state.end)));
+        }
+        case FilterOperator.IsEmpty:
+            return new IsNull();
+        case FilterOperator.IsNotEmpty:
+            return new NotNull();
+        default:
+            return undefined;
+    }
+};
 const DateFilter = (props) => {
     const filter = props.filter;
-    const filterData = Object.assign({}, props.filterData);
     if (filter.type !== FieldType.Date && filter.type !== FieldType.DateTime) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(StartAndEndDate, { value: filterData[filter.key], onValueChanged: (inBetween) => {
-            filterData[filter.key] = inBetween;
-            if (!filterData[filter.key]) {
-                delete filterData[filter.key];
-            }
-            if (props.onFilterChanged) {
-                props.onFilterChanged(filterData);
-            }
-        }, type: filter.type === FieldType.DateTime
-            ? StartAndEndDateType.DateTime
-            : StartAndEndDateType.Date }));
+    const isDateTime = filter.type === FieldType.DateTime;
+    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, isDateTime);
+        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);
+    };
+    const inputType = isDateTime
+        ? InputType.DATETIME_LOCAL
+        : InputType.DATE;
+    return (React.createElement("div", { className: "flex gap-2 items-start" },
+        React.createElement(OperatorSelector, { value: state.operator, options: DATE_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, { key: `${filter.key}-start-${state.operator}`, onChange: (changed) => {
+                        const parsed = toDate(changed);
+                        apply(Object.assign(Object.assign({}, state), { start: parsed }));
+                    }, value: state.start || "", placeholder: isBetween ? "From" : `Filter by ${filter.title}`, type: inputType, outerDivClassName: "relative rounded-md w-full" })),
+            isBetween && (React.createElement("div", { className: "flex-1 min-w-0" },
+                React.createElement(Input, { key: `${filter.key}-end-${state.operator}`, onChange: (changed) => {
+                        const parsed = toDate(changed);
+                        apply(Object.assign(Object.assign({}, state), { end: parsed }));
+                    }, value: state.end || "", placeholder: "To", type: inputType, outerDivClassName: "relative rounded-md w-full" })))))));
 };
 export default DateFilter;
 //# sourceMappingURL=DateFilter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DateFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DateFilter.tsx"],"names":[],"mappings":"AACA,OAAO,eAAe,EAAE,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAK3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,MAAM,UAAU,GAAuB,CACrC,KAAwB,EACV,EAAE;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzE,OAAO,yCAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,eAAe,IACd,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAoB,EAChD,cAAc,EAAE,CAAC,SAAiC,EAAE,EAAE;YACpD,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,SAExB,CAAC;YAEF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,EACD,IAAI,EACF,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ;YAChC,CAAC,CAAC,mBAAmB,CAAC,QAAQ;YAC9B,CAAC,CAAC,mBAAmB,CAAC,IAAI,GAE9B,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"DateFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DateFilter.tsx"],"names":[],"mappings":"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"}

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

@@ -32,7 +32,7 @@ const DropdownFilter = (props) => {
                 if (props.onFilterChanged) {
                     props.onFilterChanged(filterData);
                 }
-            }, value: dropdownValues, isMultiSelect: props.isMultiSelect || false, placeholder: `Filter by ${filter.title}` }));
+            }, value: dropdownValues, isMultiSelect: props.isMultiSelect || false, placeholder: `Filter by ${filter.title}`, className: "relative rounded-md w-full overflow-visible" }));
     }
     return React.createElement(React.Fragment, null);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"DropdownFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DropdownFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,QAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAa5C,MAAM,cAAc,GAA2B,CAC7C,KAAwB,EACV,EAAE;;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,MAAM,cAAc,GAClB,CAAA,MAAA,KAAK,CAAC,MAAM,CAAC,qBAAqB,0CAAE,MAAM,CAAC,CAAC,MAAsB,EAAE,EAAE;;QACpE,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,KAAK,EAAE,CAAC;YAC5C,OAAQ,UAAU,CAAC,MAAM,CAAC,GAAG,CAAmB;iBAC7C,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;gBACrB,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAK,MAAA,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,QAAQ,EAAE,CAAA,CAAC;IACxE,CAAC,CAAC,KAAI,EAAE,CAAC;IAEX,IACE,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAChC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW;QACrC,MAAM,CAAC,qBAAqB,EAC5B,CAAC;QACD,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE,MAAM,CAAC,qBAAqB,EACrC,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC3D,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,EACD,KAAK,EAAE,cAAc,EACrB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK,EAC3C,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,GACxC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"DropdownFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DropdownFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,QAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAa5C,MAAM,cAAc,GAA2B,CAC7C,KAAwB,EACV,EAAE;;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,MAAM,cAAc,GAClB,CAAA,MAAA,KAAK,CAAC,MAAM,CAAC,qBAAqB,0CAAE,MAAM,CAAC,CAAC,MAAsB,EAAE,EAAE;;QACpE,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,KAAK,EAAE,CAAC;YAC5C,OAAQ,UAAU,CAAC,MAAM,CAAC,GAAG,CAAmB;iBAC7C,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;gBACrB,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAK,MAAA,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,QAAQ,EAAE,CAAA,CAAC;IACxE,CAAC,CAAC,KAAI,EAAE,CAAC;IAEX,IACE,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAChC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW;QACrC,MAAM,CAAC,qBAAqB,EAC5B,CAAC;QACD,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE,MAAM,CAAC,qBAAqB,EACrC,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC3D,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,EACD,KAAK,EAAE,cAAc,EACrB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK,EAC3C,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,EACxC,SAAS,EAAC,6CAA6C,GACvD,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}

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

@@ -1,40 +1,184 @@
 import Dropdown from "../Dropdown/Dropdown";
 import FieldType from "../Types/FieldType";
-import React from "react";
+import FilterOperator from "./Types/FilterOperator";
+import OperatorSelector from "./OperatorSelector";
+import Includes from "../../../Types/BaseDatabase/Includes";
+import IncludesAll from "../../../Types/BaseDatabase/IncludesAll";
+import IncludesNone from "../../../Types/BaseDatabase/IncludesNone";
+import IsNull from "../../../Types/BaseDatabase/IsNull";
+import NotNull from "../../../Types/BaseDatabase/NotNull";
+import React, { useEffect, useState } from "react";
+const ENTITY_ARRAY_OPERATORS = [
+    FilterOperator.HasAnyOf,
+    FilterOperator.HasAllOf,
+    FilterOperator.HasNoneOf,
+    FilterOperator.IsEmpty,
+    FilterOperator.IsNotEmpty,
+];
+const ENTITY_OPERATORS = [
+    FilterOperator.Is,
+    FilterOperator.IsNot,
+    FilterOperator.IsEmpty,
+    FilterOperator.IsNotEmpty,
+];
+const detectArrayState = (rawValue) => {
+    if (rawValue instanceof IncludesAll) {
+        return {
+            operator: FilterOperator.HasAllOf,
+            values: rawValue.values.map((v) => {
+                return v.toString();
+            }),
+        };
+    }
+    if (rawValue instanceof IncludesNone) {
+        return {
+            operator: FilterOperator.HasNoneOf,
+            values: rawValue.values.map((v) => {
+                return v.toString();
+            }),
+        };
+    }
+    if (rawValue instanceof Includes) {
+        return {
+            operator: FilterOperator.HasAnyOf,
+            values: rawValue.values.map((v) => {
+                return v.toString();
+            }),
+        };
+    }
+    if (Array.isArray(rawValue)) {
+        return {
+            operator: FilterOperator.HasAnyOf,
+            values: rawValue.map((v) => {
+                return v.toString();
+            }),
+        };
+    }
+    if (rawValue instanceof IsNull) {
+        return { operator: FilterOperator.IsEmpty, values: [] };
+    }
+    if (rawValue instanceof NotNull) {
+        return { operator: FilterOperator.IsNotEmpty, values: [] };
+    }
+    return { operator: FilterOperator.HasAnyOf, values: [] };
+};
+const detectSingleState = (rawValue) => {
+    if (rawValue instanceof IsNull) {
+        return { operator: FilterOperator.IsEmpty, values: [] };
+    }
+    if (rawValue instanceof NotNull) {
+        return { operator: FilterOperator.IsNotEmpty, values: [] };
+    }
+    if (typeof rawValue === "string" && rawValue) {
+        return { operator: FilterOperator.Is, values: [rawValue] };
+    }
+    return { operator: FilterOperator.Is, values: [] };
+};
+const buildArrayValue = (state) => {
+    switch (state.operator) {
+        case FilterOperator.HasAllOf:
+            return state.values.length > 0 ? new IncludesAll(state.values) : undefined;
+        case FilterOperator.HasNoneOf:
+            return state.values.length > 0 ? new IncludesNone(state.values) : undefined;
+        case FilterOperator.HasAnyOf:
+            return state.values.length > 0 ? state.values : undefined;
+        case FilterOperator.IsEmpty:
+            return new IsNull();
+        case FilterOperator.IsNotEmpty:
+            return new NotNull();
+        default:
+            return undefined;
+    }
+};
+const buildSingleValue = (state) => {
+    switch (state.operator) {
+        case FilterOperator.Is:
+            return state.values[0] || undefined;
+        case FilterOperator.IsNot:
+            // Use IncludesNone with single-item array to represent "is not".
+            return state.values[0]
+                ? new IncludesNone([state.values[0]])
+                : undefined;
+        case FilterOperator.IsEmpty:
+            return new IsNull();
+        case FilterOperator.IsNotEmpty:
+            return new NotNull();
+        default:
+            return undefined;
+    }
+};
 const EntityFilter = (props) => {
     var _a;
     const filter = props.filter;
-    const filterData = Object.assign({}, props.filterData);
-    const dropdownValues = ((_a = props.filter.filterDropdownOptions) === null || _a === void 0 ? void 0 : _a.filter((option) => {
-        var _a;
-        if (filterData[filter.key] instanceof Array) {
-            return filterData[filter.key]
-                .map((value) => {
-                return value.toString();
-            })
-                .includes(option.value.toString());
+    if (filter.type !== FieldType.Entity &&
+        filter.type !== FieldType.EntityArray) {
+        return React.createElement(React.Fragment, null);
+    }
+    if (!filter.filterDropdownOptions) {
+        return React.createElement(React.Fragment, null);
+    }
+    const isArray = filter.type === FieldType.EntityArray;
+    const detectedState = isArray
+        ? detectArrayState(props.filterData[filter.key])
+        : detectSingleState(props.filterData[filter.key]);
+    // Hold the operator locally so the user's choice persists even when no
+    // values are selected yet (otherwise `buildArrayValue` would return
+    // undefined, filterData wouldn't carry the operator, and the next render
+    // would reset back to the default).
+    const [localOperator, setLocalOperator] = useState(detectedState.operator);
+    // When the external filter data changes and can unambiguously tell us
+    // which operator it represents, sync local state.
+    useEffect(() => {
+        const raw = props.filterData[filter.key];
+        if (raw !== undefined && raw !== null) {
+            setLocalOperator(detectedState.operator);
         }
-        return option.value.toString() === ((_a = filterData[filter.key]) === null || _a === void 0 ? void 0 : _a.toString());
+        // Intentionally only re-run when the underlying filter data reference
+        // changes — not on every detectedState re-computation.
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.filterData[filter.key]]);
+    const operator = localOperator;
+    const state = Object.assign(Object.assign({}, detectedState), { operator });
+    const valuelessOperator = operator === FilterOperator.IsEmpty ||
+        operator === FilterOperator.IsNotEmpty;
+    const dropdownValues = ((_a = filter.filterDropdownOptions) === null || _a === void 0 ? void 0 : _a.filter((option) => {
+        return state.values.includes(option.value.toString());
     })) || [];
-    if ((filter.type === FieldType.Entity ||
-        filter.type === FieldType.EntityArray) &&
-        filter.filterDropdownOptions) {
-        return (React.createElement(Dropdown, { options: filter.filterDropdownOptions, onChange: (value) => {
-                if (!filter.key) {
-                    return;
-                }
-                if (!value || (Array.isArray(value) && value.length === 0)) {
-                    delete filterData[filter.key];
-                }
-                else {
-                    filterData[filter.key] = value;
-                }
-                if (props.onFilterChanged) {
-                    props.onFilterChanged(filterData);
-                }
-            }, value: dropdownValues, isMultiSelect: filter.type === FieldType.EntityArray, placeholder: `Filter by ${filter.title}` }));
-    }
-    return React.createElement(React.Fragment, null);
+    const apply = (nextState) => {
+        var _a;
+        if (!filter.key) {
+            return;
+        }
+        setLocalOperator(nextState.operator);
+        const next = Object.assign({}, props.filterData);
+        const built = isArray
+            ? buildArrayValue(nextState)
+            : buildSingleValue(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: operator, options: isArray ? ENTITY_ARRAY_OPERATORS : ENTITY_OPERATORS, onChange: (nextOperator) => {
+                apply(Object.assign(Object.assign({}, state), { operator: nextOperator }));
+            } }),
+        !valuelessOperator && (React.createElement("div", { className: "flex-1 min-w-0" },
+            React.createElement(Dropdown, { options: filter.filterDropdownOptions, onChange: (value) => {
+                    if (!value || (Array.isArray(value) && value.length === 0)) {
+                        apply(Object.assign(Object.assign({}, state), { values: [] }));
+                        return;
+                    }
+                    const nextValues = Array.isArray(value)
+                        ? value.map((v) => {
+                            return v.toString();
+                        })
+                        : [value.toString()];
+                    apply(Object.assign(Object.assign({}, state), { values: nextValues }));
+                }, value: dropdownValues, isMultiSelect: isArray, placeholder: `Filter by ${filter.title}`, className: "relative rounded-md w-full overflow-visible" })))));
 };
 export default EntityFilter;
 //# sourceMappingURL=EntityFilter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"EntityFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/EntityFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,QAA2C,MAAM,sBAAsB,CAAC;AAC/E,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,cAAc,GAClB,CAAA,MAAA,KAAK,CAAC,MAAM,CAAC,qBAAqB,0CAAE,MAAM,CAAC,CAAC,MAAsB,EAAE,EAAE;;QACpE,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,KAAK,EAAE,CAAC;YAC5C,OAAQ,UAAU,CAAC,MAAM,CAAC,GAAG,CAAmB;iBAC7C,GAAG,CAAC,CAAC,KAAa,EAAE,EAAE;gBACrB,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAK,MAAA,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,QAAQ,EAAE,CAAA,CAAC;IACxE,CAAC,CAAC,KAAI,EAAE,CAAC;IAEX,IACE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAC/B,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW,CAAC;QACxC,MAAM,CAAC,qBAAqB,EAC5B,CAAC;QACD,OAAO,CACL,oBAAC,QAAQ,IACP,OAAO,EAAE,MAAM,CAAC,qBAAqB,EACrC,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;gBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;oBAChB,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC3D,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACjC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,EACD,KAAK,EAAE,cAAc,EACrB,aAAa,EAAE,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW,EACpD,WAAW,EAAE,aAAa,MAAM,CAAC,KAAK,EAAE,GACxC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"EntityFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/EntityFilter.tsx"],"names":[],"mappings":"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"}