@nocobase/plugin-flow-engine 2.1.0-alpha.29 → 2.1.0-alpha.30

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

@@ -165,6 +165,7 @@ const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
 ]);
 const TREE_CONNECT_TARGET_BLOCK_USES = new Set(FILTER_TARGET_BLOCK_USES);
 const EDITABLE_FIELD_WRAPPER_USES = /* @__PURE__ */ new Set(["FormItemModel", "FilterFormItemModel", "PatternFormItemModel"]);
+const REQUIRED_COLLECTION_FIELD_FORM_WRAPPER_USES = /* @__PURE__ */ new Set(["FormItemModel", "PatternFormItemModel"]);
 const DISPLAY_FIELD_WRAPPER_USES = /* @__PURE__ */ new Set([
   "DetailsItemModel",
   "TableColumnModel",
@@ -1418,11 +1419,24 @@ class FlowSurfacesService {
       filterByTk,
       associationName,
       sourceId,
+      sourceIdInferred: !(0, import_service_helpers.hasConfiguredFlowContextValue)(openView == null ? void 0 : openView.sourceId) && (0, import_service_helpers.hasConfiguredFlowContextValue)(sourceId) && this.isSameConfiguredFlowContextValue(sourceId, "{{ctx.view.inputArgs.sourceId}}"),
       hasCurrentRecord,
       hasAssociationContext,
       scene
     };
   }
+  resolvePopupCurrentRecordResourceFilterByTk(popupProfile, options = {}) {
+    if (!(popupProfile == null ? void 0 : popupProfile.currentCollection)) {
+      return popupProfile == null ? void 0 : popupProfile.filterByTk;
+    }
+    if (popupProfile.popupKind !== "associationPopup") {
+      return popupProfile.filterByTk;
+    }
+    if (options.usePopupInputArgsWhenSourceIdInferred && popupProfile.sourceIdInferred && popupProfile.popupHostUse && POPUP_ACTION_USES.has(popupProfile.popupHostUse)) {
+      return "{{ctx.view.inputArgs.filterByTk}}";
+    }
+    return `{{ctx.record.${this.getCollectionFilterTargetKey(popupProfile.currentCollection)}}}`;
+  }
   resolvePopupAssociationFields(popupProfile, blockUse) {
     var _a;
     if (!popupProfile.currentCollection || !popupProfile.hasCurrentRecord) {
@@ -1662,7 +1676,9 @@ class FlowSurfacesService {
       return (0, import_service_utils.buildDefinedPayload)({
         dataSourceKey: input.popupProfile.dataSourceKey || "main",
         collectionName: input.popupProfile.collectionName,
-        filterByTk: input.popupProfile.filterByTk,
+        filterByTk: this.resolvePopupCurrentRecordResourceFilterByTk(input.popupProfile, {
+          usePopupInputArgsWhenSourceIdInferred: true
+        }),
         ...preserveAssociationContext ? {
           associationName: input.popupProfile.associationName,
           sourceId: input.popupProfile.sourceId
@@ -2526,7 +2542,8 @@ class FlowSurfacesService {
       );
     }
     return (0, import_blueprint.compileFlowSurfaceApplyBlueprintRequest)(document, {
-      replaceTarget
+      replaceTarget,
+      getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey || "main", collectionName || "")
     });
   }
   async applyBlueprint(values, options = {}) {
@@ -2893,34 +2910,41 @@ class FlowSurfacesService {
       })
     );
   }
-  async assertPopupTemplateCompatibility(actionName, hostUid, template, transaction) {
+  async assertPopupTemplateCompatibility(actionName, hostUid, template, options = {}) {
     const normalizedHostUid = String(hostUid || "").trim();
     if (!normalizedHostUid) {
       return;
     }
     const hostNode = await this.repository.findModelById(normalizedHostUid, {
-      transaction,
+      transaction: options.transaction,
       includeAsyncNode: true
     });
     if (!(hostNode == null ? void 0 : hostNode.uid)) {
       return;
     }
-    const popupProfile = await this.resolvePopupBlockProfile(normalizedHostUid, null, hostNode, transaction).catch(
-      () => null
-    );
+    const popupProfile = await this.resolvePopupBlockProfile(
+      normalizedHostUid,
+      null,
+      hostNode,
+      options.transaction
+    ).catch(() => null);
     if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface)) {
       return;
     }
-    const disabledReason = await this.getPopupTemplateDisabledReason(template, {
-      target: { uid: normalizedHostUid },
-      resolved: {
-        uid: normalizedHostUid,
+    const disabledReason = await this.getPopupTemplateDisabledReason(
+      template,
+      {
         target: { uid: normalizedHostUid },
-        kind: "node"
+        resolved: {
+          uid: normalizedHostUid,
+          target: { uid: normalizedHostUid },
+          kind: "node"
+        },
+        node: hostNode,
+        popupProfile
       },
-      node: hostNode,
-      popupProfile
-    });
+      options.popupActionContext
+    );
     if (!disabledReason) {
       return;
     }
@@ -3123,6 +3147,67 @@ class FlowSurfacesService {
   buildPopupTemplateReferenceOpenView(template, templateTargetUid) {
     return this.buildPopupTemplateOpenView(template, "reference", templateTargetUid);
   }
+  shouldHydrateDetachedPopupTemplateBlockResourceContext(blockNode, context) {
+    if (!this.isCollectionBlockUse(blockNode == null ? void 0 : blockNode.use) || !context.associationName || !context.sourceId) {
+      return false;
+    }
+    const init = import_lodash.default.get(blockNode, ["stepParams", "resourceSettings", "init"]) || {};
+    const popupDataSourceKey = context.dataSourceKey || "main";
+    const blockDataSourceKey = init.dataSourceKey || "main";
+    if (!context.collectionName || blockDataSourceKey !== popupDataSourceKey || init.collectionName !== context.collectionName) {
+      return false;
+    }
+    const blockAssociationName = String(init.associationName || "").trim();
+    if (blockAssociationName && blockAssociationName !== context.associationName) {
+      return false;
+    }
+    if ((0, import_service_helpers.hasConfiguredFlowContextValue)(init.sourceId) && !this.isSameConfiguredFlowContextValue(init.sourceId, context.sourceId)) {
+      return false;
+    }
+    return blockAssociationName !== context.associationName || !this.isSameConfiguredFlowContextValue(init.sourceId, context.sourceId);
+  }
+  collectDetachedPopupTemplateBlockResourceContextPatches(node, context, patches = []) {
+    if (!node || typeof node !== "object") {
+      return patches;
+    }
+    if (node.uid && this.shouldHydrateDetachedPopupTemplateBlockResourceContext(node, context)) {
+      const nextStepParams = import_lodash.default.cloneDeep(node.stepParams || {});
+      const currentInit = import_lodash.default.get(nextStepParams, ["resourceSettings", "init"]) || {};
+      import_lodash.default.set(
+        nextStepParams,
+        ["resourceSettings", "init"],
+        (0, import_service_utils.buildDefinedPayload)({
+          ...currentInit,
+          dataSourceKey: context.dataSourceKey || currentInit.dataSourceKey || "main",
+          collectionName: context.collectionName || currentInit.collectionName,
+          associationName: context.associationName,
+          sourceId: context.sourceId
+        })
+      );
+      patches.push({
+        uid: node.uid,
+        stepParams: nextStepParams
+      });
+    }
+    for (const value of Object.values(node.subModels || {})) {
+      for (const child of import_lodash.default.castArray(value)) {
+        this.collectDetachedPopupTemplateBlockResourceContextPatches(child, context, patches);
+      }
+    }
+    return patches;
+  }
+  async hydrateDetachedPopupTemplateBlockResourceContext(detachedTarget, context, transaction) {
+    const patches = this.collectDetachedPopupTemplateBlockResourceContextPatches(detachedTarget, context);
+    for (const patch of patches) {
+      await this.repository.patch(
+        {
+          uid: patch.uid,
+          stepParams: patch.stepParams
+        },
+        { transaction }
+      );
+    }
+  }
   async hydrateDetachedPopupTemplateSourceContext(templateTargetUid, inferred, transaction) {
     if (inferred.templateType !== "popup") {
       return;
@@ -3139,32 +3224,32 @@ class FlowSurfacesService {
       return;
     }
     const resolvedOpenViewStep = (0, import_template_service_utils.findFlowTemplateOpenViewStep)(detachedTarget) || inferred.openViewStep;
-    if (!resolvedOpenViewStep) {
-      return;
-    }
-    const nextStepParams = import_lodash.default.cloneDeep(detachedTarget.stepParams || {});
-    const currentGroup = import_lodash.default.isPlainObject(nextStepParams[resolvedOpenViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[resolvedOpenViewStep.flowKey]) : {};
-    const currentOpenView = import_lodash.default.isPlainObject(currentGroup[resolvedOpenViewStep.stepKey]) ? import_lodash.default.omit((0, import_template_service_utils.stripTemplateInternalOpenViewFields)(currentGroup[resolvedOpenViewStep.stepKey]) || {}, ["uid"]) : {};
-    const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
-      ...currentOpenView,
-      dataSourceKey: inferred.dataSourceKey || currentOpenView.dataSourceKey,
-      collectionName: inferred.collectionName || currentOpenView.collectionName,
-      associationName: inferred.associationName || currentOpenView.associationName,
-      filterByTk: inferred.filterByTk || currentOpenView.filterByTk,
-      sourceId: inferred.sourceId || currentOpenView.sourceId
-    });
-    if (import_lodash.default.isEqual(nextOpenView, currentOpenView)) {
-      return;
+    if (resolvedOpenViewStep) {
+      const nextStepParams = import_lodash.default.cloneDeep(detachedTarget.stepParams || {});
+      const currentGroup = import_lodash.default.isPlainObject(nextStepParams[resolvedOpenViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[resolvedOpenViewStep.flowKey]) : {};
+      const currentOpenView = import_lodash.default.isPlainObject(currentGroup[resolvedOpenViewStep.stepKey]) ? import_lodash.default.omit((0, import_template_service_utils.stripTemplateInternalOpenViewFields)(currentGroup[resolvedOpenViewStep.stepKey]) || {}, ["uid"]) : {};
+      const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
+        ...currentOpenView,
+        dataSourceKey: inferred.dataSourceKey || currentOpenView.dataSourceKey,
+        collectionName: inferred.collectionName || currentOpenView.collectionName,
+        associationName: inferred.associationName || currentOpenView.associationName,
+        filterByTk: inferred.filterByTk || currentOpenView.filterByTk,
+        sourceId: inferred.sourceId || currentOpenView.sourceId
+      });
+      if (!import_lodash.default.isEqual(nextOpenView, currentOpenView)) {
+        currentGroup[resolvedOpenViewStep.stepKey] = nextOpenView;
+        nextStepParams[resolvedOpenViewStep.flowKey] = currentGroup;
+        await this.repository.patch(
+          {
+            uid: detachedTarget.uid,
+            stepParams: nextStepParams
+          },
+          { transaction }
+        );
+        detachedTarget.stepParams = nextStepParams;
+      }
     }
-    currentGroup[resolvedOpenViewStep.stepKey] = nextOpenView;
-    nextStepParams[resolvedOpenViewStep.flowKey] = currentGroup;
-    await this.repository.patch(
-      {
-        uid: detachedTarget.uid,
-        stepParams: nextStepParams
-      },
-      { transaction }
-    );
+    await this.hydrateDetachedPopupTemplateBlockResourceContext(detachedTarget, inferred, transaction);
   }
   async clearFlowTemplateUsagesByModelUids(modelUids, transaction) {
     const usageRepo = this.getFlowTemplateUsageRepositorySafe();
@@ -3381,7 +3466,7 @@ class FlowSurfacesService {
     }
     const nextStepParams = import_lodash.default.cloneDeep(sourceNode.stepParams || {});
     const currentGroup = import_lodash.default.isPlainObject(nextStepParams[openViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[openViewStep.flowKey]) : {};
-    currentGroup[openViewStep.stepKey] = {
+    let nextOpenView = {
       ...import_lodash.default.omit(openViewStep.openView || {}, [
         "popupTemplateUid",
         "popupTemplateMode",
@@ -3391,6 +3476,10 @@ class FlowSurfacesService {
       ]),
       ...this.buildPopupTemplateReferenceOpenView(template, templateTargetUid)
     };
+    if (String(sourceNode.use || "").trim() === "AddChildActionModel") {
+      nextOpenView = await this.normalizeAddChildOpenViewForAction(sourceNode, nextOpenView, transaction);
+    }
+    currentGroup[openViewStep.stepKey] = nextOpenView;
     nextStepParams[openViewStep.flowKey] = currentGroup;
     await this.cleanupLocalPopupSurfaceForHost(sourceNode.uid, transaction, sourceNode);
     await this.repository.patch(
@@ -3682,6 +3771,13 @@ class FlowSurfacesService {
         ]),
         ...this.buildPopupTemplateOpenView(resolved.template, "copy", popupUid)
       };
+      if (String(node.use || "").trim() === "AddChildActionModel") {
+        currentGroup[resolved.openViewStep.stepKey] = await this.normalizeAddChildOpenViewForAction(
+          node,
+          currentGroup[resolved.openViewStep.stepKey],
+          options.transaction
+        );
+      }
       nextStepParams[resolved.openViewStep.flowKey] = currentGroup;
       await this.cleanupLocalPopupSurfaceForHost(node.uid, options.transaction, node);
       await this.repository.patch(
@@ -5128,6 +5224,7 @@ class FlowSurfacesService {
       use: catalogItem.use,
       containerUse: parentNode == null ? void 0 : parentNode.use,
       resourceInit: effectiveResourceInit,
+      enableDefaultSorting: this.shouldEnableCreatedAtDefaultSorting(effectiveResourceInit),
       props: blockProps,
       decoratorProps: values.decoratorProps,
       stepParams: catalogItem.use === "CalendarBlockModel" ? this.buildCalendarInitialStepParams({
@@ -5482,6 +5579,7 @@ class FlowSurfacesService {
       collectionName: resolvedField.collectionName,
       fieldPath: resolvedField.fieldPath,
       associationPathName: resolvedField.associationPathName,
+      ...(0, import_service_utils.hasOwnDefined)(values, "titleField") ? { explicitTitleField: values.titleField } : {},
       bindingChange: true,
       hasExistingTitleField: false,
       enabledPackages
@@ -5605,6 +5703,10 @@ class FlowSurfacesService {
       boundFieldCapability.fieldUse,
       values.fieldProps || {}
     );
+    const requiredFieldWrapperDefaults = this.buildRequiredCollectionFieldFormWrapperDefaults({
+      wrapperUse: boundFieldCapability.wrapperUse,
+      field: resolvedField.field
+    });
     const tree = (0, import_builder.buildFieldTree)({
       wrapperUse: boundFieldCapability.wrapperUse,
       fieldUse: boundFieldCapability.fieldUse,
@@ -5617,6 +5719,7 @@ class FlowSurfacesService {
         {},
         defaultFieldState.wrapperProps || {},
         wrapperShouldPersistTitleField ? { titleField: defaultTitleField } : {},
+        requiredFieldWrapperDefaults.props,
         values.wrapperProps || {}
       ),
       fieldProps: import_lodash.default.merge(
@@ -5627,6 +5730,18 @@ class FlowSurfacesService {
       )
     });
     this.contractGuard.validateNodeTreeAgainstContract(tree.model);
+    if (wrapperShouldPersistTitleField && boundFieldCapability.wrapperUse === "TableColumnModel") {
+      tree.model.stepParams = import_lodash.default.merge({}, tree.model.stepParams || {}, {
+        tableColumnSettings: {
+          fieldNames: {
+            label: defaultTitleField
+          }
+        }
+      });
+    }
+    if (requiredFieldWrapperDefaults.stepParams) {
+      tree.model.stepParams = import_lodash.default.merge({}, tree.model.stepParams || {}, requiredFieldWrapperDefaults.stepParams);
+    }
     await this.repository.upsertModel(
       {
         parentId: container.parentUid,
@@ -5816,10 +5931,11 @@ class FlowSurfacesService {
     });
     const materializedContainer = await this.materializeRecordActionContainer(container, options.transaction);
     const resourceContext = container.ownerUid ? await this.locator.resolveCollectionContext(container.ownerUid, options.transaction).catch(() => null) : null;
+    const resourceInit = this.isAddChildCatalogItem(actionCatalogItem) ? await this.resolveAddChildResourceInitForOwnerNode(container.ownerNode, options.transaction) : values.resourceInit || (resourceContext == null ? void 0 : resourceContext.resourceInit);
     const action = (0, import_builder.buildActionTree)({
       use: actionCatalogItem.use,
       containerUse: container.containerUse,
-      resourceInit: values.resourceInit || (resourceContext == null ? void 0 : resourceContext.resourceInit),
+      resourceInit,
       props: values.props,
       decoratorProps: values.decoratorProps,
       stepParams: values.stepParams,
@@ -6111,7 +6227,8 @@ class FlowSurfacesService {
     const availableAliases = new Set(popupTemplateAliasSession ? popupTemplateAliasSession.keys() : []);
     document.tabs.forEach((tab, tabIndex) => {
       const composeValues = (0, import_compile_blocks.compileTabComposeValues)(tab, document, tabIndex, {
-        mode: document.mode === "replace" ? "replace" : "append"
+        mode: document.mode === "replace" ? "replace" : "append",
+        getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey || "main", collectionName || "")
       });
       this.validatePopupTemplateAliasesInBlocks(
         import_lodash.default.castArray(composeValues.blocks || []),
@@ -6129,6 +6246,21 @@ class FlowSurfacesService {
     }
     return settings;
   }
+  shouldEnableCreatedAtDefaultSorting(resourceInit) {
+    const collectionName = String((resourceInit == null ? void 0 : resourceInit.collectionName) || "").trim();
+    if (!collectionName) {
+      return false;
+    }
+    const dataSourceKey = String((resourceInit == null ? void 0 : resourceInit.dataSourceKey) || "main").trim() || "main";
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    return !!(0, import_service_helpers.resolveFieldFromCollection)(collection, "createdAt");
+  }
+  normalizeBlockSortingInput(value, context) {
+    return (0, import_public_compatibility.normalizeFlowSurfaceDefaultSorting)(value, context);
+  }
+  normalizeMapSortingInput(value, context) {
+    return (0, import_public_compatibility.normalizeFlowSurfaceEmptySortingAsDefault)(value, context);
+  }
   normalizeInlinePopup(actionName, popup) {
     if (import_lodash.default.isUndefined(popup)) {
       return void 0;
@@ -6289,6 +6421,9 @@ class FlowSurfacesService {
   }
   resolveDefaultActionPopupSemanticUse(use) {
     const normalizedUse = String(use || "").trim();
+    if (normalizedUse === "AddChildActionModel") {
+      return "AddNewActionModel";
+    }
     if (normalizedUse === "CalendarQuickCreateActionModel") {
       return "AddNewActionModel";
     }
@@ -6500,13 +6635,16 @@ class FlowSurfacesService {
     return ["-updatedAt", "-createdAt", "uid"];
   }
   getPopupTryTemplateExpectedAssociationName(targetContext) {
-    var _a, _b, _c;
-    if ((_a = targetContext == null ? void 0 : targetContext.popupProfile) == null ? void 0 : _a.isPopupSurface) {
+    var _a, _b, _c, _d, _e;
+    if (String(((_a = targetContext == null ? void 0 : targetContext.node) == null ? void 0 : _a.use) || "").trim() === "AddChildActionModel") {
+      return String(((_b = this.resolvePopupHostOpenView(targetContext.node)) == null ? void 0 : _b.associationName) || "").trim() || void 0;
+    }
+    if ((_c = targetContext == null ? void 0 : targetContext.popupProfile) == null ? void 0 : _c.isPopupSurface) {
       return String(targetContext.popupProfile.associationName || "").trim() || void 0;
     }
-    return String(((_c = (_b = targetContext == null ? void 0 : targetContext.resourceContext) == null ? void 0 : _b.resourceInit) == null ? void 0 : _c.associationName) || "").trim() || void 0;
+    return String(((_e = (_d = targetContext == null ? void 0 : targetContext.resourceContext) == null ? void 0 : _d.resourceInit) == null ? void 0 : _e.associationName) || "").trim() || void 0;
   }
-  getPopupTryTemplatePriority(template, expectedAssociationName) {
+  getPopupTryTemplatePriority(template, expectedAssociationName, options = {}) {
     const templateAssociationName = String(template.associationName || "").trim() || void 0;
     if (!expectedAssociationName) {
       return templateAssociationName ? null : 0;
@@ -6514,11 +6652,18 @@ class FlowSurfacesService {
     if (templateAssociationName === expectedAssociationName) {
       return 0;
     }
+    if (options.requireExactAssociationName) {
+      return null;
+    }
     if (!templateAssociationName) {
       return 1;
     }
     return null;
   }
+  shouldRequireExactPopupTryTemplateAssociation(targetContext) {
+    var _a;
+    return String(((_a = targetContext == null ? void 0 : targetContext.node) == null ? void 0 : _a.use) || "").trim() === "AddChildActionModel" && !!this.getPopupTryTemplateExpectedAssociationName(targetContext);
+  }
   getRequestedPopupDefaultType(popup) {
     const normalized = String((popup == null ? void 0 : popup.defaultType) || "").trim();
     if (normalized === "view" || normalized === "edit") {
@@ -6625,9 +6770,12 @@ class FlowSurfacesService {
       targetContext,
       options.popupActionContext
     );
+    const requireExactAssociationName = this.shouldRequireExactPopupTryTemplateAssociation(targetContext);
     for (const priority of [0, 1]) {
       for (const template of annotatedTemplates) {
-        if (template.available !== true || this.getPopupTryTemplatePriority(template, expectedAssociationName) !== priority) {
+        if (template.available !== true || this.getPopupTryTemplatePriority(template, expectedAssociationName, {
+          requireExactAssociationName
+        }) !== priority) {
           continue;
         }
         if (await this.popupTemplateMatchesDefaultType(template, popup, {
@@ -6802,12 +6950,10 @@ class FlowSurfacesService {
         transaction: options.transaction,
         expectedType: "popup"
       });
-      await this.assertPopupTemplateCompatibility(
-        actionName,
-        options.popupTemplateHostUid,
-        template,
-        options.transaction
-      );
+      await this.assertPopupTemplateCompatibility(actionName, options.popupTemplateHostUid, template, {
+        transaction: options.transaction,
+        popupActionContext: options.popupActionContext
+      });
       const resolvedUid = templateRef.mode === "copy" ? String(
         ((_a = await this.duplicateDetachedFlowModelTree(actionName, template.targetUid, options.transaction)) == null ? void 0 : _a.uid) || ""
       ) : template.targetUid;
@@ -6820,12 +6966,15 @@ class FlowSurfacesService {
       if (templateRef.mode === "copy") {
         await this.ensurePopupSurface(resolvedUid, options.transaction);
       }
-      const nextTemplateOpenView = this.buildPopupTemplateOpenView(template, templateRef.mode, resolvedUid);
+      let nextTemplateOpenView = this.buildPopupTemplateOpenView(template, templateRef.mode, resolvedUid);
       Object.keys(normalizedOpenView).forEach((key) => {
         if (key === "template" || key === "popupTemplateUid" || key === "popupTemplateMode" || key === "popupTemplateContext" || key === "popupTemplateHasFilterByTk" || key === "popupTemplateHasSourceId") {
           delete normalizedOpenView[key];
         }
       });
+      if (String(options.popupTemplateHostUse || "").trim() === "AddChildActionModel") {
+        nextTemplateOpenView = import_lodash.default.omit(nextTemplateOpenView, ["sourceId"]);
+      }
       Object.assign(normalizedOpenView, nextTemplateOpenView);
     }
     if (!import_lodash.default.isUndefined(normalizedOpenView.uid)) {
@@ -7896,15 +8045,27 @@ class FlowSurfacesService {
       return;
     }
     const currentOpenView = import_lodash.default.isPlainObject(openViewStep.openView) ? openViewStep.openView : {};
-    if (this.normalizeOptionalPopupTitle(currentOpenView.title) === openViewTitle) {
+    const popupProfile = await this.resolvePopupBlockProfile(
+      actionNode.uid,
+      null,
+      actionNode,
+      options.transaction
+    ).catch(() => null);
+    const filterTargetKey = (popupProfile == null ? void 0 : popupProfile.currentCollection) ? this.getCollectionFilterTargetKey(popupProfile.currentCollection) : null;
+    const defaultFilterByTk = this.resolvePopupCurrentRecordResourceFilterByTk(popupProfile);
+    const currentFilterByTk = import_lodash.default.isString(currentOpenView.filterByTk) ? currentOpenView.filterByTk.trim() : "";
+    const preserveCustomFilterByTk = currentFilterByTk && currentFilterByTk !== "{{ctx.view.inputArgs.filterByTk}}" && currentFilterByTk !== (filterTargetKey ? `{{ctx.record.${filterTargetKey}}}` : "");
+    const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
+      ...currentOpenView,
+      title: openViewTitle,
+      filterByTk: preserveCustomFilterByTk ? currentOpenView.filterByTk : defaultFilterByTk || currentOpenView.filterByTk
+    });
+    if (import_lodash.default.isEqual(nextOpenView, currentOpenView)) {
       return;
     }
     const nextStepParams = import_lodash.default.cloneDeep((actionNode == null ? void 0 : actionNode.stepParams) || {});
     const currentGroup = import_lodash.default.isPlainObject(nextStepParams[openViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[openViewStep.flowKey]) : {};
-    currentGroup[openViewStep.stepKey] = (0, import_service_utils.buildDefinedPayload)({
-      ...currentOpenView,
-      title: openViewTitle
-    });
+    currentGroup[openViewStep.stepKey] = nextOpenView;
     nextStepParams[openViewStep.flowKey] = currentGroup;
     await this.repository.patch(
       {
@@ -7939,12 +8100,16 @@ class FlowSurfacesService {
     const nextStepParams = import_lodash.default.cloneDeep(actionNode.stepParams || {});
     const currentGroup = import_lodash.default.isPlainObject(nextStepParams[flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[flowKey]) : {};
     const currentGroupOpenView = import_lodash.default.isPlainObject(currentGroup[stepKey]) ? currentGroup[stepKey] : {};
+    const filterTargetKey = (popupProfile == null ? void 0 : popupProfile.currentCollection) ? this.getCollectionFilterTargetKey(popupProfile.currentCollection) : null;
+    const currentFilterByTk = import_lodash.default.isString(currentGroupOpenView == null ? void 0 : currentGroupOpenView.filterByTk) ? currentGroupOpenView.filterByTk.trim() : "";
+    const defaultFilterByTk = this.resolvePopupCurrentRecordResourceFilterByTk(popupProfile);
+    const preserveCustomFilterByTk = currentFilterByTk && currentFilterByTk !== "{{ctx.view.inputArgs.filterByTk}}" && currentFilterByTk !== "{{ctx.record." + filterTargetKey + "}}";
     const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
       ...currentGroupOpenView,
       dataSourceKey: (currentOpenView == null ? void 0 : currentOpenView.dataSourceKey) || (popupProfile == null ? void 0 : popupProfile.dataSourceKey) || "main",
       collectionName,
       associationName: (currentOpenView == null ? void 0 : currentOpenView.associationName) || (popupProfile == null ? void 0 : popupProfile.associationName),
-      filterByTk: (popupProfile == null ? void 0 : popupProfile.filterByTk) || "{{ctx.view.inputArgs.filterByTk}}",
+      filterByTk: preserveCustomFilterByTk ? currentGroupOpenView.filterByTk : defaultFilterByTk || (popupProfile == null ? void 0 : popupProfile.filterByTk) || "{{ctx.view.inputArgs.filterByTk}}",
       sourceId: (currentOpenView == null ? void 0 : currentOpenView.sourceId) || (popupProfile == null ? void 0 : popupProfile.sourceId)
     });
     if (import_lodash.default.isEqual(nextOpenView, currentGroupOpenView)) {
@@ -8053,6 +8218,12 @@ class FlowSurfacesService {
           openViewActionName: actionName
         }
       );
+      if (this.isDefaultActionPopupUseForNode(actionNode)) {
+        await this.syncDefaultActionPopupOpenViewTitle(actionUid, actionNode, {
+          ...options,
+          openViewTitle: templateOpenViewTitle
+        });
+      }
       this.registerInlinePopupTemplateAlias(actionName, popup, matchedTemplate, options.popupTemplateAliasSession);
       return;
     }
@@ -8149,6 +8320,7 @@ class FlowSurfacesService {
     );
     this.syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncKanbanPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
+    this.syncDefaultSortingForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncFilterActionSettingsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncMirroredStepParamsForUpdateSettings(current, nextPayload);
     const updateActionAssignedValues = this.syncUpdateActionAssignedValuesForUpdateSettings(
@@ -8164,6 +8336,7 @@ class FlowSurfacesService {
       {
         transaction: options.transaction,
         popupTemplateHostUid: options.popupTemplateHostUid,
+        popupTemplateHostUse: current == null ? void 0 : current.use,
         popupActionContext
       }
     );
@@ -8327,6 +8500,68 @@ class FlowSurfacesService {
       }
     }
   }
+  syncDefaultSortingForUpdateSettings(current, normalizedValues, nextPayload) {
+    if (!import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.stepParams)) {
+      return;
+    }
+    const currentUse = current == null ? void 0 : current.use;
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    let changed = false;
+    const normalizeGroupSort = (groupPath, context) => {
+      const currentGroup = import_lodash.default.get(nextStepParams, groupPath);
+      if (!import_lodash.default.isPlainObject(currentGroup)) {
+        return;
+      }
+      if (!import_lodash.default.has(normalizedValues.stepParams, [...groupPath, "defaultSorting", "sort"])) {
+        return;
+      }
+      const defaultSorting = import_lodash.default.get(currentGroup, ["defaultSorting", "sort"]);
+      const normalizedSort = (0, import_public_compatibility.normalizeFlowSurfaceDefaultSorting)(defaultSorting, context);
+      if (import_lodash.default.isEqual(defaultSorting, normalizedSort)) {
+        return;
+      }
+      import_lodash.default.set(nextStepParams, [...groupPath, "defaultSorting", "sort"], normalizedSort);
+      changed = true;
+    };
+    if (currentUse === "TableBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "tableSettings")) {
+      normalizeGroupSort(["tableSettings"], "tableSettings.defaultSorting.sort");
+    }
+    if (currentUse === "DetailsBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "detailsSettings")) {
+      normalizeGroupSort(["detailsSettings"], "detailsSettings.defaultSorting.sort");
+    }
+    if (currentUse === "ListBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "listSettings")) {
+      normalizeGroupSort(["listSettings"], "listSettings.defaultSorting.sort");
+    }
+    if (currentUse === "GridCardBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "GridCardSettings")) {
+      normalizeGroupSort(["GridCardSettings"], "GridCardSettings.defaultSorting.sort");
+    }
+    if (currentUse === "TreeBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "treeSettings")) {
+      normalizeGroupSort(["treeSettings"], "treeSettings.defaultSorting.sort");
+    }
+    if (currentUse === "KanbanBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "kanbanSettings")) {
+      normalizeGroupSort(["kanbanSettings"], "kanbanSettings.defaultSorting.sort");
+    }
+    if (currentUse === "MapBlockModel" && Object.prototype.hasOwnProperty.call(normalizedValues.stepParams, "createMapBlock")) {
+      const createMapBlock = import_lodash.default.get(nextStepParams, ["createMapBlock"]);
+      if (import_lodash.default.isPlainObject(createMapBlock)) {
+        if (!import_lodash.default.has(normalizedValues.stepParams, ["createMapBlock", "lineSort", "sort"])) {
+          return;
+        }
+        const defaultSorting = import_lodash.default.get(createMapBlock, ["lineSort", "sort"]);
+        const normalizedSort = (0, import_public_compatibility.normalizeFlowSurfaceEmptySortingAsDefault)(
+          defaultSorting,
+          "createMapBlock.lineSort.sort"
+        );
+        if (!import_lodash.default.isEqual(defaultSorting, normalizedSort)) {
+          import_lodash.default.set(nextStepParams, ["createMapBlock", "lineSort", "sort"], normalizedSort);
+          changed = true;
+        }
+      }
+    }
+    if (changed) {
+      nextPayload.stepParams = nextStepParams;
+    }
+  }
   syncKanbanPopupPropsForUpdateSettings(current, normalizedValues, nextPayload) {
     if (!import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.props)) {
       return;
@@ -8500,7 +8735,7 @@ class FlowSurfacesService {
         continue;
       }
       nextStepParams = nextStepParams ?? import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
-      if (import_lodash.default.has(nextStepParams, mirror.stepParamsPath)) {
+      if (import_lodash.default.has(nextStepParams, mirror.stepParamsPath) && (!import_lodash.default.isEqual(import_lodash.default.get(current == null ? void 0 : current.stepParams, mirror.stepParamsPath), import_lodash.default.get(current == null ? void 0 : current[mirror.domain], mirror.key)) || !import_lodash.default.isEqual(import_lodash.default.get(nextStepParams, mirror.stepParamsPath), import_lodash.default.get(current == null ? void 0 : current.stepParams, mirror.stepParamsPath)))) {
         continue;
       }
       import_lodash.default.set(nextStepParams, mirror.stepParamsPath, value);
@@ -8776,11 +9011,15 @@ class FlowSurfacesService {
       }
       const requestedOpenView = import_lodash.default.get(nextPayload, openViewPath);
       const currentOpenView = import_lodash.default.get(current, openViewPath);
-      const nextOpenView = await this.normalizeOpenView(actionName, requestedOpenView, {
+      let nextOpenView = await this.normalizeOpenView(actionName, requestedOpenView, {
         transaction: options.transaction,
         popupTemplateHostUid,
+        popupTemplateHostUse: options.popupTemplateHostUse || (current == null ? void 0 : current.use),
         popupActionContext: options.popupActionContext
       });
+      if (flowKey === "popupSettings" && String((current == null ? void 0 : current.use) || "").trim() === "AddChildActionModel" && import_lodash.default.isPlainObject(nextOpenView)) {
+        nextOpenView = await this.normalizeAddChildOpenViewForAction(current, nextOpenView, options.transaction);
+      }
       if (this.isTryTemplateOnlyOpenViewRequest(requestedOpenView) && import_lodash.default.isPlainObject(nextOpenView) && !Object.keys(nextOpenView).length) {
         this.unsetPayloadPathAndPruneEmptyParents(nextPayload, openViewPath);
         if (import_lodash.default.isEqual(nextPayload.stepParams, current.stepParams)) {
@@ -9814,6 +10053,19 @@ class FlowSurfacesService {
   isAddChildCatalogItem(item) {
     return (item == null ? void 0 : item.key) === "addChild" || (item == null ? void 0 : item.use) === "AddChildActionModel";
   }
+  resolveTreeChildrenField(collection) {
+    return (0, import_service_helpers.getCollectionFields)(collection).find(
+      (field) => {
+        var _a;
+        return (field == null ? void 0 : field.treeChildren) === true || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.treeChildren) === true;
+      }
+    );
+  }
+  resolveTreeChildrenAssociationName(collection) {
+    const collectionName = (0, import_service_helpers.getCollectionName)(collection);
+    const childrenFieldName = (0, import_service_helpers.getFieldName)(this.resolveTreeChildrenField(collection));
+    return collectionName && childrenFieldName ? `${collectionName}.${childrenFieldName}` : void 0;
+  }
   isTreeCollection(collection) {
     var _a;
     return (collection == null ? void 0 : collection.template) === "tree" || ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.template) === "tree" || (collection == null ? void 0 : collection.tree) === true;
@@ -9835,11 +10087,49 @@ class FlowSurfacesService {
       includeAsyncNode: true
     }) || node;
   }
-  async resolveOwnerCollectionForAddChild(node, transaction) {
+  async resolveAddChildOwnerResourceContext(node, transaction) {
     var _a;
     const ownerNode = await this.resolveAddChildOwnerNode(node, transaction);
     const resourceInit = import_lodash.default.get(ownerNode, ["stepParams", "resourceSettings", "init"]) || ((ownerNode == null ? void 0 : ownerNode.uid) ? (_a = await this.locator.resolveCollectionContext(ownerNode.uid, transaction).catch(() => null)) == null ? void 0 : _a.resourceInit : null);
-    return this.resolveCollectionFromInit(resourceInit);
+    return {
+      ownerNode,
+      resourceInit,
+      collection: this.resolveCollectionFromInit(resourceInit)
+    };
+  }
+  async resolveOwnerCollectionForAddChild(node, transaction) {
+    return (await this.resolveAddChildOwnerResourceContext(node, transaction)).collection;
+  }
+  async resolveAddChildResourceInitForOwnerNode(node, transaction) {
+    const { resourceInit, collection } = await this.resolveAddChildOwnerResourceContext(node, transaction);
+    const associationName = this.resolveTreeChildrenAssociationName(collection);
+    if (!associationName) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces addRecordAction type 'addChild' cannot resolve tree children association for '${String((resourceInit == null ? void 0 : resourceInit.collectionName) || "").trim() || "unknown"}'`
+      );
+    }
+    return (0, import_service_utils.buildDefinedPayload)({
+      dataSourceKey: (resourceInit == null ? void 0 : resourceInit.dataSourceKey) || "main",
+      collectionName: resourceInit == null ? void 0 : resourceInit.collectionName,
+      associationName
+    });
+  }
+  async normalizeAddChildOpenViewForAction(actionNode, openView, transaction) {
+    if (!import_lodash.default.isPlainObject(openView)) {
+      return openView;
+    }
+    const parentUid = String((actionNode == null ? void 0 : actionNode.parentId) || "").trim() || ((actionNode == null ? void 0 : actionNode.uid) ? await this.locator.findParentUid(actionNode.uid, transaction).catch(() => "") : "");
+    const parentNode = parentUid ? await this.repository.findModelById(parentUid, {
+      transaction,
+      includeAsyncNode: true
+    }) : null;
+    const addChildResourceInit = await this.resolveAddChildResourceInitForOwnerNode(parentNode, transaction);
+    return (0, import_service_utils.buildDefinedPayload)({
+      ...import_lodash.default.omit(import_lodash.default.cloneDeep(openView), ["sourceId"]),
+      dataSourceKey: addChildResourceInit.dataSourceKey,
+      collectionName: addChildResourceInit.collectionName,
+      associationName: addChildResourceInit.associationName
+    });
   }
   async canUseAddChildOnOwnerNode(node, transaction) {
     const ownerNode = await this.resolveAddChildOwnerNode(node, transaction);
@@ -9847,15 +10137,26 @@ class FlowSurfacesService {
       return false;
     }
     const collection = await this.resolveOwnerCollectionForAddChild(ownerNode, transaction);
-    return this.isTreeCollection(collection);
+    return this.isTreeCollection(collection) && !!this.resolveTreeChildrenAssociationName(collection);
   }
   async assertAddChildSupportedForOwnerNode(node, context, transaction) {
-    if (await this.canUseAddChildOnOwnerNode(node, transaction)) {
-      return;
+    const ownerNode = await this.resolveAddChildOwnerNode(node, transaction);
+    if ((ownerNode == null ? void 0 : ownerNode.use) !== "TableBlockModel" || !this.isTreeTableEnabled(ownerNode)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${context} type 'addChild' only supports tables bound to tree collections with tree table enabled`
+      );
+    }
+    const collection = await this.resolveOwnerCollectionForAddChild(ownerNode, transaction);
+    if (!this.isTreeCollection(collection)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${context} type 'addChild' only supports tables bound to tree collections with tree table enabled`
+      );
+    }
+    if (!this.resolveTreeChildrenAssociationName(collection)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${context} type 'addChild' tree collection '${(0, import_service_helpers.getCollectionName)(collection) || "unknown"}' does not expose a tree children field`
+      );
     }
-    (0, import_errors.throwBadRequest)(
-      `flowSurfaces ${context} type 'addChild' only supports tables bound to tree collections with tree table enabled`
-    );
   }
   async filterTargetRecordActions(items, node, transaction) {
     if (!items.some((item) => this.isAddChildCatalogItem(item))) {
@@ -10738,7 +11039,11 @@ class FlowSurfacesService {
               ...(0, import_service_utils.hasOwnDefined)(changes, "density") ? { tableDensity: { size: changes.density } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "quickEdit") ? { quickEdit: { editable: changes.quickEdit } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "showRowNumbers") ? { showRowNumbers: { showIndex: changes.showRowNumbers } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                defaultSorting: {
+                  sort: this.normalizeBlockSortingInput(changes.sorting, "tableSettings.sorting")
+                }
+              } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "treeTable") ? { treeTable: { treeTable: changes.treeTable } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "defaultExpandAllRows") ? { defaultExpandAllRows: { defaultExpandAllRows: changes.defaultExpandAllRows } } : {},
@@ -10937,7 +11242,11 @@ class FlowSurfacesService {
               ...(0, import_service_utils.hasOwnDefined)(changes, "titleField") ? { titleField: { titleField: nextFieldNames.title } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: { pageSize: changes.pageSize } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {}
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                defaultSorting: {
+                  sort: this.normalizeBlockSortingInput(changes.sorting, "treeSettings.sorting")
+                }
+              } : {}
             })
           } : {}
         }
@@ -11161,7 +11470,7 @@ class FlowSurfacesService {
         groupOptions: nextGroupOptions || []
       } : {},
       ...(0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? { styleVariant: nextStyleVariantProp } : {},
-      ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { globalSort: changes.sorting } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { globalSort: this.normalizeBlockSortingInput(changes.sorting, "kanban.globalSort") } : {},
       ...shouldWriteDrag ? {
         dragEnabled: nextDragEnabled,
         dragSortBy: nextDragSortBy ?? null
@@ -11196,7 +11505,7 @@ class FlowSurfacesService {
           } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
             defaultSorting: {
-              sort: changes.sorting
+              sort: this.normalizeBlockSortingInput(changes.sorting, "kanbanSettings.defaultSorting.sort")
             }
           } : {},
           ...shouldWriteDrag ? {
@@ -11435,7 +11744,11 @@ class FlowSurfacesService {
                   colon: changes.colon
                 })
               } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                defaultSorting: {
+                  sort: this.normalizeBlockSortingInput(changes.sorting, "detailsSettings.sorting")
+                }
+              } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
             })
@@ -11505,7 +11818,11 @@ class FlowSurfacesService {
             listSettings: (0, import_service_utils.buildDefinedPayload)({
               ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: { pageSize: changes.pageSize } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                defaultSorting: {
+                  sort: this.normalizeBlockSortingInput(changes.sorting, "listSettings.sorting")
+                }
+              } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "layout") ? { layout: { layout: layoutValue } } : {}
             })
           } : {}
@@ -11535,7 +11852,11 @@ class FlowSurfacesService {
               ...columns ? { columnCount: { columnCount: columns } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "rowCount") ? { rowCount: { rowCount: changes.rowCount } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                defaultSorting: {
+                  sort: this.normalizeBlockSortingInput(changes.sorting, "GridCardSettings.sorting")
+                }
+              } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "layout") ? { layout: { layout: layoutValue } } : {}
             })
           } : {}
@@ -11712,7 +12033,11 @@ class FlowSurfacesService {
                 })
               } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { lineSort: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+                lineSort: {
+                  sort: this.normalizeMapSortingInput(changes.sorting, "createMapBlock.lineSort.sort")
+                }
+              } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "zoom") ? { mapZoom: { zoom: changes.zoom } } : {}
             })
           } : {}
@@ -12277,6 +12602,10 @@ class FlowSurfacesService {
     return import_lodash.default.cloneDeep(value);
   }
   async configureActionNode(target, use, changes, options) {
+    const currentNode = options.current || (target.uid ? await this.repository.findModelById(target.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    }) : null);
     changes = await this.normalizeActionPanelActionChanges(changes, options);
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
     (0, import_service_utils.assertSupportedSimpleChanges)("action", changes, allowedKeys);
@@ -12344,8 +12673,12 @@ class FlowSurfacesService {
       } else if (!POPUP_ACTION_USES.has(use)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support openView`);
       } else {
+        let openView = import_lodash.default.cloneDeep(changes.openView);
+        if (use === "AddChildActionModel") {
+          openView = await this.normalizeAddChildOpenViewForAction(currentNode, openView, options.transaction);
+        }
         stepParams.popupSettings = {
-          openView: import_lodash.default.cloneDeep(changes.openView)
+          openView
         };
       }
     }
@@ -12474,24 +12807,25 @@ class FlowSurfacesService {
         })
       };
     }
+    const props = (0, import_service_utils.buildDefinedPayload)({
+      title: changes.title,
+      tooltip: changes.tooltip,
+      icon: changes.icon,
+      type: changes.type,
+      htmlType: changes.htmlType,
+      position: changes.position,
+      danger: changes.danger,
+      color: changes.color,
+      ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? { filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames) } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
+        defaultFilterValue: normalizedDefaultFilter,
+        filterValue: import_lodash.default.cloneDeep(normalizedDefaultFilter)
+      } : {}
+    });
     return this.updateSettings(
       {
         target,
-        props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          tooltip: changes.tooltip,
-          icon: changes.icon,
-          type: changes.type,
-          htmlType: changes.htmlType,
-          position: changes.position,
-          danger: changes.danger,
-          color: changes.color,
-          ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? { filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames) } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
-            defaultFilterValue: normalizedDefaultFilter,
-            filterValue: import_lodash.default.cloneDeep(normalizedDefaultFilter)
-          } : {}
-        }),
+        ...Object.keys(props).length ? { props } : {},
         stepParams: Object.keys(stepParams).length ? stepParams : void 0
       },
       {
@@ -14059,7 +14393,8 @@ class FlowSurfacesService {
         "styleVariant",
         "dragEnabled",
         "dragSortBy",
-        "quickCreateEnabled"
+        "quickCreateEnabled",
+        "globalSort"
       ]) : {},
       ...import_lodash.default.cloneDeep(input.props || {})
     };
@@ -14128,7 +14463,8 @@ class FlowSurfacesService {
       styleVariant: currentProps.styleVariant || "color",
       quickCreateEnabled: currentProps.quickCreateEnabled === true,
       dragEnabled: nextDragEnabled,
-      dragSortBy: nextDragSortBy || void 0
+      dragSortBy: nextDragSortBy || void 0,
+      ...Object.prototype.hasOwnProperty.call(currentProps, "globalSort") ? { globalSort: this.normalizeBlockSortingInput(currentProps.globalSort, "kanban.globalSort") } : {}
     });
     delete props.quickCreatePopup;
     delete props.quickCreatePopupSettings;
@@ -15069,6 +15405,31 @@ class FlowSurfacesService {
       usesAssociationValueBinding: false
     };
   }
+  collectionFieldHasRequiredValidation(field) {
+    var _a, _b, _c;
+    const rules = [
+      ...import_lodash.default.castArray(((_a = field == null ? void 0 : field.validation) == null ? void 0 : _a.rules) || []),
+      ...import_lodash.default.castArray(((_c = (_b = field == null ? void 0 : field.options) == null ? void 0 : _b.validation) == null ? void 0 : _c.rules) || [])
+    ];
+    return rules.some((rule) => String((rule == null ? void 0 : rule.name) || "").trim() === "required");
+  }
+  buildRequiredCollectionFieldFormWrapperDefaults(input) {
+    if (!REQUIRED_COLLECTION_FIELD_FORM_WRAPPER_USES.has(input.wrapperUse || "") || !this.collectionFieldHasRequiredValidation(input.field)) {
+      return {};
+    }
+    return {
+      props: {
+        required: true
+      },
+      stepParams: {
+        editItemSettings: {
+          required: {
+            required: true
+          }
+        }
+      }
+    };
+  }
   getCollectionFieldOrBadRequest(collection, fieldPath, context) {
     const field = (0, import_service_helpers.resolveFieldFromCollection)(collection, fieldPath);
     if (!field) {