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

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

@@ -93,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"]);
@@ -121,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",
@@ -391,6 +388,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"] },
@@ -530,6 +535,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;
@@ -3031,7 +3047,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"
@@ -3577,7 +3593,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,
@@ -3869,19 +3885,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
@@ -4964,7 +5013,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"
@@ -4996,12 +5045,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,
@@ -5059,11 +5112,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,
@@ -5075,8 +5130,39 @@ class FlowSurfacesService {
       resourceInit: 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(
       {
@@ -5087,13 +5173,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,
@@ -5111,8 +5197,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) {
@@ -5160,7 +5290,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,
@@ -6157,8 +6287,30 @@ 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 === "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)) {
@@ -6190,7 +6342,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(
@@ -6239,10 +6391,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);
@@ -6384,7 +6539,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];
     }
@@ -6528,7 +6697,8 @@ class FlowSurfacesService {
       ...popupTemplateHasSourceId && template.sourceId ? { sourceId: template.sourceId } : {},
       popupTemplateHasFilterByTk,
       popupTemplateHasSourceId,
-      popupTemplateMode: mode
+      popupTemplateMode: mode,
+      popupTemplateUid: template.uid
     });
     if (mode === "copy") {
       return {
@@ -6536,16 +6706,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();
@@ -6658,8 +6833,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();
@@ -6849,14 +7027,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;
         }
@@ -6868,7 +7060,7 @@ class FlowSurfacesService {
         return nextTarget;
       })
     };
-    return nextSettings;
+    return resolvedSettings;
   }
   async applyInlineFieldPopup(actionName, result, popup, options) {
     popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
@@ -7302,7 +7494,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;
     }
@@ -7312,7 +7504,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,
@@ -7349,7 +7541,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);
@@ -7373,14 +7565,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;
     }
@@ -7401,7 +7596,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 [];
     }
@@ -7435,7 +7632,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();
     }
@@ -7557,7 +7754,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
     );
@@ -7627,7 +7824,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;
     }
@@ -7653,7 +7853,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;
     }
@@ -7685,7 +7888,10 @@ 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;
     }
@@ -7815,7 +8021,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
@@ -7935,6 +8141,14 @@ class FlowSurfacesService {
         current.use
       );
     });
+    this.replaceExplicitPopupStepParamSubtreesForUpdateSettings(
+      current,
+      normalizedValues,
+      nextPayload,
+      options.replacePopupStepParamSubtrees === true
+    );
+    this.syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
+    this.syncKanbanPopupPropsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncFilterActionSettingsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncMirroredStepParamsForUpdateSettings(current, nextPayload);
     const updateActionAssignedValues = this.syncUpdateActionAssignedValuesForUpdateSettings(
@@ -8004,12 +8218,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);
@@ -8019,6 +8243,172 @@ class FlowSurfacesService {
       updated: Object.keys(import_lodash.default.omit(nextPayload, ["uid"]))
     };
   }
+  syncCalendarPopupPropsForUpdateSettings(current, normalizedValues, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "CalendarBlockModel" || !import_lodash.default.isPlainObject(normalizedValues == null ? void 0 : normalizedValues.props)) {
+      return;
+    }
+    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;
+    }
+    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];
+      }
+    }
+  }
+  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;
@@ -8943,7 +9333,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 {
@@ -8959,8 +9349,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),
@@ -9002,6 +9392,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) {
@@ -10377,20 +10781,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,
@@ -10399,9 +10827,7 @@ class FlowSurfacesService {
           defaultView,
           enableQuickCreateEvent: quickCreateEvent,
           showLunar,
-          weekStart,
-          quickCreatePopupSettings,
-          eventPopupSettings
+          weekStart
         }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
@@ -10420,7 +10846,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 } } : {},
@@ -10432,18 +10861,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) {
@@ -10664,20 +11112,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;
@@ -10698,14 +11170,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 } : {},
@@ -10714,7 +11179,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)({
@@ -10747,7 +11212,7 @@ class FlowSurfacesService {
               quickCreateEnabled: changes.quickCreateEnabled === true
             }
           } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") ? {
+          ...shouldWriteQuickCreatePopup ? {
             popup: quickCreatePopup || {}
           } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? {
@@ -10772,13 +11237,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
       } : {},
@@ -10788,14 +11246,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") ? {
@@ -10818,7 +11276,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)));
     }
@@ -10831,7 +11293,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)));
     }
@@ -10839,7 +11305,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) } : {}
@@ -13143,13 +13639,100 @@ 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 (0, import_hidden_popup_contract.resolveHiddenPopupHostOpenView)(node);
+  }
+  popupHostHasLocalContent(actionNode) {
+    return (0, import_hidden_popup_contract.hiddenPopupHostHasLocalContent)(actionNode);
+  }
+  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;
     }
-    return null;
+    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;
@@ -13427,108 +14010,59 @@ 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"
+      ]) : {},
+      ...import_lodash.default.cloneDeep(input.props || {})
+    };
     const defaultGroupFieldName = this.getKanbanDefaultGroupFieldName(collection);
     const nextGroupFieldName = String(currentProps.groupField || defaultGroupFieldName || "").trim();
     const nextGroupField = this.getKanbanGroupField(collection, nextGroupFieldName);
@@ -13585,7 +14119,7 @@ class FlowSurfacesService {
         kind: "groupColorField"
       });
     }
-    return (0, import_service_utils.buildDefinedPayload)({
+    const props = (0, import_service_utils.buildDefinedPayload)({
       ...currentProps,
       groupField: nextGroupFieldName,
       groupTitleField: nextGroupTitleField,
@@ -13596,6 +14130,23 @@ class FlowSurfacesService {
       dragEnabled: nextDragEnabled,
       dragSortBy: nextDragSortBy || void 0
     });
+    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)) {
@@ -13811,86 +14362,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(
@@ -13898,7 +14413,7 @@ class FlowSurfacesService {
       input.resourceInit
     );
     const currentProps = import_lodash.default.cloneDeep(input.props || {});
-    return {
+    const props = {
       ...currentProps,
       fieldNames: this.normalizeCalendarFieldNamesForCollection({
         actionName: input.actionName,
@@ -13911,259 +14426,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;
+  projectKanbanBlockPopupHostsInTree(node) {
+    return (0, import_hidden_popup_kanban.projectKanbanBlockPopupHostsInTree)(node);
+  }
+  resolveManagedPopupTargetUidForHiddenPopupBackfill(hostNode) {
+    const openView = this.resolvePopupHostOpenView(hostNode);
+    const externalPopupHostUid = this.resolveExternalPopupHostUid(hostNode == null ? void 0 : hostNode.uid, openView);
+    if (!externalPopupHostUid) {
+      return void 0;
     }
-    let current = this.projectCalendarBlockPopupHosts(node);
-    let nextSubModels = current == null ? void 0 : current.subModels;
-    let changed = current !== node;
-    if (!nextSubModels || typeof nextSubModels !== "object") {
-      return current;
+    if ((openView == null ? void 0 : openView.popupTemplateContext) || String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim()) {
+      return externalPopupHostUid;
     }
-    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;
+    return void 0;
   }
-  async ensureKanbanBlockPopupHosts(blockNode, transaction) {
-    var _a;
-    if (!(blockNode == null ? void 0 : blockNode.uid) || blockNode.use !== "KanbanBlockModel") {
-      return blockNode;
-    }
-    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 (!changed) {
-      return blockNode;
+  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);
     }
@@ -14172,7 +14511,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;
         }
@@ -14181,114 +14523,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;
   }
@@ -15552,10 +15796,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") {