@ai-matrx/records-ui 0.115.79 → 0.115.80

package/dist/index.d.cts

@@ -2839,6 +2839,14 @@ interface ConditionField {
      * store compares.
      */
     field?: Field;
+    /**
+     * Set when this entry is a field of the table a relation column POINTS AT (lane NOTION-Q): `id` is
+     * `<relation field id>><field id>` and `via` names the relation. Offered only by a view's filter.
+     */
+    via?: {
+        id: string;
+        fieldId: string;
+    } | undefined;
 }
 interface ConditionRowProps {
     /** The words before the row: "Ask only when", "When". */

package/dist/index.d.ts

@@ -2839,6 +2839,14 @@ interface ConditionField {
      * store compares.
      */
     field?: Field;
+    /**
+     * Set when this entry is a field of the table a relation column POINTS AT (lane NOTION-Q): `id` is
+     * `<relation field id>><field id>` and `via` names the relation. Offered only by a view's filter.
+     */
+    via?: {
+        id: string;
+        fieldId: string;
+    } | undefined;
 }
 interface ConditionRowProps {
     /** The words before the row: "Ask only when", "When". */

package/dist/index.js

@@ -7486,6 +7486,33 @@ var CONDITION_OPS = [
   { op: "gte", label: "is at least" },
   { op: "lte", label: "is at most" }
 ];
+var LIST_TERMS = [
+  { op: "contains", label: "contains" },
+  { op: "not_contains", label: "does not contain" },
+  { op: "is_empty", label: "is empty" },
+  { op: "is_not_empty", label: "is not empty" }
+];
+var VALUELESS_OPS = /* @__PURE__ */ new Set(["present", "is_empty", "is_not_empty"]);
+var LINK_SEP = ">";
+function linkedNode(viaId, innerId, op2, value) {
+  return {
+    op: "linked",
+    match: op2 === "eq" ? "any" : "none",
+    args: [{ field: viaId }, { op: "eq", args: [{ field: innerId }, { const: value }] }]
+  };
+}
+function linkedOf(expr) {
+  const node = asNode(expr);
+  if (!node || node["op"] !== "linked") return null;
+  const [rel, cond] = argsOf(node);
+  const innerNode = asNode(cond);
+  const [a, b] = innerNode ? argsOf(innerNode) : [];
+  const match = node["match"] ?? "any";
+  if (!rel || typeof rel["field"] !== "string" || !innerNode || innerNode["op"] !== "eq") return null;
+  if (!a || typeof a["field"] !== "string" || !b || !("const" in b)) return null;
+  if (match !== "any" && match !== "none") return null;
+  return { via: rel["field"], inner: a["field"], op: match === "any" ? "eq" : "ne", value: b["const"] };
+}
 var FilterTermsContext = createContext5(false);
 var RELATIVE_DAY_TERMS = [
   { kind: "today", label: "is today" },
@@ -7598,13 +7625,15 @@ function ChoiceValue({ field: field2, value, onChange }) {
 }
 function conditionIsSimple(expr) {
   if (expr === null || expr === void 0) return true;
-  if (relativeDayOf(expr) !== null || meOf(expr) !== null) return true;
+  if (relativeDayOf(expr) !== null || meOf(expr) !== null || linkedOf(expr) !== null) return true;
   const node = expr;
-  if (typeof node.op !== "string" || !CONDITION_OPS.some((c) => c.op === node.op)) return false;
+  if (typeof node.op !== "string" || !(CONDITION_OPS.some((c) => c.op === node.op) || LIST_TERMS.some((c) => c.op === node.op))) {
+    return false;
+  }
   if (!Array.isArray(node.args)) return false;
   const first = node.args[0];
   if (!first || typeof first.field !== "string") return false;
-  if (node.op === "present") return node.args.length === 1;
+  if (VALUELESS_OPS.has(node.op)) return node.args.length === 1;
   const second = node.args[1];
   return node.args.length === 2 && !!second && "const" in second;
 }
@@ -7622,7 +7651,13 @@ function conditionInWords(expr, fields) {
     lte: "is at most",
     and: "and",
     or: "or",
-    matches: "matches"
+    matches: "matches",
+    contains: "contains",
+    not_contains: "does not contain",
+    has_any: "has any of",
+    has_all: "has all of",
+    has_none: "has none of",
+    is_exactly: "is exactly"
   };
   const walk = (node) => {
     if (node === null || node === void 0) return "nothing";
@@ -7643,6 +7678,12 @@ function conditionInWords(expr, fields) {
     const args = Array.isArray(n["args"]) ? n["args"] : [];
     if (op2 === "not") return `not ${walk(args[0])}`;
     if (op2 === "present") return `${walk(args[0])} has been answered`;
+    if (op2 === "is_empty") return `${walk(args[0])} is empty`;
+    if (op2 === "is_not_empty") return `${walk(args[0])} is not empty`;
+    if (op2 === "linked") {
+      const how = n["match"] === "every" ? "every" : n["match"] === "none" ? "none of" : "any";
+      return `${how} linked record in ${walk(args[0])}: ${walk(args[1])}`;
+    }
     const dayRange = relativeDayOf(n);
     if (dayRange) {
       const term = RELATIVE_DAY_TERMS.find((t) => t.kind === dayRange.kind);
@@ -7675,12 +7716,14 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
   const filterTerms = useContext5(FilterTermsContext);
   const relative = relativeDayOf(expr);
   const reader = meOf(expr);
-  const op2 = relative ? `rel:${relative.kind}` : reader ? reader.which : node?.op ?? "";
-  const onField = node?.args?.[0]?.field ?? "";
-  const value = relative || reader ? "" : node?.args?.[1]?.const ?? "";
+  const linked = linkedOf(expr);
+  const op2 = relative ? `rel:${relative.kind}` : reader ? reader.which : linked ? linked.op : node?.op ?? "";
+  const onField = linked ? `${linked.via}${LINK_SEP}${linked.inner}` : node?.args?.[0]?.field ?? "";
+  const value = relative || reader ? "" : linked ? linked.value : node?.args?.[1]?.const ?? "";
   const chosen = fields.find((f) => f.id === onField);
   const chosenKind = chosen?.field ? String(editorKindFor(chosen.field)) : "";
-  const extraTerms = !filterTerms ? [] : chosenKind === "datetime" ? RELATIVE_DAY_TERMS.map((t) => ({ op: `rel:${t.kind}`, label: t.label })) : chosenKind === "member" ? [{ op: "me", label: "is me" }, { op: "not_me", label: "is not me" }] : [];
+  const extraTerms = !filterTerms || chosen?.via ? [] : chosenKind === "datetime" ? RELATIVE_DAY_TERMS.map((t) => ({ op: `rel:${t.kind}`, label: t.label })) : chosenKind === "member" ? [{ op: "me", label: "is me" }, { op: "not_me", label: "is not me" }] : chosenKind === "multi_select" ? LIST_TERMS : [];
+  const baseTerms = chosen?.via ? CONDITION_OPS.filter((c) => c.op === "eq" || c.op === "ne") : CONDITION_OPS;
   const relativeTerm = relative ? RELATIVE_DAY_TERMS.find((t) => t.kind === relative.kind) : void 0;
   function write(next) {
     const picked = next.op;
@@ -7693,8 +7736,11 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
       onChange(relativeDayNode(fieldNow, relative.kind, next.days));
       return;
     }
-    if (next.field !== void 0 && (relative || reader)) {
-      onChange(next.field ? { op: CONDITION_OPS[0].op, args: [{ field: next.field }, { const: "" }] } : null);
+    if (next.field !== void 0 && (relative || reader || linked)) {
+      const target2 = fields.find((f) => f.id === next.field);
+      onChange(
+        !next.field ? null : target2?.via ? linkedNode(target2.via.id, target2.via.fieldId, "eq", "") : { op: CONDITION_OPS[0].op, args: [{ field: next.field }, { const: "" }] }
+      );
       return;
     }
     const chosenOp = next.op ?? (op2 || (next.field ? CONDITION_OPS[0].op : ""));
@@ -7704,8 +7750,13 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
       onChange(null);
       return;
     }
+    const target = fields.find((f) => f.id === chosenField);
+    if (target?.via) {
+      onChange(linkedNode(target.via.id, target.via.fieldId, chosenOp === "ne" ? "ne" : "eq", chosenValue));
+      return;
+    }
     onChange(
-      chosenOp === "present" ? { op: "present", args: [{ field: chosenField }] } : { op: chosenOp, args: [{ field: chosenField }, { const: chosenValue }] }
+      VALUELESS_OPS.has(chosenOp) ? { op: chosenOp, args: [{ field: chosenField }] } : { op: chosenOp, args: [{ field: chosenField }, { const: chosenValue }] }
     );
   }
   return /* @__PURE__ */ jsxs28("div", { className: className ?? "flex flex-wrap items-center gap-1 text-xs", children: [
@@ -7738,7 +7789,7 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
           className: "h-8 w-auto min-w-[6rem] text-xs",
           value: op2,
           onChange: (next) => write({ op: next }),
-          options: [...CONDITION_OPS, ...extraTerms].map((c) => ({ value: c.op, label: c.label })),
+          options: [...baseTerms, ...extraTerms].map((c) => ({ value: c.op, label: c.label })),
           attrs: { "data-condition": "comparison" }
         }
       ),
@@ -7752,7 +7803,7 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
           value: String(relative.days ?? 7),
           onChange: (e) => write({ days: Math.max(0, Math.floor(Number(e.target.value) || 0)) })
         }
-      ) : null : reader || op2 === "present" ? null : pointsAtARecord(chosen) ? (
+      ) : null : reader || VALUELESS_OPS.has(op2) ? null : pointsAtARecord(chosen) ? (
         // A RECORD IS PICKED BY ITS WORDS, NEVER TYPED AS AN ID. The same picker the
         // cell uses, on the same `relation_words_many` the cell reads, so a filter and
         // the column it filters can never disagree about what a record is called. It
@@ -7770,7 +7821,7 @@ function ConditionRow({ lead, expr, fields, onChange, emptyLabel = "always", cla
             allowCreate: false
           }
         )
-      ) : isChoiceColumn(chosen) && (op2 === "eq" || op2 === "ne") ? /* @__PURE__ */ jsx32(ChoiceValue, { field: chosen.field, value: String(value ?? ""), onChange: (word) => write({ value: word }) }) : /* @__PURE__ */ jsx32(
+      ) : isChoiceColumn(chosen) && (op2 === "eq" || op2 === "ne" || op2 === "contains" || op2 === "not_contains") ? /* @__PURE__ */ jsx32(ChoiceValue, { field: chosen.field, value: String(value ?? ""), onChange: (word) => write({ value: word }) }) : /* @__PURE__ */ jsx32(
         BasicInput7,
         {
           className: "h-8 w-28 text-xs",
@@ -53121,7 +53172,7 @@ function TableDuplicateDialog({ tableId, name, organizationId, open, onOpenChang
 // src/ViewFilter.tsx
 import { useEffect as useEffect123, useMemo as useMemo81, useState as useState149 } from "react";
 import { Button as Button119, Popover as Popover19, PopoverContent as PopoverContent19, PopoverTrigger as PopoverTrigger19 } from "@ai-matrx/design-system";
-import { useFields as useFields38 } from "@ai-matrx/records/react";
+import { useFields as useFields38, useOptionalRecordsClient as useOptionalRecordsClient21 } from "@ai-matrx/records/react";
 import { jsx as jsx176, jsxs as jsxs163 } from "react/jsx-runtime";
 function conditionCount(expr) {
   if (!expr || typeof expr !== "object" || Array.isArray(expr)) return 0;
@@ -53140,10 +53191,39 @@ function ViewFilter({ tableId, view, onApply, className }) {
   useEffect123(() => {
     setDraft(saved);
   }, [view?.id, savedKey]);
-  const conditionFields = useMemo81(
-    () => (fields.data ?? []).map((f) => ({ id: f.id, key: f.key, label: f.label || f.key, field: f })),
+  const client = useOptionalRecordsClient21();
+  const relations = useMemo81(
+    () => (fields.data ?? []).filter((f) => f.type === "relation" && !!f.relation_target),
     [fields.data]
   );
+  const [linkedFields, setLinkedFields] = useState149({});
+  useEffect123(() => {
+    if (!open || !client) return;
+    let cancelled = false;
+    for (const rel of relations) {
+      const target = String(rel.relation_target);
+      void client.fields({ table_id: target }).then((got) => {
+        if (cancelled || !got.ok) return;
+        setLinkedFields((now) => ({ ...now, [rel.id]: got.data ?? [] }));
+      });
+    }
+    return () => {
+      cancelled = true;
+    };
+  }, [open, client, relations]);
+  const conditionFields = useMemo81(() => {
+    const own3 = (fields.data ?? []).map((f) => ({ id: f.id, key: f.key, label: f.label || f.key, field: f }));
+    const reached = relations.flatMap(
+      (rel) => (linkedFields[rel.id] ?? []).filter((inner2) => inner2.type !== "relation").map((inner2) => ({
+        id: `${rel.id}>${inner2.id}`,
+        key: `${rel.key}.${inner2.key}`,
+        label: `${rel.label || rel.key} \u203A ${inner2.label || inner2.key}`,
+        field: inner2,
+        via: { id: rel.id, fieldId: inner2.id }
+      }))
+    );
+    return [...own3, ...reached];
+  }, [fields.data, relations, linkedFields]);
   if (!view) return null;
   const count = conditionCount(saved);
   const changed2 = JSON.stringify(draft) !== savedKey;