@ai-matrx/records-ui 0.78.0 → 0.79.0

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog — @ai-matrx/records-ui
 
+## 0.79.0
+
+**A joined column says what joins it.** (lane STORE-TAILS-2, VERIFIER-11 finding F5.)
+
+Greenline Landscaping Crew's Jobs board, "Job label" joining Job Number and Service Type,
+read `GL-2034mow_edge` on all 35 rows — beside a cell reading `Mow & Edge`. Two wrongs in
+one string. The machine's word is the store's half and is fixed there (`custom.rule_eval`'s
+concat arm now resolves a choice to its label and a relation to its display words through
+`custom.field_words`, while every comparison keeps the stored value). The missing separator
+is this package's: nothing on the field panel ever asked for one, so there was no way to
+send one.
+
+* **"Joined by"** — a new box on the worked-out-column builder, offered only for *Join them
+  together*, defaulting to ` — `. It is sent as `expr.separator`, which the store has
+  accepted since the migration above. Emptying it sends no key at all, which is exactly what
+  every formula written before today already holds, so nothing saved changes its answer.
+* A sum, a product or a difference is not offered the box and never sends the key — a
+  control that set something the evaluator ignores would be a setting that silently does
+  nothing.
+* **The panel reads an existing worked-out column back** — its operation, its columns and
+  its separator — instead of starting at "concat" with nothing picked whatever the column
+  actually held.
+* **And it says out loud what it still cannot do.** Opening an existing worked-out column
+  draws no formula controls (this panel never has), and now it says so in a sentence instead
+  of standing silent over the one thing that column is. Re-aiming an existing formula needs
+  `expr` on `FieldPatch` in `@ai-matrx/records`; the store door already takes it.
+
+Consumer action: none.
+
 ## 0.78.0
 
 **The button that could not get rid of a table now can, and says what it does.** (lane

package/dist/index.cjs

@@ -5132,6 +5132,9 @@ var ROLLUP_OPERATIONS = ROLLUP_AGG_VALUES.map((value) => ({
   value,
   label: ROLLUP_AGG_LABEL[value]
 }));
+var FORMULA_SEPARATOR_LABEL = "Joined by";
+var EDITING_A_WORKED_OUT_COLUMN = "This column works out its answer from other columns. Which columns it uses, and what joins them, cannot be changed on this screen yet \u2014 remove it and add it again to change them.";
+var FORMULA_DEFAULT_SEPARATOR = " \u2014 ";
 var FORMULA_OPERATIONS = FORMULA_OP_VALUES.map((value) => ({
   value,
   label: FORMULA_OP_LABEL[value],
@@ -5168,8 +5171,9 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
   const [of, setOf] = (0, import_react30.useState)(String(field?.config?.["of"] ?? ""));
   const [relationTarget, setRelationTarget] = (0, import_react30.useState)(String(field?.relation_target ?? ""));
   const [display, setDisplay] = (0, import_react30.useState)(field?.display ?? null);
-  const [formulaOp, setFormulaOp] = (0, import_react30.useState)("concat");
-  const [formulaFields, setFormulaFields] = (0, import_react30.useState)([]);
+  const [formulaOp, setFormulaOp] = (0, import_react30.useState)(() => formulaOpOf(field));
+  const [formulaFields, setFormulaFields] = (0, import_react30.useState)(() => formulaFieldIdsOf(field));
+  const [formulaSeparator, setFormulaSeparator] = (0, import_react30.useState)(() => formulaSeparatorOf(field));
   const [askingToRemove, setAskingToRemove] = (0, import_react30.useState)(false);
   const [notLanded, setNotLanded] = (0, import_react30.useState)(false);
   const others = (0, import_react30.useMemo)(
@@ -5243,7 +5247,7 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
       ...type === "datetime" ? { kind: withTime ? "datetime" : "date" } : {},
       ...type === "lookup" ? { via, pick } : {},
       ...type === "rollup" ? { via, agg, ...agg === "count" ? {} : { of } } : {},
-      ...type === "formula" ? { expr: formulaExpression(formulaOp, formulaFields) } : {}
+      ...type === "formula" ? { expr: formulaExpression(formulaOp, formulaFields, formulaSeparator) } : {}
     };
     const written = await mutation.declare({ table_id: tableId, spec });
     if (written === null) return;
@@ -5301,6 +5305,7 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
         /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("p", { className: "text-[11px] text-muted-foreground", children: editing ? "What a column holds cannot be changed here \u2014 every value already saved would have to be converted. Add a new column and move the values across." : choice?.explanation ?? "" })
       ] })
     ] }),
+    editing && type === "formula" ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("p", { className: "text-[11px] text-muted-foreground", children: EDITING_A_WORKED_OUT_COLUMN }) : null,
     !editing || type === "select" || type === "multi_select" || type === "relation" ? /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       TypeQuestions,
       {
@@ -5329,6 +5334,8 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
         setFormulaOp,
         formulaFields,
         setFormulaFields,
+        formulaSeparator,
+        setFormulaSeparator,
         relations,
         others,
         existingOptionsTable: Boolean(field?.options_table_id ?? field?.config?.["options_table_id"])
@@ -5513,10 +5520,30 @@ function startingType(field) {
   if (fieldTypeChoice(kind)) return kind;
   return "text";
 }
-function formulaExpression(op, fieldIds) {
+function formulaExpression(op, fieldIds, separator) {
   const args = fieldIds.filter((id) => id !== "").map((id) => ({ field: id }));
-  if (args.length === 0) return { op, args: [{ const: "" }] };
-  return { op, args };
+  const joined = op === "concat" && separator !== "" ? { separator } : {};
+  if (args.length === 0) return { op, ...joined, args: [{ const: "" }] };
+  return { op, ...joined, args };
+}
+function formulaExprOf(field) {
+  const expr = field?.config?.["expr"];
+  return expr !== null && typeof expr === "object" ? expr : null;
+}
+function formulaOpOf(field) {
+  const op = formulaExprOf(field)?.["op"];
+  return typeof op === "string" && op !== "" ? op : "concat";
+}
+function formulaFieldIdsOf(field) {
+  const args = formulaExprOf(field)?.["args"];
+  if (!Array.isArray(args)) return [];
+  return args.map((a) => a !== null && typeof a === "object" ? a["field"] : void 0).filter((id) => typeof id === "string" && id !== "");
+}
+function formulaSeparatorOf(field) {
+  const expr = formulaExprOf(field);
+  if (expr === null) return FORMULA_DEFAULT_SEPARATOR;
+  const sep = expr["separator"];
+  return typeof sep === "string" ? sep : "";
 }
 function TypeQuestions(props) {
   const { type } = props;
@@ -5655,7 +5682,21 @@ function TypeQuestions(props) {
           );
         }) }),
         /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("p", { className: "text-[11px] text-muted-foreground", children: "In the order you pick them. Columns are remembered by which column they are, so renaming one never breaks this." })
-      ] })
+      ] }),
+      props.formulaOp === "concat" ? /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)("div", { className: "flex flex-col gap-1", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(import_design_system15.Label, { className: "text-xs", children: FORMULA_SEPARATOR_LABEL }),
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
+          import_design_system15.BasicInput,
+          {
+            value: props.formulaSeparator,
+            "aria-label": FORMULA_SEPARATOR_LABEL,
+            placeholder: "\u2014",
+            className: "max-w-[10rem]",
+            onChange: (e) => props.setFormulaSeparator(e.target.value)
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("p", { className: "text-[11px] text-muted-foreground", children: "What goes between the columns. Leave it empty to run them straight together." })
+      ] }) : null
     ] });
   }
   return null;