@nocobase/plugin-flow-engine 2.2.0-beta.1 → 2.2.0-beta.10

package/dist/server/flow-surfaces/blueprint/normalize-document.js

@@ -132,8 +132,9 @@ function normalizeNavigation(input) {
     return void 0;
   }
   (0, import_private_utils.assertPlainObject)(input, "flowSurfaces applyBlueprint navigation");
-  (0, import_private_utils.assertOnlyAllowedKeys)(input, "flowSurfaces applyBlueprint navigation", ["group", "item"]);
+  (0, import_private_utils.assertOnlyAllowedKeys)(input, "flowSurfaces applyBlueprint navigation", ["layoutUid", "group", "item"]);
   const normalized = (0, import_service_utils.buildDefinedPayload)({
+    layoutUid: (0, import_private_utils.readOptionalString)(input.layoutUid),
     group: import_lodash.default.isUndefined(input.group) ? void 0 : (() => {
       (0, import_private_utils.assertPlainObject)(input.group, "flowSurfaces applyBlueprint navigation.group");
       (0, import_private_utils.assertOnlyAllowedKeys)(input.group, "flowSurfaces applyBlueprint navigation.group", [

package/dist/server/flow-surfaces/blueprint/public-types.d.ts

@@ -20,6 +20,7 @@ export type FlowSurfaceApplyBlueprintNavigationGroup = {
     hideInMenu?: boolean;
 };
 export type FlowSurfaceApplyBlueprintNavigation = {
+    layoutUid?: string;
     group?: FlowSurfaceApplyBlueprintNavigationGroup;
     item?: {
         title?: string;

package/dist/server/flow-surfaces/builder.js

@@ -731,10 +731,19 @@ function buildActionTree(options) {
     containerUse: options.containerUse,
     resourceInit: options.resourceInit
   });
+  const requestedProps = options.props;
+  const requestedButtonGeneral = import_lodash.default.get(options.stepParams, ["buttonSettings", "general"]);
+  const stripImplicitTitle = shouldStripImplicitIconOnlyActionTitle(requestedProps, requestedButtonGeneral);
   const props = import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaults.props || {}), import_lodash.default.cloneDeep(options.props || {}));
+  if (stripImplicitTitle) {
+    delete props.title;
+  }
   const stepParams = import_lodash.default.merge({}, import_lodash.default.cloneDeep(defaults.stepParams || {}), import_lodash.default.cloneDeep(options.stepParams || {}));
   if (import_lodash.default.isPlainObject((_a = stepParams == null ? void 0 : stepParams.buttonSettings) == null ? void 0 : _a.general)) {
     stepParams.buttonSettings.general = import_lodash.default.merge({}, stepParams.buttonSettings.general, pickButtonGeneralProps(props));
+    if (stripImplicitTitle) {
+      delete stepParams.buttonSettings.general.title;
+    }
   }
   return {
     use,
@@ -767,10 +776,15 @@ function buildCanonicalTableActionsColumnNode(options = {}) {
 }
 function pickButtonGeneralProps(props) {
   return import_lodash.default.pickBy(
-    import_lodash.default.pick(props || {}, ["title", "tooltip", "icon", "type", "danger", "color"]),
+    import_lodash.default.pick(props || {}, ["title", "tooltip", "icon", "iconOnly", "type", "danger", "color"]),
     (value) => !import_lodash.default.isUndefined(value)
   );
 }
+function shouldStripImplicitIconOnlyActionTitle(props, buttonGeneral) {
+  const hasRequestedOnlyIcon = import_lodash.default.isPlainObject(props) && Object.prototype.hasOwnProperty.call(props, "iconOnly") && props.iconOnly === true || import_lodash.default.isPlainObject(buttonGeneral) && Object.prototype.hasOwnProperty.call(buttonGeneral, "iconOnly") && buttonGeneral.iconOnly === true;
+  const hasRequestedTitle = import_lodash.default.isPlainObject(props) && Object.prototype.hasOwnProperty.call(props, "title") || import_lodash.default.isPlainObject(buttonGeneral) && Object.prototype.hasOwnProperty.call(buttonGeneral, "title");
+  return hasRequestedOnlyIcon && !hasRequestedTitle;
+}
 function assignClientKeysToUids(spec, clientKeyToUid) {
   const next = import_lodash.default.cloneDeep(spec);
   const walk = (node) => {
@@ -805,12 +819,16 @@ function buildActionDefaults(options) {
     (approvalDefaults == null ? void 0 : approvalDefaults.props) || {}
   );
   const normalizedProps = applyContainerActionStyle(props, options.containerUse);
+  const buttonGeneralProps = applyCompactRecordActionButtonDefaults(
+    pickButtonGeneralProps(normalizedProps),
+    options.containerUse
+  );
   const stepParams = import_lodash.default.merge(
     {},
     import_lodash.default.cloneDeep((approvalDefaults == null ? void 0 : approvalDefaults.stepParams) || {}),
     readonlyCalendarAction ? {} : {
       buttonSettings: {
-        general: pickButtonGeneralProps(normalizedProps)
+        general: buttonGeneralProps
       }
     }
   );
@@ -997,6 +1015,7 @@ function inferActionDefaultProps(use, scope) {
       title: "",
       tooltip: '{{t("Delete")}}',
       icon: "DeleteOutlined",
+      iconOnly: true,
       position: "right"
     },
     BulkEditActionModel: {
@@ -1120,10 +1139,26 @@ function inferActionDefaultProps(use, scope) {
     }
   );
 }
+const COMPACT_RECORD_ACTION_CONTAINER_USES = /* @__PURE__ */ new Set([
+  "TableActionsColumnModel",
+  "ListItemModel",
+  "GridCardItemModel",
+  "CommentItemModel"
+]);
+function isCompactRecordActionContainerUse(containerUse) {
+  return COMPACT_RECORD_ACTION_CONTAINER_USES.has(String(containerUse || "").trim());
+}
+function applyCompactRecordActionButtonDefaults(props, containerUse) {
+  if (isCompactRecordActionContainerUse(containerUse) && props.icon === null && !Object.prototype.hasOwnProperty.call(props, "iconOnly")) {
+    return {
+      ...props,
+      iconOnly: false
+    };
+  }
+  return props;
+}
 function applyContainerActionStyle(props, containerUse) {
-  if (["TableActionsColumnModel", "ListItemModel", "GridCardItemModel", "CommentItemModel"].includes(
-    String(containerUse || "").trim()
-  )) {
+  if (isCompactRecordActionContainerUse(containerUse)) {
     return {
       ...props,
       type: "link",

package/dist/server/flow-surfaces/catalog.js

@@ -182,7 +182,7 @@ const FILTER_FORM_ITEM_ALLOWED_PATHS = [
   "init.filterField.type",
   "initialValue.defaultValue"
 ];
-const ACTION_PROP_KEYS = ["title", "tooltip", "icon", "type", "htmlType", "position", "danger", "color"];
+const ACTION_PROP_KEYS = ["title", "tooltip", "icon", "iconOnly", "type", "htmlType", "position", "danger", "color"];
 const FILTER_ACTION_PROP_KEYS = [...ACTION_PROP_KEYS, "filterableFieldNames", "defaultFilterValue", "filterValue"];
 const FILTER_ACTION_PROP_PATH_SCHEMAS = {
   filterableFieldNames: {
@@ -197,6 +197,7 @@ const ACTION_BUTTON_SETTINGS_GROUP = {
     "general.title",
     "general.tooltip",
     "general.icon",
+    "general.iconOnly",
     "general.type",
     "general.danger",
     "general.color",
@@ -208,6 +209,7 @@ const ACTION_BUTTON_SETTINGS_GROUP = {
     "general.title": STRING_SCHEMA,
     "general.tooltip": STRING_SCHEMA,
     "general.icon": NULLABLE_STRING_SCHEMA,
+    "general.iconOnly": BOOLEAN_SCHEMA,
     "general.type": STRING_SCHEMA,
     "general.danger": BOOLEAN_SCHEMA,
     "general.color": STRING_SCHEMA,
@@ -244,6 +246,15 @@ const RUN_JS_SETTINGS_GROUP = {
     "runJs.version": STRING_SCHEMA
   }
 };
+const JS_BLOCK_SETTINGS_GROUP = {
+  allowedPaths: [...RUN_JS_ALLOWED_PATHS, "showBlockCard.showBlockCard"],
+  mergeStrategy: "deep",
+  eventBindingSteps: ["runJs"],
+  pathSchemas: {
+    ...RUN_JS_SETTINGS_GROUP.pathSchemas,
+    "showBlockCard.showBlockCard": BOOLEAN_SCHEMA
+  }
+};
 const FIELD_SETTINGS_INIT_GROUP = {
   allowedPaths: [
     "init.dataSourceKey",
@@ -1378,7 +1389,7 @@ const JS_BLOCK_CONTRACT = createContract({
   }
 });
 JS_BLOCK_CONTRACT.domains.stepParams = groupedDomain({
-  jsSettings: RUN_JS_SETTINGS_GROUP
+  jsSettings: JS_BLOCK_SETTINGS_GROUP
 });
 const MAP_BLOCK_CONTRACT = createContract({
   editableDomains: ["props", "decoratorProps", "stepParams", "flowRegistry"],

package/dist/server/flow-surfaces/configure-options.js

@@ -201,7 +201,7 @@ const DETAILS_OPTIONS = {
   sorting: SORTING,
   dataScope: FILTER_GROUP,
   linkageRules: arrayOption(
-    "Raw linkage-rules payload. For AI/CLI authoring, prefer `getReactionMeta` + `setFieldLinkageRules` instead of guessing this configure key directly.",
+    "Raw canonical linkage-rules payload. The API normalizes condition-only rules to include `actions: []`; for AI/CLI authoring, prefer `getReactionMeta` + `setFieldLinkageRules` instead of guessing this configure key directly.",
     { example: [] }
   )
 };
@@ -237,7 +237,7 @@ const CALENDAR_OPTIONS = {
   weekStart: numberOption("Week start day. Use 1 for Monday or 0 for Sunday.", { example: 1 }),
   dataScope: FILTER_GROUP,
   linkageRules: arrayOption(
-    "Raw linkage-rules payload. For AI/CLI authoring, prefer `getReactionMeta` + `setBlockLinkageRules` instead of guessing this configure key directly.",
+    "Raw canonical linkage-rules payload. The API normalizes condition-only rules to include `actions: []`; for AI/CLI authoring, prefer `getReactionMeta` + `setBlockLinkageRules` instead of guessing this configure key directly.",
     { example: [] }
   ),
   quickCreatePopup: OPEN_VIEW,
@@ -413,6 +413,7 @@ const JS_BLOCK_OPTIONS = {
   title: stringOption("Title", { example: "Runtime Banner" }),
   description: stringOption("Description", { example: "Custom JS block" }),
   className: stringOption("className", { example: "users-banner" }),
+  showBlockCard: booleanOption("Whether to show the outer block card", { default: true, example: true }),
   code: JS_CODE,
   version: JS_VERSION
 };
@@ -560,6 +561,7 @@ const ACTION_COMMON_OPTIONS = {
   title: stringOption("Button title", { example: "Run" }),
   tooltip: stringOption("Tooltip"),
   icon: stringOption("Icon", { example: "PlusOutlined" }),
+  iconOnly: booleanOption("Whether to render only the icon without visible button text", { example: true }),
   type: stringOption("Button type", { example: "primary" }),
   color: stringOption("Color"),
   htmlType: stringOption("HTML button type", { example: "submit" }),
@@ -588,7 +590,7 @@ const APPROVAL_ASSIGN_ACTION_OPTIONS = {
 };
 const ACTION_LINKAGE_OPTIONS = {
   linkageRules: arrayOption(
-    "Raw linkage-rules payload. For AI/CLI authoring, prefer `getReactionMeta` + `setActionLinkageRules` instead of guessing this configure key directly.",
+    "Raw canonical linkage-rules payload. The API normalizes condition-only rules to include `actions: []`; for AI/CLI authoring, prefer `getReactionMeta` + `setActionLinkageRules` instead of guessing this configure key directly.",
     { example: [] }
   )
 };

package/dist/server/flow-surfaces/constants.d.ts

@@ -45,6 +45,13 @@ export declare const FLOW_SURFACE_ACTION_DEFINITIONS: {
         readonly mutate: false;
         readonly valueSource: "default";
     };
+    readonly exportBlueprint: {
+        readonly method: "post";
+        readonly read: true;
+        readonly transaction: false;
+        readonly mutate: false;
+        readonly valueSource: "default";
+    };
     readonly getReactionMeta: {
         readonly method: "post";
         readonly read: true;
@@ -373,7 +380,7 @@ type SelectFlowSurfaceActionNames<TFlag extends keyof FlowSurfaceActionDefinitio
     [K in FlowSurfacesActionName]: (typeof FLOW_SURFACE_ACTION_DEFINITIONS)[K][TFlag] extends true ? K : never;
 }[FlowSurfacesActionName];
 type FlowSurfaceMutateActionName = SelectFlowSurfaceActionNames<'mutate'>;
-export declare const FLOW_SURFACES_ACTION_NAMES: ("setFieldValueRules" | "setBlockLinkageRules" | "setFieldLinkageRules" | "setActionLinkageRules" | "context" | "get" | "configure" | "createPage" | "addTab" | "addPopupTab" | "addBlock" | "addField" | "addAction" | "addRecordAction" | "compose" | "createMenu" | "catalog" | "describeSurface" | "getReactionMeta" | "applyBlueprint" | "applyApprovalBlueprint" | "listTemplates" | "getTemplate" | "saveTemplate" | "updateTemplate" | "destroyTemplate" | "convertTemplateToCopy" | "updateMenu" | "destroyPage" | "updateTab" | "moveTab" | "removeTab" | "updatePopupTab" | "movePopupTab" | "removePopupTab" | "addBlocks" | "addFields" | "addActions" | "addRecordActions" | "updateSettings" | "getEventFlowMeta" | "addEventFlow" | "setEventFlow" | "removeEventFlow" | "setEventFlows" | "setLayout" | "moveNode" | "removeNode" | "mutate" | "apply")[];
+export declare const FLOW_SURFACES_ACTION_NAMES: ("setFieldValueRules" | "setBlockLinkageRules" | "setFieldLinkageRules" | "setActionLinkageRules" | "context" | "get" | "configure" | "apply" | "createPage" | "addTab" | "addPopupTab" | "addBlock" | "addField" | "addAction" | "addRecordAction" | "compose" | "createMenu" | "catalog" | "describeSurface" | "exportBlueprint" | "getReactionMeta" | "applyBlueprint" | "applyApprovalBlueprint" | "listTemplates" | "getTemplate" | "saveTemplate" | "updateTemplate" | "destroyTemplate" | "convertTemplateToCopy" | "updateMenu" | "destroyPage" | "updateTab" | "moveTab" | "removeTab" | "updatePopupTab" | "movePopupTab" | "removePopupTab" | "addBlocks" | "addFields" | "addActions" | "addRecordActions" | "updateSettings" | "getEventFlowMeta" | "addEventFlow" | "setEventFlow" | "removeEventFlow" | "setEventFlows" | "setLayout" | "moveNode" | "removeNode" | "mutate")[];
 export declare const FLOW_SURFACES_READ_ACTION_NAMES: SelectFlowSurfaceActionNames<"read">[];
 export declare const FLOW_SURFACE_MUTATE_OP_TYPES: FlowSurfaceMutateActionName[];
-export declare const FLOW_SURFACES_ACTION_METHODS: Record<"setFieldValueRules" | "setBlockLinkageRules" | "setFieldLinkageRules" | "setActionLinkageRules" | "context" | "get" | "configure" | "createPage" | "addTab" | "addPopupTab" | "addBlock" | "addField" | "addAction" | "addRecordAction" | "compose" | "createMenu" | "catalog" | "describeSurface" | "getReactionMeta" | "applyBlueprint" | "applyApprovalBlueprint" | "listTemplates" | "getTemplate" | "saveTemplate" | "updateTemplate" | "destroyTemplate" | "convertTemplateToCopy" | "updateMenu" | "destroyPage" | "updateTab" | "moveTab" | "removeTab" | "updatePopupTab" | "movePopupTab" | "removePopupTab" | "addBlocks" | "addFields" | "addActions" | "addRecordActions" | "updateSettings" | "getEventFlowMeta" | "addEventFlow" | "setEventFlow" | "removeEventFlow" | "setEventFlows" | "setLayout" | "moveNode" | "removeNode" | "mutate" | "apply", FlowSurfaceActionMethod>;
+export declare const FLOW_SURFACES_ACTION_METHODS: Record<"setFieldValueRules" | "setBlockLinkageRules" | "setFieldLinkageRules" | "setActionLinkageRules" | "context" | "get" | "configure" | "apply" | "createPage" | "addTab" | "addPopupTab" | "addBlock" | "addField" | "addAction" | "addRecordAction" | "compose" | "createMenu" | "catalog" | "describeSurface" | "exportBlueprint" | "getReactionMeta" | "applyBlueprint" | "applyApprovalBlueprint" | "listTemplates" | "getTemplate" | "saveTemplate" | "updateTemplate" | "destroyTemplate" | "convertTemplateToCopy" | "updateMenu" | "destroyPage" | "updateTab" | "moveTab" | "removeTab" | "updatePopupTab" | "movePopupTab" | "removePopupTab" | "addBlocks" | "addFields" | "addActions" | "addRecordActions" | "updateSettings" | "getEventFlowMeta" | "addEventFlow" | "setEventFlow" | "removeEventFlow" | "setEventFlows" | "setLayout" | "moveNode" | "removeNode" | "mutate", FlowSurfaceActionMethod>;

package/dist/server/flow-surfaces/constants.js

@@ -40,6 +40,7 @@ const FLOW_SURFACE_ACTION_DEFINITIONS = {
   context: { method: "post", read: true, transaction: false, mutate: false, valueSource: "default" },
   get: { method: "get", read: true, transaction: false, mutate: false, valueSource: "read" },
   describeSurface: { method: "post", read: true, transaction: false, mutate: false, valueSource: "default" },
+  exportBlueprint: { method: "post", read: true, transaction: false, mutate: false, valueSource: "default" },
   getReactionMeta: { method: "post", read: true, transaction: false, mutate: false, valueSource: "default" },
   setFieldValueRules: { method: "post", read: false, transaction: true, mutate: false, valueSource: "default" },
   setBlockLinkageRules: { method: "post", read: false, transaction: true, mutate: false, valueSource: "default" },

package/dist/server/flow-surfaces/contract-guard.js

@@ -397,19 +397,41 @@ function normalizeLinkageRulesValue(value, context, path) {
       return rule;
     }
     const normalizedRule = import_lodash.default.cloneDeep(rule);
-    const domainPath = context.groupKey ? `${context.domain}.${context.groupKey}.${path}[${index}].condition` : `${context.domain}.${path}[${index}].condition`;
+    const conditionPath = getLinkageRuleDomainPath(context, path, index, "condition");
     import_lodash.default.set(
       normalizedRule,
       "condition",
       (0, import_filter_group.normalizeFlowSurfaceCompatibleFilterGroupValue)(
         import_lodash.default.get(normalizedRule, "condition"),
-        `flowSurfaces updateSettings domain '${domainPath}' on '${context.use}' expects FilterGroup or backend query filter like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`,
+        `flowSurfaces updateSettings domain '${conditionPath}' on '${context.use}' expects FilterGroup or backend query filter like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`,
         { strictDateValues: true }
       )
     );
+    if (!import_lodash.default.has(normalizedRule, "actions")) {
+      import_lodash.default.set(normalizedRule, "actions", []);
+    } else if (!Array.isArray(import_lodash.default.get(normalizedRule, "actions"))) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces updateSettings domain '${getLinkageRuleDomainPath(context, path, index, "actions")}' on '${context.use}' expects actions to be an array`
+      );
+    }
+    if (!import_lodash.default.has(normalizedRule, "key")) {
+      import_lodash.default.set(normalizedRule, "key", `linkage-rule-${index + 1}`);
+    }
+    if (!import_lodash.default.has(normalizedRule, "title")) {
+      import_lodash.default.set(normalizedRule, "title", `Linkage rule ${index + 1}`);
+    }
+    if (!import_lodash.default.has(normalizedRule, "enable")) {
+      const enabled = import_lodash.default.get(normalizedRule, "enabled");
+      import_lodash.default.set(normalizedRule, "enable", typeof enabled === "boolean" ? enabled : true);
+    }
+    import_lodash.default.unset(normalizedRule, "enabled");
     return normalizedRule;
   });
 }
+function getLinkageRuleDomainPath(context, path, index, leaf) {
+  const basePath = context.groupKey ? `${context.domain}.${context.groupKey}.${path}[${index}]` : `${context.domain}.${path}[${index}]`;
+  return `${basePath}.${leaf}`;
+}
 function isContractDefinedFlowGroup(groupContract) {
   if (!groupContract) {
     return false;

package/dist/server/flow-surfaces/default-action-popup.d.ts

@@ -47,6 +47,7 @@ export type FlowSurfaceDefaultActionPopupFieldGroupCandidate = {
 type FlowSurfaceDefaultActionPopupFieldFilterOptions = {
     excludeAuditTimestampFields?: boolean;
     excludeAssociationFields?: boolean;
+    excludeRelationBackingForeignKeyFields?: boolean;
 };
 type FlowSurfaceDefaultActionPopupFieldsInput = any[] | {
     fieldPaths?: any[];
@@ -60,6 +61,7 @@ export declare function getFlowSurfaceDefaultActionPopupConfigByUse(use?: string
 export declare function resolveFlowSurfaceDefaultActionPopupTabTitle(use?: string, currentTitle?: string | null): string;
 export declare function isFlowSurfaceDefaultActionPopupBusinessField(field: any): boolean;
 export declare function pickFlowSurfaceDefaultActionPopupFieldPaths(candidates: FlowSurfaceDefaultActionPopupFieldCandidate[], options?: FlowSurfaceDefaultActionPopupFieldFilterOptions): string[];
+export declare function collectFlowSurfaceDefaultActionPopupFieldGroupFieldPaths(fieldGroups: FlowSurfaceDefaultActionPopupFieldGroupCandidate[] | undefined): Set<string>;
 export declare function pickFlowSurfaceDefaultActionPopupFieldGroups(candidates: FlowSurfaceDefaultActionPopupFieldCandidate[], fieldGroups: FlowSurfaceDefaultActionPopupFieldGroupCandidate[] | undefined, options?: FlowSurfaceDefaultActionPopupFieldFilterOptions): FlowSurfaceDefaultActionPopupFieldGroupCandidate[];
 export declare function buildFlowSurfaceDefaultActionPopupBlocks(use: string | undefined, fieldsInput: FlowSurfaceDefaultActionPopupFieldsInput): _.Dictionary<string | any[] | Record<string, any> | FlowSurfaceDefaultActionPopupFieldGroupCandidate[] | FlowSurfaceDefaultActionPopupSubmitAction[] | {
     binding: "currentCollection" | "currentRecord";

package/dist/server/flow-surfaces/default-action-popup.js

@@ -39,6 +39,7 @@ __export(default_action_popup_exports, {
   FLOW_SURFACE_DEFAULT_ACTION_POPUP_TYPES: () => FLOW_SURFACE_DEFAULT_ACTION_POPUP_TYPES,
   FLOW_SURFACE_DEFAULT_ACTION_POPUP_USES: () => FLOW_SURFACE_DEFAULT_ACTION_POPUP_USES,
   buildFlowSurfaceDefaultActionPopupBlocks: () => buildFlowSurfaceDefaultActionPopupBlocks,
+  collectFlowSurfaceDefaultActionPopupFieldGroupFieldPaths: () => collectFlowSurfaceDefaultActionPopupFieldGroupFieldPaths,
   getFlowSurfaceDefaultActionPopupConfigByUse: () => getFlowSurfaceDefaultActionPopupConfigByUse,
   hasFlowSurfaceInlinePopupBlocks: () => hasFlowSurfaceInlinePopupBlocks,
   hasFlowSurfaceInlinePopupTemplate: () => hasFlowSurfaceInlinePopupTemplate,
@@ -52,6 +53,7 @@ __export(default_action_popup_exports, {
 module.exports = __toCommonJS(default_action_popup_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_association_interfaces = require("./association-interfaces");
+var import_relation_backing_foreign_key = require("./relation-backing-foreign-key");
 var import_service_helpers = require("./service-helpers");
 const DEFAULT_ACTION_POPUP_SYSTEM_FIELD_NAMES = /* @__PURE__ */ new Set(["id", "createdBy", "createdById", "updatedBy", "updatedById"]);
 const DEFAULT_ACTION_POPUP_SYSTEM_FIELD_INTERFACES = /* @__PURE__ */ new Set([
@@ -214,13 +216,10 @@ function isFlowSurfaceDefaultActionPopupAssociationField(field) {
   const fieldType = String((0, import_service_helpers.getFieldType)(field) || "").trim();
   return fieldType === "belongsTo" || fieldType === "hasOne" || fieldType === "hasMany" || fieldType === "belongsToMany";
 }
-function collectFlowSurfaceDefaultActionPopupAssociationForeignKeys(candidates) {
-  return new Set(
-    candidates.map((candidate) => candidate == null ? void 0 : candidate.field).filter((field) => (0, import_service_helpers.getFieldType)(field) === "belongsTo").map((field) => {
-      var _a;
-      return String((field == null ? void 0 : field.foreignKey) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.foreignKey) || "").trim();
-    }).filter(Boolean)
-  );
+function collectFlowSurfaceDefaultActionPopupRelationBackingForeignKeys(candidates) {
+  return (0, import_relation_backing_foreign_key.collectRelationBackingForeignKeyNames)({
+    getFields: () => candidates.map((candidate) => candidate == null ? void 0 : candidate.field).filter(Boolean)
+  });
 }
 function isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(field, associationForeignKeys) {
   const fieldName = String((0, import_service_helpers.getFieldName)(field) || "").trim();
@@ -229,13 +228,26 @@ function isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(field, associ
 function pickFlowSurfaceDefaultActionPopupFieldPaths(candidates, options = {}) {
   return filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options).map((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim()).filter(Boolean);
 }
+function collectFlowSurfaceDefaultActionPopupFieldGroupFieldPaths(fieldGroups) {
+  const fieldPaths = /* @__PURE__ */ new Set();
+  import_lodash.default.castArray(fieldGroups || []).forEach((group) => {
+    import_lodash.default.castArray((group == null ? void 0 : group.fields) || []).forEach((field) => {
+      const fieldPath = getFlowSurfaceDefaultActionPopupFieldGroupFieldPath(field);
+      if (fieldPath) {
+        fieldPaths.add(fieldPath);
+      }
+    });
+  });
+  return fieldPaths;
+}
 function filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options = {}) {
-  const associationForeignKeys = collectFlowSurfaceDefaultActionPopupAssociationForeignKeys(candidates);
+  const associationForeignKeys = collectFlowSurfaceDefaultActionPopupRelationBackingForeignKeys(candidates);
+  const excludeRelationBackingForeignKeyFields = options.excludeRelationBackingForeignKeyFields !== false;
   const preferredCandidates = candidates.filter(
-    (candidate) => !isFlowSurfaceDefaultActionPopupSystemField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys)
+    (candidate) => !isFlowSurfaceDefaultActionPopupSystemField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && (!excludeRelationBackingForeignKeyFields || !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys))
   );
   const fallbackCandidates = candidates.filter(
-    (candidate) => !isFlowSurfaceDefaultActionPopupTechnicalIdField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys)
+    (candidate) => !isFlowSurfaceDefaultActionPopupTechnicalIdField(candidate.field) && (!options.excludeAuditTimestampFields || !isFlowSurfaceDefaultActionPopupAuditTimestampField(candidate.field)) && (!options.excludeAssociationFields || !isFlowSurfaceDefaultActionPopupAssociationField(candidate.field)) && !isFlowSurfaceDefaultActionPopupMultiValueAssociationField(candidate.field) && (!excludeRelationBackingForeignKeyFields || !isFlowSurfaceDefaultActionPopupAssociationForeignKeyField(candidate.field, associationForeignKeys))
   );
   const baseCandidates = preferredCandidates.length ? preferredCandidates : fallbackCandidates;
   return baseCandidates.filter((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim());
@@ -266,9 +278,10 @@ function normalizeFlowSurfaceDefaultActionPopupFieldGroupField(field, fieldPath)
 }
 function pickFlowSurfaceDefaultActionPopupFieldGroups(candidates, fieldGroups, options = {}) {
   const allowedFieldPaths = new Set(
-    filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, options).map(
-      (candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim()
-    )
+    filterFlowSurfaceDefaultActionPopupFieldCandidates(candidates, {
+      ...options,
+      excludeRelationBackingForeignKeyFields: false
+    }).map((candidate) => String((candidate == null ? void 0 : candidate.fieldPath) || "").trim())
   );
   const usedFieldPaths = /* @__PURE__ */ new Set();
   return import_lodash.default.castArray(fieldGroups || []).flatMap((group) => {
@@ -351,6 +364,7 @@ function hasFlowSurfaceInlinePopupBlocks(popup) {
   FLOW_SURFACE_DEFAULT_ACTION_POPUP_TYPES,
   FLOW_SURFACE_DEFAULT_ACTION_POPUP_USES,
   buildFlowSurfaceDefaultActionPopupBlocks,
+  collectFlowSurfaceDefaultActionPopupFieldGroupFieldPaths,
   getFlowSurfaceDefaultActionPopupConfigByUse,
   hasFlowSurfaceInlinePopupBlocks,
   hasFlowSurfaceInlinePopupTemplate,

package/dist/server/flow-surfaces/filter-group.d.ts

@@ -11,13 +11,30 @@ export declare const FLOW_SURFACE_EMPTY_FILTER_GROUP: {
     items: any[];
 };
 export declare const FLOW_SURFACE_FILTER_GROUP_EXAMPLE: string;
+export declare const FLOW_SURFACE_DATE_FILTER_OPERATORS: Set<string>;
 export declare function assertFlowSurfaceFilterOperator(operator: unknown, path: string): void;
-export declare function normalizeFlowSurfaceFilterDateValue(operator: unknown, value: unknown, path: string): unknown;
-export declare function normalizeFlowSurfaceStrictFilterDateValue(operator: unknown, value: unknown, path: string): unknown;
+export declare function normalizeFlowSurfaceFilterDateValue(operator: unknown, value: unknown, path: string, options?: {
+    allowContextPathValue?: boolean;
+}): unknown;
+export declare function normalizeFlowSurfaceStrictFilterDateValue(operator: unknown, value: unknown, path: string, options?: {
+    allowContextPathValue?: boolean;
+}): unknown;
+export declare function isFlowSurfaceDateLikeFieldMeta(value: {
+    type?: unknown;
+    interface?: unknown;
+} | undefined | null): boolean;
+export declare function normalizeFlowSurfaceDateConditionValue(operator: unknown, value: unknown, path: string, options?: {
+    fieldPath?: string;
+    fieldType?: unknown;
+    fieldInterface?: unknown;
+    allowContextPathValue?: boolean;
+}): unknown;
 export declare function normalizeFlowSurfaceFilterGroupValue(value: any, errorPrefix: string, options?: {
     strictDateValues?: boolean;
+    allowContextPathValue?: boolean;
 }): any;
 export declare function normalizeFlowSurfaceCompatibleFilterGroupValue(value: unknown, errorPrefix: string, options?: {
     strictDateValues?: boolean;
+    allowContextPathValue?: boolean;
 }): any;
 export declare function assertFlowSurfaceFilterGroupShape(filter: any): void;