@ai-matrx/records-ui 0.78.0 → 0.79.0

package/dist/index.js

@@ -4929,6 +4929,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],
@@ -4965,8 +4968,9 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
   const [of, setOf] = useState15(String(field?.config?.["of"] ?? ""));
   const [relationTarget, setRelationTarget] = useState15(String(field?.relation_target ?? ""));
   const [display, setDisplay] = useState15(field?.display ?? null);
-  const [formulaOp, setFormulaOp] = useState15("concat");
-  const [formulaFields, setFormulaFields] = useState15([]);
+  const [formulaOp, setFormulaOp] = useState15(() => formulaOpOf(field));
+  const [formulaFields, setFormulaFields] = useState15(() => formulaFieldIdsOf(field));
+  const [formulaSeparator, setFormulaSeparator] = useState15(() => formulaSeparatorOf(field));
   const [askingToRemove, setAskingToRemove] = useState15(false);
   const [notLanded, setNotLanded] = useState15(false);
   const others = useMemo12(
@@ -5040,7 +5044,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;
@@ -5098,6 +5102,7 @@ function FieldEditor({ tableId, field, onSaved, onCancel, onRemoved, className }
         /* @__PURE__ */ jsx18("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__ */ jsx18("p", { className: "text-[11px] text-muted-foreground", children: EDITING_A_WORKED_OUT_COLUMN }) : null,
     !editing || type === "select" || type === "multi_select" || type === "relation" ? /* @__PURE__ */ jsx18(
       TypeQuestions,
       {
@@ -5126,6 +5131,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"])
@@ -5310,10 +5317,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;
@@ -5452,7 +5479,21 @@ function TypeQuestions(props) {
           );
         }) }),
         /* @__PURE__ */ jsx18("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__ */ jsxs14("div", { className: "flex flex-col gap-1", children: [
+        /* @__PURE__ */ jsx18(Label4, { className: "text-xs", children: FORMULA_SEPARATOR_LABEL }),
+        /* @__PURE__ */ jsx18(
+          BasicInput5,
+          {
+            value: props.formulaSeparator,
+            "aria-label": FORMULA_SEPARATOR_LABEL,
+            placeholder: "\u2014",
+            className: "max-w-[10rem]",
+            onChange: (e) => props.setFormulaSeparator(e.target.value)
+          }
+        ),
+        /* @__PURE__ */ jsx18("p", { className: "text-[11px] text-muted-foreground", children: "What goes between the columns. Leave it empty to run them straight together." })
+      ] }) : null
     ] });
   }
   return null;