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

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

@@ -50,6 +50,7 @@ var import_compiler = require("./apply/compiler");
 var import_layout = require("./apply/layout");
 var import_contract_guard = require("./contract-guard");
 var import_errors = require("./errors");
+var import_filter_group = require("./filter-group");
 var import_executor = require("./executor");
 var import_reference_guards = require("./reference-guards");
 var import_key_registry = require("./planning/key-registry");
@@ -57,6 +58,7 @@ var import_blueprint = require("./blueprint");
 var import_compile_blocks = require("./blueprint/compile-blocks");
 var import_private_utils = require("./blueprint/private-utils");
 var import_default_block_actions = require("./default-block-actions");
+var import_public_data_surface_default_filter = require("./public-data-surface-default-filter");
 var import_runtime = require("./planning/runtime");
 var import_created_keys = require("./planning/created-keys");
 var import_key_persistence = require("./planning/key-persistence");
@@ -76,6 +78,7 @@ var import_context = require("./context");
 var import_configure_options = require("./configure-options");
 var import_service_helpers = require("./service-helpers");
 var import_errors2 = require("./reaction/errors");
+var import_template_display = require("./template-display");
 var import_approval = require("./approval");
 var import_field_value = require("./reaction/field-value");
 var import_fingerprint = require("./reaction/fingerprint");
@@ -84,10 +87,13 @@ var import_meta = require("./reaction/meta");
 var import_resolver = require("./reaction/resolver");
 var import_association_title_field = require("./association-title-field");
 var import_default_action_popup = require("./default-action-popup");
+var import_defaults = require("./blueprint/defaults");
 var import_service_utils = require("./service-utils");
 var import_template_compatibility = require("./template-compatibility");
 var import_template_service_utils = require("./template-service-utils");
 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"]);
 const DETAILS_BLOCK_USES = /* @__PURE__ */ new Set(["DetailsBlockModel", ...import_approval.APPROVAL_DETAILS_BLOCK_USES]);
 const SIMPLE_FORM_BLOCK_USES = /* @__PURE__ */ new Set([
   "FormBlockModel",
@@ -96,8 +102,37 @@ const SIMPLE_FORM_BLOCK_USES = /* @__PURE__ */ new Set([
   ...import_approval.APPROVAL_FORM_BLOCK_USES
 ]);
 const COMPOSE_FIELD_GRID_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "editForm", "details", "filterForm"]);
+const COMPOSE_FIELD_GROUP_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "editForm", "details"]);
 const LIST_BLOCK_USES = /* @__PURE__ */ new Set(["ListBlockModel"]);
 const GRID_CARD_BLOCK_USES = /* @__PURE__ */ new Set(["GridCardBlockModel"]);
+const DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES = ["input", "select", "phone", "email", "radioGroup"];
+const DEFAULT_CALENDAR_COLOR_FIELD_INTERFACES = ["select", "radioGroup"];
+const DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES = [
+  "date",
+  "datetime",
+  "dateOnly",
+  "datetimeNoTz",
+  "unixTimestamp",
+  "createdAt",
+  "updatedAt"
+];
+const CALENDAR_POPUP_ACTION_KEYS = ["quickCreateAction", "eventViewAction"];
+const CANONICAL_BLOCK_HEADER_USES = /* @__PURE__ */ new Set([
+  "TableBlockModel",
+  "CalendarBlockModel",
+  "FormBlockModel",
+  "CreateFormModel",
+  "EditFormModel",
+  "DetailsBlockModel",
+  "ListBlockModel",
+  "GridCardBlockModel",
+  "MarkdownBlockModel",
+  "IframeBlockModel",
+  "ChartBlockModel",
+  "ActionPanelBlockModel",
+  "MapBlockModel",
+  "CommentsBlockModel"
+]);
 const LIST_LIKE_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard"]);
 const GRID_SETTINGS_FLOW_KEY = "gridSettings";
 const GRID_SETTINGS_LAYOUT_STEP_KEY = "grid";
@@ -108,6 +143,7 @@ const OPEN_VIEW_MODE_ALIASES = {
 const OPEN_VIEW_SUPPORTED_MODES = /* @__PURE__ */ new Set(["drawer", "dialog", "embed"]);
 const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
+  "CalendarBlockModel",
   "DetailsBlockModel",
   "ListBlockModel",
   "GridCardBlockModel",
@@ -183,6 +219,8 @@ const POPUP_ACTION_USES = /* @__PURE__ */ new Set([
   "ViewActionModel",
   "EditActionModel",
   "PopupCollectionActionModel",
+  "CalendarQuickCreateActionModel",
+  "CalendarEventViewActionModel",
   "DuplicateActionModel",
   "AddChildActionModel",
   "MailSendActionModel"
@@ -191,6 +229,7 @@ const POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES = /* @__PURE__ */ new Set([
   "ViewActionModel",
   "EditActionModel",
   "PopupCollectionActionModel",
+  "CalendarEventViewActionModel",
   "AddChildActionModel",
   "DuplicateActionModel"
 ]);
@@ -237,6 +276,7 @@ const POPUP_COLLECTION_BLOCK_SCENES = {
   ApprovalDetailsModel: ["one"],
   CommentsBlockModel: ["one", "many"],
   TableBlockModel: ["many"],
+  CalendarBlockModel: ["many"],
   ListBlockModel: ["many"],
   GridCardBlockModel: ["many"],
   MapBlockModel: ["many"],
@@ -309,6 +349,13 @@ 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 DIVIDER_ITEM_STEP_PARAM_MIRRORS = [
+  { domain: "props", key: "label", stepParamsPath: ["markdownItemSetting", "title", "label"] },
+  { domain: "props", key: "orientation", stepParamsPath: ["markdownItemSetting", "title", "orientation"] },
+  { domain: "props", key: "dashed", stepParamsPath: ["markdownItemSetting", "title", "dashed"] },
+  { domain: "props", key: "color", stepParamsPath: ["markdownItemSetting", "title", "color"] },
+  { domain: "props", key: "borderColor", stepParamsPath: ["markdownItemSetting", "title", "borderColor"] }
+];
 const UPDATE_SETTINGS_STEP_PARAM_MIRRORS_BY_USE = {
   TableActionsColumnModel: TABLE_COLUMN_STEP_PARAM_MIRRORS,
   JSColumnModel: TABLE_COLUMN_STEP_PARAM_MIRRORS,
@@ -330,9 +377,15 @@ const UPDATE_SETTINGS_STEP_PARAM_MIRRORS_BY_USE = {
   ApprovalDetailsModel: DETAILS_BLOCK_LAYOUT_STEP_PARAM_MIRRORS,
   ApplyTaskCardDetailsModel: DETAILS_BLOCK_LAYOUT_STEP_PARAM_MIRRORS,
   ApprovalTaskCardDetailsModel: DETAILS_BLOCK_LAYOUT_STEP_PARAM_MIRRORS,
-  FilterFormBlockModel: FILTER_FORM_BLOCK_LAYOUT_STEP_PARAM_MIRRORS
+  FilterFormBlockModel: FILTER_FORM_BLOCK_LAYOUT_STEP_PARAM_MIRRORS,
+  DividerItemModel: DIVIDER_ITEM_STEP_PARAM_MIRRORS
 };
 const FLOW_SURFACE_MENU_BINDABLE_OPTION_KEY = "flowSurfaceMenuBindable";
+function normalizeCalendarFieldCapabilityValues(source, defaults) {
+  const rawValues = Array.isArray(source) ? source : source instanceof Set ? Array.from(source) : typeof source === "string" ? [source] : source && typeof source === "object" ? Object.keys(source) : [];
+  const values = rawValues.map((item) => String(item || "").trim()).filter(Boolean);
+  return values.length ? Array.from(new Set(values)) : [...defaults];
+}
 class FlowSurfacesService {
   constructor(plugin) {
     this.plugin = plugin;
@@ -1066,6 +1119,16 @@ class FlowSurfacesService {
       recordActionContainerUse: (parentNode == null ? void 0 : parentNode.use) && POPUP_RECORD_ACTION_CONTAINER_USES.has(parentNode.use) ? parentNode.use : null
     };
   }
+  popupHostUsesDefaultRecordContext(hostNode, hostContext) {
+    const hostUse = String((hostNode == null ? void 0 : hostNode.use) || "").trim();
+    if (!POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES.has(hostUse)) {
+      return false;
+    }
+    if (hostUse === "CalendarEventViewActionModel") {
+      return true;
+    }
+    return !!(hostContext == null ? void 0 : hostContext.recordActionContainerUse);
+  }
   buildPopupBlockResourceBindings(blockUse, popupProfile, options = {}) {
     if (!this.isCollectionBlockUse(blockUse) || options.forCatalog && !this.isPopupCollectionBlockVisibleForScene(blockUse, popupProfile)) {
       return [];
@@ -1170,7 +1233,7 @@ class FlowSurfacesService {
     const collectionName = String((openView == null ? void 0 : openView.collectionName) || "").trim() || String(((_c = hostContext.associationContext) == null ? void 0 : _c.collectionName) || "").trim() || String(ownerResourceInit.collectionName || "").trim() || void 0;
     let filterByTk = openView == null ? void 0 : openView.filterByTk;
     let hasCurrentRecord = (0, import_service_helpers.hasConfiguredFlowContextValue)(filterByTk);
-    if (!hasCurrentRecord && POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES.has((hostNode == null ? void 0 : hostNode.use) || "") && hostContext.recordActionContainerUse) {
+    if (!hasCurrentRecord && this.popupHostUsesDefaultRecordContext(hostNode, hostContext)) {
       filterByTk = "{{ctx.view.inputArgs.filterByTk}}";
       hasCurrentRecord = true;
     }
@@ -2694,7 +2757,7 @@ class FlowSurfacesService {
     const data = rows.map((row) => (0, import_service_helpers.toTemplatePlainRow)(row)).filter(Boolean);
     const templateUids = data.map((row) => String((row == null ? void 0 : row.uid) || "").trim()).filter(Boolean);
     if (!templateUids.length) {
-      return data;
+      return (0, import_template_display.resolveFlowTemplateDisplayRows)(this.db, data, options);
     }
     const UsageModel = this.getFlowTemplateUsageModel(actionName);
     const usageRows = await UsageModel.findAll({
@@ -2710,10 +2773,14 @@ class FlowSurfacesService {
     for (const row of usageRows) {
       usageMap.set(String(row.templateUid), Number(row.count) || 0);
     }
-    return data.map((row) => ({
-      ...row,
-      usageCount: usageMap.get(String(row.uid || "")) || 0
-    }));
+    return (0, import_template_display.resolveFlowTemplateDisplayRows)(
+      this.db,
+      data.map((row) => ({
+        ...row,
+        usageCount: usageMap.get(String(row.uid || "")) || 0
+      })),
+      options
+    );
   }
   async listTemplates(values = {}, options = {}) {
     const repo = this.getFlowTemplateRepository("listTemplates");
@@ -2789,7 +2856,7 @@ class FlowSurfacesService {
           "FLOW_SURFACE_TEMPLATE_POPUP_SOURCE_UNSUPPORTED"
         );
       }
-      if (popupTemplateUid) {
+      if (popupTemplateUid && !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"
@@ -2865,6 +2932,49 @@ class FlowSurfacesService {
   buildPopupTemplateReferenceOpenView(template, templateTargetUid) {
     return this.buildPopupTemplateOpenView(template, "reference", templateTargetUid);
   }
+  async hydrateDetachedPopupTemplateSourceContext(templateTargetUid, inferred, transaction) {
+    if (inferred.templateType !== "popup") {
+      return;
+    }
+    const normalizedTemplateTargetUid = String(templateTargetUid || "").trim();
+    if (!normalizedTemplateTargetUid) {
+      return;
+    }
+    const detachedTarget = await this.repository.findModelById(normalizedTemplateTargetUid, {
+      transaction,
+      includeAsyncNode: true
+    });
+    if (!(detachedTarget == null ? void 0 : detachedTarget.uid)) {
+      return;
+    }
+    const resolvedOpenViewStep = (0, import_template_service_utils.findFlowTemplateOpenViewStep)(detachedTarget) || inferred.openViewStep;
+    if (!resolvedOpenViewStep) {
+      return;
+    }
+    const nextStepParams = import_lodash.default.cloneDeep(detachedTarget.stepParams || {});
+    const currentGroup = import_lodash.default.isPlainObject(nextStepParams[resolvedOpenViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[resolvedOpenViewStep.flowKey]) : {};
+    const currentOpenView = import_lodash.default.isPlainObject(currentGroup[resolvedOpenViewStep.stepKey]) ? import_lodash.default.omit((0, import_template_service_utils.stripTemplateInternalOpenViewFields)(currentGroup[resolvedOpenViewStep.stepKey]) || {}, ["uid"]) : {};
+    const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
+      ...currentOpenView,
+      dataSourceKey: inferred.dataSourceKey || currentOpenView.dataSourceKey,
+      collectionName: inferred.collectionName || currentOpenView.collectionName,
+      associationName: inferred.associationName || currentOpenView.associationName,
+      filterByTk: inferred.filterByTk || currentOpenView.filterByTk,
+      sourceId: inferred.sourceId || currentOpenView.sourceId
+    });
+    if (import_lodash.default.isEqual(nextOpenView, currentOpenView)) {
+      return;
+    }
+    currentGroup[resolvedOpenViewStep.stepKey] = nextOpenView;
+    nextStepParams[resolvedOpenViewStep.flowKey] = currentGroup;
+    await this.repository.patch(
+      {
+        uid: detachedTarget.uid,
+        stepParams: nextStepParams
+      },
+      { transaction }
+    );
+  }
   async clearFlowTemplateUsagesByModelUids(modelUids, transaction) {
     const usageRepo = this.getFlowTemplateUsageRepositorySafe();
     if (!usageRepo) {
@@ -3135,6 +3245,7 @@ class FlowSurfacesService {
       );
     }
     if (inferred.templateType === "popup") {
+      await this.hydrateDetachedPopupTemplateSourceContext(templateTargetUid, inferred, options.transaction);
       await this.ensurePopupSurface(templateTargetUid, options.transaction);
     }
     const templateUid = String((values == null ? void 0 : values.uid) || (0, import_utils.uid)()).trim() || (0, import_utils.uid)();
@@ -3614,6 +3725,12 @@ class FlowSurfacesService {
       }),
       applyActionPopup: async (actionName, actionUid, popup) => this.applyInlineActionPopup(actionName, actionUid, popup, {
         ...options,
+        enabledPackages,
+        ...actionName === "compose recordAction" ? {
+          popupActionContext: {
+            hasCurrentRecord: true
+          }
+        } : {},
         popupTemplateAliasSession
       }),
       collectActionKeys: async (actionUid) => this.collectComposeActionKeys(actionUid, options.transaction),
@@ -3662,6 +3779,9 @@ class FlowSurfacesService {
     if ((current == null ? void 0 : current.use) === "TableBlockModel") {
       return this.configureTableBlock(target, values.changes, options);
     }
+    if ((current == null ? void 0 : current.use) === "CalendarBlockModel") {
+      return this.configureCalendarBlock(target, current, values.changes, options);
+    }
     if (SIMPLE_FORM_BLOCK_USES.has((current == null ? void 0 : current.use) || "")) {
       return this.configureFormBlock(target, current.use, values.changes, options);
     }
@@ -3692,6 +3812,12 @@ class FlowSurfacesService {
     if ((current == null ? void 0 : current.use) === "ActionPanelBlockModel") {
       return this.configureActionPanelBlock(target, values.changes, options);
     }
+    if ((current == null ? void 0 : current.use) === "MapBlockModel") {
+      return this.configureMapBlock(target, values.changes, options);
+    }
+    if ((current == null ? void 0 : current.use) === "CommentsBlockModel") {
+      return this.configureCommentsBlock(target, values.changes, options);
+    }
     if ((current == null ? void 0 : current.use) === "TableActionsColumnModel") {
       return this.configureActionColumn(target, values.changes, options);
     }
@@ -3699,7 +3825,13 @@ class FlowSurfacesService {
       return this.configureFieldWrapper(target, current, values.changes, options);
     }
     if (import_node_use_sets.STANDALONE_FIELD_NODE_USES.has((current == null ? void 0 : current.use) || "")) {
-      return (current == null ? void 0 : current.use) === "JSColumnModel" ? this.configureJSColumn(target, values.changes, options) : this.configureJSItem(target, values.changes, options);
+      if ((current == null ? void 0 : current.use) === "JSColumnModel") {
+        return this.configureJSColumn(target, values.changes, options);
+      }
+      if ((current == null ? void 0 : current.use) === "DividerItemModel") {
+        return this.configureDividerItem(target, values.changes, options);
+      }
+      return this.configureJSItem(target, values.changes, options);
     }
     if ((0, import_service_utils.isFieldNodeUse)(current == null ? void 0 : current.use)) {
       return this.configureFieldNode(target, values.changes, options);
@@ -4580,12 +4712,83 @@ class FlowSurfacesService {
       ...result
     };
   }
+  normalizeDefaultActionSettings(actionName, value) {
+    if (import_lodash.default.isUndefined(value)) {
+      return void 0;
+    }
+    if (!import_lodash.default.isPlainObject(value)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} defaultActionSettings must be an object`);
+    }
+    const result = {};
+    for (const [rawActionType, rawSettings] of Object.entries(value)) {
+      const actionType = String(rawActionType || "").trim();
+      if (!FLOW_SURFACE_DEFAULT_ACTION_SETTINGS_KEYS.has(actionType)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} defaultActionSettings does not support '${rawActionType}'`);
+      }
+      result[actionType] = import_lodash.default.cloneDeep(rawSettings);
+    }
+    return result;
+  }
+  normalizeDefaultFilterActionSettings(actionName, settings) {
+    if (!import_lodash.default.isPlainObject(settings)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} defaultActionSettings.filter must be an object`);
+    }
+    const normalizedSettings = import_lodash.default.cloneDeep(settings);
+    if ((0, import_service_utils.hasOwnDefined)(normalizedSettings, "filterableFieldNames")) {
+      if (!Array.isArray(normalizedSettings.filterableFieldNames)) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} defaultActionSettings.filter.filterableFieldNames must be an array`
+        );
+      }
+      normalizedSettings.filterableFieldNames.forEach((fieldName, index) => {
+        if (typeof fieldName !== "string") {
+          (0, import_errors.throwBadRequest)(
+            `flowSurfaces ${actionName} defaultActionSettings.filter.filterableFieldNames[${index}] expected string`
+          );
+        }
+      });
+    }
+    if ((0, import_service_utils.hasOwnDefined)(normalizedSettings, "defaultFilter")) {
+      normalizedSettings.defaultFilter = (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
+        normalizedSettings.defaultFilter,
+        `flowSurfaces ${actionName} defaultActionSettings.filter.defaultFilter expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`
+      );
+    }
+    return normalizedSettings;
+  }
+  backfillBlockDefaultFilterIntoDefaultActionSettings(defaultActionSettings, blockDefaultFilter) {
+    if (import_lodash.default.isUndefined(blockDefaultFilter)) {
+      return defaultActionSettings;
+    }
+    const nextFilterSettings = (0, import_public_data_surface_default_filter.backfillFlowSurfaceDefaultFilterSetting)(
+      defaultActionSettings == null ? void 0 : defaultActionSettings.filter,
+      blockDefaultFilter
+    );
+    if (nextFilterSettings === (defaultActionSettings == null ? void 0 : defaultActionSettings.filter)) {
+      return defaultActionSettings;
+    }
+    return {
+      ...defaultActionSettings || {},
+      filter: nextFilterSettings
+    };
+  }
   async addBlock(values, options = {}) {
     var _a, _b, _c, _d, _e;
-    const templateRef = !import_lodash.default.isUndefined(values == null ? void 0 : values.template) ? this.normalizeFlowTemplateReference("addBlock", values.template, {
+    const templateRef = import_lodash.default.isUndefined(values == null ? void 0 : values.template) ? void 0 : this.normalizeFlowTemplateReference("addBlock", values.template, {
       allowUsage: true,
       expectedType: "block"
-    }) : null;
+    });
+    const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("addBlock", values.defaultFilter, {
+      blockType: String((values == null ? void 0 : values.type) || "").trim() || void 0,
+      template: templateRef
+    });
+    const defaultActionSettings = this.backfillBlockDefaultFilterIntoDefaultActionSettings(
+      this.normalizeDefaultActionSettings("addBlock", values.defaultActionSettings),
+      blockDefaultFilter
+    );
+    if (templateRef && !import_lodash.default.isUndefined(values.defaultActionSettings)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces addBlock template import does not allow defaultActionSettings`);
+    }
     if (templateRef) {
       const result2 = await this.addBlockFromTemplate(values, templateRef, options);
       await this.persistCreatedKeysForAction("addBlock", values, result2, options.transaction);
@@ -4647,6 +4850,15 @@ class FlowSurfacesService {
       resourceInit: resolvedResourceInit,
       resourceField: rawResourceInit ? "resourceInit" : (semanticResource == null ? void 0 : semanticResource.kind) === "raw" ? "resource" : void 0
     });
+    const effectiveResourceInit = catalogItem.use === "CalendarBlockModel" && resolvedResourceInit.collectionName && !resolvedResourceInit.dataSourceKey ? {
+      ...resolvedResourceInit,
+      dataSourceKey: "main"
+    } : resolvedResourceInit;
+    const blockProps = catalogItem.use === "CalendarBlockModel" ? this.buildCalendarInitialBlockProps({
+      actionName: "addBlock",
+      resourceInit: effectiveResourceInit,
+      props: values.props
+    }) : values.props;
     const initialGrid = options.deferAutoLayout ? null : await this.repository.findModelById(parentUid, {
       transaction: options.transaction,
       includeAsyncNode: true
@@ -4654,8 +4866,8 @@ class FlowSurfacesService {
     const tree = (0, import_builder.buildBlockTree)({
       use: catalogItem.use,
       containerUse: parentNode == null ? void 0 : parentNode.use,
-      resourceInit: resolvedResourceInit,
-      props: values.props,
+      resourceInit: effectiveResourceInit,
+      props: blockProps,
       decoratorProps: values.decoratorProps,
       stepParams: values.stepParams
     });
@@ -4698,7 +4910,8 @@ class FlowSurfacesService {
       await this.applyDefaultActionsForCreatedBlock(
         {
           blockUid: created,
-          blockType: String(catalogItem.key || values.type || "").trim()
+          blockType: String(catalogItem.key || values.type || "").trim(),
+          defaultActionSettings
         },
         {
           ...options,
@@ -4926,7 +5139,10 @@ class FlowSurfacesService {
     if (values.__autoPopupForRelationField === true && !inlinePopup && this.isPopupFieldHostUse(boundFieldCapability.fieldUse) && ((0, import_service_helpers.isAssociationField)(resolvedField.field) || !!normalizedFieldBinding.associationPathName) && !this.peekInlineFieldSettingsOpenView(inlineSettings, boundFieldCapability.wrapperUse)) {
       inlinePopup = this.normalizeInlinePopup("addField", {
         tryTemplate: true,
-        defaultType: "view"
+        defaultType: "view",
+        ...values[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY] ? {
+          [import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]: values[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]
+        } : {}
       });
     }
     if (inlinePopup && this.isExternalPopupOpenView(
@@ -5046,6 +5262,24 @@ class FlowSurfacesService {
       containerUse: container.ownerUse,
       context: "addAction"
     });
+    const reusableAction = await this.resolveReusableSingletonAction({
+      parentUid: container.parentUid,
+      ownerUse: container.ownerUse,
+      actionUse: actionCatalogItem.use,
+      transaction: options.transaction
+    });
+    if (reusableAction == null ? void 0 : reusableAction.uid) {
+      await this.applyInlineNodeSettings("addAction", reusableAction.uid, inlineSettings, options);
+      const result2 = {
+        uid: reusableAction.uid,
+        parentUid: container.parentUid,
+        subKey: container.subKey,
+        scope: actionCatalogItem.scope,
+        ...await this.collectComposeActionKeys(reusableAction.uid, options.transaction)
+      };
+      await this.persistCreatedKeysForAction("addAction", values, result2, options.transaction);
+      return result2;
+    }
     const resourceContext = container.ownerUid ? await this.locator.resolveCollectionContext(container.ownerUid, options.transaction).catch(() => null) : null;
     const action = (0, import_builder.buildActionTree)({
       use: actionCatalogItem.use,
@@ -5446,9 +5680,6 @@ class FlowSurfacesService {
     if (saveAsTemplate && !import_lodash.default.isUndefined(normalizedPopup.template)) {
       (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} popup.saveAsTemplate cannot be combined with popup.template`);
     }
-    if (saveAsTemplate && !import_lodash.default.isUndefined(tryTemplate)) {
-      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} popup.saveAsTemplate cannot be combined with popup.tryTemplate`);
-    }
     if (import_lodash.default.isUndefined(tryTemplate)) {
       delete normalizedPopup.tryTemplate;
     } else {
@@ -5502,17 +5733,17 @@ class FlowSurfacesService {
     };
   }
   formatAutoGeneratedPopupTemplateMetadata(input) {
-    const popupLabel = input.defaultType === "edit" ? "edit popup" : "details popup";
+    const popupLabel = input.defaultType === "edit" ? "Popup for Edit" : "Popup for Details";
     return {
       name: `${input.sourceCollectionLabel} -> ${input.associationFieldLabel} ${popupLabel} (Auto generated)`,
-      description: `Automatically generated ${popupLabel} template for relation field '${input.associationFieldLabel}' in collection '${input.sourceCollectionLabel}', targeting '${input.targetCollectionLabel}'.`
+      description: `Automatically generated popup template for relation field "${input.associationFieldLabel}" in collection "${input.sourceCollectionLabel}", targeting "${input.targetCollectionLabel}" (${popupLabel}).`
     };
   }
   formatAutoGeneratedActionPopupTemplateMetadata(input) {
-    const popupLabel = input.popupType === "addNew" ? "create popup" : input.popupType === "edit" ? "edit popup" : "details popup";
+    const popupLabel = input.popupType === "addNew" ? "Popup for Add New" : input.popupType === "edit" ? "Popup for Edit" : "Popup for Details";
     return {
       name: `${input.collectionLabel} ${popupLabel} (Auto generated)`,
-      description: `Automatically generated ${popupLabel} template for collection '${input.collectionLabel}'.`
+      description: `Automatically generated popup template for collection "${input.collectionLabel}" (${popupLabel}).`
     };
   }
   resolveFieldBindingContext(fieldNode, wrapperNode) {
@@ -5562,11 +5793,21 @@ class FlowSurfacesService {
       if (!bindingContext.associationField || !bindingContext.targetCollection) {
         return fallback;
       }
-      const sourceCollectionLabel = String((0, import_service_helpers.getCollectionTitle)(bindingContext.sourceCollection) || "").trim() || bindingContext.collectionName;
+      const sourceCollectionLabel = String(
+        (0, import_template_display.compileTemplateString)(
+          (0, import_service_helpers.getCollectionTitle)(bindingContext.sourceCollection) || bindingContext.collectionName || ""
+        ) || ""
+      ).trim();
       const associationFieldLabel = String(
-        (0, import_service_helpers.getFieldTitle)(bindingContext.associationField) || (0, import_service_helpers.getFieldName)(bindingContext.associationField) || ""
-      ).trim() || String((0, import_service_helpers.getFieldName)(bindingContext.associationField) || "").trim();
-      const targetCollectionLabel = String((0, import_service_helpers.getCollectionTitle)(bindingContext.targetCollection) || "").trim() || String((0, import_service_helpers.getCollectionName)(bindingContext.targetCollection) || "").trim();
+        (0, import_template_display.compileTemplateString)(
+          (0, import_service_helpers.getFieldTitle)(bindingContext.associationField) || (0, import_service_helpers.getFieldName)(bindingContext.associationField) || ""
+        ) || ""
+      ).trim();
+      const targetCollectionLabel = String(
+        (0, import_template_display.compileTemplateString)(
+          (0, import_service_helpers.getCollectionTitle)(bindingContext.targetCollection) || (0, import_service_helpers.getCollectionName)(bindingContext.targetCollection) || ""
+        ) || ""
+      ).trim();
       if (!sourceCollectionLabel || !associationFieldLabel || !targetCollectionLabel) {
         return fallback;
       }
@@ -5583,6 +5824,32 @@ class FlowSurfacesService {
   shouldAutoSaveDefaultActionPopupTemplate(popup) {
     return (popup == null ? void 0 : popup[import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]) === true;
   }
+  shouldImplicitlyTemplateDefaultActionPopup(actionNode, popup) {
+    if (!(0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use)) {
+      return false;
+    }
+    if (import_lodash.default.isPlainObject(popup == null ? void 0 : popup.template) || !import_lodash.default.isUndefined(popup == null ? void 0 : popup.saveAsTemplate)) {
+      return false;
+    }
+    if ((popup == null ? void 0 : popup.tryTemplate) === false) {
+      return false;
+    }
+    if ((0, import_default_action_popup.hasFlowSurfaceInlinePopupBlocks)(popup)) {
+      return false;
+    }
+    return true;
+  }
+  buildImplicitTemplateDefaultActionPopup(actionNode, popup) {
+    if (!this.shouldImplicitlyTemplateDefaultActionPopup(actionNode, popup)) {
+      return popup;
+    }
+    const nextPopup = import_lodash.default.isPlainObject(popup) ? import_lodash.default.cloneDeep(popup) : {};
+    if (import_lodash.default.isUndefined(nextPopup.tryTemplate)) {
+      nextPopup.tryTemplate = true;
+    }
+    nextPopup[import_default_block_actions.FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY] = true;
+    return nextPopup;
+  }
   async resolveAutoGeneratedActionPopupTemplateMetadata(actionUid, identity, transaction) {
     const fallback = this.buildLegacyAutoGeneratedPopupTemplateMetadata(identity);
     try {
@@ -5593,7 +5860,11 @@ class FlowSurfacesService {
       const actionConfig = (0, import_default_action_popup.getFlowSurfaceDefaultActionPopupConfigByUse)(actionNode == null ? void 0 : actionNode.use);
       const popupProfile = (actionNode == null ? void 0 : actionNode.uid) ? await this.resolvePopupBlockProfile(actionNode.uid, null, actionNode, transaction).catch(() => null) : null;
       const popupType = actionConfig == null ? void 0 : actionConfig.type;
-      const collectionLabel = String((0, import_service_helpers.getCollectionTitle)(popupProfile == null ? void 0 : popupProfile.currentCollection) || "").trim() || String((popupProfile == null ? void 0 : popupProfile.collectionName) || "").trim();
+      const collectionLabel = String(
+        (0, import_template_display.compileTemplateString)(
+          (0, import_service_helpers.getCollectionTitle)(popupProfile == null ? void 0 : popupProfile.currentCollection) || (popupProfile == null ? void 0 : popupProfile.collectionName) || ""
+        ) || ""
+      ).trim();
       if (!popupType || !collectionLabel) {
         return fallback;
       }
@@ -5623,8 +5894,25 @@ class FlowSurfacesService {
       options
     );
   }
-  buildInlinePopupTemplateOpenView(popup) {
-    const normalizedTitle = import_lodash.default.isUndefined(popup == null ? void 0 : popup.title) || import_lodash.default.isNull(popup == null ? void 0 : popup.title) ? void 0 : String(popup.title).trim() || void 0;
+  normalizeOptionalPopupTitle(value) {
+    if (import_lodash.default.isUndefined(value) || import_lodash.default.isNull(value)) {
+      return void 0;
+    }
+    const normalizedTitle = String(value).trim();
+    return normalizedTitle || void 0;
+  }
+  resolveDefaultActionPopupTemplateOpenViewTitle(actionNode, popup) {
+    const explicitTitle = this.normalizeOptionalPopupTitle(popup == null ? void 0 : popup.title);
+    if (explicitTitle) {
+      return explicitTitle;
+    }
+    if (!(0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use)) {
+      return void 0;
+    }
+    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(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);
     return (0, import_service_utils.buildDefinedPayload)({
       template: popup == null ? void 0 : popup.template,
       title: normalizedTitle
@@ -5768,7 +6056,8 @@ class FlowSurfacesService {
       return actionConfig.type === "view" ? ["view", "generic"] : [actionConfig.type];
     }
     if (POPUP_ACTION_USES.has(targetUse)) {
-      return (popupActionContext == null ? void 0 : popupActionContext.hasCurrentRecord) ? ["view", "generic"] : ["generic"];
+      const hasCurrentRecord = (popupActionContext == null ? void 0 : popupActionContext.hasCurrentRecord) || targetUse === "CalendarEventViewActionModel";
+      return hasCurrentRecord ? ["view", "generic"] : ["generic"];
     }
     return void 0;
   }
@@ -5919,6 +6208,12 @@ class FlowSurfacesService {
       popupTemplateUid: template.uid
     };
   }
+  isReferencedPopupTemplateOpenView(openView, hostUid) {
+    return !!this.resolveExternalPopupHostUid(hostUid, openView) && !!String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim() && !(openView == null ? void 0 : openView.popupTemplateContext);
+  }
+  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);
+  }
   resolveExternalPopupHostUid(hostUid, openView) {
     const normalizedHostUid = String(hostUid || "").trim();
     if (!normalizedHostUid || !import_lodash.default.isPlainObject(openView)) {
@@ -6058,7 +6353,7 @@ class FlowSurfacesService {
       return void 0;
     }
     const hostContext = await this.resolvePopupHostProfileContext(current, transaction).catch(() => null);
-    if (!(hostContext == null ? void 0 : hostContext.recordActionContainerUse)) {
+    if (!this.popupHostUsesDefaultRecordContext(current, hostContext)) {
       return void 0;
     }
     return {
@@ -6265,13 +6560,14 @@ class FlowSurfacesService {
           }
         )
       );
+      this.registerInlinePopupTemplateAlias(actionName, popup, matchedTemplate, options.popupTemplateAliasSession);
       return;
     }
     try {
       if (!popup || !fieldHostUid) {
         return;
       }
-      const { fieldNode, wrapperNode } = await this.loadFieldHostNodes(fieldHostUid, options.transaction);
+      let { fieldNode, wrapperNode } = await this.loadFieldHostNodes(fieldHostUid, options.transaction);
       this.assertInlinePopupSaveAsTemplateSource(actionName, popup);
       const hasLocalPopupContent = (0, import_default_action_popup.hasFlowSurfaceInlinePopupBlocks)(popup) || !import_lodash.default.isUndefined(popup.layout);
       if (popup.tryTemplate && !hasLocalPopupContent && !this.shouldAutoCompleteDefaultFieldPopup(fieldNode, popup)) {
@@ -6280,15 +6576,33 @@ class FlowSurfacesService {
       const shouldAutoCompleteDefaultPopup = this.shouldAutoCompleteDefaultFieldPopup(fieldNode, popup);
       Object.assign(result, await this.ensureLocalFieldPopupSurface(actionName, fieldHostUid, options, { popup }));
       if (shouldAutoCompleteDefaultPopup) {
+        const reloaded = await this.loadFieldHostNodes(fieldHostUid, options.transaction);
+        fieldNode = reloaded.fieldNode;
+        wrapperNode = reloaded.wrapperNode;
         const popupContext = this.resolveFieldOpenViewContext(fieldNode, wrapperNode);
         const defaultType = this.getRequestedPopupDefaultType(popup) || "view";
+        await this.syncDefaultFieldPopupOpenViewTitle(
+          fieldHostUid,
+          fieldNode,
+          wrapperNode,
+          popup,
+          defaultType,
+          popupContext,
+          options
+        );
         await this.compose(
           {
             target: {
               uid: fieldHostUid
             },
             mode: popup.mode || "replace",
-            blocks: this.buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType, options.enabledPackages),
+            blocks: this.buildDefaultFieldPopupBlocks(
+              fieldNode,
+              popupContext,
+              defaultType,
+              popup,
+              options.enabledPackages
+            ),
             layout: popup.layout
           },
           options
@@ -6382,6 +6696,9 @@ class FlowSurfacesService {
     }
     return !(0, import_default_action_popup.hasFlowSurfaceInlinePopupTemplate)(popup) && !(0, import_default_action_popup.hasFlowSurfaceInlinePopupBlocks)(popup);
   }
+  isEmptyInlinePopupPayload(popup) {
+    return import_lodash.default.isPlainObject(popup) && Object.keys(popup).length === 0;
+  }
   shouldAutoCompleteDefaultFieldPopup(fieldNode, popup) {
     if (!import_lodash.default.isPlainObject(popup)) {
       return false;
@@ -6398,7 +6715,79 @@ class FlowSurfacesService {
     }
     return popup.tryTemplate === true || !import_lodash.default.isUndefined(popup.defaultType) || Object.keys(popup).length === 0;
   }
-  buildDefaultFieldPopupFieldPaths(input) {
+  getApplyBlueprintPopupDefaultsMetadata(popup) {
+    return (0, import_defaults.readFlowSurfaceApplyBlueprintPopupDefaultsMetadata)(popup);
+  }
+  getApplyBlueprintDefaultFieldGroups(popup, collectionName) {
+    var _a;
+    return (_a = (0, import_defaults.getFlowSurfaceApplyBlueprintDefaultCollection)(
+      this.getApplyBlueprintPopupDefaultsMetadata(popup),
+      collectionName
+    )) == null ? void 0 : _a.fieldGroups;
+  }
+  pickDefaultPopupFields(input) {
+    const defaultFieldGroups = this.getApplyBlueprintDefaultFieldGroups(input.popup, input.collectionName);
+    if (defaultFieldGroups) {
+      return {
+        fieldGroups: (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldGroups)(
+          input.candidates,
+          defaultFieldGroups,
+          input.options
+        )
+      };
+    }
+    return {
+      fieldPaths: (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldPaths)(input.candidates, input.options)
+    };
+  }
+  resolveApplyBlueprintDefaultPopupMetadata(input) {
+    return (0, import_defaults.resolveFlowSurfaceApplyBlueprintDefaultPopupMetadata)({
+      metadata: this.getApplyBlueprintPopupDefaultsMetadata(input.popup),
+      actionType: input.actionType,
+      sourceCollectionName: input.sourceCollectionName,
+      associationField: input.associationField,
+      targetCollectionName: input.targetCollectionName
+    });
+  }
+  resolveApplyBlueprintAssociationDefaultContext(associationName) {
+    const parts = String(associationName || "").trim().split(".").map((part) => part.trim()).filter(Boolean);
+    if (parts.length < 2) {
+      return {};
+    }
+    const [sourceCollectionName, ...associationFieldParts] = parts;
+    return {
+      sourceCollectionName,
+      associationField: associationFieldParts.join(".")
+    };
+  }
+  resolveGeneratedDefaultFieldPopupName(input) {
+    var _a;
+    const defaultPopupMetadata = this.resolveGeneratedDefaultFieldPopupMetadata(input);
+    if (defaultPopupMetadata == null ? void 0 : defaultPopupMetadata.name) {
+      return defaultPopupMetadata.name;
+    }
+    const explicitTitle = this.normalizeOptionalPopupTitle((_a = input.popup) == null ? void 0 : _a.title);
+    if (explicitTitle) {
+      return explicitTitle;
+    }
+    return void 0;
+  }
+  resolveGeneratedDefaultFieldPopupMetadata(input) {
+    var _a, _b;
+    const explicitTitle = this.normalizeOptionalPopupTitle((_a = input.popup) == null ? void 0 : _a.title);
+    if (explicitTitle) {
+      return void 0;
+    }
+    const bindingContext = this.resolveFieldBindingContext(input.fieldNode, input.wrapperNode);
+    return this.resolveApplyBlueprintDefaultPopupMetadata({
+      popup: input.popup,
+      actionType: input.defaultType,
+      sourceCollectionName: bindingContext.collectionName,
+      associationField: (0, import_service_helpers.normalizeFieldPath)(bindingContext.fieldPath || "", bindingContext.associationPathName),
+      targetCollectionName: bindingContext.targetCollectionName || String(((_b = input.popupContext) == null ? void 0 : _b.collectionName) || "")
+    });
+  }
+  buildDefaultFieldPopupFields(input) {
     const collectionName = String(input.popupContext.collectionName || "").trim();
     if (!collectionName) {
       return [];
@@ -6414,12 +6803,17 @@ class FlowSurfacesService {
       },
       enabledPackages: input.enabledPackages
     });
-    return (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldPaths)(directCandidates, {
-      excludeAuditTimestampFields: input.defaultType === "edit",
-      excludeAssociationFields: true
+    return this.pickDefaultPopupFields({
+      candidates: directCandidates,
+      popup: input.popup,
+      collectionName,
+      options: {
+        excludeAuditTimestampFields: input.defaultType === "edit",
+        excludeAssociationFields: true
+      }
     });
   }
-  buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType, enabledPackages) {
+  buildDefaultFieldPopupBlocks(fieldNode, popupContext, defaultType, popup, enabledPackages) {
     var _a;
     const actionUse = defaultType === "edit" ? "EditActionModel" : "ViewActionModel";
     const namespace = (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
@@ -6434,18 +6828,54 @@ class FlowSurfacesService {
     if ((_a = actionConfig == null ? void 0 : actionConfig.submitAction) == null ? void 0 : _a.key) {
       keyMap.set(actionConfig.submitAction.key, `${namespace}.${actionConfig.submitAction.key}`);
     }
-    const fieldPaths = this.buildDefaultFieldPopupFieldPaths({
+    const fields = this.buildDefaultFieldPopupFields({
       defaultType,
       fieldNode,
+      popup,
       popupContext,
       enabledPackages
     });
     return this.remapDefaultActionPopupBlocks(
-      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionUse, fieldPaths),
+      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionUse, fields),
       keyMap,
       namespace
     );
   }
+  async syncDefaultFieldPopupOpenViewTitle(fieldHostUid, fieldNode, wrapperNode, popup, defaultType, popupContext, options) {
+    const normalizedFieldHostUid = String(fieldHostUid || "").trim();
+    if (!normalizedFieldHostUid) {
+      return;
+    }
+    const openViewTitle = this.resolveGeneratedDefaultFieldPopupName({
+      fieldNode,
+      wrapperNode,
+      popup,
+      defaultType,
+      popupContext
+    });
+    if (!openViewTitle) {
+      return;
+    }
+    const currentOpenView = this.resolvePopupHostOpenView(fieldNode);
+    if (this.normalizeOptionalPopupTitle(currentOpenView == null ? void 0 : currentOpenView.title) === openViewTitle) {
+      return;
+    }
+    await this.configureFieldNode(
+      {
+        uid: normalizedFieldHostUid
+      },
+      {
+        openView: {
+          ...import_lodash.default.isPlainObject(currentOpenView) ? currentOpenView : {},
+          title: openViewTitle
+        }
+      },
+      {
+        ...options,
+        openViewActionName: "addField"
+      }
+    );
+  }
   async autoSaveDefaultFieldPopupAsTemplate(result, popup, options) {
     if (!this.getFlowTemplateRepositorySafe()) {
       return;
@@ -6474,6 +6904,20 @@ class FlowSurfacesService {
     );
     const identity = (0, import_crypto.createHash)("sha1").update(uniqueKeySource).digest("hex").slice(0, 12);
     const defaultType = this.getRequestedPopupDefaultType(popup) || "view";
+    const resolvedDefaultMetadata = await (async () => {
+      try {
+        const { fieldNode, wrapperNode } = await this.loadFieldHostNodes(fieldHostUid, options.transaction);
+        return this.resolveGeneratedDefaultFieldPopupMetadata({
+          fieldNode,
+          wrapperNode,
+          popup,
+          defaultType,
+          popupContext: openView
+        });
+      } catch {
+        return void 0;
+      }
+    })();
     const metadata = await this.resolveAutoGeneratedFieldPopupTemplateMetadata(
       fieldHostUid,
       defaultType,
@@ -6485,15 +6929,15 @@ class FlowSurfacesService {
         target: {
           uid: fieldHostUid
         },
-        name: metadata.name,
-        description: metadata.description,
+        name: (resolvedDefaultMetadata == null ? void 0 : resolvedDefaultMetadata.name) || metadata.name,
+        description: (resolvedDefaultMetadata == null ? void 0 : resolvedDefaultMetadata.description) || metadata.description,
         saveMode: "convert"
       },
       options
     );
     this.clearPopupSurfaceKeys(result);
   }
-  async autoSaveDefaultActionPopupAsTemplate(actionUid, _popup, options) {
+  async autoSaveDefaultActionPopupAsTemplate(actionUid, popup, options) {
     if (!this.getFlowTemplateRepositorySafe()) {
       return;
     }
@@ -6524,6 +6968,8 @@ class FlowSurfacesService {
       })
     );
     const identity = (0, import_crypto.createHash)("sha1").update(uniqueKeySource).digest("hex").slice(0, 12);
+    const popupProfile = (actionNode == null ? void 0 : actionNode.uid) ? await this.resolvePopupBlockProfile(actionNode.uid, null, actionNode, options.transaction).catch(() => null) : null;
+    const resolvedDefaultMetadata = this.resolveGeneratedDefaultActionPopupMetadata(actionNode, popup, popupProfile);
     const metadata = await this.resolveAutoGeneratedActionPopupTemplateMetadata(
       actionUid,
       identity,
@@ -6534,12 +6980,16 @@ class FlowSurfacesService {
         target: {
           uid: actionUid
         },
-        name: metadata.name,
-        description: metadata.description,
+        name: (resolvedDefaultMetadata == null ? void 0 : resolvedDefaultMetadata.name) || metadata.name,
+        description: (resolvedDefaultMetadata == null ? void 0 : resolvedDefaultMetadata.description) || metadata.description,
         saveMode: "convert"
       },
       options
     );
+    await this.syncDefaultActionPopupOpenViewTitle(actionUid, actionNode, {
+      ...options,
+      openViewTitle: this.resolveGeneratedDefaultActionPopupName(actionNode, popup, popupProfile) || this.resolveDefaultActionPopupTemplateOpenViewTitle(actionNode, popup)
+    });
   }
   shouldAutoCompleteDefaultActionPopup(actionNode, popup, options = {}) {
     if (options.autoCompleteDefaultPopup === false) {
@@ -6557,7 +7007,41 @@ class FlowSurfacesService {
     }
     return true;
   }
-  buildDefaultActionPopupFieldPaths(input) {
+  resolveGeneratedDefaultActionPopupName(actionNode, popup, popupProfile, options = {}) {
+    const defaultPopupMetadata = this.resolveGeneratedDefaultActionPopupMetadata(actionNode, popup, popupProfile);
+    if (defaultPopupMetadata == null ? void 0 : defaultPopupMetadata.name) {
+      return defaultPopupMetadata.name;
+    }
+    const explicitTitle = this.normalizeOptionalPopupTitle(popup == null ? void 0 : popup.title);
+    if (explicitTitle) {
+      return explicitTitle;
+    }
+    if (options.includeFallback === false) {
+      return void 0;
+    }
+    return (0, import_default_action_popup.resolveFlowSurfaceDefaultActionPopupTabTitle)(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);
+    if (!actionConfig) {
+      return void 0;
+    }
+    const associationDefaultContext = this.resolveApplyBlueprintAssociationDefaultContext(
+      popupProfile == null ? void 0 : popupProfile.associationName
+    );
+    return this.resolveApplyBlueprintDefaultPopupMetadata({
+      popup,
+      actionType: actionConfig.type,
+      sourceCollectionName: associationDefaultContext.sourceCollectionName,
+      associationField: associationDefaultContext.associationField,
+      targetCollectionName: popupProfile == null ? void 0 : popupProfile.collectionName
+    });
+  }
+  buildDefaultActionPopupFields(input) {
     var _a, _b;
     const collectionName = String(((_a = input.popupProfile) == null ? void 0 : _a.collectionName) || "").trim();
     if (!collectionName) {
@@ -6577,8 +7061,13 @@ class FlowSurfacesService {
       },
       enabledPackages: input.enabledPackages
     });
-    return (0, import_default_action_popup.pickFlowSurfaceDefaultActionPopupFieldPaths)(directCandidates, {
-      excludeAuditTimestampFields: mode === "form"
+    return this.pickDefaultPopupFields({
+      candidates: directCandidates,
+      popup: input.popup,
+      collectionName,
+      options: {
+        excludeAuditTimestampFields: mode === "form"
+      }
     });
   }
   buildDefaultActionPopupNamespace(actionNode) {
@@ -6649,11 +7138,32 @@ class FlowSurfacesService {
           `flowSurfaces default popup block '${blockKey || (block == null ? void 0 : block.type) || "unknown"}' field #${fieldIndex + 1}`
         );
       });
+      const remappedFieldGroups = import_lodash.default.castArray((block == null ? void 0 : block.fieldGroups) || []).map((group, groupIndex) => {
+        if (!namespace || !import_lodash.default.isPlainObject(group)) {
+          return import_lodash.default.cloneDeep(group);
+        }
+        const rawGroupKey = typeof group.key === "string" && group.key.trim() || typeof group.title === "string" && group.title.trim() || `group_${groupIndex + 1}`;
+        return {
+          ...import_lodash.default.cloneDeep(group),
+          key: (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
+            `${namespace}.${rawGroupKey}`,
+            `flowSurfaces default popup block '${blockKey || (block == null ? void 0 : block.type) || "unknown"}' fieldGroup #${groupIndex + 1}`
+          ),
+          fields: import_lodash.default.castArray(group.fields || []).map(
+            (field, fieldIndex) => this.remapDefaultActionPopupField(
+              field,
+              namespace,
+              `flowSurfaces default popup block '${blockKey || (block == null ? void 0 : block.type) || "unknown"}' fieldGroup #${groupIndex + 1} field #${fieldIndex + 1}`
+            )
+          )
+        };
+      });
       return import_lodash.default.pickBy(
         {
           ...import_lodash.default.cloneDeep(block),
           key: blockKey && keyMap.has(blockKey) ? keyMap.get(blockKey) : block == null ? void 0 : block.key,
           fields: remappedFields.length ? remappedFields : void 0,
+          fieldGroups: remappedFieldGroups.length ? remappedFieldGroups : void 0,
           actions: remappedActions.length ? remappedActions : void 0
         },
         (value) => !import_lodash.default.isUndefined(value)
@@ -6685,14 +7195,15 @@ class FlowSurfacesService {
     );
     return nextLayout;
   }
-  buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace, enabledPackages) {
-    const fieldPaths = this.buildDefaultActionPopupFieldPaths({
+  buildDefaultActionPopupBlocks(actionNode, popupProfile, popup, keyMap, namespace, enabledPackages) {
+    const fields = this.buildDefaultActionPopupFields({
       actionUse: actionNode == null ? void 0 : actionNode.use,
       popupProfile,
+      popup,
       enabledPackages
     });
     return this.remapDefaultActionPopupBlocks(
-      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionNode == null ? void 0 : actionNode.use, fieldPaths),
+      (0, import_default_action_popup.buildFlowSurfaceDefaultActionPopupBlocks)(actionNode == null ? void 0 : actionNode.use, fields),
       keyMap,
       namespace
     );
@@ -6705,7 +7216,7 @@ class FlowSurfacesService {
         uid: actionNode.uid
       },
       mode: (popup == null ? void 0 : popup.mode) || "replace",
-      blocks: this.buildDefaultActionPopupBlocks(actionNode, popupProfile, keyMap, namespace, enabledPackages),
+      blocks: this.buildDefaultActionPopupBlocks(actionNode, popupProfile, popup, keyMap, namespace, enabledPackages),
       layout: this.remapDefaultActionPopupLayout(popup == null ? void 0 : popup.layout, keyMap)
     };
   }
@@ -6762,10 +7273,7 @@ class FlowSurfacesService {
     return normalizedTitle || void 0;
   }
   async syncDefaultActionPopupTabTitle(actionNode, popupTab, options) {
-    const 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)(actionNode == null ? void 0 : actionNode.use, this.getActionButtonTitle(actionNode));
     if (!(popupTab == null ? void 0 : popupTab.uid) || !popupTabTitle || this.resolvePopupTabTitle(popupTab) === popupTabTitle) {
       return;
     }
@@ -6779,54 +7287,186 @@ class FlowSurfacesService {
       options
     );
   }
-  async applyDefaultActionPopupContent(actionNode, popup, options) {
-    const popupProfile = await this.resolvePopupBlockProfile(actionNode.uid, null, actionNode, options.transaction);
-    if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface)) {
+  async syncDefaultActionPopupTabTitleForHost(actionNode, popupHostUid, options) {
+    var _a, _b;
+    const normalizedPopupHostUid = String(popupHostUid || "").trim();
+    if (!normalizedPopupHostUid) {
       return;
     }
-    await this.compose(
-      this.buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup, options.enabledPackages),
+    const popupHost = await this.repository.findModelById(normalizedPopupHostUid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    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));
+    if (!(popupTab == null ? void 0 : popupTab.uid) || !popupTabTitle || this.resolvePopupTabTitle(popupTab) === popupTabTitle) {
+      return;
+    }
+    await this.updatePopupTab(
+      {
+        target: {
+          uid: popupTab.uid
+        },
+        title: popupTabTitle
+      },
       options
     );
-    const popupState = await this.resolveDefaultActionPopupSurfaceState(actionNode.uid, options.transaction);
-    await this.resetDefaultActionPopupFormLinkageRules(popupState.popupBlock, options);
-    await this.syncDefaultActionPopupTabTitle(popupState.actionNode || actionNode, popupState.popupTab, options);
   }
-  async applyInlineActionPopup(actionName, actionUid, popup, options) {
+  async syncDefaultActionPopupCopiedTemplateTabTitle(actionUid, fallbackActionNode, options) {
     const actionNode = await this.repository.findModelById(actionUid, {
       transaction: options.transaction,
       includeAsyncNode: true
-    });
-    if (!(actionNode == null ? void 0 : actionNode.uid)) {
-      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} action '${actionUid}' does not exist`);
-    }
+    }) || fallbackActionNode;
     const openView = this.resolvePopupHostOpenView(actionNode);
-    if (this.isExternalPopupOpenView(openView, actionNode == null ? void 0 : actionNode.uid)) {
-      if (popup == null ? void 0 : popup.saveAsTemplate) {
-        (0, import_errors.throwBadRequest)(
-          `flowSurfaces ${actionName} popup.saveAsTemplate cannot be combined with external openView.uid`
-        );
-      }
-      if (import_lodash.default.isUndefined(popup) || this.isSemanticallyEmptyInlinePopup(popup)) {
-        return;
-      }
-      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} popup cannot be combined with external openView.uid`);
+    const copiedPopupHostUid = this.resolveDetachedPopupCopyUid(actionUid, openView);
+    if (!copiedPopupHostUid) {
+      return;
     }
-    popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
-    if (popup && (0, import_default_action_popup.hasFlowSurfaceInlinePopupTemplate)(popup)) {
-      await this.configureActionNode(
-        {
-          uid: actionUid
-        },
-        actionNode.use,
-        {
-          openView: this.buildInlinePopupTemplateOpenView(popup)
+    await this.syncDefaultActionPopupTabTitleForHost(actionNode || fallbackActionNode, copiedPopupHostUid, options);
+  }
+  async syncDefaultActionPopupOpenViewTitle(actionUid, fallbackActionNode, options) {
+    const actionNode = await this.repository.findModelById(actionUid, {
+      transaction: options.transaction,
+      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));
+    if (!openViewStep || !openViewTitle) {
+      return;
+    }
+    const currentOpenView = import_lodash.default.isPlainObject(openViewStep.openView) ? openViewStep.openView : {};
+    if (this.normalizeOptionalPopupTitle(currentOpenView.title) === openViewTitle) {
+      return;
+    }
+    const nextStepParams = import_lodash.default.cloneDeep((actionNode == null ? void 0 : actionNode.stepParams) || {});
+    const currentGroup = import_lodash.default.isPlainObject(nextStepParams[openViewStep.flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[openViewStep.flowKey]) : {};
+    currentGroup[openViewStep.stepKey] = (0, import_service_utils.buildDefinedPayload)({
+      ...currentOpenView,
+      title: openViewTitle
+    });
+    nextStepParams[openViewStep.flowKey] = currentGroup;
+    await this.repository.patch(
+      {
+        uid: actionNode.uid,
+        stepParams: nextStepParams
+      },
+      { transaction: options.transaction }
+    );
+  }
+  async hydrateLocalActionPopupCurrentRecordContext(actionNode, options) {
+    var _a;
+    if (!(actionNode == null ? void 0 : actionNode.uid) || !((_a = options.popupActionContext) == null ? void 0 : _a.hasCurrentRecord)) {
+      return;
+    }
+    const currentOpenView = this.resolvePopupHostOpenView(actionNode);
+    if (this.isExternalPopupOpenView(currentOpenView, actionNode.uid) || (0, import_service_helpers.hasConfiguredFlowContextValue)(currentOpenView == null ? void 0 : currentOpenView.filterByTk)) {
+      return;
+    }
+    const popupProfile = await this.resolvePopupBlockProfile(
+      actionNode.uid,
+      null,
+      actionNode,
+      options.transaction
+    ).catch(() => null);
+    const collectionName = String((currentOpenView == null ? void 0 : currentOpenView.collectionName) || (popupProfile == null ? void 0 : popupProfile.collectionName) || "").trim();
+    if (!collectionName) {
+      return;
+    }
+    const openViewStep = (0, import_template_service_utils.findFlowTemplateOpenViewStep)(actionNode);
+    const flowKey = (openViewStep == null ? void 0 : openViewStep.flowKey) || "popupSettings";
+    const stepKey = (openViewStep == null ? void 0 : openViewStep.stepKey) || "openView";
+    const nextStepParams = import_lodash.default.cloneDeep(actionNode.stepParams || {});
+    const currentGroup = import_lodash.default.isPlainObject(nextStepParams[flowKey]) ? import_lodash.default.cloneDeep(nextStepParams[flowKey]) : {};
+    const currentGroupOpenView = import_lodash.default.isPlainObject(currentGroup[stepKey]) ? currentGroup[stepKey] : {};
+    const nextOpenView = (0, import_service_utils.buildDefinedPayload)({
+      ...currentGroupOpenView,
+      dataSourceKey: (currentOpenView == null ? void 0 : currentOpenView.dataSourceKey) || (popupProfile == null ? void 0 : popupProfile.dataSourceKey) || "main",
+      collectionName,
+      associationName: (currentOpenView == null ? void 0 : currentOpenView.associationName) || (popupProfile == null ? void 0 : popupProfile.associationName),
+      filterByTk: (popupProfile == null ? void 0 : popupProfile.filterByTk) || "{{ctx.view.inputArgs.filterByTk}}",
+      sourceId: (currentOpenView == null ? void 0 : currentOpenView.sourceId) || (popupProfile == null ? void 0 : popupProfile.sourceId)
+    });
+    if (import_lodash.default.isEqual(nextOpenView, currentGroupOpenView)) {
+      return;
+    }
+    currentGroup[stepKey] = nextOpenView;
+    nextStepParams[flowKey] = currentGroup;
+    await this.repository.patch(
+      {
+        uid: actionNode.uid,
+        stepParams: nextStepParams
+      },
+      { transaction: options.transaction }
+    );
+    actionNode.stepParams = nextStepParams;
+  }
+  async applyDefaultActionPopupContent(actionNode, popup, options) {
+    const popupProfile = await this.resolvePopupBlockProfile(actionNode.uid, null, actionNode, options.transaction);
+    if (!(popupProfile == null ? void 0 : popupProfile.isPopupSurface)) {
+      return;
+    }
+    const generatedPopupName = this.resolveGeneratedDefaultActionPopupName(actionNode, popup, popupProfile);
+    await this.compose(
+      this.buildDefaultActionPopupComposeValues(actionNode, popupProfile, popup, options.enabledPackages),
+      options
+    );
+    const popupState = await this.resolveDefaultActionPopupSurfaceState(actionNode.uid, options.transaction);
+    await this.resetDefaultActionPopupFormLinkageRules(popupState.popupBlock, options);
+    await this.syncDefaultActionPopupTabTitle(popupState.actionNode || actionNode, popupState.popupTab, {
+      ...options,
+      popupTabTitle: generatedPopupName || options.popupTabTitle
+    });
+    await this.syncDefaultActionPopupOpenViewTitle(actionNode.uid, popupState.actionNode || actionNode, {
+      ...options,
+      openViewTitle: generatedPopupName || options.popupTabTitle
+    });
+  }
+  async applyInlineActionPopup(actionName, actionUid, popup, options) {
+    const actionNode = await this.repository.findModelById(actionUid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    if (!(actionNode == null ? void 0 : actionNode.uid)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} action '${actionUid}' does not exist`);
+    }
+    const initialOpenView = this.resolvePopupHostOpenView(actionNode);
+    if (import_lodash.default.isUndefined(popup) && options.autoCompleteDefaultPopup === false) {
+      return;
+    }
+    if (this.isExternalPopupOpenView(initialOpenView, actionNode.uid) && (import_lodash.default.isUndefined(popup) || this.isEmptyInlinePopupPayload(popup))) {
+      return;
+    }
+    popup = this.prepareInlinePopupTemplateAliases(actionName, popup, options.popupTemplateAliasSession);
+    popup = this.buildImplicitTemplateDefaultActionPopup(actionNode, popup);
+    const templateOpenViewTitle = this.resolveDefaultActionPopupTemplateOpenViewTitle(actionNode, popup);
+    if (popup && (0, import_default_action_popup.hasFlowSurfaceInlinePopupTemplate)(popup)) {
+      const templateRef = this.normalizeFlowTemplateReference(actionName, popup.template, {
+        expectedType: "popup"
+      });
+      const template = await this.getFlowTemplateOrThrow(actionName, templateRef.uid, {
+        transaction: options.transaction,
+        expectedType: "popup"
+      });
+      await this.configureActionNode(
+        {
+          uid: actionUid
+        },
+        actionNode.use,
+        {
+          openView: this.buildInlinePopupTemplateOpenView(popup, templateOpenViewTitle)
         },
         {
           ...options,
           openViewActionName: actionName
         }
       );
+      if ((0, import_default_action_popup.isFlowSurfaceDefaultActionPopupUse)(actionNode == null ? void 0 : actionNode.use) && templateRef.mode === "copy") {
+        await this.syncDefaultActionPopupCopiedTemplateTabTitle(actionUid, actionNode, {
+          ...options,
+          popupTabTitle: templateOpenViewTitle
+        });
+      }
       return;
     }
     const matchedTemplate = await this.tryResolvePopupTemplateForHost(actionName, popup, actionUid, options);
@@ -6837,21 +7477,37 @@ class FlowSurfacesService {
         },
         actionNode.use,
         {
-          openView: this.buildInlinePopupTemplateOpenView({
-            ...popup,
-            template: {
-              uid: matchedTemplate.uid,
-              mode: "reference"
-            }
-          })
+          openView: this.buildInlinePopupTemplateOpenView(
+            {
+              ...popup,
+              template: {
+                uid: matchedTemplate.uid,
+                mode: "reference"
+              }
+            },
+            templateOpenViewTitle
+          )
         },
         {
           ...options,
           openViewActionName: actionName
         }
       );
+      this.registerInlinePopupTemplateAlias(actionName, popup, matchedTemplate, options.popupTemplateAliasSession);
       return;
     }
+    const openView = this.resolvePopupHostOpenView(actionNode);
+    if (this.isExternalPopupOpenView(openView, actionNode == null ? void 0 : actionNode.uid) && !this.isEditableDefaultActionPopupTemplateReference(actionNode, openView)) {
+      if (popup == null ? void 0 : popup.saveAsTemplate) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces ${actionName} popup.saveAsTemplate cannot be combined with external openView.uid`
+        );
+      }
+      if (import_lodash.default.isUndefined(popup) || this.isSemanticallyEmptyInlinePopup(popup)) {
+        return;
+      }
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} popup cannot be combined with external openView.uid`);
+    }
     const shouldAutoCompleteDefaultPopup = this.shouldAutoCompleteDefaultActionPopup(actionNode, popup, options);
     this.assertInlinePopupSaveAsTemplateSource(actionName, popup);
     const hasLocalPopupContent = (0, import_default_action_popup.hasFlowSurfaceInlinePopupBlocks)(popup) || !import_lodash.default.isUndefined(popup == null ? void 0 : popup.layout);
@@ -6863,11 +7519,15 @@ class FlowSurfacesService {
     }
     try {
       if (shouldAutoCompleteDefaultPopup) {
-        await this.applyDefaultActionPopupContent(actionNode, popup, options);
+        await this.applyDefaultActionPopupContent(actionNode, popup, {
+          ...options,
+          popupTabTitle: templateOpenViewTitle
+        });
         if (this.shouldAutoSaveDefaultActionPopupTemplate(popup)) {
           await this.autoSaveDefaultActionPopupAsTemplate(actionUid, popup, options);
         }
       } else if (!import_lodash.default.isUndefined(popup)) {
+        await this.hydrateLocalActionPopupCurrentRecordContext(actionNode, options);
         await this.compose(
           {
             target: {
@@ -6894,10 +7554,13 @@ class FlowSurfacesService {
     const writeTarget = this.normalizeWriteTarget("updateSettings", values == null ? void 0 : values.target, values);
     const target = await this.locator.resolve(writeTarget, options);
     const current = await this.loadResolvedNode(target, options.transaction);
+    const normalizedValues = import_lodash.default.cloneDeep(values || {});
+    this.normalizeCanonicalBlockHeaderWriteForUpdateSettings(current, normalizedValues);
     const contract = (0, import_catalog.getNodeContract)(current.use);
     const nextPayload = { uid: current.uid };
+    const shouldStripLegacyBlockHeader = import_lodash.default.has(normalizedValues, ["stepParams", "cardSettings", "titleDescription"]);
     ["props", "decoratorProps", "stepParams", "flowRegistry"].forEach((domain) => {
-      if (typeof values[domain] === "undefined") {
+      if (typeof normalizedValues[domain] === "undefined") {
         return;
       }
       if (!contract.editableDomains.includes(domain)) {
@@ -6910,11 +7573,12 @@ class FlowSurfacesService {
       nextPayload[domain] = this.contractGuard.mergeDomainValue(
         domain,
         current[domain],
-        values[domain],
+        normalizedValues[domain],
         domainContract,
         current.use
       );
     });
+    this.syncFilterActionSettingsForUpdateSettings(current, normalizedValues, nextPayload);
     this.syncMirroredStepParamsForUpdateSettings(current, nextPayload);
     const popupActionContext = options.popupActionContext || await this.resolveRecordContextPopupActionContextForHost(current, options.transaction);
     await this.normalizeOpenViewForUpdateSettings(
@@ -6929,11 +7593,14 @@ class FlowSurfacesService {
     );
     this.syncChartConfigureForUpdateSettings(current, nextPayload);
     await this.validateChartConfigureForUpdateSettings(current, nextPayload, options.transaction);
+    this.syncCanonicalBlockHeaderForUpdateSettings(current, nextPayload);
+    this.syncMapHeightChromeForUpdateSettings(current, nextPayload);
     this.syncChartCardRuntimeStepParamsForUpdateSettings(
       current,
       nextPayload,
-      options.replaceChartCardSettings ? import_lodash.default.get(values, ["stepParams", "cardSettings"]) : void 0
+      options.replaceChartCardSettings ? import_lodash.default.get(normalizedValues, ["stepParams", "cardSettings"]) : void 0
     );
+    this.stripLegacyBlockHeaderChromeForUpdateSettings(current, nextPayload, shouldStripLegacyBlockHeader);
     this.stripLegacyChartCardChromeForUpdateSettings(current, nextPayload);
     const effectiveNode = {
       ...current,
@@ -6943,6 +7610,7 @@ class FlowSurfacesService {
       flowRegistry: nextPayload.flowRegistry ?? current.flowRegistry
     };
     const shouldValidateFlowRegistry = !import_lodash.default.isUndefined(nextPayload.flowRegistry) || !import_lodash.default.isUndefined(nextPayload.stepParams);
+    this.validateCalendarBlockState("updateSettings", effectiveNode);
     if (shouldValidateFlowRegistry && import_lodash.default.isPlainObject(effectiveNode.flowRegistry) && Object.keys(effectiveNode.flowRegistry).length) {
       this.contractGuard.validateFlowRegistry(effectiveNode, effectiveNode.flowRegistry);
     }
@@ -6971,6 +7639,9 @@ 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") {
+      await this.ensureCalendarBlockPopupHosts(effectiveNode, 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);
@@ -6980,6 +7651,81 @@ class FlowSurfacesService {
       updated: Object.keys(import_lodash.default.omit(nextPayload, ["uid"]))
     };
   }
+  syncFilterActionSettingsForUpdateSettings(current, values, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "FilterActionModel") {
+      return;
+    }
+    const hasPropsFilterableFieldNames = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterableFieldNames");
+    const hasPropsDefaultFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "defaultFilterValue");
+    const hasPropsFilterValue = import_lodash.default.isPlainObject(values == null ? void 0 : values.props) && Object.prototype.hasOwnProperty.call(values.props, "filterValue");
+    const hasStepFilterSettingsClear = import_lodash.default.isPlainObject(values == null ? void 0 : values.stepParams) && Object.prototype.hasOwnProperty.call(values.stepParams, "filterSettings") && (values.stepParams.filterSettings === null || import_lodash.default.isPlainObject(values.stepParams.filterSettings) && !Object.keys(values.stepParams.filterSettings).length);
+    const hasStepFilterableFieldNames = import_lodash.default.has(values, [
+      "stepParams",
+      "filterSettings",
+      "filterableFieldNames",
+      "filterableFieldNames"
+    ]);
+    const hasStepDefaultFilter = import_lodash.default.has(values, ["stepParams", "filterSettings", "defaultFilter", "defaultFilter"]);
+    if (!hasPropsFilterableFieldNames && !hasPropsDefaultFilterValue && !hasPropsFilterValue && !hasStepFilterSettingsClear && !hasStepFilterableFieldNames && !hasStepDefaultFilter) {
+      return;
+    }
+    const nextProps = import_lodash.default.cloneDeep(nextPayload.props ?? (current == null ? void 0 : current.props) ?? {});
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    if (hasStepFilterSettingsClear) {
+      if (hasPropsFilterableFieldNames || hasPropsDefaultFilterValue || hasPropsFilterValue) {
+        (0, import_errors.throwBadRequest)(
+          "flowSurfaces updateSettings filter action cannot combine 'stepParams.filterSettings' clear with filter props writes"
+        );
+      }
+      import_lodash.default.unset(nextProps, ["filterableFieldNames"]);
+      import_lodash.default.unset(nextProps, ["defaultFilterValue"]);
+      import_lodash.default.unset(nextProps, ["filterValue"]);
+      import_lodash.default.set(nextStepParams, ["filterSettings"], {});
+      nextPayload.props = nextProps;
+      nextPayload.stepParams = nextStepParams;
+      return;
+    }
+    if (hasPropsFilterableFieldNames || hasStepFilterableFieldNames) {
+      const nextPropNames = import_lodash.default.cloneDeep(import_lodash.default.get(nextProps, ["filterableFieldNames"]));
+      const nextStepNames = import_lodash.default.cloneDeep(
+        import_lodash.default.get(nextStepParams, ["filterSettings", "filterableFieldNames", "filterableFieldNames"])
+      );
+      if (hasPropsFilterableFieldNames && hasStepFilterableFieldNames && !import_lodash.default.isEqual(nextPropNames, nextStepNames)) {
+        (0, import_errors.throwBadRequest)(
+          "flowSurfaces updateSettings filter action values 'props.filterableFieldNames' and 'stepParams.filterSettings.filterableFieldNames.filterableFieldNames' must match"
+        );
+      }
+      const fieldNames = hasStepFilterableFieldNames ? nextStepNames : nextPropNames;
+      nextProps.filterableFieldNames = import_lodash.default.cloneDeep(fieldNames);
+      import_lodash.default.set(
+        nextStepParams,
+        ["filterSettings", "filterableFieldNames", "filterableFieldNames"],
+        import_lodash.default.cloneDeep(fieldNames)
+      );
+    }
+    if (hasPropsDefaultFilterValue || hasPropsFilterValue || hasStepDefaultFilter) {
+      const nextDefaultFilterValue = import_lodash.default.cloneDeep(import_lodash.default.get(nextProps, ["defaultFilterValue"]));
+      const nextFilterValue = import_lodash.default.cloneDeep(import_lodash.default.get(nextProps, ["filterValue"]));
+      const nextStepFilter = import_lodash.default.cloneDeep(import_lodash.default.get(nextStepParams, ["filterSettings", "defaultFilter", "defaultFilter"]));
+      if (hasPropsDefaultFilterValue && hasPropsFilterValue && !import_lodash.default.isEqual(nextDefaultFilterValue, nextFilterValue)) {
+        (0, import_errors.throwBadRequest)(
+          "flowSurfaces updateSettings filter action values 'props.defaultFilterValue' and 'props.filterValue' must match"
+        );
+      }
+      const nextPropFilter = hasPropsDefaultFilterValue ? nextDefaultFilterValue : nextFilterValue;
+      if ((hasPropsDefaultFilterValue || hasPropsFilterValue) && hasStepDefaultFilter && !import_lodash.default.isEqual(nextPropFilter, nextStepFilter)) {
+        (0, import_errors.throwBadRequest)(
+          "flowSurfaces updateSettings filter action values 'props.defaultFilterValue/filterValue' and 'stepParams.filterSettings.defaultFilter.defaultFilter' must match"
+        );
+      }
+      const filterValue = hasStepDefaultFilter ? nextStepFilter : nextPropFilter;
+      nextProps.defaultFilterValue = import_lodash.default.cloneDeep(filterValue);
+      nextProps.filterValue = import_lodash.default.cloneDeep(filterValue);
+      import_lodash.default.set(nextStepParams, ["filterSettings", "defaultFilter", "defaultFilter"], import_lodash.default.cloneDeep(filterValue));
+    }
+    nextPayload.props = nextProps;
+    nextPayload.stepParams = nextStepParams;
+  }
   syncMirroredStepParamsForUpdateSettings(current, nextPayload) {
     const mirrors = UPDATE_SETTINGS_STEP_PARAM_MIRRORS_BY_USE[(current == null ? void 0 : current.use) || ""];
     if (!(mirrors == null ? void 0 : mirrors.length)) {
@@ -7005,6 +7751,106 @@ class FlowSurfacesService {
       nextPayload.stepParams = nextStepParams;
     }
   }
+  normalizeCanonicalBlockHeaderWriteForUpdateSettings(current, values) {
+    const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(current == null ? void 0 : current.use);
+    if (!CANONICAL_BLOCK_HEADER_USES.has(semanticUse)) {
+      return;
+    }
+    const titleDescriptionPath = ["stepParams", "cardSettings", "titleDescription"];
+    if (!import_lodash.default.has(values, titleDescriptionPath)) {
+      return;
+    }
+    const titleDescription = import_lodash.default.get(values, titleDescriptionPath);
+    if (titleDescription === null || import_lodash.default.isPlainObject(titleDescription) && !Object.keys(titleDescription).length) {
+      import_lodash.default.set(values, titleDescriptionPath, {
+        title: "",
+        description: ""
+      });
+      return;
+    }
+    if (!import_lodash.default.isPlainObject(titleDescription)) {
+      return;
+    }
+    const normalizedTitleDescription = import_lodash.default.cloneDeep(titleDescription);
+    if (Object.prototype.hasOwnProperty.call(titleDescription, "title")) {
+      normalizedTitleDescription.title = (0, import_service_utils.normalizeBlockTitleDescriptionValue)(titleDescription.title);
+    }
+    if (Object.prototype.hasOwnProperty.call(titleDescription, "description")) {
+      normalizedTitleDescription.description = (0, import_service_utils.normalizeBlockTitleDescriptionValue)(titleDescription.description);
+    }
+    import_lodash.default.set(values, titleDescriptionPath, normalizedTitleDescription);
+  }
+  syncCanonicalBlockHeaderForUpdateSettings(current, nextPayload) {
+    const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(current == null ? void 0 : current.use);
+    if (!CANONICAL_BLOCK_HEADER_USES.has(semanticUse)) {
+      return;
+    }
+    if (import_lodash.default.isUndefined(import_lodash.default.get(nextPayload, ["stepParams", "cardSettings"]))) {
+      return;
+    }
+    const nextStepParams = import_lodash.default.cloneDeep(nextPayload.stepParams ?? (current == null ? void 0 : current.stepParams) ?? {});
+    const nextCardSettings = import_lodash.default.cloneDeep(import_lodash.default.get(nextStepParams, ["cardSettings"]) || {});
+    const normalizedTitleDescription = (0, import_service_utils.normalizeBlockTitleDescription)(import_lodash.default.get(nextCardSettings, ["titleDescription"]));
+    if (normalizedTitleDescription) {
+      import_lodash.default.set(nextCardSettings, ["titleDescription"], normalizedTitleDescription);
+    } else {
+      import_lodash.default.unset(nextCardSettings, ["titleDescription"]);
+    }
+    if (import_lodash.default.isEmpty(nextCardSettings)) {
+      import_lodash.default.unset(nextStepParams, ["cardSettings"]);
+    } else {
+      import_lodash.default.set(nextStepParams, ["cardSettings"], nextCardSettings);
+    }
+    nextPayload.stepParams = nextStepParams;
+  }
+  stripLegacyBlockHeaderChromeForUpdateSettings(current, nextPayload, shouldStrip) {
+    if (!shouldStrip) {
+      return;
+    }
+    const semanticUse = (0, import_approval.normalizeApprovalSemanticUse)(current == null ? void 0 : current.use);
+    if (!CANONICAL_BLOCK_HEADER_USES.has(semanticUse)) {
+      return;
+    }
+    const currentProps = import_lodash.default.isPlainObject(current == null ? void 0 : current.props) ? current.props : {};
+    const currentDecoratorProps = import_lodash.default.isPlainObject(current == null ? void 0 : current.decoratorProps) ? current.decoratorProps : {};
+    const legacyPropKeys = ["title", "displayTitle"];
+    const legacyDecoratorKeys = ["title", "description"];
+    const hasLegacyProps = legacyPropKeys.some((key) => Object.prototype.hasOwnProperty.call(currentProps, key));
+    const hasLegacyDecoratorProps = legacyDecoratorKeys.some(
+      (key) => Object.prototype.hasOwnProperty.call(currentDecoratorProps, key)
+    );
+    if (hasLegacyProps) {
+      nextPayload.props = import_lodash.default.omit(import_lodash.default.cloneDeep(nextPayload.props ?? currentProps), legacyPropKeys);
+    }
+    if (hasLegacyDecoratorProps) {
+      nextPayload.decoratorProps = import_lodash.default.omit(
+        import_lodash.default.cloneDeep(nextPayload.decoratorProps ?? currentDecoratorProps),
+        legacyDecoratorKeys
+      );
+    }
+  }
+  syncMapHeightChromeForUpdateSettings(current, nextPayload) {
+    if ((current == null ? void 0 : current.use) !== "MapBlockModel") {
+      return;
+    }
+    const nextProps = import_lodash.default.isPlainObject(nextPayload.props) ? nextPayload.props : void 0;
+    if (!nextProps) {
+      return;
+    }
+    const nextDecoratorProps = import_lodash.default.cloneDeep(nextPayload.decoratorProps ?? (current == null ? void 0 : current.decoratorProps) ?? {});
+    let changed = false;
+    if (Object.prototype.hasOwnProperty.call(nextProps, "height") && nextDecoratorProps.height !== nextProps.height) {
+      nextDecoratorProps.height = nextProps.height;
+      changed = true;
+    }
+    if (Object.prototype.hasOwnProperty.call(nextProps, "heightMode") && nextDecoratorProps.heightMode !== nextProps.heightMode) {
+      nextDecoratorProps.heightMode = nextProps.heightMode;
+      changed = true;
+    }
+    if (changed) {
+      nextPayload.decoratorProps = (0, import_service_utils.buildDefinedPayload)(nextDecoratorProps);
+    }
+  }
   async normalizeOpenViewForUpdateSettings(actionName, current, nextPayload, options = {}) {
     const openViewPaths = [
       ["popupSettings", "openView"],
@@ -8236,16 +9082,109 @@ class FlowSurfacesService {
       })
     };
   }
+  buildAutoComposeFieldsLayoutRow(fieldKeys, blockType) {
+    const normalizedKeys = fieldKeys.filter(Boolean);
+    if (!normalizedKeys.length) {
+      return [];
+    }
+    if (blockType === "filterForm") {
+      const span = normalizedKeys.length === 1 ? 24 : normalizedKeys.length === 2 ? 12 : 8;
+      return normalizedKeys.map((key) => ({ key, span }));
+    }
+    if (normalizedKeys.length === 1) {
+      return [{ key: normalizedKeys[0], span: 24 }];
+    }
+    return normalizedKeys.map((key) => ({ key, span: 12 }));
+  }
+  buildAutoComposeFieldsLayout(fields, blockType) {
+    if (!COMPOSE_FIELD_GRID_BLOCK_TYPES.has(blockType || "") || !fields.length) {
+      return void 0;
+    }
+    const rows = [];
+    const chunkSize = blockType === "filterForm" ? 3 : 2;
+    let pendingKeys = [];
+    const flushPending = () => {
+      if (!pendingKeys.length) {
+        return;
+      }
+      rows.push(this.buildAutoComposeFieldsLayoutRow(pendingKeys, blockType));
+      pendingKeys = [];
+    };
+    fields.forEach((field) => {
+      const key = String((field == null ? void 0 : field.key) || "").trim();
+      if (!key) {
+        return;
+      }
+      if (String((field == null ? void 0 : field.type) || "").trim() === "divider") {
+        flushPending();
+        rows.push([{ key, span: 24 }]);
+        return;
+      }
+      pendingKeys.push(key);
+      if (pendingKeys.length >= chunkSize) {
+        flushPending();
+      }
+    });
+    flushPending();
+    return rows.length ? { rows } : void 0;
+  }
+  normalizeComposeFieldGroups(input, blockType, context) {
+    if (!COMPOSE_FIELD_GROUP_BLOCK_TYPES.has(blockType)) {
+      (0, import_errors.throwBadRequest)(`${context} fieldGroups is only supported on createForm, editForm or details`);
+    }
+    const fieldGroups = import_lodash.default.castArray(input || []);
+    if (!fieldGroups.length) {
+      (0, import_errors.throwBadRequest)(`${context} fieldGroups must be a non-empty array`);
+    }
+    return fieldGroups.flatMap((group, groupIndex) => {
+      const groupContext = `${context}.fieldGroups[${groupIndex + 1}]`;
+      if (!import_lodash.default.isPlainObject(group)) {
+        (0, import_errors.throwBadRequest)(`${groupContext} must be an object`);
+      }
+      const title = String(group.title || "").trim();
+      if (!title) {
+        (0, import_errors.throwBadRequest)(`${groupContext}.title is required`);
+      }
+      const rawFields = import_lodash.default.castArray(group.fields || []);
+      if (!rawFields.length) {
+        (0, import_errors.throwBadRequest)(`${groupContext}.fields must be a non-empty array`);
+      }
+      const dividerKey = (0, import_service_utils.normalizeFlowSurfaceComposeKey)(
+        String(group.key || title).trim() || `group_${groupIndex + 1}`,
+        `${groupContext}.key`
+      );
+      return [
+        (0, import_service_utils.normalizeComposeFieldSpec)(
+          {
+            key: `${dividerKey}_divider`,
+            type: "divider",
+            settings: {
+              label: title,
+              orientation: "left"
+            }
+          },
+          groupIndex * 1e3
+        ),
+        ...rawFields.map((field, fieldIndex) => (0, import_service_utils.normalizeComposeFieldSpec)(field, groupIndex * 1e3 + fieldIndex + 1))
+      ];
+    });
+  }
   async applyDefaultActionsForCreatedBlock(input, options = {}) {
+    var _a;
     const descriptors = (0, import_default_block_actions.getFlowSurfaceDefaultBlockActions)({
       blockType: input.blockType
     });
     for (const descriptor of descriptors) {
+      let settings = (_a = input.defaultActionSettings) == null ? void 0 : _a[descriptor.type];
+      if (descriptor.type === "filter" && !import_lodash.default.isUndefined(settings)) {
+        settings = this.normalizeDefaultFilterActionSettings("addBlock", settings);
+      }
       const actionValues = (0, import_service_utils.buildDefinedPayload)({
         target: {
           uid: input.blockUid
         },
         type: descriptor.type,
+        settings: !import_lodash.default.isUndefined(settings) ? import_lodash.default.cloneDeep(settings) : void 0,
         popup: descriptor.popup ? import_lodash.default.cloneDeep(descriptor.popup) : void 0
       });
       if (descriptor.scope === "actions") {
@@ -8255,6 +9194,19 @@ class FlowSurfacesService {
       }
     }
   }
+  async resolveReusableSingletonAction(input) {
+    var _a;
+    if (!AUTO_SUBMIT_FORM_BLOCK_USES.has(input.ownerUse || "") || input.actionUse !== "FormSubmitActionModel") {
+      return null;
+    }
+    const parentNode = await this.repository.findModelById(input.parentUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    return import_lodash.default.castArray(((_a = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _a.actions) || []).find(
+      (action) => (action == null ? void 0 : action.use) === "FormSubmitActionModel" && (action == null ? void 0 : action.uid)
+    ) || null;
+  }
   normalizeComposeBlock(input, index, enabledPackages) {
     if (!import_lodash.default.isPlainObject(input)) {
       (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} must be an object`);
@@ -8295,15 +9247,44 @@ class FlowSurfacesService {
         skipContainerValidation: true
       }
     ) : null;
+    const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("compose", input.defaultFilter, {
+      blockType: type,
+      template,
+      path: `block #${index + 1}`
+    });
     const actions = import_lodash.default.castArray(input.actions || []).map(
       (action, actionIndex) => (0, import_service_utils.normalizeComposeActionSpec)(action, actionIndex)
     );
     const recordActions = import_lodash.default.castArray(input.recordActions || []).map(
       (action, actionIndex) => (0, import_service_utils.normalizeComposeActionSpec)(action, actionIndex)
     );
-    const fields = import_lodash.default.castArray(input.fields || []).map(
-      (field, fieldIndex) => (0, import_service_utils.normalizeComposeFieldSpec)(field, fieldIndex)
-    );
+    const hasFields = Object.prototype.hasOwnProperty.call(input, "fields");
+    const hasFieldGroups = Object.prototype.hasOwnProperty.call(input, "fieldGroups");
+    const hasRecordActions = Object.prototype.hasOwnProperty.call(input, "recordActions");
+    if (type === "calendar") {
+      if (hasFields) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} calendar does not support fields[] on the main block; add event fields under the quick-create or event-view popup host instead`
+        );
+      }
+      if (hasFieldGroups) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} calendar does not support fieldGroups[] on the main block; add grouped fields under the quick-create or event-view popup host instead`
+        );
+      }
+      if (hasRecordActions) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} calendar does not support recordActions[] on the main block; configure event actions inside the event-view popup host instead`
+        );
+      }
+    }
+    if (hasFields && hasFieldGroups) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} cannot mix fields with fieldGroups`);
+    }
+    if (hasFieldGroups && Object.prototype.hasOwnProperty.call(input, "fieldsLayout")) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} cannot mix fieldGroups with fieldsLayout`);
+    }
+    const fields = hasFieldGroups ? this.normalizeComposeFieldGroups(input.fieldGroups, type, `flowSurfaces compose block #${index + 1}`) : import_lodash.default.castArray(input.fields || []).map((field, fieldIndex) => (0, import_service_utils.normalizeComposeFieldSpec)(field, fieldIndex));
     (0, import_service_utils.assertFlowSurfaceComposeUniqueKeys)(fields, `flowSurfaces compose block #${index + 1} fields`);
     (0, import_service_utils.assertFlowSurfaceComposeUniqueKeys)(actions, `flowSurfaces compose block #${index + 1} actions`);
     (0, import_service_utils.assertFlowSurfaceComposeUniqueKeys)(recordActions, `flowSurfaces compose block #${index + 1} recordActions`);
@@ -8327,7 +9308,7 @@ class FlowSurfacesService {
       blockDescriptor,
       blockType: type,
       fields
-    });
+    }) || this.buildAutoComposeFieldsLayout(fields, type);
     const mergedActions = (0, import_default_block_actions.mergeFlowSurfaceDefaultBlockActions)({
       blockType: type,
       template,
@@ -8339,6 +9320,10 @@ class FlowSurfacesService {
         `flowSurfaces compose block #${index + 1}`
       )
     });
+    const actionsWithDefaultFilter = (0, import_public_data_surface_default_filter.backfillFlowSurfaceFilterActionDefaultFilter)(
+      mergedActions.actions,
+      blockDefaultFilter
+    );
     return {
       index: index + 1,
       key,
@@ -8348,7 +9333,7 @@ class FlowSurfacesService {
       settings: import_lodash.default.isPlainObject(input.settings) ? input.settings : {},
       fields,
       ...fieldsLayout ? { fieldsLayout } : {},
-      actions: mergedActions.actions,
+      actions: actionsWithDefaultFilter,
       recordActions: mergedActions.recordActions,
       template
     };
@@ -8685,19 +9670,17 @@ class FlowSurfacesService {
   }
   async configureTableBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("TableBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("table", changes, allowedKeys);
     return this.updateSettings(
       {
         target,
-        props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle
-        }),
         decoratorProps: (0, import_service_utils.buildDefinedPayload)({
           height: changes.height,
           heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
         }),
         stepParams: {
+          ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
             resourceSettings: {
               init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
@@ -8733,11 +9716,108 @@ class FlowSurfacesService {
       options
     );
   }
+  async configureCalendarBlock(target, current, changes, options) {
+    var _a;
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("CalendarBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    (0, import_service_utils.assertSupportedSimpleChanges)("calendar", changes, allowedKeys);
+    const currentResourceInit = this.getCalendarBlockResourceInit(current);
+    const nextResourceInit = changes.resource ? (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource) : currentResourceInit;
+    if (nextResourceInit.collectionName && !nextResourceInit.dataSourceKey) {
+      nextResourceInit.dataSourceKey = "main";
+    }
+    const resourceChanged = !!changes.resource;
+    const { collection, collectionName } = this.assertCalendarCollectionCompatible("configure", nextResourceInit);
+    const fieldNames = this.normalizeCalendarFieldNamesForCollection({
+      actionName: "configure",
+      collection,
+      collectionName,
+      currentFieldNames: (_a = current == null ? void 0 : current.props) == null ? void 0 : _a.fieldNames,
+      changes,
+      resetInvalidExisting: resourceChanged
+    });
+    const quickCreatePopupSettings = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup") ? 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({
+      actionName: "configure calendar eventPopup",
+      blockUid: current.uid,
+      actionKey: "eventViewAction",
+      value: changes.eventPopup,
+      transaction: options.transaction
+    }) : void 0;
+    const result = await this.updateSettings(
+      {
+        target,
+        props: (0, import_service_utils.buildDefinedPayload)({
+          fieldNames,
+          defaultView: changes.defaultView,
+          enableQuickCreateEvent: changes.quickCreateEvent,
+          showLunar: changes.showLunar,
+          weekStart: changes.weekStart,
+          quickCreatePopupSettings,
+          eventPopupSettings
+        }),
+        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+          height: changes.height,
+          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
+        }),
+        stepParams: {
+          ...cardSettings ? { cardSettings } : {},
+          ...changes.resource ? {
+            resourceSettings: {
+              init: nextResourceInit
+            }
+          } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, [
+            "titleField",
+            "colorField",
+            "startField",
+            "endField",
+            "defaultView",
+            "quickCreateEvent",
+            "showLunar",
+            "weekStart",
+            "dataScope",
+            "linkageRules"
+          ]) ? {
+            calendarSettings: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "titleField") ? { titleField: { titleField: fieldNames.title } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "colorField") ? { colorField: { colorFieldName: fieldNames.colorFieldName || "" } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "startField") ? { startDateField: { start: fieldNames.start } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "endField") ? { endDateField: { end: fieldNames.end || "" } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "defaultView") ? { defaultView: { defaultView: changes.defaultView } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreateEvent") ? { quickCreateEvent: { enableQuickCreateEvent: changes.quickCreateEvent !== false } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "showLunar") ? { showLunar: { showLunar: changes.showLunar === true } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "weekStart") ? { weekStart: { weekStart: changes.weekStart } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
+            })
+          } : {}
+        }
+      },
+      options
+    );
+    const reloaded = await this.repository.findModelById(current.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    await this.ensureCalendarBlockPopupHosts(reloaded, options.transaction);
+    return result;
+  }
   async configureFormBlock(target, use, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("form", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     const nextStepParams = {};
+    if (cardSettings) {
+      nextStepParams.cardSettings = cardSettings;
+    }
     if (changes.resource) {
       nextStepParams.resourceSettings = {
         init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
@@ -8768,8 +9848,6 @@ class FlowSurfacesService {
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle,
           ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
         }),
@@ -8784,14 +9862,13 @@ class FlowSurfacesService {
   }
   async configureDetailsBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("DetailsBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("details", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     return this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle,
           ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
         }),
@@ -8800,6 +9877,7 @@ class FlowSurfacesService {
           ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
         }),
         stepParams: {
+          ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
             resourceSettings: {
               init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
@@ -8878,20 +9956,18 @@ class FlowSurfacesService {
   }
   async configureListBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("ListBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("list", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     return this.updateSettings(
       {
         target,
-        props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle
-        }),
         decoratorProps: (0, import_service_utils.buildDefinedPayload)({
           height: changes.height,
           heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
         }),
         stepParams: {
+          ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
             resourceSettings: {
               init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
@@ -8912,21 +9988,19 @@ class FlowSurfacesService {
   }
   async configureGridCardBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("GridCardBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("gridCard", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     const columns = (0, import_service_utils.normalizeGridCardColumns)(changes.columns);
     return this.updateSettings(
       {
         target,
-        props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle
-        }),
         decoratorProps: (0, import_service_utils.buildDefinedPayload)({
           height: changes.height,
           heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
         }),
         stepParams: {
+          ...cardSettings ? { cardSettings } : {},
           ...changes.resource ? {
             resourceSettings: {
               init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
@@ -8948,36 +10022,37 @@ class FlowSurfacesService {
   }
   async configureMarkdownBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("MarkdownBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("markdown", changes, allowedKeys);
     return this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle,
           content: changes.content,
           value: changes.content
         }),
-        stepParams: (0, import_service_utils.hasOwnDefined)(changes, "content") ? {
-          markdownBlockSettings: {
-            editMarkdown: {
-              content: changes.content
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "content") ? {
+            markdownBlockSettings: {
+              editMarkdown: {
+                content: changes.content
+              }
             }
-          }
-        } : void 0
+          } : {}
+        })
       },
       options
     );
   }
   async configureIframeBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("IframeBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("iframe", changes, allowedKeys);
     return this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle,
           height: changes.height,
           heightMode: changes.heightMode,
           mode: changes.mode,
@@ -8987,19 +10062,22 @@ class FlowSurfacesService {
           allow: changes.allow,
           htmlId: changes.htmlId
         }),
-        stepParams: (0, import_service_utils.hasDefinedValue)(changes, ["height", "mode", "url", "html", "params", "allow", "htmlId"]) ? {
-          iframeBlockSettings: {
-            editIframe: (0, import_service_utils.buildDefinedPayload)({
-              height: changes.height,
-              mode: changes.mode,
-              url: changes.url,
-              html: changes.html,
-              params: changes.params,
-              allow: changes.allow,
-              htmlId: changes.htmlId
-            })
-          }
-        } : void 0
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, ["height", "mode", "url", "html", "params", "allow", "htmlId"]) ? {
+            iframeBlockSettings: {
+              editIframe: (0, import_service_utils.buildDefinedPayload)({
+                height: changes.height,
+                mode: changes.mode,
+                url: changes.url,
+                html: changes.html,
+                params: changes.params,
+                allow: changes.allow,
+                htmlId: changes.htmlId
+              })
+            }
+          } : {}
+        })
       },
       options
     );
@@ -9007,7 +10085,7 @@ class FlowSurfacesService {
   async configureChartBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("ChartBlockModel");
     (0, import_service_utils.assertSupportedSimpleChanges)("chart", changes, allowedKeys);
-    const shouldUpdateCardSettings = ["title", "displayTitle", "height", "heightMode"].some(
+    const shouldUpdateCardSettings = ["title", "description", "height", "heightMode"].some(
       (key) => Object.prototype.hasOwnProperty.call(changes, key)
     );
     const shouldUpdateConfigure = ["configure", "query", "visual", "events"].some(
@@ -9064,23 +10142,86 @@ class FlowSurfacesService {
   }
   async configureActionPanelBlock(target, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("ActionPanelBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("actionPanel", changes, allowedKeys);
     const layoutValue = (0, import_service_utils.normalizeSimpleLayoutValue)(changes.layout);
     return this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          title: changes.title,
-          displayTitle: changes.displayTitle,
           layout: layoutValue,
           ellipsis: changes.ellipsis
         }),
-        stepParams: (0, import_service_utils.hasDefinedValue)(changes, ["layout", "ellipsis"]) ? {
-          actionPanelBlockSetting: (0, import_service_utils.buildDefinedPayload)({
-            ...(0, import_service_utils.hasOwnDefined)(changes, "layout") ? { layout: { layout: layoutValue } } : {},
-            ...(0, import_service_utils.hasOwnDefined)(changes, "ellipsis") ? { ellipsis: { ellipsis: changes.ellipsis } } : {}
-          })
-        } : void 0
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, ["layout", "ellipsis"]) ? {
+            actionPanelBlockSetting: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "layout") ? { layout: { layout: layoutValue } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "ellipsis") ? { ellipsis: { ellipsis: changes.ellipsis } } : {}
+            })
+          } : {}
+        })
+      },
+      options
+    );
+  }
+  async configureMapBlock(target, changes, options) {
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("MapBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    (0, import_service_utils.assertSupportedSimpleChanges)("map", changes, allowedKeys);
+    return this.updateSettings(
+      {
+        target,
+        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+          height: changes.height,
+          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
+        }),
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...changes.resource ? {
+            resourceSettings: {
+              init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
+            }
+          } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, ["mapField", "marker", "dataScope", "sorting", "zoom"]) ? {
+            createMapBlock: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "mapField") || (0, import_service_utils.hasOwnDefined)(changes, "marker") ? {
+                init: (0, import_service_utils.buildDefinedPayload)({
+                  mapField: changes.mapField,
+                  marker: changes.marker
+                })
+              } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { lineSort: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "zoom") ? { mapZoom: { zoom: changes.zoom } } : {}
+            })
+          } : {}
+        })
+      },
+      options
+    );
+  }
+  async configureCommentsBlock(target, changes, options) {
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("CommentsBlockModel");
+    const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    (0, import_service_utils.assertSupportedSimpleChanges)("comments", changes, allowedKeys);
+    return this.updateSettings(
+      {
+        target,
+        stepParams: (0, import_service_utils.buildDefinedPayload)({
+          ...cardSettings ? { cardSettings } : {},
+          ...changes.resource ? {
+            resourceSettings: {
+              init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
+            }
+          } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, ["pageSize", "dataScope"]) ? {
+            commentsSettings: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: { pageSize: changes.pageSize } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {}
+            })
+          } : {}
+        })
       },
       options
     );
@@ -9192,6 +10333,29 @@ class FlowSurfacesService {
       options
     );
   }
+  async configureDividerItem(target, changes, options) {
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("DividerItemModel");
+    (0, import_service_utils.assertSupportedSimpleChanges)("divider", changes, allowedKeys);
+    const dividerSettings = (0, import_service_utils.buildDefinedPayload)({
+      label: changes.label,
+      orientation: changes.orientation,
+      dashed: changes.dashed,
+      color: changes.color,
+      borderColor: changes.borderColor
+    });
+    return this.updateSettings(
+      {
+        target,
+        props: dividerSettings,
+        stepParams: Object.keys(dividerSettings).length ? {
+          markdownItemSetting: {
+            title: dividerSettings
+          }
+        } : void 0
+      },
+      options
+    );
+  }
   async configureFieldWrapper(target, current, changes, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
@@ -9518,9 +10682,19 @@ class FlowSurfacesService {
     }
     return result;
   }
+  normalizeFilterActionDefaultFilterValue(value) {
+    if (value === null || import_lodash.default.isPlainObject(value) && !Object.keys(value).length) {
+      return {
+        logic: "$and",
+        items: []
+      };
+    }
+    return import_lodash.default.cloneDeep(value);
+  }
   async configureActionNode(target, use, changes, options) {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
     (0, import_service_utils.assertSupportedSimpleChanges)("action", changes, allowedKeys);
+    const normalizedDefaultFilter = (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? this.normalizeFilterActionDefaultFilterValue(changes.defaultFilter) : void 0;
     const stepParams = {};
     if ((0, import_service_utils.hasDefinedValue)(changes, ["title", "tooltip", "icon", "type", "danger", "color", "linkageRules"])) {
       stepParams.buttonSettings = {
@@ -9537,6 +10711,23 @@ class FlowSurfacesService {
         ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: changes.linkageRules } : {}
       };
     }
+    if ((0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") || (0, import_service_utils.hasOwnDefined)(changes, "defaultFilter")) {
+      if (use !== "FilterActionModel") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support filterableFieldNames/defaultFilter`);
+      }
+      stepParams.filterSettings = (0, import_service_utils.buildDefinedPayload)({
+        ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? {
+          filterableFieldNames: {
+            filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames)
+          }
+        } : {},
+        ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
+          defaultFilter: {
+            defaultFilter: normalizedDefaultFilter
+          }
+        } : {}
+      });
+    }
     if ((0, import_service_utils.hasOwnDefined)(changes, "approvalReturn")) {
       if (use !== "ProcessFormReturnModel") {
         (0, import_errors.throwBadRequest)(`flowSurfaces configure action '${use}' does not support approvalReturn`);
@@ -9707,7 +10898,12 @@ class FlowSurfacesService {
           htmlType: changes.htmlType,
           position: changes.position,
           danger: changes.danger,
-          color: changes.color
+          color: changes.color,
+          ...(0, import_service_utils.hasOwnDefined)(changes, "filterableFieldNames") ? { filterableFieldNames: import_lodash.default.cloneDeep(changes.filterableFieldNames) } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "defaultFilter") ? {
+            defaultFilterValue: normalizedDefaultFilter,
+            filterValue: import_lodash.default.cloneDeep(normalizedDefaultFilter)
+          } : {}
         }),
         stepParams: Object.keys(stepParams).length ? stepParams : void 0
       },
@@ -10673,6 +11869,441 @@ class FlowSurfacesService {
     const dataSource = (_a = dataSourceManager == null ? void 0 : dataSourceManager.get) == null ? void 0 : _a.call(dataSourceManager, normalizedDataSourceKey);
     return ((_c = (_b = dataSource == null ? void 0 : dataSource.collectionManager) == null ? void 0 : _b.getCollection) == null ? void 0 : _c.call(_b, collectionName)) || ((_e = (_d = this.plugin.app.db) == null ? void 0 : _d.getCollection) == null ? void 0 : _e.call(_d, collectionName));
   }
+  normalizeCalendarFieldPathInput(value, context, options = {}) {
+    if (import_lodash.default.isUndefined(value)) {
+      return void 0;
+    }
+    if (import_lodash.default.isNull(value) || value === "") {
+      if (options.allowEmpty) {
+        return "";
+      }
+      (0, import_errors.throwBadRequest)(`${context} is required`);
+    }
+    const normalized = Array.isArray(value) ? value.map((item) => String(item || "").trim()).filter(Boolean).join(".") : String(value || "").trim();
+    if (!normalized && !options.allowEmpty) {
+      (0, import_errors.throwBadRequest)(`${context} is required`);
+    }
+    return normalized;
+  }
+  isCalendarDateField(field) {
+    var _a, _b, _c;
+    const supportedTypes = new Set(this.getCalendarDateFieldTypes());
+    const candidates = [
+      (0, import_service_helpers.getFieldInterface)(field),
+      (0, import_service_helpers.getFieldType)(field),
+      (_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a.type,
+      (_c = (_b = field == null ? void 0 : field.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.type
+    ].filter(Boolean);
+    return candidates.some((item) => supportedTypes.has(String(item)));
+  }
+  isCalendarTitleField(field) {
+    return new Set(this.getCalendarTitleFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
+  }
+  isCalendarColorField(field) {
+    return new Set(this.getCalendarColorFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
+  }
+  getCalendarPluginFieldCapabilities(input) {
+    const calendarPlugin = this.plugin.app.pm.get("calendar");
+    const source = typeof (calendarPlugin == null ? void 0 : calendarPlugin[input.getter]) === "function" ? calendarPlugin[input.getter]() : calendarPlugin == null ? void 0 : calendarPlugin[input.property];
+    return normalizeCalendarFieldCapabilityValues(source, input.defaults);
+  }
+  getCalendarTitleFieldInterfaces() {
+    const defaults = this.plugin.app.pm.get("field-sequence") ? [...DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES, "sequence"] : DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES;
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getTitleFieldInterfaces",
+      property: "titleFieldInterfaces",
+      defaults
+    });
+  }
+  getCalendarColorFieldInterfaces() {
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getColorFieldInterfaces",
+      property: "colorFieldInterfaces",
+      defaults: DEFAULT_CALENDAR_COLOR_FIELD_INTERFACES
+    });
+  }
+  getCalendarDateFieldTypes() {
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getDateTimeFieldInterfaces",
+      property: "dateTimeFieldInterfaces",
+      defaults: DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES
+    });
+  }
+  getCalendarTitleFallbackFieldName(collection) {
+    var _a;
+    const filterTargetKey = (collection == null ? void 0 : collection.filterTargetKey) || ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.filterTargetKey);
+    if (Array.isArray(filterTargetKey)) {
+      return filterTargetKey[0] || "id";
+    }
+    return filterTargetKey || "id";
+  }
+  isCalendarTitleFallbackField(collection, fieldPath) {
+    const normalized = String(fieldPath || "").trim();
+    return normalized === "id" || normalized === this.getCalendarTitleFallbackFieldName(collection);
+  }
+  getCalendarDateFields(collection) {
+    return (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarDateField(field));
+  }
+  resolveCalendarDefaultFieldNames(collection) {
+    const titleField = (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarTitleField(field)).map((field) => (0, import_service_helpers.getFieldName)(field)).find(Boolean) || this.getCalendarTitleFallbackFieldName(collection);
+    const dateFields = this.getCalendarDateFields(collection).map((field) => (0, import_service_helpers.getFieldName)(field)).filter(Boolean);
+    const startField = dateFields.find((fieldName) => fieldName === "createdAt") || dateFields[0];
+    const endField = dateFields.find((fieldName) => fieldName !== startField);
+    return (0, import_service_utils.buildDefinedPayload)({
+      id: "id",
+      title: titleField,
+      start: startField,
+      end: endField
+    });
+  }
+  getCalendarCollectionOrThrow(actionName, resourceInit) {
+    const dataSourceKey = String((resourceInit == null ? void 0 : resourceInit.dataSourceKey) || "main").trim() || "main";
+    const collectionName = String((resourceInit == null ? void 0 : resourceInit.collectionName) || "").trim();
+    if (!collectionName) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar block requires resource.collectionName`);
+    }
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar collection '${dataSourceKey}.${collectionName}' not found`);
+    }
+    return {
+      dataSourceKey,
+      collectionName,
+      collection
+    };
+  }
+  assertCalendarCollectionCompatible(actionName, resourceInit) {
+    const resolved = this.getCalendarCollectionOrThrow(actionName, resourceInit);
+    if (!this.getCalendarDateFields(resolved.collection).length) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} calendar collection '${resolved.dataSourceKey}.${resolved.collectionName}' must contain at least one date field`
+      );
+    }
+    return resolved;
+  }
+  assertCalendarFieldBinding(input) {
+    const field = (0, import_service_helpers.resolveFieldFromCollection)(input.collection, input.fieldPath);
+    if (input.kind === "titleField" && !field && this.isCalendarTitleFallbackField(input.collection, input.fieldPath)) {
+      return;
+    }
+    if (!field) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} calendar ${input.kind} '${input.fieldPath}' does not exist in collection '${input.collectionName}'`
+      );
+    }
+    const supported = input.kind === "titleField" ? this.isCalendarTitleField(field) || this.isCalendarTitleFallbackField(input.collection, input.fieldPath) : input.kind === "colorField" ? this.isCalendarColorField(field) : this.isCalendarDateField(field);
+    if (!supported) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} calendar ${input.kind} '${input.fieldPath}' is not supported by CalendarBlockModel`
+      );
+    }
+  }
+  normalizeCalendarFieldNamesForCollection(input) {
+    const defaults = this.resolveCalendarDefaultFieldNames(input.collection);
+    const current = import_lodash.default.cloneDeep(input.currentFieldNames || {});
+    const nextFieldNames = {
+      id: current.id || "id",
+      title: current.title || defaults.title,
+      start: current.start || defaults.start,
+      end: current.end || defaults.end,
+      colorFieldName: current.colorFieldName
+    };
+    const isExistingValid = (kind, fieldPath) => {
+      const normalized = this.normalizeCalendarFieldPathInput(fieldPath, `${input.actionName} ${kind}`, {
+        allowEmpty: kind === "colorField" || kind === "endField"
+      });
+      if (!normalized) {
+        return kind === "colorField" || kind === "endField";
+      }
+      try {
+        this.assertCalendarFieldBinding({
+          actionName: input.actionName,
+          collection: input.collection,
+          collectionName: input.collectionName,
+          fieldPath: normalized,
+          kind
+        });
+        return true;
+      } catch (error) {
+        return false;
+      }
+    };
+    if (input.resetInvalidExisting) {
+      if (!isExistingValid("titleField", nextFieldNames.title)) {
+        nextFieldNames.title = defaults.title;
+      }
+      if (!isExistingValid("startField", nextFieldNames.start)) {
+        nextFieldNames.start = defaults.start;
+      }
+      if (!isExistingValid("endField", nextFieldNames.end)) {
+        nextFieldNames.end = defaults.end;
+      }
+      if (nextFieldNames.colorFieldName && !isExistingValid("colorField", nextFieldNames.colorFieldName)) {
+        nextFieldNames.colorFieldName = null;
+      }
+    }
+    const applyExplicitField = (changeKey, storageKey, allowEmpty = false) => {
+      if (!input.changes || !Object.prototype.hasOwnProperty.call(input.changes, changeKey)) {
+        return;
+      }
+      const normalized = this.normalizeCalendarFieldPathInput(
+        input.changes[changeKey],
+        `flowSurfaces ${input.actionName} calendar ${changeKey}`,
+        { allowEmpty }
+      );
+      if (!normalized) {
+        nextFieldNames[storageKey] = null;
+        return;
+      }
+      this.assertCalendarFieldBinding({
+        actionName: input.actionName,
+        collection: input.collection,
+        collectionName: input.collectionName,
+        fieldPath: normalized,
+        kind: changeKey
+      });
+      nextFieldNames[storageKey] = normalized;
+    };
+    applyExplicitField("titleField", "title");
+    applyExplicitField("startField", "start");
+    applyExplicitField("endField", "end", true);
+    applyExplicitField("colorField", "colorFieldName", true);
+    if (!nextFieldNames.title) {
+      nextFieldNames.title = defaults.title;
+    }
+    if (!nextFieldNames.start) {
+      nextFieldNames.start = defaults.start;
+    }
+    return (0, import_service_utils.buildDefinedPayload)({
+      id: nextFieldNames.id || "id",
+      title: nextFieldNames.title,
+      start: nextFieldNames.start,
+      end: nextFieldNames.end,
+      colorFieldName: nextFieldNames.colorFieldName
+    });
+  }
+  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") {
+      if (nextParams.popupTemplateHasFilterByTk) {
+        delete nextParams.popupTemplateUid;
+        delete nextParams.popupTemplateContext;
+        delete nextParams.popupTemplateHasFilterByTk;
+        delete nextParams.popupTemplateHasSourceId;
+        delete nextParams.uid;
+      }
+      delete nextParams.filterByTk;
+    }
+    return nextParams;
+  }
+  getCalendarPopupActionUse(actionKey) {
+    return actionKey === "quickCreateAction" ? "CalendarQuickCreateActionModel" : "CalendarEventViewActionModel";
+  }
+  getCalendarPopupPropKey(actionKey) {
+    return actionKey === "quickCreateAction" ? "quickCreatePopupSettings" : "eventPopupSettings";
+  }
+  getCalendarPopupActionUid(calendarUid, actionKey) {
+    return `${calendarUid}-${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;
+  }
+  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
+    });
+  }
+  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 this.normalizeCalendarPopupSettings(input.actionKey, normalized || {});
+  }
+  buildCalendarInitialBlockProps(input) {
+    const { collection, collectionName } = this.assertCalendarCollectionCompatible(
+      input.actionName,
+      input.resourceInit
+    );
+    const currentProps = import_lodash.default.cloneDeep(input.props || {});
+    return {
+      ...currentProps,
+      fieldNames: this.normalizeCalendarFieldNamesForCollection({
+        actionName: input.actionName,
+        collection,
+        collectionName,
+        currentFieldNames: currentProps.fieldNames,
+        resetInvalidExisting: true
+      }),
+      defaultView: currentProps.defaultView || "month",
+      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, {
+      transaction,
+      includeAsyncNode: true
+    });
+  }
+  async ensureCalendarBlockPopupHostsInTree(node, transaction) {
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    const current = node;
+    if (current.use === "CalendarBlockModel") {
+      return 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;
+  }
+  validateCalendarBlockState(actionName, node) {
+    var _a;
+    if ((node == null ? void 0 : node.use) !== "CalendarBlockModel") {
+      return;
+    }
+    const resourceInit = this.getCalendarBlockResourceInit(node);
+    const { collection, collectionName } = this.assertCalendarCollectionCompatible(actionName, resourceInit);
+    const fieldNames = ((_a = node == null ? void 0 : node.props) == null ? void 0 : _a.fieldNames) || {};
+    const checks = [
+      ["titleField", fieldNames.title],
+      ["startField", fieldNames.start],
+      ["endField", fieldNames.end],
+      ["colorField", fieldNames.colorFieldName]
+    ];
+    for (const [kind, rawFieldPath] of checks) {
+      if (import_lodash.default.isUndefined(rawFieldPath) || import_lodash.default.isNull(rawFieldPath) || rawFieldPath === "") {
+        continue;
+      }
+      const fieldPath = this.normalizeCalendarFieldPathInput(
+        rawFieldPath,
+        `flowSurfaces ${actionName} calendar ${kind}`,
+        {
+          allowEmpty: kind === "colorField" || kind === "endField"
+        }
+      );
+      if (!fieldPath) {
+        continue;
+      }
+      this.assertCalendarFieldBinding({
+        actionName,
+        collection,
+        collectionName,
+        fieldPath,
+        kind
+      });
+    }
+  }
   async resolveFieldDefinition(input) {
     const collection = this.getCollection(input.dataSourceKey, input.collectionName);
     const parsed = this.parseFieldPath(
@@ -10898,7 +12529,7 @@ class FlowSurfacesService {
     });
     const openView = this.resolvePopupHostOpenView(hostNode);
     const externalPopupHostUid = this.resolveExternalPopupHostUid(parentUid, openView);
-    if (externalPopupHostUid && String((openView == null ? void 0 : openView.popupTemplateUid) || "").trim() && !(openView == null ? void 0 : openView.popupTemplateContext)) {
+    if (externalPopupHostUid && this.isReferencedPopupTemplateOpenView(openView, parentUid) && !this.isEditableDefaultActionPopupTemplateReference(hostNode, openView)) {
       (0, import_errors.throwBadRequest)(
         `flowSurfaces popup surface '${parentUid}' uses a popup template reference; convert it to copy before editing popup blocks`,
         "FLOW_SURFACE_TEMPLATE_REFERENCE_REQUIRED"
@@ -11326,16 +12957,17 @@ class FlowSurfacesService {
   }
   async loadResolvedNode(resolved, transaction) {
     var _a;
+    let node;
     if ((resolved == null ? void 0 : resolved.kind) === "page" && (resolved == null ? void 0 : resolved.pageRoute)) {
-      return this.routeSync.buildPageTree(resolved.pageRoute, transaction);
-    }
-    if ((resolved == null ? void 0 : resolved.kind) === "tab" && (resolved == null ? void 0 : resolved.tabRoute)) {
-      return this.routeSync.buildTabAnchor(resolved.tabRoute, transaction);
-    }
-    if ((_a = resolved == null ? void 0 : resolved.node) == null ? void 0 : _a.uid) {
-      return resolved.node;
+      node = await this.routeSync.buildPageTree(resolved.pageRoute, transaction);
+    } else if ((resolved == null ? void 0 : resolved.kind) === "tab" && (resolved == null ? void 0 : resolved.tabRoute)) {
+      node = await this.routeSync.buildTabAnchor(resolved.tabRoute, transaction);
+    } else if ((_a = resolved == null ? void 0 : resolved.node) == null ? void 0 : _a.uid) {
+      node = resolved.node;
+    } else {
+      node = await this.repository.findModelById(resolved.uid, { transaction, includeAsyncNode: true });
     }
-    return this.repository.findModelById(resolved.uid, { transaction, includeAsyncNode: true });
+    return this.ensureCalendarBlockPopupHostsInTree(node, transaction);
   }
   normalizePopupTreeShape(node) {
     if (!node || typeof node !== "object") {