@nocobase/plugin-flow-engine 2.1.0-alpha.19 → 2.1.0-alpha.20

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

@@ -56,6 +56,7 @@ var import_key_registry = require("./planning/key-registry");
 var import_blueprint = require("./blueprint");
 var import_compile_blocks = require("./blueprint/compile-blocks");
 var import_private_utils = require("./blueprint/private-utils");
+var import_default_block_actions = require("./default-block-actions");
 var import_runtime = require("./planning/runtime");
 var import_created_keys = require("./planning/created-keys");
 var import_key_persistence = require("./planning/key-persistence");
@@ -94,6 +95,7 @@ const SIMPLE_FORM_BLOCK_USES = /* @__PURE__ */ new Set([
   "EditFormModel",
   ...import_approval.APPROVAL_FORM_BLOCK_USES
 ]);
+const COMPOSE_FIELD_GRID_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "editForm", "details", "filterForm"]);
 const LIST_BLOCK_USES = /* @__PURE__ */ new Set(["ListBlockModel"]);
 const GRID_CARD_BLOCK_USES = /* @__PURE__ */ new Set(["GridCardBlockModel"]);
 const LIST_LIKE_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard"]);
@@ -194,6 +196,18 @@ const POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES = /* @__PURE__ */ new Set([
 ]);
 const DELETE_ACTION_USES = /* @__PURE__ */ new Set(["DeleteActionModel", "BulkDeleteActionModel"]);
 const CONFIRMABLE_SUBMIT_ACTION_USES = /* @__PURE__ */ new Set(["FormSubmitActionModel"]);
+const APPROVAL_CONFIRM_ACTION_USES = /* @__PURE__ */ new Set([
+  "ApplyFormSubmitModel",
+  "ApplyFormSaveDraftModel",
+  "ApplyFormWithdrawModel"
+]);
+const APPROVAL_ASSIGN_ACTION_USES = /* @__PURE__ */ new Set(["ApplyFormSubmitModel", "ApplyFormSaveDraftModel"]);
+const APPROVAL_COMMENT_ACTION_USES = /* @__PURE__ */ new Set([
+  "ProcessFormApproveModel",
+  "ProcessFormRejectModel",
+  "ProcessFormReturnModel"
+]);
+const APPROVAL_REASSIGN_ACTION_USES = /* @__PURE__ */ new Set(["ProcessFormDelegateModel", "ProcessFormAddAssigneeModel"]);
 const ITEM_CONTEXT_OWNER_USES = /* @__PURE__ */ new Set([
   "SubFormFieldModel",
   "SubFormListFieldModel",
@@ -349,6 +363,13 @@ class FlowSurfacesService {
       );
     }
   }
+  getFlowTemplateRepositorySafe() {
+    try {
+      return this.db.getRepository("flowModelTemplates");
+    } catch (error) {
+      return null;
+    }
+  }
   getFlowTemplateUsageRepository(actionName) {
     try {
       return this.db.getRepository("flowModelTemplateUsages");
@@ -3565,7 +3586,8 @@ class FlowSurfacesService {
       createBlock: async (payload) => this.addBlock(payload, {
         ...options,
         deferAutoLayout: true,
-        enabledPackages
+        enabledPackages,
+        skipDefaultBlockActions: true
       }),
       applyNodeSettings: async (actionName, targetUid, settings) => {
         if (!targetUid) {
@@ -3597,10 +3619,7 @@ class FlowSurfacesService {
       collectActionKeys: async (actionUid) => this.collectComposeActionKeys(actionUid, options.transaction),
       buildExplicitLayoutPayload: async (input) => {
         var _a2;
-        const finalGrid = await this.repository.findModelById(input.gridUid, {
-          transaction: options.transaction,
-          includeAsyncNode: true
-        });
+        const finalGrid = await this.surfaceContext.resolveGridNode(input.targetUid, options.transaction);
         const finalItems = import_lodash.default.castArray(((_a2 = finalGrid == null ? void 0 : finalGrid.subModels) == null ? void 0 : _a2.items) || []).filter((item) => item == null ? void 0 : item.uid);
         return this.buildComposeLayoutPayload({
           layout: input.layout,
@@ -4439,7 +4458,10 @@ class FlowSurfacesService {
           })
         } : {}
       },
-      options
+      {
+        ...options,
+        skipDefaultBlockActions: true
+      }
     );
     const templateFieldsResult = await this.applyTemplateFieldsToBlock(
       "addBlock",
@@ -4672,6 +4694,18 @@ class FlowSurfacesService {
       } : {}
     };
     await this.applyInlineNodeSettings("addBlock", created, inlineSettings, options);
+    if (!options.skipDefaultBlockActions) {
+      await this.applyDefaultActionsForCreatedBlock(
+        {
+          blockUid: created,
+          blockType: String(catalogItem.key || values.type || "").trim()
+        },
+        {
+          ...options,
+          enabledPackages
+        }
+      );
+    }
     if (!options.deferAutoLayout && (initialGrid == null ? void 0 : initialGrid.uid)) {
       const finalGrid = await this.repository.findModelById(parentUid, {
         transaction: options.transaction,
@@ -4966,7 +5000,10 @@ class FlowSurfacesService {
       fieldPath: normalizedFieldBinding.fieldPath
     };
     await this.applyInlineFieldSettings("addField", result, inlineSettings, options);
-    await this.applyInlineFieldPopup("addField", result, inlinePopup, options);
+    await this.applyInlineFieldPopup("addField", result, inlinePopup, {
+      ...options,
+      enabledPackages
+    });
     await this.persistCreatedKeysForAction("addField", values, result, options.transaction);
     return result;
   }
@@ -5032,6 +5069,7 @@ class FlowSurfacesService {
     await this.applyInlineNodeSettings("addAction", created, inlineSettings, options);
     await this.applyInlineActionPopup("addAction", created, inlinePopup, {
       ...options,
+      enabledPackages,
       popupActionContext: {
         hasCurrentRecord: false
       }
@@ -5103,6 +5141,7 @@ class FlowSurfacesService {
     await this.applyInlineNodeSettings("addRecordAction", created, inlineSettings, options);
     await this.applyInlineActionPopup("addRecordAction", created, inlinePopup, {
       ...options,
+      enabledPackages,
       popupActionContext: {
         hasCurrentRecord: true
       }
@@ -5456,6 +5495,116 @@ class FlowSurfacesService {
     delete result.popupTabUid;
     delete result.popupGridUid;
   }
+  buildLegacyAutoGeneratedPopupTemplateMetadata(identity) {
+    return {
+      name: `Auto popup ${identity}`,
+      description: `Auto-generated popup template ${identity}`
+    };
+  }
+  formatAutoGeneratedPopupTemplateMetadata(input) {
+    const popupLabel = input.defaultType === "edit" ? "edit popup" : "details popup";
+    return {
+      name: `${input.sourceCollectionLabel} -> ${input.associationFieldLabel} ${popupLabel} (Auto generated)`,
+      description: `Automatically generated ${popupLabel} template for relation field '${input.associationFieldLabel}' in collection '${input.sourceCollectionLabel}', targeting '${input.targetCollectionLabel}'.`
+    };
+  }
+  formatAutoGeneratedActionPopupTemplateMetadata(input) {
+    const popupLabel = input.popupType === "addNew" ? "create popup" : input.popupType === "edit" ? "edit popup" : "details popup";
+    return {
+      name: `${input.collectionLabel} ${popupLabel} (Auto generated)`,
+      description: `Automatically generated ${popupLabel} template for collection '${input.collectionLabel}'.`
+    };
+  }
+  resolveFieldBindingContext(fieldNode, wrapperNode) {
+    var _a, _b, _c, _d;
+    const fieldInit = ((_b = (_a = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _a.fieldSettings) == null ? void 0 : _b.init) || ((_d = (_c = wrapperNode == null ? void 0 : wrapperNode.stepParams) == null ? void 0 : _c.fieldSettings) == null ? void 0 : _d.init) || {};
+    const dataSourceKey = String(fieldInit.dataSourceKey || "main").trim() || "main";
+    const collectionName = String(fieldInit.collectionName || "").trim() || void 0;
+    const fieldPath = String(fieldInit.fieldPath || "").trim() || void 0;
+    const associationPathName = String(fieldInit.associationPathName || "").trim() || void 0;
+    const sourceCollection = collectionName ? this.getCollection(dataSourceKey, collectionName) : void 0;
+    if (!sourceCollection || !fieldPath) {
+      return {
+        dataSourceKey,
+        collectionName,
+        fieldPath,
+        associationPathName,
+        sourceCollection
+      };
+    }
+    const associationContext = this.resolveFieldAssociationContextFromBinding({
+      collection: sourceCollection,
+      fieldPath,
+      associationPathName,
+      dataSourceKey,
+      collectionName
+    });
+    return {
+      dataSourceKey,
+      collectionName,
+      fieldPath,
+      associationPathName,
+      sourceCollection,
+      targetCollectionName: associationContext.collectionName,
+      associationName: associationContext.associationName,
+      associationField: associationContext.associationField,
+      targetCollection: associationContext.targetCollection
+    };
+  }
+  async resolveAutoGeneratedFieldPopupTemplateMetadata(fieldHostUid, defaultType, identity, transaction) {
+    const fallback = this.buildLegacyAutoGeneratedPopupTemplateMetadata(identity);
+    try {
+      const { fieldNode, wrapperNode } = await this.loadFieldHostNodes(fieldHostUid, transaction);
+      const bindingContext = this.resolveFieldBindingContext(fieldNode, wrapperNode);
+      if (!bindingContext.collectionName || !bindingContext.fieldPath || !bindingContext.sourceCollection) {
+        return fallback;
+      }
+      if (!bindingContext.associationField || !bindingContext.targetCollection) {
+        return fallback;
+      }
+      const sourceCollectionLabel = String((0, import_service_helpers.getCollectionTitle)(bindingContext.sourceCollection) || "").trim() || bindingContext.collectionName;
+      const associationFieldLabel = String(
+        (0, import_service_helpers.getFieldTitle)(bindingContext.associationField) || (0, import_service_helpers.getFieldName)(bindingContext.associationField) || ""
+      ).trim() || String((0, import_service_helpers.getFieldName)(bindingContext.associationField) || "").trim();
+      const targetCollectionLabel = String((0, import_service_helpers.getCollectionTitle)(bindingContext.targetCollection) || "").trim() || String((0, import_service_helpers.getCollectionName)(bindingContext.targetCollection) || "").trim();
+      if (!sourceCollectionLabel || !associationFieldLabel || !targetCollectionLabel) {
+        return fallback;
+      }
+      return this.formatAutoGeneratedPopupTemplateMetadata({
+        defaultType,
+        sourceCollectionLabel,
+        associationFieldLabel,
+        targetCollectionLabel
+      });
+    } catch (error) {
+      return fallback;
+    }
+  }
+  shouldAutoSaveDefaultActionPopupTemplate(popup) {
+    return (popup == null ? void 0 : popup[import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]) === true;
+  }
+  async resolveAutoGeneratedActionPopupTemplateMetadata(actionUid, identity, transaction) {
+    const fallback = this.buildLegacyAutoGeneratedPopupTemplateMetadata(identity);
+    try {
+      const actionNode = await this.repository.findModelById(actionUid, {
+        transaction,
+        includeAsyncNode: true
+      });
+      const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode == null ? void 0 : actionNode.use);
+      const popupProfile = (actionNode == null ? void 0 : actionNode.uid) ? await this.resolvePopupBlockProfile(actionNode.uid, null, actionNode, transaction).catch(() => null) : null;
+      const popupType = actionConfig == null ? void 0 : actionConfig.type;
+      const collectionLabel = String((0, import_service_helpers.getCollectionTitle)(popupProfile == null ? void 0 : popupProfile.currentCollection) || "").trim() || String((popupProfile == null ? void 0 : popupProfile.collectionName) || "").trim();
+      if (!popupType || !collectionLabel) {
+        return fallback;
+      }
+      return this.formatAutoGeneratedActionPopupTemplateMetadata({
+        popupType,
+        collectionLabel
+      });
+    } catch (error) {
+      return fallback;
+    }
+  }
   async savePopupAsTemplate(hostUid, popup, options) {
     const normalizedHostUid = String(hostUid || "").trim();
     const saveAsTemplate = popup == null ? void 0 : popup.saveAsTemplate;
@@ -5601,6 +5750,28 @@ class FlowSurfacesService {
     }
     return void 0;
   }
+  getPopupTryTemplateAllowedDefaultTypes(popup, targetContext, popupActionContext) {
+    var _a;
+    const requestedDefaultType = this.getRequestedPopupDefaultType(popup);
+    if (requestedDefaultType) {
+      return [requestedDefaultType];
+    }
+    const targetUse = String(((_a = targetContext == null ? void 0 : targetContext.node) == null ? void 0 : _a.use) || "").trim();
+    if (!targetUse) {
+      return void 0;
+    }
+    if (this.isPopupFieldHostUse(targetUse)) {
+      return ["view", "generic"];
+    }
+    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(targetUse);
+    if (actionConfig) {
+      return actionConfig.type === "view" ? ["view", "generic"] : [actionConfig.type];
+    }
+    if (POPUP_ACTION_USES.has(targetUse)) {
+      return (popupActionContext == null ? void 0 : popupActionContext.hasCurrentRecord) ? ["view", "generic"] : ["generic"];
+    }
+    return void 0;
+  }
   inferPopupDefaultTypeFromTemplateTree(node) {
     var _a, _b, _c, _d;
     const popupPage = (0, import_service_utils.getSingleNodeSubModel)((_a = node == null ? void 0 : node.subModels) == null ? void 0 : _a.page);
@@ -5613,11 +5784,15 @@ class FlowSurfacesService {
     if ((popupBlock == null ? void 0 : popupBlock.use) === "EditFormModel") {
       return "edit";
     }
-    return void 0;
+    if ((popupBlock == null ? void 0 : popupBlock.use) === "CreateFormModel") {
+      return "addNew";
+    }
+    return "generic";
   }
   async popupTemplateMatchesDefaultType(template, popup, options = {}) {
-    const requestedDefaultType = this.getRequestedPopupDefaultType(popup);
-    if (!requestedDefaultType) {
+    var _a;
+    const allowedDefaultTypes = ((_a = options.allowedDefaultTypes) == null ? void 0 : _a.length) ? Array.from(new Set(options.allowedDefaultTypes)) : void 0;
+    if (!allowedDefaultTypes) {
       return true;
     }
     const templateTargetUid = String((template == null ? void 0 : template.targetUid) || "").trim();
@@ -5628,14 +5803,17 @@ class FlowSurfacesService {
       transaction: options.transaction,
       includeAsyncNode: true
     });
-    return this.inferPopupDefaultTypeFromTemplateTree(templateTree) === requestedDefaultType;
+    return allowedDefaultTypes.includes(this.inferPopupDefaultTypeFromTemplateTree(templateTree));
   }
   async tryResolvePopupTemplateForHost(actionName, popup, hostUid, options = {}) {
     const normalizedHostUid = String(hostUid || "").trim();
     if (!normalizedHostUid || !import_lodash.default.isPlainObject(popup) || !popup.tryTemplate || !import_lodash.default.isUndefined(popup.template)) {
       return null;
     }
-    const repo = this.getFlowTemplateRepository(actionName);
+    const repo = this.getFlowTemplateRepositorySafe();
+    if (!repo) {
+      return null;
+    }
     const targetContext = await this.loadTemplateListTargetContext({ uid: normalizedHostUid }, options.transaction);
     const templates = await repo.find({
       filter: (0, import_template_service_utils.buildTemplateListFilter)(void 0, void 0, "popup"),
@@ -5651,12 +5829,20 @@ class FlowSurfacesService {
       }
     );
     const expectedAssociationName = this.getPopupTryTemplateExpectedAssociationName(targetContext);
+    const allowedDefaultTypes = this.getPopupTryTemplateAllowedDefaultTypes(
+      popup,
+      targetContext,
+      options.popupActionContext
+    );
     for (const priority of [0, 1]) {
       for (const template of annotatedTemplates) {
         if (template.available !== true || this.getPopupTryTemplatePriority(template, expectedAssociationName) !== priority) {
           continue;
         }
-        if (await this.popupTemplateMatchesDefaultType(template, popup, options)) {
+        if (await this.popupTemplateMatchesDefaultType(template, popup, {
+          ...options,
+          allowedDefaultTypes
+        })) {
           return template;
         }
       }
@@ -6102,7 +6288,7 @@ class FlowSurfacesService {
               uid: fieldHostUid
             },
             mode: popup.mode || "replace",
-            blocks: this.buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType),
+            blocks: this.buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType, options.enabledPackages),
             layout: popup.layout
           },
           options
@@ -6225,14 +6411,15 @@ class FlowSurfacesService {
       resourceInit: {
         dataSourceKey: input.popupContext.dataSourceKey || "main",
         collectionName
-      }
+      },
+      enabledPackages: input.enabledPackages
     });
     return (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldPaths)(directCandidates, {
       excludeAuditTimestampFields: input.defaultType === "edit",
       excludeAssociationFields: true
     });
   }
-  buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType) {
+  buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType, enabledPackages) {
     var _a;
     const actionUse = defaultType === "edit" ? "EditActionModel" : "ViewActionModel";
     const namespace = (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
@@ -6250,7 +6437,8 @@ class FlowSurfacesService {
     const fieldPaths = this.buildDefaultFieldPopupFieldPaths({
       defaultType,
       fieldNode,
-      popupContext
+      popupContext,
+      enabledPackages
     });
     return this.remapDefaultActionPopupBlocks(
       (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionUse, fieldPaths),
@@ -6259,6 +6447,9 @@ class FlowSurfacesService {
     );
   }
   async autoSaveDefaultFieldPopupAsTemplate(result, popup, options) {
+    if (!this.getFlowTemplateRepositorySafe()) {
+      return;
+    }
     const fieldHostUid = result.fieldUid || result.uid;
     if (!fieldHostUid) {
       return;
@@ -6282,19 +6473,74 @@ class FlowSurfacesService {
       })
     );
     const identity = (0, import_crypto.createHash)("sha1").update(uniqueKeySource).digest("hex").slice(0, 12);
+    const defaultType = this.getRequestedPopupDefaultType(popup) || "view";
+    const metadata = await this.resolveAutoGeneratedFieldPopupTemplateMetadata(
+      fieldHostUid,
+      defaultType,
+      identity,
+      options.transaction
+    );
     await this.saveTemplate(
       {
         target: {
           uid: fieldHostUid
         },
-        name: `Auto popup ${identity}`,
-        description: `Auto-generated popup template ${identity}`,
+        name: metadata.name,
+        description: metadata.description,
         saveMode: "convert"
       },
       options
     );
     this.clearPopupSurfaceKeys(result);
   }
+  async autoSaveDefaultActionPopupAsTemplate(actionUid, _popup, options) {
+    if (!this.getFlowTemplateRepositorySafe()) {
+      return;
+    }
+    const actionNode = await this.repository.findModelById(actionUid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    if (!(actionNode == null ? void 0 : actionNode.uid)) {
+      return;
+    }
+    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode.use);
+    if (!actionConfig) {
+      return;
+    }
+    const openView = this.resolvePopupHostOpenView(actionNode);
+    if (String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim()) {
+      return;
+    }
+    const uniqueKeySource = JSON.stringify(
+      (0, import_service_utils.buildDefinedPayload)({
+        actionUse: actionNode.use,
+        dataSourceKey: openView == null ? void 0 : openView.dataSourceKey,
+        collectionName: openView == null ? void 0 : openView.collectionName,
+        associationName: openView == null ? void 0 : openView.associationName,
+        filterByTk: openView == null ? void 0 : openView.filterByTk,
+        sourceId: openView == null ? void 0 : openView.sourceId,
+        popupType: actionConfig.type
+      })
+    );
+    const identity = (0, import_crypto.createHash)("sha1").update(uniqueKeySource).digest("hex").slice(0, 12);
+    const metadata = await this.resolveAutoGeneratedActionPopupTemplateMetadata(
+      actionUid,
+      identity,
+      options.transaction
+    );
+    await this.saveTemplate(
+      {
+        target: {
+          uid: actionUid
+        },
+        name: metadata.name,
+        description: metadata.description,
+        saveMode: "convert"
+      },
+      options
+    );
+  }
   shouldAutoCompleteDefaultActionPopup(actionNode, popup, options = {}) {
     if (options.autoCompleteDefaultPopup === false) {
       return false;
@@ -6328,7 +6574,8 @@ class FlowSurfacesService {
       resourceInit: {
         dataSourceKey: ((_b = input.popupProfile) == null ? void 0 : _b.dataSourceKey) || "main",
         collectionName
-      }
+      },
+      enabledPackages: input.enabledPackages
     });
     return (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldPaths)(directCandidates, {
       excludeAuditTimestampFields: mode === "form"
@@ -6438,10 +6685,11 @@ class FlowSurfacesService {
     );
     return nextLayout;
   }
-  buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace) {
+  buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace, enabledPackages) {
     const fieldPaths = this.buildDefaultActionPopupFieldPaths({
       actionUse: actionNode == null ? void 0 : actionNode.use,
-      popupProfile
+      popupProfile,
+      enabledPackages
     });
     return this.remapDefaultActionPopupBlocks(
       (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionNode == null ? void 0 : actionNode.use, fieldPaths),
@@ -6449,7 +6697,7 @@ class FlowSurfacesService {
       namespace
     );
   }
-  buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup) {
+  buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup, enabledPackages) {
     const namespace = this.buildDefaultActionPopupNamespace(actionNode);
     const keyMap = this.buildDefaultActionPopupKeyMap(actionNode, namespace);
     return {
@@ -6457,7 +6705,7 @@ class FlowSurfacesService {
         uid: actionNode.uid
       },
       mode: (popup == null ? void 0 : popup.mode) || "replace",
-      blocks: this.buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace),
+      blocks: this.buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace, enabledPackages),
       layout: this.remapDefaultActionPopupLayout(popup == null ? void 0 : popup.layout, keyMap)
     };
   }
@@ -6536,7 +6784,10 @@ class FlowSurfacesService {
     if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface)) {
       return;
     }
-    await this.compose(this.buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup), options);
+    await this.compose(
+      this.buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup, options.enabledPackages),
+      options
+    );
     const popupState = await this.resolveDefaultActionPopupSurfaceState(actionNode.uid, options.transaction);
     await this.resetDefaultActionPopupFormLinkageRules(popupState.popupBlock, options);
     await this.syncDefaultActionPopupTabTitle(popupState.actionNode || actionNode, popupState.popupTab, options);
@@ -6613,6 +6864,9 @@ class FlowSurfacesService {
     try {
       if (shouldAutoCompleteDefaultPopup) {
         await this.applyDefaultActionPopupContent(actionNode, popup, options);
+        if (this.shouldAutoSaveDefaultActionPopupTemplate(popup)) {
+          await this.autoSaveDefaultActionPopupAsTemplate(actionUid, popup, options);
+        }
       } else if (!import_lodash.default.isUndefined(popup)) {
         await this.compose(
           {
@@ -7179,12 +7433,21 @@ class FlowSurfacesService {
   }
   async transaction(callback) {
     const transaction = await this.db.sequelize.transaction();
+    const transactionState = transaction;
     try {
       const result = await callback(transaction);
       await transaction.commit();
       return result;
     } catch (error) {
-      await transaction.rollback();
+      if (!transactionState.finished) {
+        try {
+          await transaction.rollback();
+        } catch (rollbackError) {
+          if (!String((rollbackError == null ? void 0 : rollbackError.message) || "").includes("Transaction cannot be rolled back")) {
+            throw rollbackError;
+          }
+        }
+      }
       throw error;
     }
   }
@@ -7883,6 +8146,115 @@ class FlowSurfacesService {
       errorCount
     };
   }
+  buildInjectedComposeDefaultActionSpec(descriptor, existingKeys, context) {
+    const baseKey = `${descriptor.type}Default`;
+    let candidate = baseKey;
+    let suffix = 2;
+    while (existingKeys.has(candidate)) {
+      candidate = `${baseKey}${suffix}`;
+      suffix += 1;
+    }
+    existingKeys.add(candidate);
+    return {
+      key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)(candidate, `${context} default ${descriptor.scope} '${descriptor.type}'`),
+      type: descriptor.type,
+      settings: {},
+      ...descriptor.popup ? { popup: import_lodash.default.cloneDeep(descriptor.popup) } : {}
+    };
+  }
+  normalizeComposeFieldsLayout(input, options) {
+    if (import_lodash.default.isUndefined(input)) {
+      return void 0;
+    }
+    if (!import_lodash.default.isPlainObject(input)) {
+      (0, import_errors.throwBadRequest)(`${options.blockContext} fieldsLayout must be an object`);
+    }
+    if (!COMPOSE_FIELD_GRID_BLOCK_TYPES.has(options.blockType || "")) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces compose ${options.blockDescriptor} does not support fieldsLayout`);
+    }
+    if (!options.fields.length) {
+      (0, import_errors.throwBadRequest)(`${options.blockContext} fieldsLayout requires fields[] on the same block`);
+    }
+    const rows = import_lodash.default.castArray(input.rows || []);
+    if (!rows.length) {
+      (0, import_errors.throwBadRequest)(`${options.blockContext} fieldsLayout.rows must be a non-empty array`);
+    }
+    const fieldKeys = new Set(options.fields.map((field) => field.key).filter(Boolean));
+    const mentioned = /* @__PURE__ */ new Set();
+    const normalizedRows = rows.map((row, rowIndex) => {
+      if (!Array.isArray(row) || !row.length) {
+        (0, import_errors.throwBadRequest)(`${options.blockContext} fieldsLayout row #${rowIndex + 1} must be a non-empty array`);
+      }
+      return row.map((cell, cellIndex) => {
+        const cellContext = `${options.blockContext} fieldsLayout row #${rowIndex + 1} cell #${cellIndex + 1}`;
+        const normalizedCell = this.normalizeComposeFieldsLayoutCell(cell, cellContext);
+        if (!fieldKeys.has(normalizedCell.key)) {
+          (0, import_errors.throwBadRequest)(`${cellContext} references unknown field '${normalizedCell.key}'`);
+        }
+        if (mentioned.has(normalizedCell.key)) {
+          (0, import_errors.throwBadRequest)(`${cellContext} duplicates field '${normalizedCell.key}'`);
+        }
+        mentioned.add(normalizedCell.key);
+        return normalizedCell.raw;
+      });
+    });
+    const missingFieldKeys = options.fields.map((field) => field.key).filter((key) => !mentioned.has(key));
+    if (missingFieldKeys.length) {
+      (0, import_errors.throwBadRequest)(
+        `${options.blockContext} fieldsLayout must place every field exactly once; missing: ${missingFieldKeys.join(
+          ", "
+        )}`
+      );
+    }
+    return {
+      rows: normalizedRows
+    };
+  }
+  normalizeComposeFieldsLayoutCell(cell, context) {
+    if (typeof cell === "string") {
+      const key2 = String(cell || "").trim();
+      if (!key2) {
+        (0, import_errors.throwBadRequest)(`${context} cannot be empty`);
+      }
+      return {
+        key: key2,
+        raw: key2
+      };
+    }
+    if (!import_lodash.default.isPlainObject(cell)) {
+      (0, import_errors.throwBadRequest)(`${context} must be a string or object`);
+    }
+    const key = String(cell.key || "").trim();
+    if (!key) {
+      (0, import_errors.throwBadRequest)(`${context}.key cannot be empty`);
+    }
+    return {
+      key,
+      raw: (0, import_service_utils.buildDefinedPayload)({
+        key,
+        span: import_lodash.default.isUndefined(cell.span) ? void 0 : import_lodash.default.isNumber(cell.span) ? cell.span : (0, import_errors.throwBadRequest)(`${context}.span must be a number`)
+      })
+    };
+  }
+  async applyDefaultActionsForCreatedBlock(input, options = {}) {
+    const descriptors = (0, import_default_block_actions.getFlowSurfaceDefaultBlockActions)({
+      blockType: input.blockType
+    });
+    for (const descriptor of descriptors) {
+      const actionValues = (0, import_service_utils.buildDefinedPayload)({
+        target: {
+          uid: input.blockUid
+        },
+        type: descriptor.type,
+        popup: descriptor.popup ? import_lodash.default.cloneDeep(descriptor.popup) : void 0
+      });
+      if (descriptor.scope === "actions") {
+        await this.addAction(actionValues, options);
+      } else {
+        await this.addRecordAction(actionValues, options);
+      }
+    }
+  }
   normalizeComposeBlock(input, index, enabledPackages) {
     if (!import_lodash.default.isPlainObject(input)) {
       (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} must be an object`);
@@ -7943,6 +8315,30 @@ class FlowSurfacesService {
     if (blockCatalogItem) {
       this.validateComposeActionGroups(blockCatalogItem.use, actions, recordActions, enabledPackages);
     }
+    const actionKeys = new Set(actions.map((item) => item.key).filter(Boolean));
+    const recordActionKeys = new Set(recordActions.map((item) => item.key).filter(Boolean));
+    const blockDescriptor = this.describeComposeBlock({
+      index: index + 1,
+      key,
+      type
+    });
+    const fieldsLayout = this.normalizeComposeFieldsLayout(input.fieldsLayout, {
+      blockContext: `flowSurfaces compose block #${index + 1}`,
+      blockDescriptor,
+      blockType: type,
+      fields
+    });
+    const mergedActions = (0, import_default_block_actions.mergeFlowSurfaceDefaultBlockActions)({
+      blockType: type,
+      template,
+      actions,
+      recordActions,
+      createAction: (descriptor) => this.buildInjectedComposeDefaultActionSpec(
+        descriptor,
+        descriptor.scope === "actions" ? actionKeys : recordActionKeys,
+        `flowSurfaces compose block #${index + 1}`
+      )
+    });
     return {
       index: index + 1,
       key,
@@ -7951,8 +8347,9 @@ class FlowSurfacesService {
       resource: this.normalizeResourceInput(input.resource),
       settings: import_lodash.default.isPlainObject(input.settings) ? input.settings : {},
       fields,
-      actions,
-      recordActions,
+      ...fieldsLayout ? { fieldsLayout } : {},
+      actions: mergedActions.actions,
+      recordActions: mergedActions.recordActions,
       template
     };
   }
@@ -9151,11 +9548,17 @@ class FlowSurfacesService {
       );
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "assigneesScope")) {
-      if (!["ProcessFormDelegateModel", "ProcessFormAddAssigneeModel"].includes(use)) {
+      if (!APPROVAL_REASSIGN_ACTION_USES.has(use)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support assigneesScope`);
       }
       import_lodash.default.set(stepParams, ["clickSettings", "saveResource", "assigneesScope"], import_lodash.default.cloneDeep(changes.assigneesScope || {}));
     }
+    if ((0, import_service_utils.hasOwnDefined)(changes, "commentFormUid")) {
+      if (!APPROVAL_COMMENT_ACTION_USES.has(use)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support commentFormUid`);
+      }
+      import_lodash.default.set(stepParams, ["clickSettings", "saveResource", "commentModelUid"], import_lodash.default.cloneDeep(changes.commentFormUid));
+    }
     if (!import_lodash.default.isUndefined(changes.openView)) {
       if (use === "UploadActionModel") {
         stepParams.selectExitRecordSettings = {
@@ -9174,6 +9577,11 @@ class FlowSurfacesService {
         stepParams.deleteSettings = {
           confirm: (0, import_service_utils.normalizeSimpleConfirm)(changes.confirm)
         };
+      } else if (APPROVAL_CONFIRM_ACTION_USES.has(use)) {
+        stepParams.clickSettings = {
+          ...stepParams.clickSettings || {},
+          confirm: (0, import_service_utils.normalizeSimpleConfirm)(changes.confirm)
+        };
       } else if (CONFIRMABLE_SUBMIT_ACTION_USES.has(use)) {
         stepParams.submitSettings = {
           confirm: (0, import_service_utils.normalizeSimpleConfirm)(changes.confirm)
@@ -9187,20 +9595,28 @@ class FlowSurfacesService {
       }
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "assignValues")) {
-      if (!["UpdateRecordActionModel", "BulkUpdateActionModel"].includes(use)) {
+      if (APPROVAL_ASSIGN_ACTION_USES.has(use)) {
+        stepParams.clickSettings = {
+          ...stepParams.clickSettings || {},
+          assignFieldValues: {
+            assignedValues: changes.assignValues
+          }
+        };
+      } else if (!["UpdateRecordActionModel", "BulkUpdateActionModel"].includes(use)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support assignValues`);
+      } else {
+        stepParams.assignSettings = {
+          ...stepParams.assignSettings || {},
+          assignFieldValues: {
+            assignedValues: changes.assignValues
+          }
+        };
+        stepParams.apply = {
+          apply: {
+            assignedValues: changes.assignValues
+          }
+        };
       }
-      stepParams.assignSettings = {
-        ...stepParams.assignSettings || {},
-        assignFieldValues: {
-          assignedValues: changes.assignValues
-        }
-      };
-      stepParams.apply = {
-        apply: {
-          assignedValues: changes.assignValues
-        }
-      };
     }
     if ((0, import_service_utils.hasOwnDefined)(changes, "editMode")) {
       if (use !== "BulkEditActionModel") {
@@ -10050,7 +10466,7 @@ class FlowSurfacesService {
   async resolveContextSemantic(uid2, resolved, transaction) {
     const collection = await this.resolveContextOwnerCollection(uid2, transaction).catch(() => null);
     const ancestors = await this.loadContextAncestorChain(uid2, resolved, transaction);
-    const recordContextOwner = ancestors.find((node) => RECORD_CONTEXT_OWNER_USES.has(node == null ? void 0 : node.use));
+    const recordContextOwner = ancestors.find((node) => RECORD_CONTEXT_OWNER_USES.has(node == null ? void 0 : node.use)) || this.resolveRecordActionContextOwner(ancestors);
     const recordCollection = recordContextOwner ? await this.resolveContextOwnerCollection(recordContextOwner.uid, transaction) : null;
     const formNode = ancestors.find((node) => FORM_BLOCK_USES.has(node == null ? void 0 : node.use));
     const formValuesCollection = this.resolveCollectionFromInit(
@@ -10086,6 +10502,13 @@ class FlowSurfacesService {
       chart: await this.buildChartContextSemantic(chartNode, transaction)
     };
   }
+  resolveRecordActionContextOwner(ancestors) {
+    const currentNode = ancestors[0];
+    if (!String((currentNode == null ? void 0 : currentNode.use) || "").endsWith("ActionModel")) {
+      return null;
+    }
+    return ancestors.slice(1).find((node) => (0, import_action_scope.getActionContainerScope)(node == null ? void 0 : node.use) === "record") || null;
+  }
   async loadContextAncestorChain(uid2, resolved, transaction) {
     const chain = [];
     const visited = /* @__PURE__ */ new Set();