@qoretechnologies/reqraft 0.10.62 → 0.10.63-pr.142.g0b675cd

package/dist/components/form/expressions/builder/index.js

@@ -71,6 +71,7 @@ var styled_components_1 = __importDefault(require("styled-components"));
 var common_1 = require("../../../../helpers/common");
 var expressions_1 = require("../../../../helpers/expressions");
 var argumentPresence_1 = require("../argumentPresence");
+var optionUiTypes_1 = require("../../../../helpers/optionUiTypes");
 var templates_1 = require("../../../../helpers/templates");
 var validations_1 = require("../../../../helpers/validations");
 var useQorusTypes_1 = require("../../../../hooks/useQorusTypes");
@@ -82,6 +83,7 @@ var AutoFormField_1 = require("../../fields/auto/AutoFormField");
 var Select_1 = require("../../fields/select/Select");
 var TemplateField_1 = require("../../fields/template/TemplateField");
 var types_1 = require("../types");
+var useExpressionType_1 = require("../useExpressionType");
 var useExpressions_1 = require("../useExpressions");
 var argumentDetail_1 = require("./argumentDetail");
 var argumentSlot_1 = require("./argumentSlot");
@@ -100,14 +102,14 @@ var noopUseRegisterHintView = function () {
 };
 var StyledExpressionItemLabel = styled_components_1.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  position: absolute;\n  text-orientation: upright;\n  writing-mode: vertical-rl;\n  top: calc(50%);\n  transform: translateY(-50%);\n  white-space: nowrap;\n  height: calc(100% - 24px);\n  // Centered flex\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid ", ";\n"], ["\n  position: absolute;\n  text-orientation: upright;\n  writing-mode: vertical-rl;\n  top: calc(50%);\n  transform: translateY(-50%);\n  white-space: nowrap;\n  height: calc(100% - 24px);\n  // Centered flex\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid ", ";\n"])), function () { return (0, polished_1.rgba)('#fff', 0.3); });
 var Expression = function (_a) {
-    var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-    var localTemplates = _a.localTemplates, _q = _a.value, value = _q === void 0 ? types_1.ExpressionDefaultValue : _q, isChild = _a.isChild, index = _a.index, type = _a.type, level = _a.level, path = _a.path, onValueChange = _a.onValueChange, group = _a.group, returnType = _a.returnType, readOnly = _a.readOnly, id = _a.id, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, props = __rest(_a, ["localTemplates", "value", "isChild", "index", "type", "level", "path", "onValueChange", "group", "returnType", "readOnly", "id", "expressionsUrl", "serverHandled", "extraActions", "componentOverrides"]);
+    var _b, _c, _d, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var localTemplates = _a.localTemplates, _t = _a.value, value = _t === void 0 ? types_1.ExpressionDefaultValue : _t, isChild = _a.isChild, index = _a.index, type = _a.type, level = _a.level, path = _a.path, onValueChange = _a.onValueChange, group = _a.group, returnType = _a.returnType, readOnly = _a.readOnly, id = _a.id, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, isCondition = _a.condition, partCards = _a.conditionPartCards, conditionMessage = _a.conditionMessage, props = __rest(_a, ["localTemplates", "value", "isChild", "index", "type", "level", "path", "onValueChange", "group", "returnType", "readOnly", "id", "expressionsUrl", "serverHandled", "extraActions", "componentOverrides", "condition", "conditionPartCards", "conditionMessage"]);
     var coarsePointer = (0, useCoarsePointer_1.useCoarsePointer)();
     var types = (0, useQorusTypes_1.useQorusTypes)();
-    var _r = (0, react_1.useState)(false), showSummary = _r[0], setShowSummary = _r[1];
-    var _s = (0, react_1.useState)(undefined), confirmDialogData = _s[0], setConfirmDialogData = _s[1];
+    var _u = (0, react_1.useState)(false), showSummary = _u[0], setShowSummary = _u[1];
+    var _v = (0, react_1.useState)(undefined), confirmDialogData = _v[0], setConfirmDialogData = _v[1];
     var doNotShowTypeConfirmation = (0, useStorage_1.useReqraftStorage)('doNotShowTypeExpressionConfirmation', false, true)[0];
-    var _t = ((_b = value.value) === null || _b === void 0 ? void 0 : _b.args) || [], firstArgument = _t[0], rest = _t.slice(1);
+    var _w = ((_b = value.value) === null || _b === void 0 ? void 0 : _b.args) || [], firstArgument = _w[0], rest = _w.slice(1);
     var _expressions = (0, useExpressions_1.useExpressions)({
         allow: true,
         expressionsUrl: expressionsUrl,
@@ -126,31 +128,24 @@ var Expression = function (_a) {
             ? extraActions({ selectedExpression: selectedExpression, value: value })
             : (extraActions !== null && extraActions !== void 0 ? extraActions : []);
     }, [extraActions, selectedExpression, JSON.stringify(value)]);
-    // If the `return_type_first_arg` is set, we need to get the return type from the first arguments type
-    var expressionReturnType = (0, react_1.useMemo)(function () {
-        var _a, _b;
-        if ((selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.return_type_first_arg) && firstArgument) {
-            if (firstArgument.is_expression && ((_a = firstArgument.value) === null || _a === void 0 ? void 0 : _a.exp)) {
-                var firstArgExpression = (_b = expressions.value) === null || _b === void 0 ? void 0 : _b.find(function (exp) { return exp.name === firstArgument.value.exp; });
-                return firstArgExpression === null || firstArgExpression === void 0 ? void 0 : firstArgExpression.ui_return_type;
-            }
-            return firstArgument.type;
-        }
-        return selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.ui_return_type;
-    }, [
-        JSON.stringify(selectedExpression),
-        JSON.stringify(firstArgument),
-        returnType,
-        JSON.stringify(expressions.value),
-    ]);
-    var expectedReturnTypeText = (0, lodash_1.isArray)(returnType)
-        ? returnType.map(types.getTypeDisplayName).join(' or ')
-        : types.getTypeDisplayName(returnType);
+    // The type the expression gives is the server's, the same as everywhere else in Qorus
+    // (qoretechnologies/qorus#713); it is not known, and nothing is judged by it, until the server gives it.
+    // `ui_type` is compared with the types this place takes, which are UI types; what the expression gives is
+    // named, and judged as a condition, by the type's own name, as the Text view names it (`inferred_type`:
+    // "a whole number", where the UI type of every number is `number`).
+    var serverType = (0, useExpressionType_1.useExpressionType)(value.value);
+    var expressionReturnType = serverType === null || serverType === void 0 ? void 0 : serverType.ui_type;
+    var expressionGivesType = serverType === null || serverType === void 0 ? void 0 : serverType.inferred_type;
+    // An empty card gives nothing, which is known without asking: it does not fit a place that takes something.
+    var typeNotKnownYet = !!((_c = value.value) === null || _c === void 0 ? void 0 : _c.exp) && !serverType;
+    // the type(s) this place takes, named inside a sentence: their sentence forms; none where no type is known
+    // (qorus#646)
+    var expectedReturnTypeText = (0, lodash_1.compact)(((0, lodash_1.isArray)(returnType) ? returnType : [returnType]).map(types.getTypeSentenceForm)).join(' or ') || undefined;
     // Server Handler expressions is either defined by the option
     // then it's always the first level
     // Or if the first argument is a field (data_role: 'record') or the first selected expression is
     // a server expression
-    var isFirstArgumentField = ((_d = (_c = (0, templates_1.findTemplate)(localTemplates, firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value)) === null || _c === void 0 ? void 0 : _c.metadata) === null || _d === void 0 ? void 0 : _d.dataRole) === 'record';
+    var isFirstArgumentField = ((_f = (_d = (0, templates_1.findTemplate)(localTemplates, firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value)) === null || _d === void 0 ? void 0 : _d.metadata) === null || _f === void 0 ? void 0 : _f.dataRole) === 'record';
     var isExpressionServerHandled = (selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.from_server) ||
         ((selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.from_both) && isFirstArgumentField) ||
         (level === 0 && serverHandled);
@@ -256,9 +251,9 @@ var Expression = function (_a) {
     // keyed by slot, and a slot's TemplateField keeps template / text-mode
     // state that only resyncs one way — remounting hands every slot a field
     // seeded from the operand that now lives there.
-    var _u = (0, react_1.useState)(0), argsGeneration = _u[0], setArgsGeneration = _u[1];
+    var _x = (0, react_1.useState)(0), argsGeneration = _x[0], setArgsGeneration = _x[1];
     var dragArg = (0, react_1.useRef)(null);
-    var _v = (0, react_1.useState)(null), dragOverArg = _v[0], setDragOverArg = _v[1];
+    var _y = (0, react_1.useState)(null), dragOverArg = _y[0], setDragOverArg = _y[1];
     var moveVarArg = (0, react_1.useCallback)(function (from, to) {
         setArgsGeneration(function (generation) { return generation + 1; });
         onValueChange(__assign(__assign({}, value), { value: __assign(__assign({}, value.value), { args: (0, common_1.moveItem)(value.value.args, from, to) }) }), path);
@@ -305,11 +300,18 @@ var Expression = function (_a) {
         onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(undefined, path, true);
     }, [onValueChange, path]);
     var firstArgSchema = selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.args[0];
+    /* An empty untyped operand is of the type the catalogue declares for it, as the other operands are:
+       falling back to the builder's own type gave the first value of a condition (the builder's `bool`)
+       or of an untyped builder (`context`) a type it is not, which rendered as "Unknown type!" once an
+       untyped operand was written as text. */
     var firstParamType = (firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.is_expression)
         ? firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.ui_type
-        : (firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.type) || type || 'context';
+        : (firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.type) ||
+            ((0, optionUiTypes_1.isUntypedOptionType)(firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.ui_type) ? firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.ui_type : undefined) ||
+            type ||
+            'context';
     var restOfArgs = selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.args.slice(1);
-    var argCount = (0, lodash_1.size)((_f = value.value) === null || _f === void 0 ? void 0 : _f.args);
+    var argCount = (0, lodash_1.size)((_g = value.value) === null || _g === void 0 ? void 0 : _g.args);
     var canReorderArgs = !!(selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.varargs) && argCount > 1 && !readOnly && (0, lodash_1.size)(reorderSurfaces) > 0;
     var argReorderSurfaces = canReorderArgs ? reorderSurfaces : undefined;
     var isDragOverArg = function (index) {
@@ -355,20 +357,38 @@ var Expression = function (_a) {
     if (selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.varargs) {
         restOfArgs = __spreadArray(__spreadArray([], restOfArgs, true), rest.map(function () { return (__assign({}, selectedExpression.args[0])); }), true);
     }
-    var isReturnTypeMatching = expressionReturnType === 'any' ||
-        ((0, lodash_1.isArray)(returnType)
-            ? (0, expressions_1.areQorusTypesCompatible)(returnType, expressionReturnType)
-            : returnType === 'auto' ||
-                returnType === 'any' ||
-                returnType === 'context' ||
-                expressionReturnType === 'any' ||
-                (0, expressions_1.areQorusTypesCompatible)(returnType, expressionReturnType) ||
-                returnType === expressionReturnType ||
-                !returnType) ||
-        // a condition is decided by any result but text, a date or a time
-        ((0, expressions_1.isConditionType)(returnType) &&
-            !!expressionReturnType &&
-            !(0, expressions_1.isTextOrDateType)(expressionReturnType));
+    /* The expression as a condition (qorus#646): a Qog if state's, a while or for block's, a transition's
+       condition is read by the server as true unless its value is zero or empty (Fsm.qc calls .toBool()). What
+       it gives is said as every condition editor says it: a number or a list is accepted with a warning under
+       it, text, a date or a time is refused. Only where the host says it is a condition: a value of type bool
+       is checked as a bool, and an int does not fit it. */
+    var condition = level === 0 && isCondition ? (0, expressions_1.conditionVerdict)(expressionGivesType) : undefined;
+    /* A part of the condition's AND, OR or NOT (this card's own, or the one a NOT reads): read as true or false
+       by its value as the whole condition is, and judged by the server by the same rule (qorus#646). Its verdict
+       is the server's, drawn here; nothing on this side checks a part as a bool. */
+    var part = partCards === null || partCards === void 0 ? void 0 : partCards[path !== null && path !== void 0 ? path : ''];
+    var partVerdict = (0, expressions_1.conditionPartVerdict)(part);
+    /* A bool place that takes any result but text, a date or a time: the condition itself, and a bool place a
+       catalogue still declares (a part of an AND or an OR is typed by its operator's arguments, which take any
+       value on a Qorus that reads them as conditions). */
+    var takesCondition = level === 0 ? !!isCondition : (0, expressions_1.isConditionType)(returnType);
+    /* A condition the server says gives text, a date or a time is refused, whatever this place declares: a
+       condition field need not declare `bool`, and a mismatch was then never drawn - the refusal was shown only
+       because the type worked out here happened to be a number's (a warning, in the server's words). */
+    var isReturnTypeMatching = condition !== 'error' &&
+        (typeNotKnownYet ||
+            expressionReturnType === 'any' ||
+            ((0, lodash_1.isArray)(returnType)
+                ? (0, expressions_1.areQorusTypesCompatible)(returnType, expressionReturnType)
+                : returnType === 'auto' ||
+                    returnType === 'any' ||
+                    returnType === 'context' ||
+                    expressionReturnType === 'any' ||
+                    (0, expressions_1.areQorusTypesCompatible)(returnType, expressionReturnType) ||
+                    returnType === expressionReturnType ||
+                    !returnType) ||
+            // a condition is decided by any result but text, a date or a time
+            (takesCondition && !!expressionReturnType && !(0, expressions_1.isTextOrDateType)(expressionReturnType)));
     var defaultItems = (0, react_1.useMemo)(function () {
         return expressions.value
             // a condition (a field or an operand that must be true or false) offers the operations whose
@@ -379,6 +399,7 @@ var Expression = function (_a) {
             var _a;
             return isChild ||
                 exp.name === ((_a = value === null || value === void 0 ? void 0 : value.value) === null || _a === void 0 ? void 0 : _a.exp) ||
+                !takesCondition ||
                 (0, expressions_1.expressionFitsReturnType)(returnType, exp);
         })
             .map(function (exp) { return ({
@@ -399,7 +420,7 @@ var Expression = function (_a) {
                     ? !exp.from_server
                     : true;
         });
-    }, [JSON.stringify(expressions.value), serverExpression, level, isChild, returnType, (_g = value === null || value === void 0 ? void 0 : value.value) === null || _g === void 0 ? void 0 : _g.exp]);
+    }, [JSON.stringify(expressions.value), serverExpression, level, isChild, returnType, (_h = value === null || value === void 0 ? void 0 : value.value) === null || _h === void 0 ? void 0 : _h.exp]);
     // SEAM (reqraft): reqraft's `SelectFormField` calls `onChange(value)` with
     // the value directly (the IDE's Select used `(name, value)`).
     var handleOperatorChange = (0, react_1.useCallback)(function (value) {
@@ -428,13 +449,11 @@ var Expression = function (_a) {
         if (!added) {
             return;
         }
-        // A typed operand mounts a text field; an untyped one opens on its
-        // template picker, whose trigger is the field's first button that is not
-        // one of the operand's own controls (grip, position, ⋮, remove).
-        var field = (_a = added.querySelector('textarea, input')) !== null && _a !== void 0 ? _a : Array.from(added.querySelectorAll('button')).find(function (button) {
-            return !button.closest('.expression-arg-drag-handle, .expression-arg-position, .template-more, .expression-remove-arg');
-        });
-        field === null || field === void 0 ? void 0 : field.focus();
+        /* A typed operand mounts a text field, and the caret goes there. An untyped one has nothing to type into:
+           its first control is its template picker, a list that opens when it is focused, and since reqore 0.78
+           one focused as it mounts opens at once. Adding a value is not asking for that list (David, qorus#646),
+           so the operand itself takes the focus, and its picker opens when the user goes to it. */
+        ((_a = added.querySelector('textarea, input')) !== null && _a !== void 0 ? _a : added).focus();
     }, [argCount]);
     var canAddArg = !!(selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.varargs) && !readOnly;
     // On a phone the operand row has no room for a remove button beside the
@@ -446,7 +465,7 @@ var Expression = function (_a) {
     // down to the catalogue's minimum — one for most, so the last operand
     // left is the one that cannot be removed.
     var canRemoveArgs = !!(selectedExpression === null || selectedExpression === void 0 ? void 0 : selectedExpression.varargs) &&
-        argCount > Math.max(1, (_h = selectedExpression.min_args) !== null && _h !== void 0 ? _h : 1) &&
+        argCount > Math.max(1, (_j = selectedExpression.min_args) !== null && _j !== void 0 ? _j : 1) &&
         !readOnly;
     var removeArgInline = canRemoveArgs && !phone;
     var handleRemoveFirstArg = (0, react_1.useCallback)(function () { return removeVarArg(0); }, [removeVarArg]);
@@ -558,9 +577,9 @@ var Expression = function (_a) {
     var validationData = (0, validations_1.validateFieldWithResult)('expression', value, {
         expressions: expressions.value,
     });
-    return ((0, jsx_runtime_1.jsxs)(item_1.ExpressionItem, { index: index, as: reqore_1.ReqorePanel, intent: validationData.isValid && !!returnType && isReturnTypeMatching ? 'muted' : 'danger', description: isExpressionServerHandled ? 'This expression will be executed outside of Qorus' : '', flat: true, readOnly: readOnly, minimal: true, size: 'small', isChild: isChild, className: 'expression', customTheme: {
+    return ((0, jsx_runtime_1.jsxs)(item_1.ExpressionItem, { index: index, as: reqore_1.ReqorePanel, intent: validationData.isValid && !!returnType && isReturnTypeMatching ? 'muted' : 'danger', description: isExpressionServerHandled ? 'This expression runs outside Qorus' : '', flat: true, readOnly: readOnly, minimal: true, size: 'small', isChild: isChild, className: 'expression', customTheme: {
             main: "main:darken:".concat(level),
-        }, id: id, label: (0, jsx_runtime_1.jsx)(Select_1.SelectFormField, { size: 'tiny', className: 'expression-operator-selector', value: (_j = value === null || value === void 0 ? void 0 : value.value) === null || _j === void 0 ? void 0 : _j.exp, icon: 'Functions', placeholder: 'Select operation', fluid: false, 
+        }, id: id, label: (0, jsx_runtime_1.jsx)(Select_1.SelectFormField, { size: 'tiny', className: 'expression-operator-selector', value: (_k = value === null || value === void 0 ? void 0 : value.value) === null || _k === void 0 ? void 0 : _k.exp, icon: 'Functions', placeholder: 'Select operation', fluid: false, 
             // shrinks with a narrow panel, its name shortened, rather than holding the panel open
             fixed: false, style: { minWidth: 0, maxWidth: '100%' }, flat: true, 
             // The operation catalogue is long and every entry carries a description,
@@ -604,7 +623,7 @@ var Expression = function (_a) {
                     hideItemCount: true,
                     onChange: handleWrapExpressionClick,
                     showDescription: 'tooltip',
-                    tooltip: 'Wrap this expression in another expression',
+                    tooltip: 'Put this expression inside another one',
                     size: 'tiny',
                 },
             },
@@ -613,10 +632,10 @@ var Expression = function (_a) {
                 label: 'Remove',
                 textAlign: 'center',
                 icon: 'CloseLine',
-                tooltip: 'Remove this expression but keep the children',
+                tooltip: 'Remove this expression and keep what is inside it',
                 fixed: true,
                 onClick: unwrapExpression,
-                show: ((_m = (_l = (_k = value.value) === null || _k === void 0 ? void 0 : _k.args) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.is_expression) === true && !readOnly ? 'hover' : false,
+                show: ((_o = (_m = (_l = value.value) === null || _l === void 0 ? void 0 : _l.args) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o.is_expression) === true && !readOnly ? 'hover' : false,
             },
             {
                 className: 'expression-explain',
@@ -634,7 +653,7 @@ var Expression = function (_a) {
                 intent: 'danger',
                 textAlign: 'center',
                 icon: 'DeleteBinLine',
-                tooltip: 'Remove this expression and its children',
+                tooltip: 'Remove this expression and everything inside it',
                 fixed: true,
                 minimal: true,
                 show: readOnly ? false : 'hover',
@@ -642,7 +661,11 @@ var Expression = function (_a) {
             },
         ], false), bottomActions: [
             {
-                show: !!selectedExpression && (0, expressions_1.areQorusTypesCompatible)('bool', returnType) && !readOnly,
+                /* a yes/no place, or a part of an AND or an OR, which another AND or OR can stand for (a part
+                   takes any value, qorus#646) */
+                show: !!selectedExpression &&
+                    (!!group || (0, expressions_1.areQorusTypesCompatible)('bool', returnType)) &&
+                    !readOnly,
                 group: [
                     {
                         flat: true,
@@ -670,7 +693,7 @@ var Expression = function (_a) {
                     },
                 ],
             },
-        ], children: [hasArgumentsWithTypeMismatch && ((0, jsx_runtime_1.jsx)(confirmMismatchedTypesModal_1.ConfirmMismatchedTypesModal, { args: (_o = value.value) === null || _o === void 0 ? void 0 : _o.args, expression: selectedExpression, onSubmit: updateMultipleArgs, expressions: expressions.value })), (confirmDialogData === null || confirmDialogData === void 0 ? void 0 : confirmDialogData.isOpen) && ((0, jsx_runtime_1.jsx)(confirmUnsupportedTypeModal_1.ConfirmUnsupportedTypeModal, { acceptedTypes: confirmDialogData.acceptedTypes, onClose: function () {
+        ], children: [hasArgumentsWithTypeMismatch && ((0, jsx_runtime_1.jsx)(confirmMismatchedTypesModal_1.ConfirmMismatchedTypesModal, { args: (_p = value.value) === null || _p === void 0 ? void 0 : _p.args, expression: selectedExpression, onSubmit: updateMultipleArgs, expressions: expressions.value })), (confirmDialogData === null || confirmDialogData === void 0 ? void 0 : confirmDialogData.isOpen) && ((0, jsx_runtime_1.jsx)(confirmUnsupportedTypeModal_1.ConfirmUnsupportedTypeModal, { acceptedTypes: confirmDialogData.acceptedTypes, onClose: function () {
                     setConfirmDialogData(undefined);
                 }, maxSize: '550px', bottomActions: [
                     {
@@ -695,7 +718,7 @@ var Expression = function (_a) {
                             setConfirmDialogData(undefined);
                         },
                     },
-                ], children: confirmDialogData.children })), showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: expressions.value, templates: localTemplates })), !selectedExpression && !serverExpression && !(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value) && level === 0 ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', opaque: false, intent: 'info', children: "Select an operation to start building your expression" })) : ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup
+                ], children: confirmDialogData.children })), showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: expressions.value, templates: localTemplates })), !selectedExpression && !serverExpression && !(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value) && level === 0 ? ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreMessage, { size: 'small', opaque: false, intent: 'info', children: "Choose what this expression does." })) : ((0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup
             // On a phone every operand is a full-width row, so the group spans
             // the panel; on desktop it hugs its content and wraps.
             , { 
@@ -719,7 +742,10 @@ var Expression = function (_a) {
                                 ? firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.type.base_type
                                 : firstParamType, returnType: types.getAcceptedTypes(firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.ui_type), value: firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.value, isFunction: firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.is_expression, onChange: handleFirstParamChange, templates: localTemplates, allowTemplates: true, filterTemplatesByType: false, allowCustomValues: !!(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.allowed_values) ||
                                 !!(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.element_allowed_values) ||
-                                (!!(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.type) && !serverExpression), filterTemplatesFunc: function (templates) {
+                                // an untyped operand is written as text from the start, as a typed one is once
+                                // it has a type: a template chosen into it is a chip, with text around it
+                                ((!!(firstArgument === null || firstArgument === void 0 ? void 0 : firstArgument.type) || (0, optionUiTypes_1.isUntypedOptionType)(firstArgSchema === null || firstArgSchema === void 0 ? void 0 : firstArgSchema.ui_type)) &&
+                                    !serverExpression), filterTemplatesFunc: function (templates) {
                                 var _a;
                                 // PORT NOTE: `?.` on `items` added — with no templates at all
                                 // (FormEngine with templates off) the IDE original crashes on
@@ -757,25 +783,33 @@ var Expression = function (_a) {
                                                 : ((_f = (_d = rest[index]) === null || _d === void 0 ? void 0 : _d.type) !== null && _f !== void 0 ? _f : arg.ui_type), returnType: types.getAcceptedTypes(arg.ui_type), canBeNull: false, value: (_g = rest[index]) === null || _g === void 0 ? void 0 : _g.value, templates: localTemplates, allowTemplates: !(arg === null || arg === void 0 ? void 0 : arg.allowed_values) && !(arg === null || arg === void 0 ? void 0 : arg.element_allowed_values), filterTemplatesByType: false, allowCustomValues: !!arg.allowed_values ||
                                                 !!arg.element_allowed_values ||
                                                 !!((_h = rest[index]) === null || _h === void 0 ? void 0 : _h.type) ||
-                                                !!arg.default_value, onChange: (function (_name, value, type, isFunction) {
+                                                !!arg.default_value ||
+                                                // an untyped operand is written as text from the start (see the first operand)
+                                                (0, optionUiTypes_1.isUntypedOptionType)(arg.ui_type), onChange: (function (_name, value, type, isFunction) {
                                                 updateArg(value, index + 1, isFunction ? undefined : type, isFunction);
                                             }), fluid: phone, fixed: !phone, disableManagement: true, disabled: readOnly, menuItems: buildCustomTemplateItems(arg, function (type, removeTemplate) {
                                                 removeTemplate === null || removeTemplate === void 0 ? void 0 : removeTemplate();
                                                 updateArg(undefined, index + 1, type.name === 'context' ? undefined : type.name);
                                             }), menuActions: argMenuActions === null || argMenuActions === void 0 ? void 0 : argMenuActions[index + 1], menuTrailingItems: argRemoveMenuItems === null || argRemoveMenuItems === void 0 ? void 0 : argRemoveMenuItems[index + 1], reorder: props.reorder, expressions: props.expressions, expressions_url: expressionsUrl, allowed_values: arg === null || arg === void 0 ? void 0 : arg.allowed_values, element_allowed_values: arg === null || arg === void 0 ? void 0 : arg.element_allowed_values, ui_element_type: arg === null || arg === void 0 ? void 0 : arg.ui_element_type }, "".concat(argsGeneration, "-").concat(index, "-").concat(arg.ui_type, "-").concat(arg.display_name, "-").concat(level + 1)) }), (arg === null || arg === void 0 ? void 0 : arg.label_after) && (0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: arg.label_after })] }, "".concat(argsGeneration, "-").concat(index, "-").concat(arg.ui_type, "-").concat(arg.display_name)));
                         })
-                        : null, canAddArg && ((0, jsx_runtime_1.jsx)(argumentSlot_1.ExpressionBuilderAddArgumentSlot, { argumentName: (_p = selectedExpression.args[0]) === null || _p === void 0 ? void 0 : _p.display_name, disabled: !(0, validations_1.validateField)('expression', value, { expressions: expressions.value }), droppable: isSlotDropTarget, dragOver: isDragOverArg(argCount), onClick: handleAddArgumentClick, onDragOver: handleSlotDragOver, onDrop: handleSlotDrop }))] })), !isReturnTypeMatching && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, icon: 'ErrorWarningLine', intent: 'danger', size: 'tiny', wrap: true, label: (0, expressions_1.isConditionType)(returnType) &&
-                            !!expressionReturnType &&
-                            (0, expressions_1.isTextOrDateType)(expressionReturnType)
-                            ? // a condition that gives text, a date or a time: say how to make it one
-                                "A condition can't give ".concat(types.getTypeDisplayName(expressionReturnType), ": compare it explicitly, for example @status == \"open\" or @note != \"\".")
-                            : "This expression returns ".concat(types.getTypeDisplayName(expressionReturnType) || 'nothing', " but the expected return type is ").concat(expectedReturnTypeText, ". Please select an expression that returns ").concat(expectedReturnTypeText, " or wrap this expression inside another one that does.") })] })), selectedExpression && !validationData.isValid ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, icon: 'ErrorWarningLine', intent: 'danger', size: 'tiny', wrap: true, label: validationData.reason || 'Expression is not valid for unknown reasons' })] })) : null] }));
+                        : null, canAddArg && ((0, jsx_runtime_1.jsx)(argumentSlot_1.ExpressionBuilderAddArgumentSlot, { argumentName: (_q = selectedExpression.args[0]) === null || _q === void 0 ? void 0 : _q.display_name, disabled: !(0, validations_1.validateField)('expression', value, { expressions: expressions.value }), droppable: isSlotDropTarget, dragOver: isDragOverArg(argCount), onClick: handleAddArgumentClick, onDragOver: handleSlotDragOver, onDrop: handleSlotDrop }))] })), partVerdict && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, className: 'expression-condition-part-verdict', "data-verdict": partVerdict, icon: partVerdict === 'error' ? 'ErrorWarningLine' : 'AlertLine', intent: partVerdict === 'error' ? 'danger' : 'warning', size: 'tiny', wrap: true, label: (_r = part === null || part === void 0 ? void 0 : part.message) !== null && _r !== void 0 ? _r : (partVerdict === 'error' ?
+                            (0, expressions_1.conditionErrorText)(types.getTypeSentenceForm((0, expressions_1.conditionBaseType)(part.type)), part.type)
+                            : (0, expressions_1.conditionByTruthinessText)(part.type)) })] })), condition === 'warning' && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, className: 'expression-condition-verdict', icon: 'AlertLine', intent: 'warning', size: 'tiny', wrap: true, 
+                        // the server's words for the whole condition, where it said any; the same rule's own otherwise
+                        label: conditionMessage !== null && conditionMessage !== void 0 ? conditionMessage : (0, expressions_1.conditionByTruthinessText)(expressionGivesType) })] })), !isReturnTypeMatching && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), takesCondition && !!expressionGivesType && (0, expressions_1.isTextOrDateType)(expressionGivesType) ? (
+                    // a condition that gives text, a date or a time: say how to make it one
+                    (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, className: 'expression-condition-verdict', icon: 'ErrorWarningLine', intent: 'danger', size: 'tiny', wrap: true, label: (_s = (level === 0 ? conditionMessage : undefined)) !== null && _s !== void 0 ? _s : (0, expressions_1.conditionErrorText)(types.getTypeSentenceForm((0, expressions_1.conditionBaseType)(expressionGivesType)), expressionGivesType) })) : ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, icon: 'ErrorWarningLine', intent: 'danger', size: 'tiny', wrap: true, label: (0, expressions_1.expressionTypeMismatchText)(expressionGivesType ? types.getTypeSentenceForm(expressionGivesType) : undefined, expectedReturnTypeText) }))] })), selectedExpression && !validationData.isValid ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(reqore_1.ReqoreVerticalSpacer, { height: 5 }), (0, jsx_runtime_1.jsx)(reqore_1.ReqoreTag, { minimal: true, icon: 'ErrorWarningLine', intent: 'danger', size: 'tiny', wrap: true, label: validationData.reason || 'Qorus could not check this expression.' })] })) : null] }));
 };
 exports.Expression = Expression;
 var ExpressionBuilder = function (_a) {
     var _b, _c, _d;
-    var localTemplates = _a.localTemplates, _f = _a.value, value = _f === void 0 ? types_1.ExpressionDefaultValue : _f, isChild = _a.isChild, _g = _a.level, level = _g === void 0 ? 0 : _g, _h = _a.index, index = _h === void 0 ? 0 : _h, path = _a.path, type = _a.type, returnType = _a.returnType, group = _a.group, onChange = _a.onChange, onValueChange = _a.onValueChange, readOnly = _a.readOnly, expressions = _a.expressions, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, reorder = _a.reorder;
+    var localTemplates = _a.localTemplates, _f = _a.value, value = _f === void 0 ? types_1.ExpressionDefaultValue : _f, isChild = _a.isChild, _g = _a.level, level = _g === void 0 ? 0 : _g, _h = _a.index, index = _h === void 0 ? 0 : _h, path = _a.path, type = _a.type, returnType = _a.returnType, group = _a.group, onChange = _a.onChange, onValueChange = _a.onValueChange, readOnly = _a.readOnly, expressions = _a.expressions, expressionsUrl = _a.expressionsUrl, serverHandled = _a.serverHandled, extraActions = _a.extraActions, componentOverrides = _a.componentOverrides, reorder = _a.reorder, condition = _a.condition, conditionParts = _a.conditionParts, givenPartCards = _a.conditionPartCards, conditionMessage = _a.conditionMessage;
     var templates = (0, useTemplates_1.useTemplates)(!isChild, localTemplates);
+    /* The top builder places what the server says of each part of the condition on that part's card; a nested
+       one is handed the placement. */
+    var partCards = (0, react_1.useMemo)(function () {
+        return givenPartCards !== null && givenPartCards !== void 0 ? givenPartCards : (condition && conditionParts ? (0, expressions_1.conditionPartCards)(value, conditionParts) : undefined);
+    }, [givenPartCards, condition, conditionParts, JSON.stringify(value)]);
     /* A builder nested in a group does not resolve templates again: its parent hands it the resolved ones.
        `useTemplates` gives a nested builder none, and they were what it handed on, so every comparison in
        an AND/OR group had no templates - its field pickers had nothing to offer and were drawn disabled,
@@ -836,7 +870,11 @@ var ExpressionBuilder = function (_a) {
         (((_b = value.value) === null || _b === void 0 ? void 0 : _b.exp) === '&&' || ((_c = value.value) === null || _c === void 0 ? void 0 : _c.exp) === '||')) {
         return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreErrorBoundary, { children: (0, jsx_runtime_1.jsx)(item_1.ExpressionItem, { index: index, as: reqore_1.ReqorePanel, isChild: isChild, isAndOr: true, minimal: true, readOnly: readOnly, size: 'small', flat: true, customTheme: {
                     main: (0, polished_1.darken)("0.0".concat(level * 25), theme.main),
-                }, label: isChild ? (value.value.exp === '||' ? 'OR group' : 'AND group') : 'IF group', style: {
+                }, label: isChild ?
+                    value.value.exp === '||' ?
+                        'At least one of these is true (OR)'
+                        : 'All of these are true (AND)'
+                    : 'If', style: {
                     marginLeft: isChild ? 10 : 0,
                     // a nested group too: its indent is taken out of its width, not added past it
                     maxWidth: isChild ? 'calc(100% - 10px)' : undefined,
@@ -848,7 +886,7 @@ var ExpressionBuilder = function (_a) {
                         onClick: function () {
                             handleChange(types_1.ExpressionDefaultValue, "".concat(path ? "".concat(path, ".") : '', "value.args.").concat((0, lodash_1.size)(value.value.args)));
                         },
-                        tooltip: 'Add condition parameter',
+                        tooltip: 'Add a condition',
                     },
                     {
                         className: 'expression-explain',
@@ -861,11 +899,17 @@ var ExpressionBuilder = function (_a) {
                             : 'Show explanation of this expression',
                         fixed: true,
                     },
-                ], children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { vertical: true, fluid: true, size: 'normal', style: { position: 'relative' }, wrap: true, children: [showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: _expressions.expressions, templates: localTemplates })), (0, jsx_runtime_1.jsx)(StyledExpressionItemLabel, { as: reqore_1.ReqoreP, color: 'transparent', className: 'expression-operator' }), (_d = value.value.args) === null || _d === void 0 ? void 0 : _d.map(function (arg, index) { return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.ExpressionBuilder, { value: arg, localTemplates: resolvedTemplates, isChild: true, path: "".concat(path ? "".concat(path, ".") : '', "value.args.").concat(index), level: level + 1, index: index, type: type, onValueChange: handleChange, returnType: 'bool', group: value.value.exp, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, serverHandled: serverHandled, extraActions: extraActions, reorder: reorder }), index < (0, lodash_1.size)(value.value.args) - 1 && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: value.value.exp === '||' ? 'OR' : 'AND', align: 'left', style: {
-                                        marginLeft: 10,
-                                    } }))] }, index)); })] }) }) }));
+                ], children: (0, jsx_runtime_1.jsxs)(reqore_1.ReqoreControlGroup, { vertical: true, fluid: true, size: 'normal', style: { position: 'relative' }, wrap: true, children: [showSummary && ((0, jsx_runtime_1.jsx)(renderTemplate_1.ExpressionRenderTemplate, { exp: value, expressions: _expressions.expressions, templates: localTemplates })), (0, jsx_runtime_1.jsx)(StyledExpressionItemLabel, { as: reqore_1.ReqoreP, color: 'transparent', className: 'expression-operator' }), (_d = value.value.args) === null || _d === void 0 ? void 0 : _d.map(function (arg, index) {
+                            var _a, _b, _c, _d, _f;
+                            return ((0, jsx_runtime_1.jsxs)(react_1.default.Fragment, { children: [(0, jsx_runtime_1.jsx)(exports.ExpressionBuilder, { value: arg, localTemplates: resolvedTemplates, isChild: true, path: "".concat(path ? "".concat(path, ".") : '', "value.args.").concat(index), level: level + 1, index: index, type: type, onValueChange: handleChange, 
+                                        /* what its operator takes, as the catalogue declares it: any value, on a Qorus that reads
+                                           each part of an AND or an OR as a condition (qorus#646) */
+                                        returnType: ((_f = (_d = (_c = (_b = (_a = _expressions.expressions) === null || _a === void 0 ? void 0 : _a.find(function (exp) { return exp.name === value.value.exp; })) === null || _b === void 0 ? void 0 : _b.args) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.ui_type) !== null && _f !== void 0 ? _f : 'any'), conditionPartCards: partCards, group: value.value.exp, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, serverHandled: serverHandled, extraActions: extraActions, reorder: reorder }), index < (0, lodash_1.size)(value.value.args) - 1 && ((0, jsx_runtime_1.jsx)(argumentDetail_1.ExpressionArgumentDetail, { label: value.value.exp === '||' ? 'OR' : 'AND', align: 'left', style: {
+                                            marginLeft: 10,
+                                        } }))] }, index));
+                        })] }) }) }));
     }
-    return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreErrorBoundary, { children: (0, jsx_runtime_1.jsx)(exports.Expression, { localTemplates: resolvedTemplates, value: value, isChild: isChild, type: type, returnType: returnType, level: level, path: path, index: index, onValueChange: handleChange, group: group, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, id: level === 0 && index === 0 ? 'expression-builder' : undefined, serverHandled: serverHandled, extraActions: extraActions, componentOverrides: componentOverrides, reorder: reorder }) }));
+    return ((0, jsx_runtime_1.jsx)(reqore_1.ReqoreErrorBoundary, { children: (0, jsx_runtime_1.jsx)(exports.Expression, { localTemplates: resolvedTemplates, value: value, isChild: isChild, type: type, returnType: returnType, level: level, path: path, index: index, onValueChange: handleChange, group: group, readOnly: readOnly, expressions: expressions, expressionsUrl: expressionsUrl, id: level === 0 && index === 0 ? 'expression-builder' : undefined, serverHandled: serverHandled, extraActions: extraActions, componentOverrides: componentOverrides, reorder: reorder, condition: condition, conditionPartCards: partCards, conditionMessage: conditionMessage }) }));
 };
 exports.ExpressionBuilder = ExpressionBuilder;
 var templateObject_1;