@nocobase/plugin-flow-engine 2.1.0-beta.24 → 2.1.0-beta.26

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

@@ -56,7 +56,6 @@ var import_reference_guards = require("./reference-guards");
 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_public_data_surface_default_filter = require("./public-data-surface-default-filter");
 var import_runtime = require("./planning/runtime");
@@ -94,6 +93,9 @@ var import_service_utils = require("./service-utils");
 var import_field_type_resolver = require("./field-type-resolver");
 var import_template_compatibility = require("./template-compatibility");
 var import_template_service_utils = require("./template-service-utils");
+var import_hidden_popup_contract = require("./hidden-popup-contract");
+var import_hidden_popup_calendar = require("./hidden-popup-calendar");
+var import_hidden_popup_kanban = require("./hidden-popup-kanban");
 const FORM_BLOCK_USES = /* @__PURE__ */ new Set(["FormBlockModel", "CreateFormModel", "EditFormModel", ...import_approval.APPROVAL_FORM_BLOCK_USES]);
 const AUTO_SUBMIT_FORM_BLOCK_USES = /* @__PURE__ */ new Set(["CreateFormModel", "EditFormModel"]);
 const FLOW_SURFACE_DEFAULT_ACTION_SETTINGS_KEYS = /* @__PURE__ */ new Set(["filter"]);
@@ -122,12 +124,6 @@ const DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES = [
 ];
 const CALENDAR_DEFAULT_VIEWS = /* @__PURE__ */ new Set(["month", "week", "day"]);
 const CALENDAR_WEEK_STARTS = /* @__PURE__ */ new Set([0, 1]);
-const CALENDAR_POPUP_ACTION_KEYS = ["quickCreateAction", "eventViewAction"];
-const KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY = {
-  quickCreateAction: "-quick-create-action",
-  cardViewAction: "-card-view-action"
-};
-const KANBAN_POPUP_ACTION_KEYS = Object.keys(KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY);
 const CANONICAL_BLOCK_HEADER_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
@@ -169,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",
@@ -392,6 +389,14 @@ const FILTER_FORM_BLOCK_LAYOUT_STEP_PARAM_MIRRORS = [
   { domain: "props", key: "labelWidth", stepParamsPath: ["formFilterBlockModelSettings", "layout", "labelWidth"] },
   { domain: "props", key: "labelWrap", stepParamsPath: ["formFilterBlockModelSettings", "layout", "labelWrap"] }
 ];
+const UPDATE_SETTINGS_POPUP_STEP_PARAM_REPLACE_PATHS_BY_USE = {
+  CalendarBlockModel: [
+    ["calendarSettings", "quickCreatePopupSettings"],
+    ["calendarSettings", "eventPopupSettings"]
+  ],
+  KanbanBlockModel: [["kanbanSettings", "popup"]],
+  KanbanCardItemModel: [["cardSettings", "popup"]]
+};
 const DIVIDER_ITEM_STEP_PARAM_MIRRORS = [
   { domain: "props", key: "label", stepParamsPath: ["markdownItemSetting", "title", "label"] },
   { domain: "props", key: "orientation", stepParamsPath: ["markdownItemSetting", "title", "orientation"] },
@@ -531,6 +536,17 @@ class FlowSurfacesService {
       syncApprovalRuntimeConfigForSurfaceRoot: (root, transaction) => this.approvalRuntimeConfigService.syncApprovalRuntimeConfigForSurfaceRoot(root, transaction)
     });
   }
+  get hiddenPopupRuntime() {
+    return {
+      repository: this.repository,
+      buildPopupOpenViewWithTemplate: (input) => this.buildPopupOpenViewWithTemplate(input),
+      clearFlowTemplateUsagesForNodeTree: (uid2, transaction) => this.clearFlowTemplateUsagesForNodeTree(uid2, transaction),
+      ensurePopupHostDefaultContent: (input) => this.ensurePopupHostDefaultContent(input),
+      reconcilePopupOpenViewTransition: (uid2, currentOpenView, nextOpenView, transaction) => this.reconcilePopupOpenViewTransition(uid2, currentOpenView, nextOpenView, transaction),
+      removeNodeTreeWithBindings: (uid2, transaction) => this.removeNodeTreeWithBindings(uid2, transaction),
+      syncFlowTemplateUsagesForNodeTree: (uid2, transaction) => this.syncFlowTemplateUsagesForNodeTree(uid2, transaction)
+    };
+  }
   async setFlowModelNodeAsyncFlag(uid2, asyncFlag, transaction) {
     var _a, _b;
     const sequelize = (_a = this.db) == null ? void 0 : _a.sequelize;
@@ -1403,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) {
@@ -1647,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
@@ -2484,19 +2515,6 @@ class FlowSurfacesService {
         `flowSurfaces applyBlueprint navigation.group.title '${groupTitle}' matches ${matchedRoutes.length} existing menu groups; pass navigation.group.routeId explicitly`
       );
     }
-    const reusedMetadataFields = import_private_utils.APPLY_BLUEPRINT_CREATE_MENU_GROUP_METADATA_KEYS.filter(
-      (key) => {
-        var _a2, _b;
-        return !import_lodash.default.isUndefined((_b = (_a2 = document.navigation) == null ? void 0 : _a2.group) == null ? void 0 : _b[key]);
-      }
-    );
-    if (reusedMetadataFields.length) {
-      (0, import_errors.throwBadRequest)(
-        `flowSurfaces applyBlueprint navigation.group.title '${groupTitle}' matched an existing menu group; do not also pass ${reusedMetadataFields.map((key) => `navigation.group.${key}`).join(
-          ", "
-        )} when reusing by title. Same-title reuse is title-only. Keep only navigation.group.title or use navigation.group.routeId for exact targeting, and call flowSurfaces:updateMenu separately if existing group metadata must change`
-      );
-    }
     const routeId = this.readRouteField(matchedRoutes[0], "id");
     if (import_lodash.default.isNil(routeId) || routeId === "") {
       (0, import_errors.throwBadRequest)(
@@ -2524,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 = {}) {
@@ -2891,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;
     }
@@ -3045,7 +3071,7 @@ class FlowSurfacesService {
           "FLOW_SURFACE_TEMPLATE_POPUP_SOURCE_UNSUPPORTED"
         );
       }
-      if (popupTemplateUid && !this.isEditableDefaultActionPopupTemplateReference(node, openView)) {
+      if (this.isPopupTemplateReferenceOpenViewState(openView) && !this.isEditableDefaultActionPopupTemplateReference(node, openView)) {
         (0, import_errors.throwBadRequest)(
           `flowSurfaces ${actionName} target '${node.uid}' already uses a popup template; convert it to copy first`,
           "FLOW_SURFACE_TEMPLATE_SOURCE_ALREADY_TEMPLATED"
@@ -3121,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;
@@ -3137,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();
@@ -3379,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",
@@ -3389,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(
@@ -3591,7 +3682,7 @@ class FlowSurfacesService {
       };
     }
     const openViewStep = (0, import_template_service_utils.findFlowTemplateOpenViewStep)(node);
-    const popupTemplateUid = String(((_a = openViewStep == null ? void 0 : openViewStep.openView) == null ? void 0 : _a.popupTemplateUid) || "").trim();
+    const popupTemplateUid = this.isPopupTemplateReferenceOpenViewState(openViewStep == null ? void 0 : openViewStep.openView) ? String(((_a = openViewStep == null ? void 0 : openViewStep.openView) == null ? void 0 : _a.popupTemplateUid) || "").trim() : "";
     if (popupTemplateUid) {
       const template = await this.getFlowTemplateOrThrow(actionName, popupTemplateUid, {
         transaction,
@@ -3680,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(
@@ -3883,19 +3981,52 @@ class FlowSurfacesService {
     });
     const result = await (0, import_compose_runtime.executeComposeRuntime)(plan, {
       removeExistingItem: async (uid2) => this.removeNodeTreeWithBindings(uid2, options.transaction),
-      createBlock: async (payload) => this.addBlock(payload, {
-        ...options,
-        deferAutoLayout: true,
-        enabledPackages,
-        skipDefaultBlockActions: true
-      }),
+      createBlock: async (payload, spec) => {
+        const calendarPopupSettings = spec.type === "calendar" && spec.settings ? import_lodash.default.pick(spec.settings, [
+          "quickCreatePopup",
+          "eventPopup",
+          "quickCreatePopupSettings",
+          "eventPopupSettings"
+        ]) : {};
+        const kanbanPopupSettings = spec.type === "kanban" && spec.settings ? import_lodash.default.pick(spec.settings, [
+          "groupField",
+          "groupOptions",
+          "groupTitleField",
+          "groupColorField",
+          "styleVariant",
+          "dragEnabled",
+          "dragSortBy",
+          "quickCreateEnabled",
+          "enableCardClick",
+          "quickCreatePopup",
+          "cardPopup",
+          "quickCreatePopupSettings",
+          "cardPopupSettings"
+        ]) : {};
+        const hiddenPopupSettings = {
+          ...calendarPopupSettings,
+          ...kanbanPopupSettings
+        };
+        return this.addBlock(
+          {
+            ...payload,
+            ...Object.keys(hiddenPopupSettings).length ? { settings: hiddenPopupSettings } : {}
+          },
+          {
+            ...options,
+            deferAutoLayout: true,
+            enabledPackages,
+            skipDefaultBlockActions: true
+          }
+        );
+      },
       applyNodeSettings: async (actionName, targetUid, settings) => {
         if (!targetUid) {
           return;
         }
         await this.applyInlineNodeSettings(actionName, targetUid, settings, options);
       },
-      resolveBlockSettings: (settings, state) => this.resolveComposeBlockSettings(settings, state.keyMap),
+      resolveBlockSettings: (settings, state, block) => this.resolveComposeBlockSettings(settings, state.keyMap, block),
       createField: async (payload) => this.addField(payload, {
         ...options,
         popupTemplateAliasSession
@@ -4978,7 +5109,7 @@ class FlowSurfacesService {
     };
   }
   async addBlock(values, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const templateRef = import_lodash.default.isUndefined(values == null ? void 0 : values.template) ? void 0 : this.normalizeFlowTemplateReference("addBlock", values.template, {
       allowUsage: true,
       expectedType: "block"
@@ -5010,12 +5141,16 @@ class FlowSurfacesService {
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const hasInlineFields = Object.prototype.hasOwnProperty.call(values || {}, "fields") || Object.prototype.hasOwnProperty.call(values || {}, "fieldsLayout");
     let resolvedTarget = await this.locator.resolve(target, options);
-    let targetNode = await this.loadResolvedNode(resolvedTarget, options.transaction);
+    let targetNode = await this.loadResolvedNode(resolvedTarget, options.transaction, {
+      ensureManagedPopupTemplateTargets: true
+    });
     const targetOpenView = this.resolvePopupHostOpenView(targetNode);
     if (this.isPopupFieldHostUse(targetNode == null ? void 0 : targetNode.use) && !targetOpenView) {
       await this.ensureLocalFieldPopupSurface("addBlock", target.uid, options, { popup: {} });
       resolvedTarget = await this.locator.resolve(target, options);
-      targetNode = await this.loadResolvedNode(resolvedTarget, options.transaction);
+      targetNode = await this.loadResolvedNode(resolvedTarget, options.transaction, {
+        ensureManagedPopupTemplateTargets: true
+      });
     }
     const popupProfile = await this.resolvePopupBlockProfile(
       target.uid,
@@ -5073,11 +5208,13 @@ class FlowSurfacesService {
     const blockProps = catalogItem.use === "CalendarBlockModel" ? this.buildCalendarInitialBlockProps({
       actionName: "addBlock",
       resourceInit: effectiveResourceInit,
-      props: values.props
+      props: values.props,
+      settings: inlineSettings
     }) : catalogItem.use === "KanbanBlockModel" ? this.buildKanbanInitialBlockProps({
       actionName: "addBlock",
       resourceInit: effectiveResourceInit,
-      props: values.props
+      props: values.props,
+      settings: inlineSettings
     }) : values.props;
     const initialGrid = options.deferAutoLayout ? null : await this.repository.findModelById(parentUid, {
       transaction: options.transaction,
@@ -5087,10 +5224,42 @@ class FlowSurfacesService {
       use: catalogItem.use,
       containerUse: parentNode == null ? void 0 : parentNode.use,
       resourceInit: effectiveResourceInit,
+      enableDefaultSorting: this.shouldEnableCreatedAtDefaultSorting(effectiveResourceInit),
       props: blockProps,
       decoratorProps: values.decoratorProps,
-      stepParams: values.stepParams
-    });
+      stepParams: catalogItem.use === "CalendarBlockModel" ? this.buildCalendarInitialStepParams({
+        stepParams: values.stepParams,
+        props: values.props,
+        settings: inlineSettings
+      }) : catalogItem.use === "KanbanBlockModel" ? this.buildKanbanInitialStepParams({
+        stepParams: values.stepParams,
+        props: values.props,
+        settings: inlineSettings
+      }) : values.stepParams
+    });
+    if (catalogItem.use === "KanbanBlockModel") {
+      const itemNode2 = (0, import_service_utils.getSingleNodeSubModel)((_a = tree.subModels) == null ? void 0 : _a.item);
+      if (itemNode2) {
+        const itemProps = this.buildKanbanInitialItemProps({
+          props: values.props,
+          settings: inlineSettings
+        });
+        const itemStepParams = this.buildKanbanInitialItemStepParams({
+          stepParams: itemNode2.stepParams,
+          props: values.props,
+          settings: inlineSettings
+        });
+        if (Object.keys(itemProps).length) {
+          itemNode2.props = {
+            ...itemNode2.props || {},
+            ...itemProps
+          };
+        }
+        if (Object.keys(itemStepParams).length) {
+          itemNode2.stepParams = itemStepParams;
+        }
+      }
+    }
     this.contractGuard.validateNodeTreeAgainstContract(tree);
     const created = await this.repository.upsertModel(
       {
@@ -5101,13 +5270,13 @@ class FlowSurfacesService {
       },
       { transaction: options.transaction }
     );
-    const gridNode = (0, import_service_utils.getSingleNodeSubModel)((_a = tree.subModels) == null ? void 0 : _a.grid);
-    const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_b = tree.subModels) == null ? void 0 : _b.item);
-    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_c = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _c.grid);
-    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_d = tree.subModels) == null ? void 0 : _d.columns);
+    const gridNode = (0, import_service_utils.getSingleNodeSubModel)((_b = tree.subModels) == null ? void 0 : _b.grid);
+    const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_c = tree.subModels) == null ? void 0 : _c.item);
+    const itemGridNode = (0, import_service_utils.getSingleNodeSubModel)((_d = itemNode == null ? void 0 : itemNode.subModels) == null ? void 0 : _d.grid);
+    const columnNodes = (0, import_service_utils.getNodeSubModelList)((_e = tree.subModels) == null ? void 0 : _e.columns);
     const blockGridUid = (gridNode == null ? void 0 : gridNode.uid) || (itemGridNode == null ? void 0 : itemGridNode.uid);
     const popupGridUid = popupSurface == null ? void 0 : popupSurface.gridUid;
-    const actionsColumnUid = catalogItem.use === "TableBlockModel" ? await this.ensureTableActionsColumn(created, options.transaction) : (_e = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _e.uid;
+    const actionsColumnUid = catalogItem.use === "TableBlockModel" ? await this.ensureTableActionsColumn(created, options.transaction) : (_f = columnNodes.find((item) => item.use === "TableActionsColumnModel")) == null ? void 0 : _f.uid;
     const result = {
       uid: created,
       parentUid,
@@ -5125,8 +5294,52 @@ class FlowSurfacesService {
         popupGridUid: popupSurface.gridUid
       } : {}
     };
-    await this.applyInlineNodeSettings("addBlock", created, inlineSettings, options);
-    if ((_f = inlineFields == null ? void 0 : inlineFields.fields) == null ? void 0 : _f.length) {
+    const ensureInitialBlockPopupHosts = async () => {
+      if (catalogItem.use === "CalendarBlockModel") {
+        const calendarNode = await this.repository.findModelById(created, {
+          transaction: options.transaction,
+          includeAsyncNode: true
+        });
+        if (calendarNode == null ? void 0 : calendarNode.uid) {
+          await this.ensureCalendarBlockPopupHosts(calendarNode, options.transaction, {
+            quickCreateAction: this.resolveCalendarInitialPopupOverride(
+              inlineSettings,
+              "quickCreatePopup",
+              "quickCreatePopupSettings"
+            ),
+            eventViewAction: this.resolveCalendarInitialPopupOverride(
+              inlineSettings,
+              "eventPopup",
+              "eventPopupSettings"
+            )
+          });
+        }
+      }
+      if (catalogItem.use === "KanbanBlockModel") {
+        const kanbanNode = await this.repository.findModelById(created, {
+          transaction: options.transaction,
+          includeAsyncNode: true
+        });
+        if (kanbanNode == null ? void 0 : kanbanNode.uid) {
+          await this.ensureKanbanBlockPopupHosts(kanbanNode, options.transaction, {
+            quickCreateAction: this.resolveKanbanInitialPopupOverride(
+              inlineSettings,
+              "quickCreatePopup",
+              "quickCreatePopupSettings"
+            ),
+            cardViewAction: this.resolveKanbanInitialPopupOverride(inlineSettings, "cardPopup", "cardPopupSettings")
+          });
+        }
+      }
+    };
+    await ensureInitialBlockPopupHosts();
+    const inlineSettingsForConfigure = catalogItem.use === "CalendarBlockModel" ? this.omitHiddenPopupSettingsForConfigure(
+      this.normalizeCalendarInlineSettingsForConfigure(inlineSettings),
+      "calendar"
+    ) : catalogItem.use === "KanbanBlockModel" ? this.omitHiddenPopupSettingsForConfigure(inlineSettings, "kanban") : inlineSettings;
+    await this.applyInlineNodeSettings("addBlock", created, inlineSettingsForConfigure, options);
+    await ensureInitialBlockPopupHosts();
+    if ((_g = inlineFields == null ? void 0 : inlineFields.fields) == null ? void 0 : _g.length) {
       const fieldTargetUid = this.resolveComposeFieldContainerUid(inlineFields, result);
       const createdByKey = {};
       for (const fieldSpec of inlineFields.fields) {
@@ -5174,7 +5387,7 @@ class FlowSurfacesService {
           includeAsyncNode: true
         });
         const layoutItems = import_lodash.default.castArray(
-          ((_i = (_h = (_g = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _g.grid) == null ? void 0 : _h.subModels) == null ? void 0 : _i.items) || ((_j = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _j.items) || []
+          ((_j = (_i = (_h = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _h.grid) == null ? void 0 : _i.subModels) == null ? void 0 : _j.items) || ((_k = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _k.items) || []
         );
         const layoutPayload = this.buildComposeLayoutPayload({
           layout: inlineFields.fieldsLayout,
@@ -5366,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
@@ -5489,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,
@@ -5501,6 +5719,7 @@ class FlowSurfacesService {
         {},
         defaultFieldState.wrapperProps || {},
         wrapperShouldPersistTitleField ? { titleField: defaultTitleField } : {},
+        requiredFieldWrapperDefaults.props,
         values.wrapperProps || {}
       ),
       fieldProps: import_lodash.default.merge(
@@ -5511,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,
@@ -5700,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,
@@ -5995,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 || []),
@@ -6013,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;
@@ -6171,8 +6419,33 @@ class FlowSurfacesService {
   shouldAutoSaveDefaultActionPopupTemplate(popup) {
     return (popup == null ? void 0 : popup[import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]) === true;
   }
+  resolveDefaultActionPopupSemanticUse(use) {
+    const normalizedUse = String(use || "").trim();
+    if (normalizedUse === "AddChildActionModel") {
+      return "AddNewActionModel";
+    }
+    if (normalizedUse === "CalendarQuickCreateActionModel") {
+      return "AddNewActionModel";
+    }
+    if (normalizedUse === "CalendarEventViewActionModel") {
+      return "ViewActionModel";
+    }
+    if (normalizedUse === "KanbanQuickCreateActionModel") {
+      return "AddNewActionModel";
+    }
+    if (normalizedUse === "KanbanCardViewActionModel") {
+      return "ViewActionModel";
+    }
+    return normalizedUse || void 0;
+  }
+  getDefaultActionPopupConfigForNode(actionNode) {
+    return (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use));
+  }
+  isDefaultActionPopupUseForNode(actionNode) {
+    return !!this.getDefaultActionPopupConfigForNode(actionNode);
+  }
   shouldImplicitlyTemplateDefaultActionPopup(actionNode, popup) {
-    if (!(0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use)) {
+    if (!this.isDefaultActionPopupUseForNode(actionNode)) {
       return false;
     }
     if (import_lodash.default.isPlainObject(popup == null ? void 0 : popup.template) || !import_lodash.default.isUndefined(popup == null ? void 0 : popup.saveAsTemplate)) {
@@ -6204,7 +6477,7 @@ class FlowSurfacesService {
         transaction,
         includeAsyncNode: true
       });
-      const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode == null ? void 0 : actionNode.use);
+      const actionConfig = this.getDefaultActionPopupConfigForNode(actionNode);
       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(
@@ -6253,10 +6526,13 @@ class FlowSurfacesService {
     if (explicitTitle) {
       return explicitTitle;
     }
-    if (!(0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use)) {
+    if (!this.isDefaultActionPopupUseForNode(actionNode)) {
       return void 0;
     }
-    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
+    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(
+      this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use),
+      this.getActionButtonTitle(actionNode)
+    );
   }
   buildInlinePopupTemplateOpenView(popup, fallbackTitle) {
     const normalizedTitle = this.normalizeOptionalPopupTitle(popup == null ? void 0 : popup.title) || this.normalizeOptionalPopupTitle(fallbackTitle);
@@ -6359,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;
@@ -6373,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") {
@@ -6398,7 +6684,21 @@ class FlowSurfacesService {
     if (this.isPopupFieldHostUse(targetUse)) {
       return ["view", "generic"];
     }
-    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(targetUse);
+    if (targetUse === "CalendarQuickCreateActionModel") {
+      return ["addNew"];
+    }
+    if (targetUse === "CalendarEventViewActionModel") {
+      return ["view", "generic"];
+    }
+    if (targetUse === "KanbanQuickCreateActionModel") {
+      return ["addNew"];
+    }
+    if (targetUse === "KanbanCardViewActionModel") {
+      return ["view", "generic"];
+    }
+    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(
+      this.resolveDefaultActionPopupSemanticUse(targetUse)
+    );
     if (actionConfig) {
       return actionConfig.type === "view" ? ["view", "generic"] : [actionConfig.type];
     }
@@ -6470,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, {
@@ -6542,7 +6845,8 @@ class FlowSurfacesService {
       ...popupTemplateHasSourceId && template.sourceId ? { sourceId: template.sourceId } : {},
       popupTemplateHasFilterByTk,
       popupTemplateHasSourceId,
-      popupTemplateMode: mode
+      popupTemplateMode: mode,
+      popupTemplateUid: template.uid
     });
     if (mode === "copy") {
       return {
@@ -6550,16 +6854,21 @@ class FlowSurfacesService {
         popupTemplateContext: true
       };
     }
-    return {
-      ...base,
-      popupTemplateUid: template.uid
-    };
+    return base;
   }
   isReferencedPopupTemplateOpenView(openView, hostUid) {
-    return !!this.resolveExternalPopupHostUid(hostUid, openView) && !!String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim() && !(openView == null ? void 0 : openView.popupTemplateContext);
+    return !!this.resolveExternalPopupHostUid(hostUid, openView) && this.isPopupTemplateReferenceOpenViewState(openView);
+  }
+  isPopupTemplateReferenceOpenViewState(openView) {
+    const popupTemplateUid = String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim();
+    if (!popupTemplateUid || (openView == null ? void 0 : openView.popupTemplateContext)) {
+      return false;
+    }
+    const popupTemplateMode = String((openView == null ? void 0 : openView.popupTemplateMode) || "reference").trim() || "reference";
+    return popupTemplateMode !== "copy";
   }
   isEditableDefaultActionPopupTemplateReference(hostNode, openView) {
-    return (0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(hostNode == null ? void 0 : hostNode.use) && this.isReferencedPopupTemplateOpenView(openView, hostNode == null ? void 0 : hostNode.uid);
+    return this.isDefaultActionPopupUseForNode(hostNode) && this.isReferencedPopupTemplateOpenView(openView, hostNode == null ? void 0 : hostNode.uid);
   }
   resolveExternalPopupHostUid(hostUid, openView) {
     const normalizedHostUid = String(hostUid || "").trim();
@@ -6641,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;
@@ -6659,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)) {
@@ -6672,8 +6982,11 @@ class FlowSurfacesService {
       if (!normalizedUid) {
         (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} openView.uid cannot be empty`);
       }
+      const normalizedHostUid = String(options.popupTemplateHostUid || "").trim();
       normalizedOpenView.uid = normalizedUid;
-      await this.assertOpenViewUidTarget(actionName, normalizedUid, options);
+      if (normalizedUid !== normalizedHostUid) {
+        await this.assertOpenViewUidTarget(actionName, normalizedUid, options);
+      }
     }
     if (!import_lodash.default.isUndefined(normalizedOpenView.mode)) {
       const rawMode = String(normalizedOpenView.mode || "").trim();
@@ -6863,14 +7176,28 @@ class FlowSurfacesService {
       (0, import_service_utils.rethrowInlineConfigurationError)(error, `flowSurfaces ${actionName} settings invalid`);
     }
   }
-  resolveComposeBlockSettings(settings, keyMap) {
-    if (!import_lodash.default.isPlainObject(settings == null ? void 0 : settings.connectFields) || !Array.isArray(settings.connectFields.targets)) {
-      return settings;
-    }
-    const nextSettings = import_lodash.default.cloneDeep(settings);
-    nextSettings.connectFields = {
-      ...nextSettings.connectFields,
-      targets: import_lodash.default.castArray(nextSettings.connectFields.targets).map((target) => {
+  resolveComposeBlockSettings(settings, keyMap, block) {
+    var _a, _b;
+    let nextSettings = settings;
+    if (((_a = block == null ? void 0 : block.spec) == null ? void 0 : _a.type) === "calendar") {
+      nextSettings = import_lodash.default.omit(nextSettings, [
+        "quickCreatePopup",
+        "eventPopup",
+        "quickCreatePopupSettings",
+        "eventPopupSettings"
+      ]);
+    } else if (((_b = block == null ? void 0 : block.spec) == null ? void 0 : _b.type) === "kanban") {
+      const omittedKeys = ["quickCreatePopup", "cardPopup", "quickCreatePopupSettings", "cardPopupSettings"];
+      const withoutHiddenPopupSettings = import_lodash.default.omit(nextSettings, omittedKeys);
+      nextSettings = Object.keys(withoutHiddenPopupSettings).length || omittedKeys.every((key) => !import_lodash.default.has(nextSettings, key)) ? withoutHiddenPopupSettings : {};
+    }
+    if (!import_lodash.default.isPlainObject(nextSettings == null ? void 0 : nextSettings.connectFields) || !Array.isArray(nextSettings.connectFields.targets)) {
+      return nextSettings;
+    }
+    const resolvedSettings = import_lodash.default.cloneDeep(nextSettings);
+    resolvedSettings.connectFields = {
+      ...resolvedSettings.connectFields,
+      targets: import_lodash.default.castArray(resolvedSettings.connectFields.targets).map((target) => {
         if (!import_lodash.default.isPlainObject(target) || import_lodash.default.isUndefined(target.target) || target.target === null || target.target === "") {
           return target;
         }
@@ -6882,7 +7209,7 @@ class FlowSurfacesService {
         return nextTarget;
       })
     };
-    return nextSettings;
+    return resolvedSettings;
   }
   async applyInlineFieldPopup(actionName, result, popup, options) {
     popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
@@ -7316,7 +7643,7 @@ class FlowSurfacesService {
     if (!(actionNode == null ? void 0 : actionNode.uid)) {
       return;
     }
-    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode.use);
+    const actionConfig = this.getDefaultActionPopupConfigForNode(actionNode);
     if (!actionConfig) {
       return;
     }
@@ -7326,7 +7653,7 @@ class FlowSurfacesService {
     }
     const uniqueKeySource = JSON.stringify(
       (0, import_service_utils.buildDefinedPayload)({
-        actionUse: actionNode.use,
+        actionUse: this.resolveDefaultActionPopupSemanticUse(actionNode.use),
         dataSourceKey: openView == null ? void 0 : openView.dataSourceKey,
         collectionName: openView == null ? void 0 : openView.collectionName,
         associationName: openView == null ? void 0 : openView.associationName,
@@ -7363,7 +7690,7 @@ class FlowSurfacesService {
     if (options.autoCompleteDefaultPopup === false) {
       return false;
     }
-    if (!(0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use)) {
+    if (!this.isDefaultActionPopupUseForNode(actionNode)) {
       return false;
     }
     const openView = this.resolvePopupHostOpenView(actionNode);
@@ -7387,14 +7714,17 @@ class FlowSurfacesService {
     if (options.includeFallback === false) {
       return void 0;
     }
-    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
+    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(
+      this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use),
+      this.getActionButtonTitle(actionNode)
+    );
   }
   resolveGeneratedDefaultActionPopupMetadata(actionNode, popup, popupProfile) {
     const explicitTitle = this.normalizeOptionalPopupTitle(popup == null ? void 0 : popup.title);
     if (explicitTitle) {
       return void 0;
     }
-    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode == null ? void 0 : actionNode.use);
+    const actionConfig = this.getDefaultActionPopupConfigForNode(actionNode);
     if (!actionConfig) {
       return void 0;
     }
@@ -7415,7 +7745,9 @@ class FlowSurfacesService {
     if (!collectionName) {
       return [];
     }
-    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(input.actionUse);
+    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(
+      this.resolveDefaultActionPopupSemanticUse(input.actionUse)
+    );
     if (!actionConfig) {
       return [];
     }
@@ -7449,7 +7781,7 @@ class FlowSurfacesService {
   }
   buildDefaultActionPopupKeyMap(actionNode, namespace) {
     var _a;
-    const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode == null ? void 0 : actionNode.use);
+    const actionConfig = this.getDefaultActionPopupConfigForNode(actionNode);
     if (!actionConfig || !namespace) {
       return /* @__PURE__ */ new Map();
     }
@@ -7571,7 +7903,7 @@ class FlowSurfacesService {
       enabledPackages
     });
     return this.remapDefaultActionPopupBlocks(
-      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionNode == null ? void 0 : actionNode.use, fields),
+      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use), fields),
       keyMap,
       namespace
     );
@@ -7641,7 +7973,10 @@ class FlowSurfacesService {
     return normalizedTitle || void 0;
   }
   async syncDefaultActionPopupTabTitle(actionNode, popupTab, options) {
-    const popupTabTitle = this.normalizeOptionalPopupTitle(options.popupTabTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
+    const popupTabTitle = this.normalizeOptionalPopupTitle(options.popupTabTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(
+      this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use),
+      this.getActionButtonTitle(actionNode)
+    );
     if (!(popupTab == null ? void 0 : popupTab.uid) || !popupTabTitle || this.resolvePopupTabTitle(popupTab) === popupTabTitle) {
       return;
     }
@@ -7667,7 +8002,10 @@ class FlowSurfacesService {
     });
     const popupPage = (0, import_service_utils.getSingleNodeSubModel)((_a = popupHost == null ? void 0 : popupHost.subModels) == null ? void 0 : _a.page);
     const popupTab = import_lodash.default.castArray(((_b = popupPage == null ? void 0 : popupPage.subModels) == null ? void 0 : _b.tabs) || [])[0];
-    const popupTabTitle = this.normalizeOptionalPopupTitle(options.popupTabTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
+    const popupTabTitle = this.normalizeOptionalPopupTitle(options.popupTabTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(
+      this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use),
+      this.getActionButtonTitle(actionNode)
+    );
     if (!(popupTab == null ? void 0 : popupTab.uid) || !popupTabTitle || this.resolvePopupTabTitle(popupTab) === popupTabTitle) {
       return;
     }
@@ -7699,20 +8037,35 @@ class FlowSurfacesService {
       includeAsyncNode: true
     }) || fallbackActionNode;
     const openViewStep = (0, import_template_service_utils.findFlowTemplateOpenViewStep)(actionNode);
-    const openViewTitle = this.normalizeOptionalPopupTitle(options.openViewTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
+    const openViewTitle = this.normalizeOptionalPopupTitle(options.openViewTitle) || (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(
+      this.resolveDefaultActionPopupSemanticUse(actionNode == null ? void 0 : actionNode.use),
+      this.getActionButtonTitle(actionNode)
+    );
     if (!openViewStep || !openViewTitle) {
       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(
       {
@@ -7747,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)) {
@@ -7829,7 +8186,7 @@ class FlowSurfacesService {
           openViewActionName: actionName
         }
       );
-      if ((0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use) && templateRef.mode === "copy") {
+      if (this.isDefaultActionPopupUseForNode(actionNode) && templateRef.mode === "copy") {
         await this.syncDefaultActionPopupCopiedTemplateTabTitle(actionUid, actionNode, {
           ...options,
           popupTabTitle: templateOpenViewTitle
@@ -7861,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;
     }
@@ -7949,6 +8312,15 @@ class FlowSurfacesService {
         current.use
       );
     });
+    this.replaceExplicitPopupStepParamSubtreesForUpdateSettings(
+      current,
+      normalizedValues,
+      nextPayload,
+      options.replacePopupStepParamSubtrees === true
+    );
+    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(
@@ -7964,6 +8336,7 @@ class FlowSurfacesService {
       {
         transaction: options.transaction,
         popupTemplateHostUid: options.popupTemplateHostUid,
+        popupTemplateHostUse: current == null ? void 0 : current.use,
         popupActionContext
       }
     );
@@ -8018,12 +8391,22 @@ class FlowSurfacesService {
     } else if (current.use === "ChartBlockModel" && !import_lodash.default.isUndefined((_b = nextPayload.stepParams) == null ? void 0 : _b.chartSettings)) {
       await this.syncChartDataBindingsForNode(effectiveNode, options.transaction);
     }
-    if (current.use === "CalendarBlockModel") {
+    if (!options.skipHiddenPopupHostEnsure && current.use === "CalendarBlockModel") {
       await this.ensureCalendarBlockPopupHosts(effectiveNode, options.transaction);
     }
-    if (current.use === "KanbanBlockModel") {
+    if (!options.skipHiddenPopupHostEnsure && current.use === "KanbanBlockModel") {
       await this.ensureKanbanBlockPopupHosts(effectiveNode, options.transaction);
     }
+    if (!options.skipHiddenPopupHostEnsure && current.use === "KanbanCardItemModel") {
+      const parentUid = String(current.parentId || "").trim() || (current.uid ? await this.locator.findParentUid(current.uid, options.transaction).catch(() => "") : "") || void 0;
+      const parentNode = parentUid ? await this.repository.findModelById(parentUid, {
+        transaction: options.transaction,
+        includeAsyncNode: true
+      }) : null;
+      if ((parentNode == null ? void 0 : parentNode.use) === "KanbanBlockModel") {
+        await this.ensureKanbanBlockPopupHosts(parentNode, options.transaction);
+      }
+    }
     await this.syncFlowTemplateUsagesForNodeTree(current.uid, options.transaction);
     if (import_approval.APPROVAL_SINGLETON_ACTION_USES.has(current.use || "")) {
       await this.syncApprovalRuntimeConfigForNode(current.uid, options.transaction);
@@ -8033,32 +8416,260 @@ class FlowSurfacesService {
       updated: Object.keys(import_lodash.default.omit(nextPayload, ["uid"]))
     };
   }
-  syncFilterActionSettingsForUpdateSettings(current, values, nextPayload) {
-    if ((current == null ? void 0 : current.use) !== "FilterActionModel") {
+  syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "CalendarBlockModel" || !import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.props)) {
       return;
     }
-    const hasPropsFilterableFieldNames = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterableFieldNames");
-    const hasPropsDefaultFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "defaultFilterValue");
-    const hasPropsFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterValue");
-    const hasStepFilterSettingsClear = import_lodash.default.isPlainObject(values == null ? void 0 : values.stepParams) && Object.prototype.hasOwnProperty.call(values.stepParams, "filterSettings") && (values.stepParams.filterSettings === null || import_lodash.default.isPlainObject(values.stepParams.filterSettings) && !Object.keys(values.stepParams.filterSettings).length);
-    const hasStepFilterableFieldNames = import_lodash.default.has(values, [
-      "stepParams",
-      "filterSettings",
-      "filterableFieldNames",
-      "filterableFieldNames"
-    ]);
-    const hasStepDefaultFilter = import_lodash.default.has(values, ["stepParams", "filterSettings", "defaultFilter", "defaultFilter"]);
-    if (!hasPropsFilterableFieldNames && !hasPropsDefaultFilterValue && !hasPropsFilterValue && !hasStepFilterSettingsClear && !hasStepFilterableFieldNames && !hasStepDefaultFilter) {
+    let nextStepParams;
+    for (const actionKey of import_hidden_popup_calendar.CALENDAR_POPUP_ACTION_KEYS) {
+      const propKey = this.getCalendarPopupPropKey(actionKey);
+      if (!Object.prototype.hasOwnProperty.call(normalizedValues.props, propKey)) {
+        continue;
+      }
+      const value = normalizedValues.props[propKey];
+      if (!import_lodash.default.has(normalizedValues, ["stepParams", "calendarSettings", propKey])) {
+        nextStepParams = nextStepParams ?? import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+        const currentSettings = import_lodash.default.get(nextStepParams, ["calendarSettings", propKey]);
+        const popupSettings = import_lodash.default.isPlainObject(value) ? this.normalizeCalendarPopupSettings(
+          actionKey,
+          import_lodash.default.isPlainObject(currentSettings) ? { ...import_lodash.default.cloneDeep(currentSettings), ...import_lodash.default.cloneDeep(value) } : value
+        ) : {};
+        import_lodash.default.set(nextStepParams, ["calendarSettings", propKey], import_lodash.default.cloneDeep(popupSettings));
+      }
+    }
+    this.stripPopupPropsFromPayload(nextPayload, import_hidden_popup_calendar.CALENDAR_POPUP_PROP_KEYS);
+    if (nextStepParams) {
+      nextPayload.stepParams = nextStepParams;
+    }
+  }
+  replaceExplicitPopupStepParamSubtreesForUpdateSettings(current, normalizedValues, nextPayload, replacePopupStepParamSubtrees = false) {
+    const replacePaths = UPDATE_SETTINGS_POPUP_STEP_PARAM_REPLACE_PATHS_BY_USE[(current == null ? void 0 : current.use) || ""];
+    if (!(replacePaths == null ? void 0 : replacePaths.length) || !import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.stepParams)) {
       return;
     }
-    const nextProps = import_lodash.default.cloneDeep(nextPayload.props ?? (current == null ? void 0 : current.props) ?? {});
-    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
-    if (hasStepFilterSettingsClear) {
-      if (hasPropsFilterableFieldNames || hasPropsDefaultFilterValue || hasPropsFilterValue) {
-        (0, import_errors.throwBadRequest)(
-          "flowSurfaces updateSettings filter action cannot combine 'stepParams.filterSettings' clear with filter props writes"
-        );
-      }
+    let nextStepParams;
+    for (const path of replacePaths) {
+      const inputPath = ["stepParams", ...path];
+      if (!import_lodash.default.has(normalizedValues, inputPath)) {
+        continue;
+      }
+      nextStepParams = nextStepParams ?? import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+      const value = import_lodash.default.get(normalizedValues, inputPath);
+      const currentValue = import_lodash.default.get(nextStepParams, path);
+      import_lodash.default.set(
+        nextStepParams,
+        path,
+        this.normalizePopupStepParamReplacementForUpdateSettings(
+          current,
+          path,
+          value,
+          currentValue,
+          replacePopupStepParamSubtrees
+        )
+      );
+    }
+    if (nextStepParams) {
+      nextPayload.stepParams = nextStepParams;
+    }
+  }
+  normalizePopupStepParamReplacementForUpdateSettings(current, path, value, currentValue, replacePopupStepParamSubtrees = false) {
+    if (!import_lodash.default.isPlainObject(value)) {
+      return {};
+    }
+    const mergedValue = !replacePopupStepParamSubtrees && import_lodash.default.isPlainObject(currentValue) ? { ...import_lodash.default.cloneDeep(currentValue), ...import_lodash.default.cloneDeep(value) } : value;
+    if ((current == null ? void 0 : current.use) === "CalendarBlockModel") {
+      const actionKey = path[1] === "quickCreatePopupSettings" ? "quickCreateAction" : "eventViewAction";
+      return this.normalizeCalendarPopupSettings(actionKey, mergedValue);
+    }
+    if ((current == null ? void 0 : current.use) === "KanbanBlockModel") {
+      return this.normalizeKanbanPopupSettings("quickCreateAction", mergedValue, current.uid);
+    }
+    if ((current == null ? void 0 : current.use) === "KanbanCardItemModel") {
+      const parentUid = String((current == null ? void 0 : current.parentId) || "").trim() || void 0;
+      return this.normalizeKanbanPopupSettings("cardViewAction", mergedValue, parentUid);
+    }
+    return import_lodash.default.cloneDeep(mergedValue);
+  }
+  stripPopupPropsFromPayload(nextPayload, keys) {
+    if (!import_lodash.default.isPlainObject(nextPayload.props)) {
+      return;
+    }
+    for (const key of keys) {
+      if (Object.prototype.hasOwnProperty.call(nextPayload.props, key)) {
+        delete nextPayload.props[key];
+      }
+    }
+  }
+  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;
+    }
+    if ((current == null ? void 0 : current.use) === "KanbanBlockModel") {
+      const propToPopupKey = {
+        popupMode: "mode",
+        popupSize: "size",
+        popupTemplateUid: "popupTemplateUid",
+        popupPageModelClass: "pageModelClass",
+        popupTargetUid: "uid"
+      };
+      const writtenProps = Object.keys(propToPopupKey).filter(
+        (propKey) => Object.prototype.hasOwnProperty.call(normalizedValues.props, propKey)
+      );
+      const hasLegacyPopupSettings = Object.prototype.hasOwnProperty.call(
+        normalizedValues.props,
+        "quickCreatePopupSettings"
+      );
+      if (!writtenProps.length && !hasLegacyPopupSettings) {
+        return;
+      }
+      if (import_lodash.default.has(normalizedValues, ["stepParams", "kanbanSettings", "popup"])) {
+        this.stripPopupPropsFromPayload(nextPayload, import_hidden_popup_kanban.KANBAN_BLOCK_POPUP_PROP_KEYS);
+        return;
+      }
+      const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+      const currentPopupSettings = import_lodash.default.get(nextStepParams, ["kanbanSettings", "popup"]);
+      const popupSettings = import_lodash.default.cloneDeep(import_lodash.default.isPlainObject(currentPopupSettings) ? currentPopupSettings : {});
+      if (import_lodash.default.isPlainObject(normalizedValues.props.quickCreatePopupSettings)) {
+        Object.assign(popupSettings, import_lodash.default.cloneDeep(normalizedValues.props.quickCreatePopupSettings));
+      }
+      for (const propKey of writtenProps) {
+        popupSettings[propToPopupKey[propKey]] = normalizedValues.props[propKey];
+      }
+      import_lodash.default.set(
+        nextStepParams,
+        ["kanbanSettings", "popup"],
+        this.normalizeKanbanPopupSettings("quickCreateAction", popupSettings, current.uid)
+      );
+      nextPayload.stepParams = nextStepParams;
+      this.stripPopupPropsFromPayload(nextPayload, import_hidden_popup_kanban.KANBAN_BLOCK_POPUP_PROP_KEYS);
+      return;
+    }
+    if ((current == null ? void 0 : current.use) === "KanbanCardItemModel") {
+      const propToPopupKey = {
+        openMode: "mode",
+        popupSize: "size",
+        popupTemplateUid: "popupTemplateUid",
+        pageModelClass: "pageModelClass",
+        popupTargetUid: "uid"
+      };
+      const writtenProps = Object.keys(propToPopupKey).filter(
+        (propKey) => Object.prototype.hasOwnProperty.call(normalizedValues.props, propKey)
+      );
+      const hasLegacyPopupSettings = Object.prototype.hasOwnProperty.call(normalizedValues.props, "cardPopupSettings");
+      if (!writtenProps.length && !hasLegacyPopupSettings) {
+        return;
+      }
+      if (import_lodash.default.has(normalizedValues, ["stepParams", "cardSettings", "popup"])) {
+        this.stripPopupPropsFromPayload(nextPayload, import_hidden_popup_kanban.KANBAN_CARD_POPUP_PROP_KEYS);
+        return;
+      }
+      const parentUid = String((current == null ? void 0 : current.parentId) || "").trim() || void 0;
+      const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+      const currentPopupSettings = import_lodash.default.get(nextStepParams, ["cardSettings", "popup"]);
+      const popupSettings = import_lodash.default.cloneDeep(import_lodash.default.isPlainObject(currentPopupSettings) ? currentPopupSettings : {});
+      if (import_lodash.default.isPlainObject(normalizedValues.props.cardPopupSettings)) {
+        Object.assign(popupSettings, import_lodash.default.cloneDeep(normalizedValues.props.cardPopupSettings));
+      }
+      for (const propKey of writtenProps) {
+        popupSettings[propToPopupKey[propKey]] = normalizedValues.props[propKey];
+      }
+      import_lodash.default.set(
+        nextStepParams,
+        ["cardSettings", "popup"],
+        this.normalizeKanbanPopupSettings("cardViewAction", popupSettings, parentUid)
+      );
+      nextPayload.stepParams = nextStepParams;
+      this.stripPopupPropsFromPayload(nextPayload, import_hidden_popup_kanban.KANBAN_CARD_POPUP_PROP_KEYS);
+    }
+  }
+  syncFilterActionSettingsForUpdateSettings(current, values, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "FilterActionModel") {
+      return;
+    }
+    const hasPropsFilterableFieldNames = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterableFieldNames");
+    const hasPropsDefaultFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "defaultFilterValue");
+    const hasPropsFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterValue");
+    const hasStepFilterSettingsClear = import_lodash.default.isPlainObject(values == null ? void 0 : values.stepParams) && Object.prototype.hasOwnProperty.call(values.stepParams, "filterSettings") && (values.stepParams.filterSettings === null || import_lodash.default.isPlainObject(values.stepParams.filterSettings) && !Object.keys(values.stepParams.filterSettings).length);
+    const hasStepFilterableFieldNames = import_lodash.default.has(values, [
+      "stepParams",
+      "filterSettings",
+      "filterableFieldNames",
+      "filterableFieldNames"
+    ]);
+    const hasStepDefaultFilter = import_lodash.default.has(values, ["stepParams", "filterSettings", "defaultFilter", "defaultFilter"]);
+    if (!hasPropsFilterableFieldNames && !hasPropsDefaultFilterValue && !hasPropsFilterValue && !hasStepFilterSettingsClear && !hasStepFilterableFieldNames && !hasStepDefaultFilter) {
+      return;
+    }
+    const nextProps = import_lodash.default.cloneDeep(nextPayload.props ?? (current == null ? void 0 : current.props) ?? {});
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    if (hasStepFilterSettingsClear) {
+      if (hasPropsFilterableFieldNames || hasPropsDefaultFilterValue || hasPropsFilterValue) {
+        (0, import_errors.throwBadRequest)(
+          "flowSurfaces updateSettings filter action cannot combine 'stepParams.filterSettings' clear with filter props writes"
+        );
+      }
       import_lodash.default.unset(nextProps, ["filterableFieldNames"]);
       import_lodash.default.unset(nextProps, ["defaultFilterValue"]);
       import_lodash.default.unset(nextProps, ["filterValue"]);
@@ -8124,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);
@@ -8400,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)) {
@@ -8957,7 +9572,7 @@ class FlowSurfacesService {
     if (!normalizedUid) {
       return null;
     }
-    for (const actionKey of CALENDAR_POPUP_ACTION_KEYS) {
+    for (const actionKey of import_hidden_popup_calendar.CALENDAR_POPUP_ACTION_KEYS) {
       const suffix = `-${actionKey}`;
       if (normalizedUid.endsWith(suffix) && normalizedUid.length > suffix.length) {
         return {
@@ -8973,8 +9588,8 @@ class FlowSurfacesService {
     if (!normalizedUid) {
       return null;
     }
-    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
-      const suffix = KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY[actionKey];
+    for (const actionKey of import_hidden_popup_kanban.KANBAN_POPUP_ACTION_KEYS) {
+      const suffix = import_hidden_popup_kanban.KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY[actionKey];
       if (normalizedUid.endsWith(suffix) && normalizedUid.length > suffix.length) {
         return {
           kanbanUid: normalizedUid.slice(0, -suffix.length),
@@ -9016,6 +9631,20 @@ class FlowSurfacesService {
         await this.ensureKanbanBlockPopupHosts(kanbanNode, options.transaction);
       }
     }
+    const repairedTarget = await this.repository.findModelById(writeTarget.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    if (repairedTarget == null ? void 0 : repairedTarget.uid) {
+      return writeTarget;
+    }
+    const ownerNode = await this.repository.findModelById((parsedCalendarPopupTarget == null ? void 0 : parsedCalendarPopupTarget.calendarUid) || (parsedKanbanPopupTarget == null ? void 0 : parsedKanbanPopupTarget.kanbanUid), {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    }).catch(() => null);
+    if (ownerNode == null ? void 0 : ownerNode.uid) {
+      await this.ensureHiddenPopupBlockHostsInManagedPopupTarget(ownerNode, options.transaction);
+    }
     return writeTarget;
   }
   normalizeRootUidValue(actionName, values) {
@@ -9424,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;
@@ -9445,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);
@@ -9457,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))) {
@@ -10348,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 } } : {},
@@ -10391,20 +11086,44 @@ class FlowSurfacesService {
       changes,
       resetInvalidExisting: resourceChanged
     });
-    const quickCreatePopupSettings = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup") ? await this.normalizeCalendarPopupConfigureValue({
+    const hasQuickCreatePopupChange = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup");
+    const hasEventPopupChange = Object.prototype.hasOwnProperty.call(changes, "eventPopup");
+    const quickCreatePopupSettingsInput = hasQuickCreatePopupChange ? await this.normalizeCalendarPopupConfigureValue({
       actionName: "configure calendar quickCreatePopup",
       blockUid: current.uid,
       actionKey: "quickCreateAction",
       value: changes.quickCreatePopup,
       transaction: options.transaction
     }) : void 0;
-    const eventPopupSettings = Object.prototype.hasOwnProperty.call(changes, "eventPopup") ? await this.normalizeCalendarPopupConfigureValue({
+    const eventPopupSettingsInput = hasEventPopupChange ? await this.normalizeCalendarPopupConfigureValue({
       actionName: "configure calendar eventPopup",
       blockUid: current.uid,
       actionKey: "eventViewAction",
       value: changes.eventPopup,
       transaction: options.transaction
     }) : void 0;
+    const currentQuickCreatePopupSettings = this.getCalendarPopupStoredSettings(current, "quickCreateAction");
+    const currentEventPopupSettings = this.getCalendarPopupStoredSettings(current, "eventViewAction");
+    const quickCreatePopupSettingsBase = resourceChanged ? this.stripCalendarPopupTargetSettingsForResourceChange("quickCreateAction", currentQuickCreatePopupSettings) : currentQuickCreatePopupSettings;
+    const eventPopupSettingsBase = resourceChanged ? this.stripCalendarPopupTargetSettingsForResourceChange("eventViewAction", currentEventPopupSettings) : currentEventPopupSettings;
+    const quickCreatePopupSettings = hasQuickCreatePopupChange ? import_lodash.default.isNull(changes.quickCreatePopup) ? quickCreatePopupSettingsInput || {} : this.mergeCalendarPopupSettings(
+      "quickCreateAction",
+      quickCreatePopupSettingsBase,
+      quickCreatePopupSettingsInput
+    ) : void 0;
+    const eventPopupSettings = hasEventPopupChange ? import_lodash.default.isNull(changes.eventPopup) ? eventPopupSettingsInput || {} : this.mergeCalendarPopupSettings("eventViewAction", eventPopupSettingsBase, eventPopupSettingsInput) : void 0;
+    const previousQuickCreateOpenView = this.buildCalendarPopupOpenView({
+      blockNode: current,
+      actionKey: "quickCreateAction",
+      resourceInit: currentResourceInit,
+      popupSettings: currentQuickCreatePopupSettings
+    });
+    const previousEventOpenView = this.buildCalendarPopupOpenView({
+      blockNode: current,
+      actionKey: "eventViewAction",
+      resourceInit: currentResourceInit,
+      popupSettings: currentEventPopupSettings
+    });
     const result = await this.updateSettings(
       {
         target,
@@ -10413,9 +11132,7 @@ class FlowSurfacesService {
           defaultView,
           enableQuickCreateEvent: quickCreateEvent,
           showLunar,
-          weekStart,
-          quickCreatePopupSettings,
-          eventPopupSettings
+          weekStart
         }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
@@ -10434,7 +11151,10 @@ class FlowSurfacesService {
             "showLunar",
             "weekStart",
             "dataScope",
-            "linkageRules"
+            "linkageRules",
+            "quickCreatePopup",
+            "eventPopup",
+            "resource"
           ]) ? {
             calendarSettings: (0, import_service_utils.buildDefinedPayload)({
               ...(0, import_service_utils.hasOwnDefined)(changes, "titleField") ? { titleField: { titleField: fieldNames.title } } : {},
@@ -10446,18 +11166,37 @@ class FlowSurfacesService {
               ...(0, import_service_utils.hasOwnDefined)(changes, "showLunar") ? { showLunar: { showLunar: showLunar === true } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "weekStart") ? { weekStart: { weekStart } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
+              ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {},
+              ...hasQuickCreatePopupChange ? { quickCreatePopupSettings: quickCreatePopupSettings || {} } : resourceChanged ? { quickCreatePopupSettings: quickCreatePopupSettingsBase } : {},
+              ...hasEventPopupChange ? { eventPopupSettings: eventPopupSettings || {} } : resourceChanged ? { eventPopupSettings: eventPopupSettingsBase } : {}
             })
           } : {}
         }
       },
-      options
+      {
+        ...options,
+        replacePopupStepParamSubtrees: resourceChanged,
+        skipHiddenPopupHostEnsure: true
+      }
     );
     const reloaded = await this.repository.findModelById(current.uid, {
       transaction: options.transaction,
       includeAsyncNode: true
     });
-    await this.ensureCalendarBlockPopupHosts(reloaded, options.transaction);
+    await this.ensureCalendarBlockPopupHosts(
+      reloaded,
+      options.transaction,
+      {
+        quickCreateAction: hasQuickCreatePopupChange ? quickCreatePopupSettings : resourceChanged ? quickCreatePopupSettingsBase : void 0,
+        eventViewAction: hasEventPopupChange ? eventPopupSettings : resourceChanged ? eventPopupSettingsBase : void 0
+      },
+      {
+        displayFallbackOpenViews: {
+          quickCreateAction: previousQuickCreateOpenView,
+          eventViewAction: previousEventOpenView
+        }
+      }
+    );
     return result;
   }
   async configureTreeBlock(target, current, changes, options) {
@@ -10503,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")
+                }
+              } : {}
             })
           } : {}
         }
@@ -10678,20 +11421,44 @@ class FlowSurfacesService {
     const nextDragEnabled = requestedDragEnabled === true && !!nextDragSortBy;
     const nextStyleVariantProp = (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? String(changes.styleVariant || "").trim() === "default" ? "default" : "color" : void 0;
     const nextStyleVariantSetting = (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? String(changes.styleVariant || "").trim() : void 0;
-    const quickCreatePopup = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup") ? await this.normalizeKanbanPopupConfigureValue({
+    const shouldWriteQuickCreatePopup = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup");
+    const shouldWriteCardPopup = Object.prototype.hasOwnProperty.call(changes, "cardPopup");
+    const quickCreatePopupInput = shouldWriteQuickCreatePopup ? await this.normalizeKanbanPopupConfigureValue({
       actionName: "configure kanban quickCreatePopup",
       blockUid: current.uid,
       actionKey: "quickCreateAction",
       value: changes.quickCreatePopup,
       transaction: options.transaction
     }) : void 0;
-    const cardPopup = Object.prototype.hasOwnProperty.call(changes, "cardPopup") ? await this.normalizeKanbanPopupConfigureValue({
+    const cardPopupInput = shouldWriteCardPopup ? await this.normalizeKanbanPopupConfigureValue({
       actionName: "configure kanban cardPopup",
       blockUid: current.uid,
       actionKey: "cardViewAction",
       value: changes.cardPopup,
       transaction: options.transaction
     }) : void 0;
+    const currentQuickCreatePopupSettings = this.getKanbanPopupStoredSettings(current, "quickCreateAction");
+    const currentCardPopupSettings = this.getKanbanPopupStoredSettings(current, "cardViewAction");
+    const quickCreatePopupBase = resourceChanged ? this.stripKanbanPopupTargetSettingsForResourceChange(
+      "quickCreateAction",
+      currentQuickCreatePopupSettings,
+      current.uid
+    ) : currentQuickCreatePopupSettings;
+    const cardPopupBase = resourceChanged ? this.stripKanbanPopupTargetSettingsForResourceChange("cardViewAction", currentCardPopupSettings, current.uid) : currentCardPopupSettings;
+    const quickCreatePopup = shouldWriteQuickCreatePopup ? import_lodash.default.isNull(changes.quickCreatePopup) ? quickCreatePopupInput || {} : this.mergeKanbanPopupSettings("quickCreateAction", quickCreatePopupBase, quickCreatePopupInput, current.uid) : void 0;
+    const cardPopup = shouldWriteCardPopup ? import_lodash.default.isNull(changes.cardPopup) ? cardPopupInput || {} : this.mergeKanbanPopupSettings("cardViewAction", cardPopupBase, cardPopupInput, current.uid) : void 0;
+    const previousQuickCreateOpenView = this.buildKanbanPopupOpenView({
+      blockNode: current,
+      actionKey: "quickCreateAction",
+      resourceInit: currentResourceInit,
+      popupSettings: currentQuickCreatePopupSettings
+    });
+    const previousCardOpenView = this.buildKanbanPopupOpenView({
+      blockNode: current,
+      actionKey: "cardViewAction",
+      resourceInit: currentResourceInit,
+      popupSettings: currentCardPopupSettings
+    });
     const nextCardLayout = (0, import_service_utils.hasOwnDefined)(changes, "cardLayout") ? (0, import_service_utils.normalizeSimpleLayoutValue)(changes.cardLayout) : void 0;
     const shouldWriteGrouping = resourceChanged || (0, import_service_utils.hasOwnDefined)(changes, "groupField") || (0, import_service_utils.hasOwnDefined)(changes, "groupTitleField") || (0, import_service_utils.hasOwnDefined)(changes, "groupColorField") || (0, import_service_utils.hasOwnDefined)(changes, "groupOptions") || groupFieldChanged;
     const shouldWriteDrag = resourceChanged || (0, import_service_utils.hasOwnDefined)(changes, "dragEnabled") || (0, import_service_utils.hasOwnDefined)(changes, "dragSortBy") || groupFieldChanged;
@@ -10703,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
@@ -10712,14 +11479,7 @@ class FlowSurfacesService {
         quickCreateEnabled: changes.quickCreateEnabled === true
       } : {},
       ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: changes.pageSize } : {},
-      ...(0, import_service_utils.hasOwnDefined)(changes, "columnWidth") ? { columnWidth: changes.columnWidth } : {},
-      ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") ? {
-        popupMode: (quickCreatePopup == null ? void 0 : quickCreatePopup.mode) ?? null,
-        popupSize: (quickCreatePopup == null ? void 0 : quickCreatePopup.size) ?? null,
-        popupTemplateUid: (quickCreatePopup == null ? void 0 : quickCreatePopup.popupTemplateUid) ?? null,
-        popupPageModelClass: (quickCreatePopup == null ? void 0 : quickCreatePopup.pageModelClass) ?? null,
-        popupTargetUid: (quickCreatePopup == null ? void 0 : quickCreatePopup.uid) ?? null
-      } : {}
+      ...(0, import_service_utils.hasOwnDefined)(changes, "columnWidth") ? { columnWidth: changes.columnWidth } : {}
     });
     const blockStepParams = (0, import_service_utils.buildDefinedPayload)({
       ...blockCardSettings ? { cardSettings: blockCardSettings } : {},
@@ -10728,7 +11488,7 @@ class FlowSurfacesService {
           init: nextResourceInit
         }
       } : {},
-      ...shouldWriteGrouping || (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") || (0, import_service_utils.hasOwnDefined)(changes, "sorting") || shouldWriteDrag || (0, import_service_utils.hasOwnDefined)(changes, "quickCreateEnabled") || (0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "columnWidth") || (0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? {
+      ...shouldWriteGrouping || (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") || (0, import_service_utils.hasOwnDefined)(changes, "sorting") || shouldWriteDrag || (0, import_service_utils.hasOwnDefined)(changes, "quickCreateEnabled") || shouldWriteQuickCreatePopup || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "columnWidth") || (0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? {
         kanbanSettings: (0, import_service_utils.buildDefinedPayload)({
           ...shouldWriteGrouping ? {
             grouping: (0, import_service_utils.buildDefinedPayload)({
@@ -10745,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 ? {
@@ -10761,7 +11521,7 @@ class FlowSurfacesService {
               quickCreateEnabled: changes.quickCreateEnabled === true
             }
           } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") ? {
+          ...shouldWriteQuickCreatePopup ? {
             popup: quickCreatePopup || {}
           } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? {
@@ -10786,13 +11546,6 @@ class FlowSurfacesService {
       ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") ? {
         enableCardClick: changes.enableCardClick === true
       } : {},
-      ...(0, import_service_utils.hasOwnDefined)(changes, "cardPopup") ? {
-        openMode: (cardPopup == null ? void 0 : cardPopup.mode) ?? null,
-        popupSize: (cardPopup == null ? void 0 : cardPopup.size) ?? null,
-        popupTemplateUid: (cardPopup == null ? void 0 : cardPopup.popupTemplateUid) ?? null,
-        pageModelClass: (cardPopup == null ? void 0 : cardPopup.pageModelClass) ?? null,
-        popupTargetUid: (cardPopup == null ? void 0 : cardPopup.uid) ?? null
-      } : {},
       ...(0, import_service_utils.hasOwnDefined)(changes, "cardLayout") ? {
         layout: nextCardLayout
       } : {},
@@ -10802,14 +11555,14 @@ class FlowSurfacesService {
       ...(0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? { colon: changes.cardColon === true } : {}
     });
     const itemStepParams = (0, import_service_utils.buildDefinedPayload)({
-      ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") || (0, import_service_utils.hasOwnDefined)(changes, "cardPopup") || (0, import_service_utils.hasOwnDefined)(changes, "cardLayout") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? {
+      ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") || shouldWriteCardPopup || (0, import_service_utils.hasOwnDefined)(changes, "cardLayout") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? {
         cardSettings: (0, import_service_utils.buildDefinedPayload)({
           ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") ? {
             click: {
               enableCardClick: changes.enableCardClick === true
             }
           } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "cardPopup") ? {
+          ...shouldWriteCardPopup ? {
             popup: cardPopup || {}
           } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "cardLayout") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? {
@@ -10832,7 +11585,11 @@ class FlowSurfacesService {
           props: blockProps,
           stepParams: blockStepParams
         },
-        options
+        {
+          ...options,
+          replacePopupStepParamSubtrees: resourceChanged,
+          skipHiddenPopupHostEnsure: true
+        }
       );
       import_lodash.default.castArray((blockResult == null ? void 0 : blockResult.updated) || []).forEach((key) => updated.add(String(key)));
     }
@@ -10845,7 +11602,11 @@ class FlowSurfacesService {
           props: itemProps,
           stepParams: itemStepParams
         },
-        options
+        {
+          ...options,
+          replacePopupStepParamSubtrees: resourceChanged,
+          skipHiddenPopupHostEnsure: true
+        }
       );
       import_lodash.default.castArray((itemResult == null ? void 0 : itemResult.updated) || []).forEach((key) => updated.add(String(key)));
     }
@@ -10853,7 +11614,37 @@ class FlowSurfacesService {
       transaction: options.transaction,
       includeAsyncNode: true
     });
-    await this.ensureKanbanBlockPopupHosts(reloaded, options.transaction);
+    const popupSettingsStorageNode = reloaded || current;
+    if (resourceChanged && !shouldWriteQuickCreatePopup) {
+      await this.replaceKanbanStoredPopupSettings(
+        popupSettingsStorageNode,
+        "quickCreateAction",
+        quickCreatePopupBase,
+        options.transaction
+      );
+    }
+    if (resourceChanged && !shouldWriteCardPopup) {
+      await this.replaceKanbanStoredPopupSettings(
+        popupSettingsStorageNode,
+        "cardViewAction",
+        cardPopupBase,
+        options.transaction
+      );
+    }
+    await this.ensureKanbanBlockPopupHosts(
+      reloaded,
+      options.transaction,
+      {
+        quickCreateAction: shouldWriteQuickCreatePopup ? quickCreatePopup || {} : resourceChanged ? quickCreatePopupBase : void 0,
+        cardViewAction: shouldWriteCardPopup ? cardPopup || {} : resourceChanged ? cardPopupBase : void 0
+      },
+      {
+        displayFallbackOpenViews: {
+          quickCreateAction: previousQuickCreateOpenView,
+          cardViewAction: previousCardOpenView
+        }
+      }
+    );
     return (0, import_service_utils.buildDefinedPayload)({
       uid: current.uid,
       ...updated.size ? { updated: Array.from(updated) } : {}
@@ -10953,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 } } : {}
             })
@@ -11023,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 } } : {}
             })
           } : {}
@@ -11053,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 } } : {}
             })
           } : {}
@@ -11230,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 } } : {}
             })
           } : {}
@@ -11795,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);
@@ -11862,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
         };
       }
     }
@@ -11992,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
       },
       {
@@ -13157,33 +13973,120 @@ class FlowSurfacesService {
     ) || (field == null ? void 0 : field.targetCollection) || null;
   }
   resolvePopupHostOpenView(node) {
-    for (const [flowKey, stepKey] of import_template_service_utils.POPUP_HOST_STEP_PARAM_PATHS) {
-      const openView = import_lodash.default.get(node, ["stepParams", flowKey, stepKey]);
-      if (import_lodash.default.isPlainObject(openView)) {
-        return openView;
-      }
-    }
-    return null;
+    return (0, import_hidden_popup_contract.resolveHiddenPopupHostOpenView)(node);
   }
-  resolvePopupSourceRecordCollectionName(popupAssociationName, hostContext) {
-    var _a, _b, _c;
-    const normalizedAssociationName = String(popupAssociationName || "").trim();
-    const resourceCollectionName = String(((_b = (_a = hostContext == null ? void 0 : hostContext.resourceContext) == null ? void 0 : _a.resourceInit) == null ? void 0 : _b.collectionName) || "").trim();
-    if (((_c = hostContext == null ? void 0 : hostContext.associationContext) == null ? void 0 : _c.associationField) && resourceCollectionName) {
-      return resourceCollectionName;
-    }
-    if (normalizedAssociationName.includes(".")) {
-      return normalizedAssociationName.split(".")[0];
-    }
-    if (normalizedAssociationName && resourceCollectionName) {
-      return resourceCollectionName;
-    }
-    return void 0;
+  popupHostHasLocalContent(actionNode) {
+    return (0, import_hidden_popup_contract.hiddenPopupHostHasLocalContent)(actionNode);
   }
-  async resolvePopupContextLevel(uid2, hostNode, transaction, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const popupConfig = this.resolvePopupHostOpenView(hostNode);
-    const hostContext = (hostNode == null ? void 0 : hostNode.uid) ? await this.resolvePopupHostProfileContext(hostNode, transaction).catch(() => null) : null;
+  shouldAutoBindPopupTemplate(openView, popupSettings, expectedHostUid, hostNode) {
+    return (0, import_hidden_popup_contract.shouldAutoBindHiddenPopupTemplate)(openView, popupSettings, expectedHostUid, {
+      hostHasLocalContent: !!(hostNode == null ? void 0 : hostNode.uid) && this.popupHostHasLocalContent(hostNode)
+    });
+  }
+  async patchPopupOpenViewIfChanged(actionUid, openView, transaction) {
+    const actionNode = await this.repository.findModelById(actionUid, {
+      transaction,
+      includeAsyncNode: true
+    });
+    if (!(actionNode == null ? void 0 : actionNode.uid)) {
+      return false;
+    }
+    const currentOpenView = this.resolvePopupHostOpenView(actionNode);
+    if (import_lodash.default.isEqual(currentOpenView, openView)) {
+      return false;
+    }
+    await this.repository.patch(
+      {
+        uid: actionUid,
+        stepParams: (0, import_hidden_popup_contract.buildHiddenPopupActionStepParams)(actionNode.stepParams, openView)
+      },
+      { transaction }
+    );
+    return true;
+  }
+  async buildPopupOpenViewWithTemplate(input) {
+    var _a;
+    const hasExplicitTargetSettings = (0, import_hidden_popup_contract.hasExplicitHiddenPopupTargetSettings)(input.popupSettings, input.actionUid);
+    const shouldAutoBind = this.shouldAutoBindPopupTemplate(
+      input.openView,
+      input.popupSettings,
+      input.actionUid,
+      input.existingHost
+    );
+    if (!hasExplicitTargetSettings && !shouldAutoBind) {
+      return input.openView;
+    }
+    const openViewForNormalize = shouldAutoBind && String(((_a = input.openView) == null ? void 0 : _a.uid) || "").trim() === input.actionUid ? { ...input.openView, uid: void 0, tryTemplate: true } : shouldAutoBind ? { ...input.openView, tryTemplate: true } : input.openView;
+    const normalized = await this.normalizeOpenView(input.actionName, openViewForNormalize, {
+      transaction: input.transaction,
+      popupTemplateHostUid: input.actionUid,
+      popupActionContext: {
+        hasCurrentRecord: !!input.hasCurrentRecord
+      }
+    });
+    const normalizedOpenView = input.normalizePopupSettings(normalized || input.openView);
+    return input.mergeDisplaySettings(
+      (0, import_service_utils.buildDefinedPayload)({
+        ...input.openView,
+        ...normalizedOpenView,
+        uid: normalizedOpenView.uid || input.openView.uid,
+        collectionName: normalizedOpenView.collectionName || input.openView.collectionName,
+        dataSourceKey: normalizedOpenView.dataSourceKey || input.openView.dataSourceKey
+      }),
+      input.popupSettings,
+      input.openView
+    );
+  }
+  async completePopupHostDefaultContent(input) {
+    const popup = (0, import_hidden_popup_contract.buildImplicitHiddenPopupDefaultContent)(input.popupSettings);
+    if (!popup) {
+      return;
+    }
+    await this.applyInlineActionPopup(input.actionName, input.actionUid, popup, {
+      transaction: input.transaction,
+      popupActionContext: {
+        hasCurrentRecord: !!input.hasCurrentRecord
+      }
+    });
+  }
+  async ensurePopupHostDefaultContent(input) {
+    let actionNode = await this.repository.findModelById(input.actionUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    const openView = this.resolvePopupHostOpenView(actionNode);
+    if (!this.shouldAutoBindPopupTemplate(openView, input.popupSettings, input.actionUid) || String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim() || this.popupHostHasLocalContent(actionNode)) {
+      return false;
+    }
+    await this.completePopupHostDefaultContent(input);
+    actionNode = await this.repository.findModelById(input.actionUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    const completedOpenView = this.resolvePopupHostOpenView(actionNode);
+    const mergedCompletedOpenView = input.mergeDisplaySettings(completedOpenView, input.popupSettings, openView);
+    await this.patchPopupOpenViewIfChanged(input.actionUid, mergedCompletedOpenView, input.transaction);
+    return true;
+  }
+  resolvePopupSourceRecordCollectionName(popupAssociationName, hostContext) {
+    var _a, _b, _c;
+    const normalizedAssociationName = String(popupAssociationName || "").trim();
+    const resourceCollectionName = String(((_b = (_a = hostContext == null ? void 0 : hostContext.resourceContext) == null ? void 0 : _a.resourceInit) == null ? void 0 : _b.collectionName) || "").trim();
+    if (((_c = hostContext == null ? void 0 : hostContext.associationContext) == null ? void 0 : _c.associationField) && resourceCollectionName) {
+      return resourceCollectionName;
+    }
+    if (normalizedAssociationName.includes(".")) {
+      return normalizedAssociationName.split(".")[0];
+    }
+    if (normalizedAssociationName && resourceCollectionName) {
+      return resourceCollectionName;
+    }
+    return void 0;
+  }
+  async resolvePopupContextLevel(uid2, hostNode, transaction, options = {}) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const popupConfig = this.resolvePopupHostOpenView(hostNode);
+    const hostContext = (hostNode == null ? void 0 : hostNode.uid) ? await this.resolvePopupHostProfileContext(hostNode, transaction).catch(() => null) : null;
     const popupDataSourceKey = (popupConfig == null ? void 0 : popupConfig.dataSourceKey) || ((_a = hostContext == null ? void 0 : hostContext.associationContext) == null ? void 0 : _a.dataSourceKey) || ((_c = (_b = hostContext == null ? void 0 : hostContext.resourceContext) == null ? void 0 : _b.resourceInit) == null ? void 0 : _c.dataSourceKey) || "main";
     const popupCollectionName = String((popupConfig == null ? void 0 : popupConfig.collectionName) || ((_d = hostContext == null ? void 0 : hostContext.associationContext) == null ? void 0 : _d.collectionName) || "").trim() || void 0;
     const popupAssociationName = String(
@@ -13441,108 +14344,60 @@ class FlowSurfacesService {
     });
   }
   normalizeKanbanPopupSettings(actionKey, popupSettings, blockUid) {
-    const nextParams = import_lodash.default.cloneDeep(popupSettings || {});
-    const actionUid = blockUid && actionKey ? this.getKanbanPopupActionUid(blockUid, actionKey) : void 0;
-    const popupTemplateUidProvided = Object.prototype.hasOwnProperty.call(nextParams, "popupTemplateUid");
-    const popupTemplateUid = typeof nextParams.popupTemplateUid === "string" ? nextParams.popupTemplateUid.trim() : nextParams.popupTemplateUid;
-    if (popupTemplateUidProvided && (popupTemplateUid === void 0 || popupTemplateUid === null || popupTemplateUid === "")) {
-      delete nextParams.popupTemplateUid;
-      delete nextParams.popupTemplateContext;
-      delete nextParams.popupTemplateHasFilterByTk;
-      delete nextParams.popupTemplateHasSourceId;
-      delete nextParams.uid;
-    }
-    const normalizedUid = typeof nextParams.uid === "string" ? nextParams.uid.trim() : nextParams.uid;
-    if (!normalizedUid || normalizedUid === blockUid || normalizedUid === actionUid) {
-      delete nextParams.uid;
-    } else {
-      nextParams.uid = normalizedUid;
-    }
-    if (typeof nextParams.mode === "string") {
-      nextParams.mode = OPEN_VIEW_MODE_ALIASES[nextParams.mode] || nextParams.mode;
-    }
-    if (typeof nextParams.size === "string" && !nextParams.size.trim()) {
-      delete nextParams.size;
-    }
-    if (typeof nextParams.pageModelClass === "string" && !nextParams.pageModelClass.trim()) {
-      delete nextParams.pageModelClass;
-    }
-    return nextParams;
-  }
-  getKanbanPopupActionUse(actionKey) {
-    return actionKey === "quickCreateAction" ? "KanbanQuickCreateActionModel" : "KanbanCardViewActionModel";
+    return (0, import_hidden_popup_kanban.normalizeKanbanPopupSettings)(actionKey, popupSettings, blockUid);
   }
   getKanbanPopupActionUid(kanbanUid, actionKey) {
-    return `${kanbanUid}${KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY[actionKey]}`;
+    return (0, import_hidden_popup_kanban.getKanbanPopupActionUid)(kanbanUid, actionKey);
   }
   getKanbanBlockResourceInit(blockNode) {
-    const resourceInit = import_lodash.default.cloneDeep(import_lodash.default.get(blockNode, ["stepParams", "resourceSettings", "init"]) || {});
-    if (resourceInit.collectionName && !resourceInit.dataSourceKey) {
-      resourceInit.dataSourceKey = "main";
-    }
-    return resourceInit;
+    return (0, import_hidden_popup_kanban.getKanbanBlockResourceInit)(blockNode);
+  }
+  buildKanbanInitialStepParams(input) {
+    return (0, import_hidden_popup_kanban.buildKanbanInitialStepParams)(input);
+  }
+  buildKanbanInitialItemProps(input) {
+    return (0, import_hidden_popup_kanban.buildKanbanInitialItemProps)(input);
+  }
+  buildKanbanInitialItemStepParams(input) {
+    return (0, import_hidden_popup_kanban.buildKanbanInitialItemStepParams)(input);
   }
   getKanbanPopupStoredSettings(blockNode, actionKey) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-    const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_a = blockNode == null ? void 0 : blockNode.subModels) == null ? void 0 : _a.item);
-    const rawPopupSettings = actionKey === "quickCreateAction" ? import_lodash.default.get(blockNode, ["stepParams", "kanbanSettings", "popup"]) || {
-      mode: (_b = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _b.popupMode,
-      size: (_c = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _c.popupSize,
-      popupTemplateUid: (_d = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _d.popupTemplateUid,
-      pageModelClass: (_e = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _e.popupPageModelClass,
-      uid: (_f = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _f.popupTargetUid
-    } : import_lodash.default.get(itemNode, ["stepParams", "cardSettings", "popup"]) || {
-      mode: (_g = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _g.openMode,
-      size: (_h = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _h.popupSize,
-      popupTemplateUid: (_i = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _i.popupTemplateUid,
-      pageModelClass: (_j = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _j.pageModelClass,
-      uid: (_k = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _k.popupTargetUid
-    };
-    return this.normalizeKanbanPopupSettings(actionKey, rawPopupSettings, blockNode == null ? void 0 : blockNode.uid);
+    return (0, import_hidden_popup_kanban.getKanbanPopupStoredSettings)(blockNode, actionKey);
+  }
+  mergeKanbanPopupSettings(actionKey, current, value, blockUid) {
+    return (0, import_hidden_popup_kanban.mergeKanbanPopupSettings)(actionKey, current, value, blockUid);
+  }
+  stripKanbanPopupTargetSettingsForResourceChange(actionKey, popupSettings, blockUid) {
+    return (0, import_hidden_popup_kanban.stripKanbanPopupTargetSettingsForResourceChange)(actionKey, popupSettings, blockUid);
   }
   buildKanbanPopupOpenView(input) {
-    const actionUid = this.getKanbanPopupActionUid(input.blockNode.uid, input.actionKey);
-    const resourceInit = input.resourceInit || this.getKanbanBlockResourceInit(input.blockNode);
-    const defaults = (0, import_service_utils.buildDefinedPayload)({
-      mode: "drawer",
-      size: "medium",
-      pageModelClass: "ChildPageModel",
-      uid: actionUid,
-      collectionName: resourceInit.collectionName,
-      dataSourceKey: resourceInit.dataSourceKey || (resourceInit.collectionName ? "main" : void 0)
-    });
-    const current = this.getKanbanPopupStoredSettings(input.blockNode, input.actionKey);
-    return (0, import_service_utils.buildDefinedPayload)({
-      ...defaults,
-      ...current,
-      uid: current.uid || defaults.uid,
-      collectionName: current.collectionName || defaults.collectionName,
-      dataSourceKey: current.dataSourceKey || defaults.dataSourceKey
-    });
+    return (0, import_hidden_popup_kanban.buildKanbanPopupOpenView)(input);
   }
   async normalizeKanbanPopupConfigureValue(input) {
-    if (import_lodash.default.isUndefined(input.value)) {
-      return void 0;
-    }
-    if (import_lodash.default.isNull(input.value)) {
-      return {};
-    }
-    const actionUid = this.getKanbanPopupActionUid(input.blockUid, input.actionKey);
-    const normalized = await this.normalizeOpenView(input.actionName, input.value, {
-      transaction: input.transaction,
-      popupTemplateHostUid: actionUid,
-      popupActionContext: {
-        hasCurrentRecord: input.actionKey === "cardViewAction"
-      }
+    return (0, import_hidden_popup_kanban.normalizeKanbanPopupConfigureValue)({
+      ...input,
+      normalizeOpenView: (actionName, value, options) => this.normalizeOpenView(actionName, value, options)
     });
-    return this.normalizeKanbanPopupSettings(input.actionKey, normalized || {}, input.blockUid);
   }
   buildKanbanInitialBlockProps(input) {
     const { collection, collectionName, dataSourceKey } = this.assertKanbanCollectionCompatible(
       input.actionName,
       input.resourceInit
     );
-    const currentProps = import_lodash.default.cloneDeep(input.props || {});
+    const currentProps = {
+      ...import_lodash.default.isPlainObject(input.settings) ? import_lodash.default.pick(input.settings, [
+        "groupField",
+        "groupOptions",
+        "groupTitleField",
+        "groupColorField",
+        "styleVariant",
+        "dragEnabled",
+        "dragSortBy",
+        "quickCreateEnabled",
+        "globalSort"
+      ]) : {},
+      ...import_lodash.default.cloneDeep(input.props || {})
+    };
     const defaultGroupFieldName = this.getKanbanDefaultGroupFieldName(collection);
     const nextGroupFieldName = String(currentProps.groupField || defaultGroupFieldName || "").trim();
     const nextGroupField = this.getKanbanGroupField(collection, nextGroupFieldName);
@@ -13599,7 +14454,7 @@ class FlowSurfacesService {
         kind: "groupColorField"
       });
     }
-    return (0, import_service_utils.buildDefinedPayload)({
+    const props = (0, import_service_utils.buildDefinedPayload)({
       ...currentProps,
       groupField: nextGroupFieldName,
       groupTitleField: nextGroupTitleField,
@@ -13608,8 +14463,26 @@ 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;
+    delete props.cardPopup;
+    delete props.cardPopupSettings;
+    for (const propKey of import_hidden_popup_kanban.KANBAN_BLOCK_POPUP_PROP_KEYS) {
+      delete props[propKey];
+    }
+    for (const propKey of [
+      "cardOpenMode",
+      "cardPopupSize",
+      "cardPopupTemplateUid",
+      "cardPopupPageModelClass",
+      "cardPopupTargetUid"
+    ]) {
+      delete props[propKey];
+    }
+    return props;
   }
   normalizeCalendarFieldPathInput(value, context, options = {}) {
     if (import_lodash.default.isUndefined(value)) {
@@ -13825,86 +14698,50 @@ class FlowSurfacesService {
     });
   }
   normalizeCalendarPopupSettings(actionKey, popupSettings) {
-    const nextParams = import_lodash.default.cloneDeep(popupSettings || {});
-    const popupTemplateUidProvided = Object.prototype.hasOwnProperty.call(nextParams, "popupTemplateUid");
-    const popupTemplateUid = typeof nextParams.popupTemplateUid === "string" ? nextParams.popupTemplateUid.trim() : nextParams.popupTemplateUid;
-    if (popupTemplateUidProvided && (popupTemplateUid === void 0 || popupTemplateUid === null || popupTemplateUid === "")) {
-      delete nextParams.popupTemplateUid;
-      delete nextParams.popupTemplateContext;
-      delete nextParams.popupTemplateHasFilterByTk;
-      delete nextParams.popupTemplateHasSourceId;
-      delete nextParams.uid;
-    }
-    if (actionKey === "quickCreateAction") {
-      const hasRecordScopedTemplate = !!nextParams.popupTemplateHasFilterByTk || !!nextParams.popupTemplateHasSourceId || !import_lodash.default.isUndefined(nextParams.filterByTk) || !import_lodash.default.isUndefined(nextParams.sourceId) || !!String(nextParams.associationName || "").trim();
-      if (hasRecordScopedTemplate) {
-        delete nextParams.popupTemplateUid;
-        delete nextParams.popupTemplateContext;
-        delete nextParams.popupTemplateHasFilterByTk;
-        delete nextParams.popupTemplateHasSourceId;
-        delete nextParams.uid;
-      }
-      delete nextParams.associationName;
-      delete nextParams.filterByTk;
-      delete nextParams.sourceId;
-    }
-    return nextParams;
-  }
-  getCalendarPopupActionUse(actionKey) {
-    return actionKey === "quickCreateAction" ? "CalendarQuickCreateActionModel" : "CalendarEventViewActionModel";
+    return (0, import_hidden_popup_calendar.normalizeCalendarPopupSettings)(actionKey, popupSettings);
   }
-  getCalendarPopupPropKey(actionKey) {
-    return actionKey === "quickCreateAction" ? "quickCreatePopupSettings" : "eventPopupSettings";
+  getCalendarBlockResourceInit(blockNode) {
+    return (0, import_hidden_popup_calendar.getCalendarBlockResourceInit)(blockNode);
   }
-  getCalendarPopupActionUid(calendarUid, actionKey) {
-    return `${calendarUid}-${actionKey}`;
+  getCalendarPopupStoredSettings(blockNode, actionKey) {
+    return (0, import_hidden_popup_calendar.getCalendarPopupStoredSettings)(blockNode, actionKey);
   }
-  getCalendarBlockResourceInit(blockNode) {
-    const resourceInit = import_lodash.default.cloneDeep(import_lodash.default.get(blockNode, ["stepParams", "resourceSettings", "init"]) || {});
-    if (resourceInit.collectionName && !resourceInit.dataSourceKey) {
-      resourceInit.dataSourceKey = "main";
-    }
-    return resourceInit;
+  getCalendarPopupPropKey(actionKey) {
+    return (0, import_hidden_popup_calendar.getCalendarPopupPropKey)(actionKey);
+  }
+  buildCalendarInitialStepParams(input) {
+    return (0, import_hidden_popup_calendar.buildCalendarInitialStepParams)(input);
   }
   buildCalendarPopupOpenView(input) {
-    const actionUid = this.getCalendarPopupActionUid(input.blockNode.uid, input.actionKey);
-    const resourceInit = input.resourceInit || this.getCalendarBlockResourceInit(input.blockNode);
-    const defaults = (0, import_service_utils.buildDefinedPayload)({
-      mode: "drawer",
-      size: "medium",
-      pageModelClass: "ChildPageModel",
-      uid: actionUid,
-      collectionName: resourceInit.collectionName,
-      dataSourceKey: resourceInit.dataSourceKey || (resourceInit.collectionName ? "main" : void 0)
-    });
-    const current = this.normalizeCalendarPopupSettings(
-      input.actionKey,
-      import_lodash.default.get(input.blockNode, ["props", this.getCalendarPopupPropKey(input.actionKey)]) || {}
-    );
-    return (0, import_service_utils.buildDefinedPayload)({
-      ...defaults,
-      ...current,
-      uid: current.uid || defaults.uid,
-      collectionName: current.collectionName || defaults.collectionName,
-      dataSourceKey: current.dataSourceKey || defaults.dataSourceKey
-    });
+    return (0, import_hidden_popup_calendar.buildCalendarPopupOpenView)(input);
+  }
+  mergeCalendarPopupSettings(actionKey, current, value) {
+    return (0, import_hidden_popup_calendar.mergeCalendarPopupSettings)(actionKey, current, value);
+  }
+  stripCalendarPopupTargetSettingsForResourceChange(actionKey, popupSettings) {
+    return (0, import_hidden_popup_calendar.stripCalendarPopupTargetSettingsForResourceChange)(actionKey, popupSettings);
   }
   async normalizeCalendarPopupConfigureValue(input) {
-    if (import_lodash.default.isUndefined(input.value)) {
-      return void 0;
-    }
-    if (import_lodash.default.isNull(input.value)) {
-      return {};
-    }
-    const actionUid = this.getCalendarPopupActionUid(input.blockUid, input.actionKey);
-    const normalized = await this.normalizeOpenView(input.actionName, input.value, {
-      transaction: input.transaction,
-      popupTemplateHostUid: actionUid,
-      popupActionContext: {
-        hasCurrentRecord: input.actionKey === "eventViewAction"
-      }
+    return (0, import_hidden_popup_calendar.normalizeCalendarPopupConfigureValue)({
+      ...input,
+      normalizeOpenView: (actionName, value, options) => this.normalizeOpenView(actionName, value, options)
     });
-    return this.normalizeCalendarPopupSettings(input.actionKey, normalized || {});
+  }
+  normalizeCalendarInlineSettingsForConfigure(settings) {
+    return (0, import_hidden_popup_calendar.normalizeCalendarInlineSettingsForConfigure)(settings);
+  }
+  omitHiddenPopupSettingsForConfigure(settings, type) {
+    if (!import_lodash.default.isPlainObject(settings)) {
+      return settings;
+    }
+    const omittedKeys = type === "calendar" ? ["quickCreatePopup", "eventPopup", "quickCreatePopupSettings", "eventPopupSettings"] : ["quickCreatePopup", "cardPopup", "quickCreatePopupSettings", "cardPopupSettings"];
+    return import_lodash.default.omit(settings, omittedKeys);
+  }
+  resolveCalendarInitialPopupOverride(settings, primaryKey, legacyKey) {
+    return (0, import_hidden_popup_calendar.resolveCalendarInitialPopupOverride)(settings, primaryKey, legacyKey);
+  }
+  resolveKanbanInitialPopupOverride(settings, primaryKey, legacyKey) {
+    return (0, import_hidden_popup_kanban.resolveKanbanInitialPopupOverride)(settings, primaryKey, legacyKey);
   }
   buildCalendarInitialBlockProps(input) {
     const { collection, collectionName } = this.assertCalendarCollectionCompatible(
@@ -13912,7 +14749,7 @@ class FlowSurfacesService {
       input.resourceInit
     );
     const currentProps = import_lodash.default.cloneDeep(input.props || {});
-    return {
+    const props = {
       ...currentProps,
       fieldNames: this.normalizeCalendarFieldNamesForCollection({
         actionName: input.actionName,
@@ -13925,259 +14762,83 @@ class FlowSurfacesService {
       enableQuickCreateEvent: typeof currentProps.enableQuickCreateEvent === "boolean" ? currentProps.enableQuickCreateEvent : true,
       weekStart: typeof currentProps.weekStart === "number" ? currentProps.weekStart : 1
     };
-  }
-  async ensureCalendarBlockPopupHosts(blockNode, transaction) {
-    var _a;
-    if (!(blockNode == null ? void 0 : blockNode.uid) || blockNode.use !== "CalendarBlockModel") {
-      return blockNode;
-    }
-    const resourceInit = this.getCalendarBlockResourceInit(blockNode);
-    let changed = false;
-    for (const actionKey of CALENDAR_POPUP_ACTION_KEYS) {
-      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = blockNode.subModels) == null ? void 0 : _a[actionKey]);
-      const expectedUid = this.getCalendarPopupActionUid(blockNode.uid, actionKey);
-      const expectedUse = this.getCalendarPopupActionUse(actionKey);
-      const openView = this.buildCalendarPopupOpenView({
-        blockNode,
-        actionKey,
-        resourceInit
-      });
-      const currentOpenView = this.resolvePopupHostOpenView(existing);
-      const shouldReplaceExisting = (existing == null ? void 0 : existing.uid) && existing.uid !== expectedUid;
-      const shouldUpsert = !(existing == null ? void 0 : existing.uid) || shouldReplaceExisting || existing.use !== expectedUse || !import_lodash.default.isEqual(currentOpenView, openView);
-      if (!shouldUpsert) {
-        continue;
-      }
-      if (shouldReplaceExisting) {
-        await this.removeNodeTreeWithBindings(existing.uid, transaction);
-      }
-      if ((existing == null ? void 0 : existing.uid) && existing.uid === expectedUid && !import_lodash.default.isEqual(currentOpenView, openView)) {
-        await this.reconcilePopupOpenViewTransition(expectedUid, currentOpenView, openView, transaction);
-      }
-      const nextActionNode = {
-        ...(existing == null ? void 0 : existing.uid) && existing.uid === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
-        uid: expectedUid,
-        use: expectedUse,
-        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
-          popupSettings: {
-            openView
-          }
-        })
-      };
-      await this.repository.upsertModel(
-        {
-          parentId: blockNode.uid,
-          subKey: actionKey,
-          subType: "object",
-          ...nextActionNode
-        },
-        { transaction }
-      );
-      changed = true;
-    }
-    if (!changed) {
-      return blockNode;
-    }
-    return this.repository.findModelById(blockNode.uid, {
+    delete props.quickCreatePopup;
+    delete props.quickCreatePopupSettings;
+    delete props.eventPopup;
+    delete props.eventPopupSettings;
+    return props;
+  }
+  async ensureCalendarBlockPopupHosts(blockNode, transaction, popupSettingsOverrides, options = {}) {
+    return (0, import_hidden_popup_calendar.ensureCalendarBlockPopupHosts)(
+      this.hiddenPopupRuntime,
+      blockNode,
       transaction,
-      includeAsyncNode: true
-    });
+      popupSettingsOverrides,
+      options
+    );
   }
-  async ensureCalendarBlockPopupHostsInTree(node, transaction) {
-    if (!node || typeof node !== "object") {
-      return node;
-    }
-    let current = node;
-    if (current.use === "CalendarBlockModel") {
-      current = await this.ensureCalendarBlockPopupHosts(current, transaction);
-    }
-    for (const [subKey, value] of Object.entries(current.subModels || {})) {
-      if (Array.isArray(value)) {
-        const nextItems = [];
-        let changed = false;
-        for (const item of value) {
-          const nextItem = await this.ensureCalendarBlockPopupHostsInTree(item, transaction);
-          nextItems.push(nextItem);
-          changed = changed || nextItem !== item;
-        }
-        if (changed) {
-          current.subModels[subKey] = nextItems;
-        }
-        continue;
-      }
-      const nextValue = await this.ensureCalendarBlockPopupHostsInTree(value, transaction);
-      if (nextValue !== value) {
-        current.subModels[subKey] = nextValue;
-      }
-    }
-    return current;
+  projectCalendarBlockPopupHostsInTree(node) {
+    return (0, import_hidden_popup_calendar.projectCalendarBlockPopupHostsInTree)(node);
+  }
+  async replaceKanbanStoredPopupSettings(blockNode, actionKey, popupSettings, transaction) {
+    return (0, import_hidden_popup_kanban.replaceKanbanStoredPopupSettings)(
+      this.hiddenPopupRuntime,
+      blockNode,
+      actionKey,
+      popupSettings,
+      transaction
+    );
   }
-  projectCalendarBlockPopupHosts(node) {
-    var _a;
-    if (!node || typeof node !== "object") {
-      return node;
-    }
-    const current = node;
-    if (!(current == null ? void 0 : current.uid) || current.use !== "CalendarBlockModel") {
-      return node;
-    }
-    const resourceInit = this.getCalendarBlockResourceInit(current);
-    let nextSubModels = current.subModels;
-    let changed = false;
-    for (const actionKey of CALENDAR_POPUP_ACTION_KEYS) {
-      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = current.subModels) == null ? void 0 : _a[actionKey]);
-      const expectedUid = this.getCalendarPopupActionUid(current.uid, actionKey);
-      const expectedUse = this.getCalendarPopupActionUse(actionKey);
-      const openView = this.buildCalendarPopupOpenView({
-        blockNode: current,
-        actionKey,
-        resourceInit
-      });
-      const currentOpenView = this.resolvePopupHostOpenView(existing);
-      if ((existing == null ? void 0 : existing.uid) === expectedUid && existing.use === expectedUse && import_lodash.default.isEqual(currentOpenView, openView)) {
-        continue;
-      }
-      const nextActionNode = {
-        ...(existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
-        uid: expectedUid,
-        use: expectedUse,
-        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
-          popupSettings: {
-            openView
-          }
-        })
-      };
-      if (!changed) {
-        nextSubModels = {
-          ...current.subModels || {}
-        };
-        changed = true;
-      }
-      nextSubModels[actionKey] = nextActionNode;
-    }
-    if (!changed) {
-      return node;
-    }
-    return {
-      ...current,
-      subModels: nextSubModels
-    };
+  async ensureKanbanBlockPopupHosts(blockNode, transaction, popupSettingsOverrides, options = {}) {
+    return (0, import_hidden_popup_kanban.ensureKanbanBlockPopupHosts)(
+      this.hiddenPopupRuntime,
+      blockNode,
+      transaction,
+      popupSettingsOverrides,
+      options
+    );
   }
-  projectCalendarBlockPopupHostsInTree(node) {
-    if (!node || typeof node !== "object") {
-      return node;
-    }
-    let current = this.projectCalendarBlockPopupHosts(node);
-    let nextSubModels = current == null ? void 0 : current.subModels;
-    let changed = current !== node;
-    if (!nextSubModels || typeof nextSubModels !== "object") {
-      return current;
-    }
-    for (const [subKey, value] of Object.entries(nextSubModels)) {
-      if (Array.isArray(value)) {
-        const nextItems = [];
-        let itemsChanged = false;
-        for (const item of value) {
-          const nextItem = this.projectCalendarBlockPopupHostsInTree(item);
-          nextItems.push(nextItem);
-          itemsChanged = itemsChanged || nextItem !== item;
-        }
-        if (!itemsChanged) {
-          continue;
-        }
-        if (!changed) {
-          current = {
-            ...current,
-            subModels: {
-              ...nextSubModels
-            }
-          };
-          nextSubModels = current.subModels;
-          changed = true;
-        }
-        nextSubModels[subKey] = nextItems;
-        continue;
-      }
-      const nextValue = this.projectCalendarBlockPopupHostsInTree(value);
-      if (nextValue === value) {
-        continue;
-      }
-      if (!changed) {
-        current = {
-          ...current,
-          subModels: {
-            ...nextSubModels
-          }
-        };
-        nextSubModels = current.subModels;
-        changed = true;
-      }
-      nextSubModels[subKey] = nextValue;
-    }
-    return current;
+  projectKanbanBlockPopupHostsInTree(node) {
+    return (0, import_hidden_popup_kanban.projectKanbanBlockPopupHostsInTree)(node);
   }
-  async ensureKanbanBlockPopupHosts(blockNode, transaction) {
-    var _a;
-    if (!(blockNode == null ? void 0 : blockNode.uid) || blockNode.use !== "KanbanBlockModel") {
-      return blockNode;
+  resolveManagedPopupTargetUidForHiddenPopupBackfill(hostNode) {
+    const openView = this.resolvePopupHostOpenView(hostNode);
+    const externalPopupHostUid = this.resolveExternalPopupHostUid(hostNode == null ? void 0 : hostNode.uid, openView);
+    if (!externalPopupHostUid) {
+      return void 0;
     }
-    const resourceInit = this.getKanbanBlockResourceInit(blockNode);
-    let changed = false;
-    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
-      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = blockNode.subModels) == null ? void 0 : _a[actionKey]);
-      const expectedUid = this.getKanbanPopupActionUid(blockNode.uid, actionKey);
-      const expectedUse = this.getKanbanPopupActionUse(actionKey);
-      const openView = this.buildKanbanPopupOpenView({
-        blockNode,
-        actionKey,
-        resourceInit
-      });
-      const currentOpenView = this.resolvePopupHostOpenView(existing);
-      const shouldReplaceExisting = (existing == null ? void 0 : existing.uid) && existing.uid !== expectedUid;
-      const shouldUpsert = !(existing == null ? void 0 : existing.uid) || shouldReplaceExisting || existing.use !== expectedUse || !import_lodash.default.isEqual(currentOpenView, openView);
-      if (!shouldUpsert) {
-        continue;
-      }
-      if (shouldReplaceExisting) {
-        await this.removeNodeTreeWithBindings(existing.uid, transaction);
-      }
-      if ((existing == null ? void 0 : existing.uid) && existing.uid === expectedUid && !import_lodash.default.isEqual(currentOpenView, openView)) {
-        await this.reconcilePopupOpenViewTransition(expectedUid, currentOpenView, openView, transaction);
-      }
-      const nextActionNode = {
-        ...(existing == null ? void 0 : existing.uid) && existing.uid === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
-        uid: expectedUid,
-        use: expectedUse,
-        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
-          popupSettings: {
-            openView
-          }
-        })
-      };
-      await this.repository.upsertModel(
-        {
-          parentId: blockNode.uid,
-          subKey: actionKey,
-          subType: "object",
-          ...nextActionNode
-        },
-        { transaction }
-      );
-      changed = true;
+    if ((openView == null ? void 0 : openView.popupTemplateContext) || String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim()) {
+      return externalPopupHostUid;
     }
-    if (!changed) {
-      return blockNode;
+    return void 0;
+  }
+  async ensureHiddenPopupBlockHostsInManagedPopupTarget(hostNode, transaction, visitedPopupTargetUids = /* @__PURE__ */ new Set()) {
+    const popupTargetUid = this.resolveManagedPopupTargetUidForHiddenPopupBackfill(hostNode);
+    if (!popupTargetUid || visitedPopupTargetUids.has(popupTargetUid)) {
+      return;
     }
-    return this.repository.findModelById(blockNode.uid, {
+    visitedPopupTargetUids.add(popupTargetUid);
+    const popupTarget = await this.repository.findModelById(popupTargetUid, {
       transaction,
       includeAsyncNode: true
+    }).catch(() => null);
+    if (!(popupTarget == null ? void 0 : popupTarget.uid)) {
+      return;
+    }
+    await this.ensureHiddenPopupBlockHostsInTree(popupTarget, transaction, {
+      ensureManagedPopupTemplateTargets: true,
+      visitedPopupTargetUids
     });
   }
-  async ensureKanbanBlockPopupHostsInTree(node, transaction) {
+  async ensureHiddenPopupBlockHostsInTree(node, transaction, options = {}) {
     if (!node || typeof node !== "object") {
       return node;
     }
+    const visitedPopupTargetUids = options.visitedPopupTargetUids || /* @__PURE__ */ new Set();
     let current = node;
+    if (current.use === "CalendarBlockModel") {
+      current = await this.ensureCalendarBlockPopupHosts(current, transaction);
+    }
     if (current.use === "KanbanBlockModel") {
       current = await this.ensureKanbanBlockPopupHosts(current, transaction);
     }
@@ -14186,7 +14847,10 @@ class FlowSurfacesService {
         const nextItems = [];
         let changed = false;
         for (const item of value) {
-          const nextItem = await this.ensureKanbanBlockPopupHostsInTree(item, transaction);
+          const nextItem = await this.ensureHiddenPopupBlockHostsInTree(item, transaction, {
+            ...options,
+            visitedPopupTargetUids
+          });
           nextItems.push(nextItem);
           changed = changed || nextItem !== item;
         }
@@ -14195,114 +14859,16 @@ class FlowSurfacesService {
         }
         continue;
       }
-      const nextValue = await this.ensureKanbanBlockPopupHostsInTree(value, transaction);
+      const nextValue = await this.ensureHiddenPopupBlockHostsInTree(value, transaction, {
+        ...options,
+        visitedPopupTargetUids
+      });
       if (nextValue !== value) {
         current.subModels[subKey] = nextValue;
       }
     }
-    return current;
-  }
-  projectKanbanBlockPopupHosts(node) {
-    var _a;
-    if (!node || typeof node !== "object") {
-      return node;
-    }
-    const current = node;
-    if (!(current == null ? void 0 : current.uid) || current.use !== "KanbanBlockModel") {
-      return node;
-    }
-    const resourceInit = this.getKanbanBlockResourceInit(current);
-    let nextSubModels = current.subModels;
-    let changed = false;
-    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
-      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = current.subModels) == null ? void 0 : _a[actionKey]);
-      const expectedUid = this.getKanbanPopupActionUid(current.uid, actionKey);
-      const expectedUse = this.getKanbanPopupActionUse(actionKey);
-      const openView = this.buildKanbanPopupOpenView({
-        blockNode: current,
-        actionKey,
-        resourceInit
-      });
-      const currentOpenView = this.resolvePopupHostOpenView(existing);
-      if ((existing == null ? void 0 : existing.uid) === expectedUid && existing.use === expectedUse && import_lodash.default.isEqual(currentOpenView, openView)) {
-        continue;
-      }
-      const nextActionNode = {
-        ...(existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
-        uid: expectedUid,
-        use: expectedUse,
-        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
-          popupSettings: {
-            openView
-          }
-        })
-      };
-      if (!changed) {
-        nextSubModels = {
-          ...current.subModels || {}
-        };
-        changed = true;
-      }
-      nextSubModels[actionKey] = nextActionNode;
-    }
-    if (!changed) {
-      return node;
-    }
-    return {
-      ...current,
-      subModels: nextSubModels
-    };
-  }
-  projectKanbanBlockPopupHostsInTree(node) {
-    if (!node || typeof node !== "object") {
-      return node;
-    }
-    let current = this.projectKanbanBlockPopupHosts(node);
-    let nextSubModels = current == null ? void 0 : current.subModels;
-    let changed = current !== node;
-    if (!nextSubModels || typeof nextSubModels !== "object") {
-      return current;
-    }
-    for (const [subKey, value] of Object.entries(nextSubModels)) {
-      if (Array.isArray(value)) {
-        const nextItems = [];
-        let itemsChanged = false;
-        for (const item of value) {
-          const nextItem = this.projectKanbanBlockPopupHostsInTree(item);
-          nextItems.push(nextItem);
-          itemsChanged = itemsChanged || nextItem !== item;
-        }
-        if (!itemsChanged) {
-          continue;
-        }
-        if (!changed) {
-          current = {
-            ...current,
-            subModels: {
-              ...nextSubModels
-            }
-          };
-          nextSubModels = current.subModels;
-          changed = true;
-        }
-        nextSubModels[subKey] = nextItems;
-        continue;
-      }
-      const nextValue = this.projectKanbanBlockPopupHostsInTree(value);
-      if (nextValue === value) {
-        continue;
-      }
-      if (!changed) {
-        current = {
-          ...current,
-          subModels: {
-            ...nextSubModels
-          }
-        };
-        nextSubModels = current.subModels;
-        changed = true;
-      }
-      nextSubModels[subKey] = nextValue;
+    if (options.ensureManagedPopupTemplateTargets) {
+      await this.ensureHiddenPopupBlockHostsInManagedPopupTarget(current, transaction, visitedPopupTargetUids);
     }
     return current;
   }
@@ -14839,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) {
@@ -15566,10 +16157,9 @@ class FlowSurfacesService {
     if (options.persistCalendarPopupHosts === false) {
       return this.projectKanbanBlockPopupHostsInTree(this.projectCalendarBlockPopupHostsInTree(node));
     }
-    return this.ensureKanbanBlockPopupHostsInTree(
-      await this.ensureCalendarBlockPopupHostsInTree(node, transaction),
-      transaction
-    );
+    return this.ensureHiddenPopupBlockHostsInTree(node, transaction, {
+      ensureManagedPopupTemplateTargets: options.ensureManagedPopupTemplateTargets === true
+    });
   }
   normalizePopupTreeShape(node) {
     if (!node || typeof node !== "object") {