@nocobase/plugin-flow-engine 2.1.0-alpha.23 → 2.1.0-alpha.25

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

@@ -64,6 +64,7 @@ var import_created_keys = require("./planning/created-keys");
 var import_key_persistence = require("./planning/key-persistence");
 var import_payload_shape = require("./payload-shape");
 var import_field_semantics = require("./field-semantics");
+var import_association_interfaces = require("./association-interfaces");
 var import_field_binding_registry = require("./field-binding-registry");
 var import_node_use_sets = require("./node-use-sets");
 var import_chart_config = require("./chart-config");
@@ -89,6 +90,7 @@ 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_field_type_resolver = require("./field-type-resolver");
 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]);
@@ -105,6 +107,7 @@ const COMPOSE_FIELD_GRID_BLOCK_TYPES = /* @__PURE__ */ new Set(["createForm", "e
 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 KANBAN_BLOCK_USES = /* @__PURE__ */ new Set(["KanbanBlockModel"]);
 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 = [
@@ -116,10 +119,19 @@ const DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES = [
   "createdAt",
   "updatedAt"
 ];
+const CALENDAR_DEFAULT_VIEWS = /* @__PURE__ */ new Set(["month", "week", "day"]);
+const CALENDAR_WEEK_STARTS = /* @__PURE__ */ new Set([0, 1]);
 const CALENDAR_POPUP_ACTION_KEYS = ["quickCreateAction", "eventViewAction"];
+const KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY = {
+  quickCreateAction: "-quick-create-action",
+  cardViewAction: "-card-view-action"
+};
+const KANBAN_POPUP_ACTION_KEYS = Object.keys(KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY);
 const CANONICAL_BLOCK_HEADER_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "TreeBlockModel",
+  "KanbanBlockModel",
   "FormBlockModel",
   "CreateFormModel",
   "EditFormModel",
@@ -133,7 +145,8 @@ const CANONICAL_BLOCK_HEADER_USES = /* @__PURE__ */ new Set([
   "MapBlockModel",
   "CommentsBlockModel"
 ]);
-const LIST_LIKE_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard"]);
+const CARD_FIELD_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard", "kanban"]);
+const RECORD_ACTION_COMPOSE_BLOCK_TYPES = /* @__PURE__ */ new Set(["list", "gridCard"]);
 const GRID_SETTINGS_FLOW_KEY = "gridSettings";
 const GRID_SETTINGS_LAYOUT_STEP_KEY = "grid";
 const OPEN_VIEW_MODE_ALIASES = {
@@ -144,6 +157,8 @@ const OPEN_VIEW_SUPPORTED_MODES = /* @__PURE__ */ new Set(["drawer", "dialog", "
 const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "TreeBlockModel",
+  "KanbanBlockModel",
   "DetailsBlockModel",
   "ListBlockModel",
   "GridCardBlockModel",
@@ -193,6 +208,8 @@ const UI_FIELD_MENU_DETAILS_OWNER_USES = /* @__PURE__ */ new Set([
   "DetailsBlockModel",
   "GridCardBlockModel",
   "GridCardItemModel",
+  "KanbanBlockModel",
+  "KanbanCardItemModel",
   ...import_approval.APPROVAL_DETAILS_BLOCK_USES,
   ...import_approval.APPROVAL_DETAILS_GRID_USES
 ]);
@@ -221,6 +238,8 @@ const POPUP_ACTION_USES = /* @__PURE__ */ new Set([
   "PopupCollectionActionModel",
   "CalendarQuickCreateActionModel",
   "CalendarEventViewActionModel",
+  "KanbanQuickCreateActionModel",
+  "KanbanCardViewActionModel",
   "DuplicateActionModel",
   "AddChildActionModel",
   "MailSendActionModel"
@@ -230,6 +249,7 @@ const POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES = /* @__PURE__ */ new Set([
   "EditActionModel",
   "PopupCollectionActionModel",
   "CalendarEventViewActionModel",
+  "KanbanCardViewActionModel",
   "AddChildActionModel",
   "DuplicateActionModel"
 ]);
@@ -277,6 +297,8 @@ const POPUP_COLLECTION_BLOCK_SCENES = {
   CommentsBlockModel: ["one", "many"],
   TableBlockModel: ["many"],
   CalendarBlockModel: ["many"],
+  TreeBlockModel: ["filter"],
+  KanbanBlockModel: ["many"],
   ListBlockModel: ["many"],
   GridCardBlockModel: ["many"],
   MapBlockModel: ["many"],
@@ -829,7 +851,9 @@ class FlowSurfacesService {
     }
     const target = import_lodash.default.isUndefined(input == null ? void 0 : input.target) ? void 0 : this.normalizeWriteTarget("catalog", input == null ? void 0 : input.target, input);
     const resolved = target ? await this.locator.resolve(target, options) : null;
-    const node = resolved ? await this.loadResolvedNode(resolved, options.transaction) : null;
+    const node = resolved ? await this.loadResolvedNode(resolved, options.transaction, {
+      persistCalendarPopupHosts: false
+    }) : null;
     const popupProfile = target ? await this.resolvePopupBlockProfile(target.uid, resolved, node, options.transaction) : null;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const expand = new Set((0, import_catalog_smart.normalizeCatalogExpand)("catalog", input == null ? void 0 : input.expand));
@@ -932,8 +956,8 @@ class FlowSurfacesService {
     return this.patchResolvedNodeConfigureOptions(node, projected, enabledPackages);
   }
   patchResolvedNodeConfigureOptions(node, projected, enabledPackages) {
-    var _a, _b, _c;
-    if (!((_a = projected == null ? void 0 : projected.configureOptions) == null ? void 0 : _a.fieldComponent) || !(node == null ? void 0 : node.use)) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    if (!((_a = projected == null ? void 0 : projected.configureOptions) == null ? void 0 : _a.fieldType) || !(node == null ? void 0 : node.use)) {
       return projected;
     }
     try {
@@ -948,20 +972,98 @@ class FlowSurfacesService {
       if (!(supportedFieldUses == null ? void 0 : supportedFieldUses.size)) {
         return projected;
       }
+      const supportedFieldTypes = Array.from(supportedFieldUses).map((use) => (0, import_field_type_resolver.getPublicFieldTypeForUse)(use)).filter(Boolean);
       const configureOptions = import_lodash.default.cloneDeep(projected.configureOptions || {});
-      configureOptions.fieldComponent = {
-        type: ((_c = configureOptions.fieldComponent) == null ? void 0 : _c.type) || "string",
-        ...configureOptions.fieldComponent || {},
-        enum: Array.from(supportedFieldUses)
+      configureOptions.fieldType = {
+        type: ((_c = configureOptions.fieldType) == null ? void 0 : _c.type) || "string",
+        ...configureOptions.fieldType || {},
+        enum: Array.from(new Set(supportedFieldTypes))
       };
+      const innerField = ((_d = node == null ? void 0 : node.subModels) == null ? void 0 : _d.field) || node;
+      const relationFieldTypes = Array.from(new Set(supportedFieldTypes));
+      const defaultTitleField = this.getAssociationDefaultTitleFieldName(
+        fieldSource.field,
+        (_e = fieldSource.fieldSettingsInit) == null ? void 0 : _e.dataSourceKey
+      );
       return {
         ...projected,
-        configureOptions
+        configureOptions,
+        relation: {
+          ...projected.relation,
+          fieldTypes: relationFieldTypes,
+          current: (0, import_service_utils.buildDefinedPayload)({
+            fieldType: (0, import_field_type_resolver.getPublicFieldTypeForUse)(((_g = (_f = innerField == null ? void 0 : innerField.stepParams) == null ? void 0 : _f.fieldBinding) == null ? void 0 : _g.use) || (innerField == null ? void 0 : innerField.use)),
+            fields: this.collectRelationNestedFieldPaths(innerField),
+            selectorFields: this.collectRelationSelectorFieldPaths(innerField),
+            titleField: ((_h = innerField == null ? void 0 : innerField.props) == null ? void 0 : _h.titleField) || ((_i = node == null ? void 0 : node.props) == null ? void 0 : _i.titleField)
+          }),
+          defaults: (0, import_service_utils.buildDefinedPayload)({
+            titleField: defaultTitleField
+          }),
+          candidates: this.buildRelationFieldTypeCandidates(relationFieldTypes, defaultTitleField),
+          configureOptions
+        }
       };
     } catch {
       return projected;
     }
   }
+  buildRelationFieldTypeCandidates(fieldTypes, defaultTitleField) {
+    return fieldTypes.map((fieldType) => {
+      const defaults = {
+        titleField: defaultTitleField
+      };
+      if (["subForm", "subFormList", "subDetails", "subDetailsList", "subTable", "popupSubTable"].includes(fieldType) && defaultTitleField) {
+        defaults.fields = [defaultTitleField];
+      }
+      if (fieldType === "picker" && defaultTitleField) {
+        defaults.selectorFields = [defaultTitleField];
+      }
+      return {
+        fieldType,
+        defaults: (0, import_service_utils.buildDefinedPayload)(defaults)
+      };
+    });
+  }
+  collectRelationNestedFieldPaths(fieldNode) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const fieldUse = String(((_b = (_a = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _a.fieldBinding) == null ? void 0 : _b.use) || (fieldNode == null ? void 0 : fieldNode.use) || "").trim();
+    if (["SubTableFieldModel", "DisplaySubTableFieldModel"].includes(fieldUse)) {
+      return import_lodash.default.castArray(((_c = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _c.columns) || []).map((item) => {
+        var _a2, _b2, _c2;
+        return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
+      }).filter(Boolean);
+    }
+    if (fieldUse === "PopupSubTableFieldModel") {
+      return import_lodash.default.castArray(((_d = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _d.subTableColumns) || []).filter((item) => (item == null ? void 0 : item.use) === "TableColumnModel").map((item) => {
+        var _a2, _b2, _c2;
+        return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
+      }).filter(Boolean);
+    }
+    if (["SubFormFieldModel", "SubFormListFieldModel", "DisplaySubItemFieldModel", "DisplaySubListFieldModel"].includes(
+      fieldUse
+    )) {
+      return import_lodash.default.castArray(((_g = (_f = (_e = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _e.grid) == null ? void 0 : _f.subModels) == null ? void 0 : _g.items) || []).map((item) => {
+        var _a2, _b2, _c2;
+        return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
+      }).filter(Boolean);
+    }
+    return void 0;
+  }
+  collectRelationSelectorFieldPaths(fieldNode) {
+    var _a, _b, _c, _d, _e, _f;
+    const fieldUse = String(((_b = (_a = fieldNode == null ? void 0 : fieldNode.stepParams) == null ? void 0 : _a.fieldBinding) == null ? void 0 : _b.use) || (fieldNode == null ? void 0 : fieldNode.use) || "").trim();
+    if (fieldUse !== "RecordPickerFieldModel") {
+      return void 0;
+    }
+    const table = import_lodash.default.castArray(((_e = (_d = (_c = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _c["grid-block"]) == null ? void 0 : _d.subModels) == null ? void 0 : _e.items) || []).find(
+      (item) => (item == null ? void 0 : item.use) === "TableBlockModel"
+    );
+    return import_lodash.default.castArray(((_f = table == null ? void 0 : table.subModels) == null ? void 0 : _f.columns) || []).map((item) => {
+      var _a2, _b2, _c2;
+      return (_c2 = (_b2 = (_a2 = item == null ? void 0 : item.stepParams) == null ? void 0 : _a2.fieldSettings) == null ? void 0 : _b2.init) == null ? void 0 : _c2.fieldPath;
+    }).filter(Boolean);
+  }
   projectCatalogItem(item, expand) {
     return (0, import_catalog_smart.projectCatalogItem)(item, expand, {
       getEditableDomains: this.getEditableDomains.bind(this),
@@ -1124,7 +1226,7 @@ class FlowSurfacesService {
     if (!POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES.has(hostUse)) {
       return false;
     }
-    if (hostUse === "CalendarEventViewActionModel") {
+    if (hostUse === "CalendarEventViewActionModel" || hostUse === "KanbanCardViewActionModel") {
       return true;
     }
     return !!(hostContext == null ? void 0 : hostContext.recordActionContainerUse);
@@ -1799,7 +1901,9 @@ class FlowSurfacesService {
       target: targetInput
     });
     const resolved = await this.locator.resolve(writeTarget, options);
-    const rawNode = await this.loadResolvedNode(resolved, options.transaction);
+    const rawNode = await this.loadResolvedNode(resolved, options.transaction, {
+      persistCalendarPopupHosts: options.persistCalendarPopupHosts
+    });
     const node = this.stripInternalSurfaceMetaFromNodeTree(import_lodash.default.cloneDeep(rawNode));
     const resolvedTarget = (0, import_resolver.resolveReactionTarget)({
       target: writeTarget,
@@ -1886,11 +1990,10 @@ class FlowSurfacesService {
   }
   async getReactionMeta(values, options = {}) {
     (0, import_payload_shape.validateFlowSurfacePayloadShape)("getReactionMeta", values, "values");
-    const { writeTarget, node, resolvedTarget } = await this.resolveReactionRequest(
-      "getReactionMeta",
-      values == null ? void 0 : values.target,
-      options
-    );
+    const { writeTarget, node, resolvedTarget } = await this.resolveReactionRequest("getReactionMeta", values == null ? void 0 : values.target, {
+      ...options,
+      persistCalendarPopupHosts: false
+    });
     const context = await this.context(
       {
         target: writeTarget
@@ -2123,7 +2226,11 @@ class FlowSurfacesService {
     const target = this.normalizeGetTarget(input);
     const resolved = await this.locator.resolve(target, options);
     const rawNode = await this.decorateTemplateReadbackTree(
-      this.normalizePopupTreeShape(await this.loadResolvedNode(resolved, options.transaction)),
+      this.normalizePopupTreeShape(
+        await this.loadResolvedNode(resolved, options.transaction, {
+          persistCalendarPopupHosts: false
+        })
+      ),
       options.transaction
     );
     const publicNode = this.stripInternalSurfaceMetaFromNodeTree(import_lodash.default.cloneDeep(rawNode));
@@ -2193,7 +2300,11 @@ class FlowSurfacesService {
       normalizeGetTarget: (value) => this.normalizeGetTarget(value),
       resolveLocator: (target, resolveOptions) => this.locator.resolve(target, resolveOptions),
       loadResolvedSurfaceTree: async (resolved, transaction) => this.decorateTemplateReadbackTree(
-        this.normalizePopupTreeShape(await this.loadResolvedNode(resolved, transaction)),
+        this.normalizePopupTreeShape(
+          await this.loadResolvedNode(resolved, transaction, {
+            persistCalendarPopupHosts: false
+          })
+        ),
         transaction
       ),
       stripInternalSurfaceMetaFromNodeTree: (node) => this.stripInternalSurfaceMetaFromNodeTree(node),
@@ -2421,9 +2532,11 @@ class FlowSurfacesService {
       disabledReason.startsWith("requires root use compatible") ? "FLOW_SURFACE_TEMPLATE_FIELDS_USE_MISMATCH" : "FLOW_SURFACE_TEMPLATE_FIELDS_RESOURCE_MISMATCH"
     );
   }
-  async loadTemplateListTargetContext(target, transaction) {
+  async loadTemplateListTargetContext(target, transaction, options = {}) {
     const resolved = await this.locator.resolve(target, { transaction });
-    const node = await this.loadResolvedNode(resolved, transaction);
+    const node = await this.loadResolvedNode(resolved, transaction, {
+      persistCalendarPopupHosts: options.persistCalendarPopupHosts
+    });
     const resourceContext = await this.locator.resolveCollectionContext(node.uid, transaction).catch(() => null);
     const fieldContainer = await this.surfaceContext.resolveFieldContainer(node.uid, transaction).catch(() => null);
     const fieldHostBlock = (fieldContainer == null ? void 0 : fieldContainer.ownerUid) && fieldContainer.ownerUid !== node.uid ? await this.repository.findModelById(fieldContainer.ownerUid, {
@@ -2801,7 +2914,9 @@ class FlowSurfacesService {
       );
     }
     const target = import_lodash.default.isUndefined(values == null ? void 0 : values.target) ? void 0 : this.normalizeWriteTarget("listTemplates", values == null ? void 0 : values.target, values);
-    const targetContext = target ? await this.loadTemplateListTargetContext(target, options.transaction) : void 0;
+    const targetContext = target ? await this.loadTemplateListTargetContext(target, options.transaction, {
+      persistCalendarPopupHosts: false
+    }) : void 0;
     const popupActionContext = requestedType === "popup" ? this.resolveTemplateListPopupActionContext({
       targetContext,
       actionType: requestedActionType,
@@ -3220,7 +3335,7 @@ class FlowSurfacesService {
     const name = (0, import_template_service_utils.normalizeRequiredTemplateString)("saveTemplate", values == null ? void 0 : values.name, "name");
     const description = (0, import_template_service_utils.normalizeRequiredTemplateString)("saveTemplate", values == null ? void 0 : values.description, "description");
     const saveMode = (0, import_template_service_utils.normalizeTemplateSaveMode)("saveTemplate", values == null ? void 0 : values.saveMode);
-    const target = this.normalizeWriteTarget("saveTemplate", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("saveTemplate", values == null ? void 0 : values.target, values, options);
     const sourceNode = await this.repository.findModelById(target.uid, {
       transaction: options.transaction,
       includeAsyncNode: true
@@ -3453,7 +3568,7 @@ class FlowSurfacesService {
     return duplicatedTree;
   }
   async convertTemplateToCopy(values, options = {}) {
-    const target = this.normalizeWriteTarget("convertTemplateToCopy", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("convertTemplateToCopy", values == null ? void 0 : values.target, values, options);
     const node = await this.repository.findModelById(target.uid, {
       transaction: options.transaction,
       includeAsyncNode: true
@@ -3661,7 +3776,7 @@ class FlowSurfacesService {
   async compose(values, options = {}) {
     var _a, _b, _c;
     const popupTemplateAliasSession = options.popupTemplateAliasSession || this.createPopupTemplateAliasSession();
-    const target = this.normalizeWriteTarget("compose", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("compose", values == null ? void 0 : values.target, values, options);
     const mode = this.assertComposeMode(values == null ? void 0 : values.mode);
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const normalizedBlocks = this.normalizeComposeBlocks(values == null ? void 0 : values.blocks, enabledPackages);
@@ -3763,7 +3878,7 @@ class FlowSurfacesService {
     return result;
   }
   async configure(values, options = {}) {
-    const target = this.normalizeWriteTarget("configure", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("configure", values == null ? void 0 : values.target, values, options);
     if (!import_lodash.default.isPlainObject(values.changes) || !Object.keys(values.changes).length) {
       (0, import_errors.throwBadRequest)("flowSurfaces configure requires a non-empty changes object");
     }
@@ -3782,6 +3897,12 @@ class FlowSurfacesService {
     if ((current == null ? void 0 : current.use) === "CalendarBlockModel") {
       return this.configureCalendarBlock(target, current, values.changes, options);
     }
+    if ((current == null ? void 0 : current.use) === "TreeBlockModel") {
+      return this.configureTreeBlock(target, current, values.changes, options);
+    }
+    if ((current == null ? void 0 : current.use) === "KanbanBlockModel") {
+      return this.configureKanbanBlock(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);
     }
@@ -3837,7 +3958,10 @@ class FlowSurfacesService {
       return this.configureFieldNode(target, values.changes, options);
     }
     if (import_node_use_sets.ACTION_BUTTON_USES.has((current == null ? void 0 : current.use) || "")) {
-      return this.configureActionNode(target, current.use, values.changes, options);
+      return this.configureActionNode(target, current.use, values.changes, {
+        ...options,
+        current
+      });
     }
     (0, import_errors.throwBadRequest)(`flowSurfaces configure does not support configureOptions on '${(current == null ? void 0 : current.use) || resolved.uid}'`);
   }
@@ -4628,7 +4752,7 @@ class FlowSurfacesService {
         "FLOW_SURFACE_TEMPLATE_REFERENCE_SETTINGS_UNSUPPORTED"
       );
     }
-    const target = this.normalizeWriteTarget("addBlock", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addBlock", values == null ? void 0 : values.target, values, options);
     await this.assertBlockTemplateCompatibility("addBlock", target, template, options.transaction);
     const { parentUid, subKey, subType, popupSurface } = await this.surfaceContext.resolveBlockParent(
       target,
@@ -4695,7 +4819,7 @@ class FlowSurfacesService {
       transaction: options.transaction,
       expectedType: "block"
     });
-    const target = this.normalizeWriteTarget("addField", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addField", values == null ? void 0 : values.target, values, options);
     const resolvedTarget = await this.locator.resolve(target, options);
     const container = await this.surfaceContext.resolveFieldContainer(resolvedTarget.uid, options.transaction);
     const result = await this.applyTemplateFieldsToBlock(
@@ -4773,7 +4897,7 @@ class FlowSurfacesService {
     };
   }
   async addBlock(values, options = {}) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     const templateRef = import_lodash.default.isUndefined(values == null ? void 0 : values.template) ? void 0 : this.normalizeFlowTemplateReference("addBlock", values.template, {
       allowUsage: true,
       expectedType: "block"
@@ -4794,7 +4918,7 @@ class FlowSurfacesService {
       await this.persistCreatedKeysForAction("addBlock", values, result2, options.transaction);
       return result2;
     }
-    const target = this.normalizeWriteTarget("addBlock", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addBlock", values == null ? void 0 : values.target, values, options);
     (0, import_service_utils.ensureNoRawDirectAddKeys)("addBlock", values, ["props", "decoratorProps", "stepParams", "flowRegistry"]);
     const inlineSettings = this.normalizeInlineSettings("addBlock", values.settings);
     const semanticResource = this.normalizeResourceInput(values.resource);
@@ -4803,6 +4927,7 @@ class FlowSurfacesService {
       (0, import_errors.throwBadRequest)("flowSurfaces addBlock does not allow resource and resourceInit at the same time");
     }
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
+    const hasInlineFields = Object.prototype.hasOwnProperty.call(values || {}, "fields") || Object.prototype.hasOwnProperty.call(values || {}, "fieldsLayout");
     let resolvedTarget = await this.locator.resolve(target, options);
     let targetNode = await this.loadResolvedNode(resolvedTarget, options.transaction);
     const targetOpenView = this.resolvePopupHostOpenView(targetNode);
@@ -4837,6 +4962,16 @@ class FlowSurfacesService {
         requireCreateSupported: true
       }
     );
+    const inlineFields = hasInlineFields ? this.normalizeComposeBlock(
+      {
+        key: String((values == null ? void 0 : values.key) || catalogItem.key || (values == null ? void 0 : values.type) || (values == null ? void 0 : values.use) || "addBlock_inline").trim() || "addBlock_inline",
+        type: catalogItem.key || values.type,
+        fields: values.fields,
+        fieldsLayout: values.fieldsLayout
+      },
+      0,
+      enabledPackages
+    ) : null;
     const resolvedResourceInit = await this.resolvePopupCollectionBlockResourceInit({
       actionName: "addBlock",
       blockUse: catalogItem.use,
@@ -4850,7 +4985,7 @@ 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 ? {
+    const effectiveResourceInit = (catalogItem.use === "CalendarBlockModel" || catalogItem.use === "KanbanBlockModel") && resolvedResourceInit.collectionName && !resolvedResourceInit.dataSourceKey ? {
       ...resolvedResourceInit,
       dataSourceKey: "main"
     } : resolvedResourceInit;
@@ -4858,6 +4993,10 @@ class FlowSurfacesService {
       actionName: "addBlock",
       resourceInit: effectiveResourceInit,
       props: values.props
+    }) : catalogItem.use === "KanbanBlockModel" ? this.buildKanbanInitialBlockProps({
+      actionName: "addBlock",
+      resourceInit: effectiveResourceInit,
+      props: values.props
     }) : values.props;
     const initialGrid = options.deferAutoLayout ? null : await this.repository.findModelById(parentUid, {
       transaction: options.transaction,
@@ -4906,6 +5045,73 @@ class FlowSurfacesService {
       } : {}
     };
     await this.applyInlineNodeSettings("addBlock", created, inlineSettings, options);
+    if ((_f = inlineFields == null ? void 0 : inlineFields.fields) == null ? void 0 : _f.length) {
+      const fieldTargetUid = this.resolveComposeFieldContainerUid(inlineFields, result);
+      const createdByKey = {};
+      for (const fieldSpec of inlineFields.fields) {
+        const createdField = await this.addField(
+          {
+            target: {
+              uid: fieldTargetUid
+            },
+            ...fieldSpec.key ? { key: fieldSpec.key } : {},
+            ...fieldSpec.fieldPath ? { fieldPath: fieldSpec.fieldPath } : {},
+            ...fieldSpec.associationPathName ? { associationPathName: fieldSpec.associationPathName } : {},
+            ...fieldSpec.renderer ? { renderer: fieldSpec.renderer } : {},
+            ...fieldSpec.type ? { type: fieldSpec.type } : {},
+            ...fieldSpec.fieldType ? { fieldType: fieldSpec.fieldType } : {},
+            ...!import_lodash.default.isUndefined(fieldSpec.fields) ? { fields: fieldSpec.fields } : {},
+            ...!import_lodash.default.isUndefined(fieldSpec.selectorFields) ? { selectorFields: fieldSpec.selectorFields } : {},
+            ...fieldSpec.titleField ? { titleField: fieldSpec.titleField } : {},
+            ...fieldSpec.openMode ? { openMode: fieldSpec.openMode } : {},
+            ...fieldSpec.popupSize ? { popupSize: fieldSpec.popupSize } : {},
+            ...!import_lodash.default.isUndefined(fieldSpec.pageSize) ? { pageSize: fieldSpec.pageSize } : {},
+            ...!import_lodash.default.isUndefined(fieldSpec.showIndex) ? { showIndex: fieldSpec.showIndex } : {},
+            ...fieldSpec.popup ? { popup: fieldSpec.popup } : {},
+            ...fieldSpec.__autoPopupForRelationField ? { __autoPopupForRelationField: true } : {},
+            ...fieldSpec[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY] ? {
+              [import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]: fieldSpec[import_defaults.FLOW_SURFACE_APPLY_BLUEPRINT_POPUP_DEFAULTS_KEY]
+            } : {}
+          },
+          {
+            transaction: options.transaction,
+            enabledPackages
+          }
+        );
+        if (fieldSpec.settings && Object.keys(fieldSpec.settings).length) {
+          await this.applyInlineFieldSettings("addBlock field", createdField, fieldSpec.settings, {
+            transaction: options.transaction
+          });
+        }
+        const layoutUid = createdField.wrapperUid || createdField.uid;
+        if (layoutUid && fieldSpec.key) {
+          createdByKey[fieldSpec.key] = { uid: layoutUid };
+        }
+      }
+      if (inlineFields.fieldsLayout && Object.keys(createdByKey).length) {
+        const layoutHost = await this.repository.findModelById(created, {
+          transaction: options.transaction,
+          includeAsyncNode: true
+        });
+        const layoutItems = import_lodash.default.castArray(
+          ((_i = (_h = (_g = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _g.grid) == null ? void 0 : _h.subModels) == null ? void 0 : _i.items) || ((_j = layoutHost == null ? void 0 : layoutHost.subModels) == null ? void 0 : _j.items) || []
+        );
+        const layoutPayload = this.buildComposeLayoutPayload({
+          layout: inlineFields.fieldsLayout,
+          createdByKey,
+          finalItems: layoutItems
+        });
+        await this.setLayout(
+          {
+            target: {
+              uid: created
+            },
+            ...layoutPayload
+          },
+          options
+        );
+      }
+    }
     if (!options.skipDefaultBlockActions) {
       await this.applyDefaultActionsForCreatedBlock(
         {
@@ -4951,7 +5157,9 @@ class FlowSurfacesService {
       await this.persistCreatedKeysForAction("addField", values, result2, options.transaction);
       return result2;
     }
-    const target = this.normalizeWriteTarget("addField", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addField", values == null ? void 0 : values.target, values, options);
+    (0, import_field_type_resolver.assertNoInternalFieldKeys)(values, "flowSurfaces addField");
+    (0, import_field_type_resolver.assertNoInternalFieldKeys)(values == null ? void 0 : values.settings, "flowSurfaces addField.settings");
     (0, import_service_utils.ensureNoRawDirectAddKeys)("addField", values, [
       "wrapperProps",
       "fieldProps",
@@ -4968,6 +5176,8 @@ class FlowSurfacesService {
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     const isFilterFormItem = container.wrapperUse === "FilterFormItemModel";
     const isApprovalFormTarget = (0, import_approval.isApprovalFormContainerUse)(container.ownerUse);
+    const requestedLegacyFieldUse = (0, import_service_utils.resolveRequestedFieldUseAlias)(values);
+    let requestedFieldUse = (0, import_service_utils.resolveRequestedFieldUse)(values);
     const requestedStandaloneType = typeof values.type === "string" && values.type.trim().length ? values.type.trim() : void 0;
     const fieldCapability = (0, import_catalog.resolveSupportedFieldCapability)({
       containerUse: container.ownerUse,
@@ -4978,6 +5188,9 @@ class FlowSurfacesService {
       enabledPackages
     });
     if (fieldCapability.standaloneUse) {
+      if ((0, import_service_utils.hasOwnDefined)(values, "fieldType")) {
+        (0, import_errors.throwBadRequest)("flowSurfaces fieldType is only supported for relation fields");
+      }
       if (inlinePopup) {
         (0, import_errors.throwBadRequest)(`flowSurfaces addField type '${values.type}' does not support popup`);
       }
@@ -5083,6 +5296,32 @@ class FlowSurfacesService {
       associationPathName: resolvedField.associationPathName,
       field: resolvedField.field
     });
+    const relationFieldTypeResolution = (0, import_field_type_resolver.resolveRelationFieldType)({
+      fieldType: values.fieldType,
+      containerUse: container.ownerUse,
+      field: resolvedField.field,
+      dataSourceKey: resolvedField.dataSourceKey,
+      getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName),
+      fields: values.fields,
+      selectorFields: values.selectorFields,
+      titleField: values.titleField,
+      openMode: values.openMode,
+      popupSize: values.popupSize,
+      pageSize: values.pageSize,
+      showIndex: values.showIndex,
+      context: "addField"
+    });
+    if (relationFieldTypeResolution) {
+      if (values.renderer) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces addField fieldType cannot be combined with renderer`);
+      }
+      if (requestedLegacyFieldUse && requestedLegacyFieldUse !== relationFieldTypeResolution.fieldUse) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces fieldUse '${requestedLegacyFieldUse}' does not match fieldType '${relationFieldTypeResolution.fieldType}'`
+        );
+      }
+      requestedFieldUse = relationFieldTypeResolution.fieldUse;
+    }
     const filterFormInit = isFilterFormItem ? {
       filterField: (0, import_service_helpers.buildFilterFieldMeta)(resolvedField.field),
       ...(selectedFilterTarget == null ? void 0 : selectedFilterTarget.ownerUid) ? { defaultTargetUid: selectedFilterTarget.ownerUid } : {}
@@ -5090,25 +5329,29 @@ class FlowSurfacesService {
     let capabilityField = preferredCapabilityField;
     let boundFieldCapability;
     if ((fieldMenuCandidate == null ? void 0 : fieldMenuCandidate.explicitWrapperUse) && (fieldMenuCandidate == null ? void 0 : fieldMenuCandidate.explicitFieldUse) && !values.renderer) {
-      if ((0, import_service_utils.hasOwnDefined)(values, "fieldUse") && values.fieldUse !== fieldMenuCandidate.explicitFieldUse) {
+      if (requestedLegacyFieldUse && requestedLegacyFieldUse !== fieldMenuCandidate.explicitFieldUse) {
         (0, import_errors.throwBadRequest)(
-          `flowSurfaces fieldUse '${values.fieldUse}' does not match inferred fieldUse '${fieldMenuCandidate.explicitFieldUse}' under '${container.ownerUse}'`
+          `flowSurfaces fieldUse '${requestedLegacyFieldUse}' does not match inferred fieldUse '${fieldMenuCandidate.explicitFieldUse}' under '${container.ownerUse}'`
         );
       }
-      boundFieldCapability = {
-        wrapperUse: fieldMenuCandidate.explicitWrapperUse,
-        fieldUse: fieldMenuCandidate.explicitFieldUse,
-        inferredFieldUse: fieldMenuCandidate.explicitFieldUse,
-        standaloneUse: void 0,
-        renderer: void 0
-      };
-      capabilityField = resolvedField.field;
-    } else {
+      if (!relationFieldTypeResolution) {
+        boundFieldCapability = {
+          wrapperUse: fieldMenuCandidate.explicitWrapperUse,
+          fieldUse: fieldMenuCandidate.explicitFieldUse,
+          inferredFieldUse: fieldMenuCandidate.explicitFieldUse,
+          standaloneUse: void 0,
+          renderer: void 0
+        };
+        capabilityField = resolvedField.field;
+      }
+    }
+    if (!boundFieldCapability) {
       try {
         boundFieldCapability = (0, import_catalog.resolveSupportedFieldCapability)({
           containerUse: container.ownerUse,
           field: capabilityField,
-          requestedFieldUse: values.fieldUse,
+          requestedFieldUse,
+          requestedFieldUseMode: relationFieldTypeResolution ? "fieldType" : "fieldUse",
           requestedWrapperUse: container.wrapperUse,
           requestedRenderer: values.renderer,
           enabledPackages,
@@ -5116,12 +5359,13 @@ class FlowSurfacesService {
           getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName)
         });
       } catch (error) {
-        if ((0, import_service_utils.hasOwnDefined)(values, "fieldUse") && capabilityField !== resolvedField.field && error instanceof import_errors.FlowSurfaceBadRequestError) {
+        if (requestedFieldUse && capabilityField !== resolvedField.field && error instanceof import_errors.FlowSurfaceBadRequestError) {
           capabilityField = resolvedField.field;
           boundFieldCapability = (0, import_catalog.resolveSupportedFieldCapability)({
             containerUse: container.ownerUse,
             field: capabilityField,
-            requestedFieldUse: values.fieldUse,
+            requestedFieldUse,
+            requestedFieldUseMode: relationFieldTypeResolution ? "fieldType" : "fieldUse",
             requestedWrapperUse: container.wrapperUse,
             requestedRenderer: values.renderer,
             enabledPackages,
@@ -5155,9 +5399,17 @@ class FlowSurfacesService {
       boundFieldCapability.fieldUse,
       capabilityField
     );
-    const defaultTitleField = titleFieldSyncDecision.titleField ?? normalizedFieldBinding.defaultTitleField ?? (fieldMenuCandidate == null ? void 0 : fieldMenuCandidate.defaultTitleField);
+    const defaultTitleField = (relationFieldTypeResolution == null ? void 0 : relationFieldTypeResolution.titleField) ?? titleFieldSyncDecision.titleField ?? normalizedFieldBinding.defaultTitleField ?? (fieldMenuCandidate == null ? void 0 : fieldMenuCandidate.defaultTitleField);
     const wrapperShouldPersistTitleField = !import_lodash.default.isUndefined(defaultTitleField) && TITLE_FIELD_SUPPORTED_WRAPPER_USES.has(boundFieldCapability.wrapperUse || "");
-    const fieldShouldPersistTitleField = !import_lodash.default.isUndefined(defaultTitleField);
+    const fieldShouldPersistTitleField = !import_lodash.default.isUndefined(defaultTitleField) && this.supportsFieldTitleFieldProp(boundFieldCapability.fieldUse);
+    const normalizedDefaultFieldProps = this.normalizeFieldPropsForUse(
+      boundFieldCapability.fieldUse,
+      defaultFieldState.fieldProps || {}
+    );
+    const normalizedInlineFieldProps = this.normalizeFieldPropsForUse(
+      boundFieldCapability.fieldUse,
+      values.fieldProps || {}
+    );
     const tree = (0, import_builder.buildFieldTree)({
       wrapperUse: boundFieldCapability.wrapperUse,
       fieldUse: boundFieldCapability.fieldUse,
@@ -5174,9 +5426,9 @@ class FlowSurfacesService {
       ),
       fieldProps: import_lodash.default.merge(
         {},
-        defaultFieldState.fieldProps || {},
+        normalizedDefaultFieldProps,
         fieldShouldPersistTitleField ? { titleField: defaultTitleField } : {},
-        values.fieldProps || {}
+        normalizedInlineFieldProps
       )
     });
     this.contractGuard.validateNodeTreeAgainstContract(tree.model);
@@ -5215,6 +5467,21 @@ class FlowSurfacesService {
       associationPathName: normalizedFieldBinding.associationPathName,
       fieldPath: normalizedFieldBinding.fieldPath
     };
+    if (relationFieldTypeResolution) {
+      await this.applyResolvedRelationFieldType({
+        fieldUid: tree.innerUid,
+        fieldUse: boundFieldCapability.fieldUse,
+        targetCollection: relationFieldTypeResolution.targetCollection,
+        fields: relationFieldTypeResolution.fields,
+        selectorFields: relationFieldTypeResolution.selectorFields,
+        titleField: relationFieldTypeResolution.titleField,
+        openMode: relationFieldTypeResolution.openMode,
+        popupSize: relationFieldTypeResolution.popupSize,
+        pageSize: relationFieldTypeResolution.pageSize,
+        showIndex: relationFieldTypeResolution.showIndex,
+        transaction: options.transaction
+      });
+    }
     await this.applyInlineFieldSettings("addField", result, inlineSettings, options);
     await this.applyInlineFieldPopup("addField", result, inlinePopup, {
       ...options,
@@ -5224,7 +5491,7 @@ class FlowSurfacesService {
     return result;
   }
   async addAction(values, options = {}) {
-    const target = this.normalizeWriteTarget("addAction", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addAction", values == null ? void 0 : values.target, values, options);
     (0, import_service_utils.ensureNoDirectActionScopeKey)("addAction", values);
     (0, import_service_utils.ensureNoRawDirectAddKeys)("addAction", values, ["props", "decoratorProps", "stepParams", "flowRegistry"]);
     const inlineSettings = this.normalizeInlineSettings("addAction", values.settings);
@@ -5321,7 +5588,7 @@ class FlowSurfacesService {
     return result;
   }
   async addRecordAction(values, options = {}) {
-    const target = this.normalizeWriteTarget("addRecordAction", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("addRecordAction", values == null ? void 0 : values.target, values, options);
     (0, import_service_utils.ensureNoDirectActionScopeKey)("addRecordAction", values);
     (0, import_service_utils.ensureNoRawDirectAddKeys)("addRecordAction", values, ["props", "decoratorProps", "stepParams", "flowRegistry"]);
     const inlineSettings = this.normalizeInlineSettings("addRecordAction", values.settings);
@@ -7551,7 +7818,7 @@ class FlowSurfacesService {
   async updateSettings(values, options = {}) {
     var _a, _b;
     (0, import_payload_shape.validateFlowSurfacePayloadShape)("updateSettings", values, "values");
-    const writeTarget = this.normalizeWriteTarget("updateSettings", values == null ? void 0 : values.target, values);
+    const writeTarget = await this.prepareWriteTarget("updateSettings", values == null ? void 0 : values.target, values, options);
     const target = await this.locator.resolve(writeTarget, options);
     const current = await this.loadResolvedNode(target, options.transaction);
     const normalizedValues = import_lodash.default.cloneDeep(values || {});
@@ -7611,6 +7878,7 @@ class FlowSurfacesService {
     };
     const shouldValidateFlowRegistry = !import_lodash.default.isUndefined(nextPayload.flowRegistry) || !import_lodash.default.isUndefined(nextPayload.stepParams);
     this.validateCalendarBlockState("updateSettings", effectiveNode);
+    this.validateKanbanBlockState("updateSettings", effectiveNode);
     if (shouldValidateFlowRegistry && import_lodash.default.isPlainObject(effectiveNode.flowRegistry) && Object.keys(effectiveNode.flowRegistry).length) {
       this.contractGuard.validateFlowRegistry(effectiveNode, effectiveNode.flowRegistry);
     }
@@ -7642,6 +7910,9 @@ class FlowSurfacesService {
     if (current.use === "CalendarBlockModel") {
       await this.ensureCalendarBlockPopupHosts(effectiveNode, options.transaction);
     }
+    if (current.use === "KanbanBlockModel") {
+      await this.ensureKanbanBlockPopupHosts(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);
@@ -8110,7 +8381,7 @@ class FlowSurfacesService {
     );
   }
   async setEventFlows(values, options = {}) {
-    const writeTarget = this.normalizeWriteTarget("setEventFlows", values == null ? void 0 : values.target, values);
+    const writeTarget = await this.prepareWriteTarget("setEventFlows", values == null ? void 0 : values.target, values, options);
     const target = await this.locator.resolve(writeTarget, options);
     const current = await this.loadResolvedNode(target, options.transaction);
     const contract = (0, import_catalog.getNodeContract)(current == null ? void 0 : current.use);
@@ -8148,7 +8419,7 @@ class FlowSurfacesService {
   }
   async setLayout(values, options = {}) {
     var _a, _b;
-    const target = this.normalizeWriteTarget("setLayout", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("setLayout", values == null ? void 0 : values.target, values, options);
     const resolved = await this.locator.resolve(target, options);
     const grid = await this.surfaceContext.resolveGridNode(resolved.uid, options.transaction);
     const contract = (0, import_catalog.getNodeContract)(grid == null ? void 0 : grid.use);
@@ -8264,7 +8535,7 @@ class FlowSurfacesService {
   async apply(values, options = {}) {
     this.assertApplyMode(values.mode);
     (0, import_payload_shape.validateFlowSurfacePayloadShape)("apply", values == null ? void 0 : values.spec, "spec");
-    const target = this.normalizeWriteTarget("apply", values == null ? void 0 : values.target, values);
+    const target = await this.prepareWriteTarget("apply", values == null ? void 0 : values.target, values, options);
     const spec = values.spec;
     const readback = await this.get(target, options);
     const compiled = (0, import_compiler.compileApplySpec)(target, readback.tree, spec);
@@ -8412,6 +8683,72 @@ class FlowSurfacesService {
     }
     return { uid: uid2 };
   }
+  parseCalendarPopupActionTargetUid(uid2) {
+    const normalizedUid = String(uid2 || "").trim();
+    if (!normalizedUid) {
+      return null;
+    }
+    for (const actionKey of CALENDAR_POPUP_ACTION_KEYS) {
+      const suffix = `-${actionKey}`;
+      if (normalizedUid.endsWith(suffix) && normalizedUid.length > suffix.length) {
+        return {
+          calendarUid: normalizedUid.slice(0, -suffix.length),
+          actionKey
+        };
+      }
+    }
+    return null;
+  }
+  parseKanbanPopupActionTargetUid(uid2) {
+    const normalizedUid = String(uid2 || "").trim();
+    if (!normalizedUid) {
+      return null;
+    }
+    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
+      const suffix = KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY[actionKey];
+      if (normalizedUid.endsWith(suffix) && normalizedUid.length > suffix.length) {
+        return {
+          kanbanUid: normalizedUid.slice(0, -suffix.length),
+          actionKey
+        };
+      }
+    }
+    return null;
+  }
+  async prepareWriteTarget(actionName, target, values, options = {}) {
+    const writeTarget = this.normalizeWriteTarget(actionName, target, values);
+    const parsedCalendarPopupTarget = this.parseCalendarPopupActionTargetUid(writeTarget.uid);
+    const parsedKanbanPopupTarget = this.parseKanbanPopupActionTargetUid(writeTarget.uid);
+    if (!parsedCalendarPopupTarget && !parsedKanbanPopupTarget) {
+      return writeTarget;
+    }
+    const persistedTarget = await this.repository.findModelById(writeTarget.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    if (persistedTarget == null ? void 0 : persistedTarget.uid) {
+      return writeTarget;
+    }
+    if (parsedCalendarPopupTarget) {
+      const calendarNode = await this.repository.findModelById(parsedCalendarPopupTarget.calendarUid, {
+        transaction: options.transaction,
+        includeAsyncNode: true
+      }).catch(() => null);
+      if ((calendarNode == null ? void 0 : calendarNode.use) === "CalendarBlockModel") {
+        await this.ensureCalendarBlockPopupHosts(calendarNode, options.transaction);
+      }
+    }
+    if (parsedKanbanPopupTarget) {
+      const kanbanNode = await this.repository.findModelById(parsedKanbanPopupTarget.kanbanUid, {
+        transaction: options.transaction,
+        includeAsyncNode: true
+      }).catch(() => null);
+      if ((kanbanNode == null ? void 0 : kanbanNode.use) === "KanbanBlockModel") {
+        await this.ensureKanbanBlockPopupHosts(kanbanNode, options.transaction);
+      }
+    }
+    return writeTarget;
+  }
   normalizeRootUidValue(actionName, values) {
     if (import_lodash.default.isPlainObject(values == null ? void 0 : values.target)) {
       (0, import_errors.throwBadRequest)(
@@ -8914,6 +9251,11 @@ class FlowSurfacesService {
         subType: "array"
       };
     }
+    if (use === "KanbanBlockModel") {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces addRecordAction target '${use}' is not supported; kanban record actions are not exposed in the public API v1`
+      );
+    }
     if (use === "TableActionsColumnModel") {
       (0, import_errors.throwBadRequest)(
         `flowSurfaces addRecordAction target '${use}' is an internal record action container; pass the owning table block uid instead`
@@ -9260,6 +9602,7 @@ class FlowSurfacesService {
     );
     const hasFields = Object.prototype.hasOwnProperty.call(input, "fields");
     const hasFieldGroups = Object.prototype.hasOwnProperty.call(input, "fieldGroups");
+    const hasActions = Object.prototype.hasOwnProperty.call(input, "actions");
     const hasRecordActions = Object.prototype.hasOwnProperty.call(input, "recordActions");
     if (type === "calendar") {
       if (hasFields) {
@@ -9278,6 +9621,40 @@ class FlowSurfacesService {
         );
       }
     }
+    if (type === "kanban") {
+      if (hasFieldGroups) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} kanban does not support fieldGroups[] on the main block; add card fields directly under fields[] instead`
+        );
+      }
+      if (hasRecordActions) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} kanban does not support recordActions[] on the main block; configure block actions only in v1`
+        );
+      }
+      if (Object.prototype.hasOwnProperty.call(input, "fieldsLayout")) {
+        (0, import_errors.throwBadRequest)(
+          `flowSurfaces compose block #${index + 1} kanban does not support fieldsLayout on the main block`
+        );
+      }
+    }
+    if (type === "tree") {
+      if (hasFields) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} tree does not support fields[]`);
+      }
+      if (hasFieldGroups) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} tree does not support fieldGroups[]`);
+      }
+      if (hasActions) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} tree does not support actions[]`);
+      }
+      if (hasRecordActions) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} tree does not support recordActions[]`);
+      }
+      if (Object.prototype.hasOwnProperty.call(input, "fieldsLayout")) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} tree does not support fieldsLayout`);
+      }
+    }
     if (hasFields && hasFieldGroups) {
       (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} cannot mix fields with fieldGroups`);
     }
@@ -9349,7 +9726,7 @@ class FlowSurfacesService {
     return blockResult.uid;
   }
   resolveComposeFieldContainerUid(blockSpec, blockResult) {
-    if (LIST_LIKE_COMPOSE_BLOCK_TYPES.has(blockSpec.type)) {
+    if (CARD_FIELD_COMPOSE_BLOCK_TYPES.has(blockSpec.type)) {
       return blockResult.itemUid || blockResult.uid;
     }
     return blockResult.uid;
@@ -9361,7 +9738,7 @@ class FlowSurfacesService {
     if (blockSpec.type === "details") {
       return blockResult.uid;
     }
-    if (!LIST_LIKE_COMPOSE_BLOCK_TYPES.has(blockSpec.type)) {
+    if (!RECORD_ACTION_COMPOSE_BLOCK_TYPES.has(blockSpec.type)) {
       (0, import_errors.throwBadRequest)(
         `flowSurfaces compose recordActions only support 'table', 'details', 'list' or 'gridCard' blocks`
       );
@@ -9721,6 +10098,16 @@ class FlowSurfacesService {
     const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("CalendarBlockModel");
     const cardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
     (0, import_service_utils.assertSupportedSimpleChanges)("calendar", changes, allowedKeys);
+    this.validateCalendarSettingValues("configure", {
+      defaultView: changes.defaultView,
+      quickCreateEvent: changes.quickCreateEvent,
+      showLunar: changes.showLunar,
+      weekStart: changes.weekStart
+    });
+    const defaultView = (0, import_service_utils.hasOwnDefined)(changes, "defaultView") ? String(changes.defaultView).trim() : void 0;
+    const quickCreateEvent = (0, import_service_utils.hasOwnDefined)(changes, "quickCreateEvent") ? changes.quickCreateEvent : void 0;
+    const showLunar = (0, import_service_utils.hasOwnDefined)(changes, "showLunar") ? changes.showLunar : void 0;
+    const weekStart = (0, import_service_utils.hasOwnDefined)(changes, "weekStart") ? changes.weekStart : void 0;
     const currentResourceInit = this.getCalendarBlockResourceInit(current);
     const nextResourceInit = changes.resource ? (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource) : currentResourceInit;
     if (nextResourceInit.collectionName && !nextResourceInit.dataSourceKey) {
@@ -9755,10 +10142,10 @@ class FlowSurfacesService {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
           fieldNames,
-          defaultView: changes.defaultView,
-          enableQuickCreateEvent: changes.quickCreateEvent,
-          showLunar: changes.showLunar,
-          weekStart: changes.weekStart,
+          defaultView,
+          enableQuickCreateEvent: quickCreateEvent,
+          showLunar,
+          weekStart,
           quickCreatePopupSettings,
           eventPopupSettings
         }),
@@ -9790,10 +10177,10 @@ class FlowSurfacesService {
               ...(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, "defaultView") ? { defaultView: { defaultView } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreateEvent") ? { quickCreateEvent: { enableQuickCreateEvent: quickCreateEvent !== false } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "showLunar") ? { showLunar: { showLunar: showLunar === true } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "weekStart") ? { weekStart: { weekStart } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
             })
@@ -9809,72 +10196,29 @@ class FlowSurfacesService {
     await this.ensureCalendarBlockPopupHosts(reloaded, options.transaction);
     return result;
   }
-  async configureFormBlock(target, use, changes, options) {
-    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)(use);
+  async configureTreeBlock(target, current, changes, options) {
+    var _a, _b;
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("TreeBlockModel");
     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)
-      };
-    }
-    if ((0, import_service_utils.hasDefinedValue)(changes, ["layout", "labelAlign", "labelWidth", "labelWrap", "assignRules", "colon"])) {
-      nextStepParams.formModelSettings = (0, import_service_utils.buildDefinedPayload)({
-        ...(0, import_service_utils.hasOwnDefined)(changes, "layout") || (0, import_service_utils.hasOwnDefined)(changes, "labelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "labelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "labelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "colon") ? {
-          layout: (0, import_service_utils.buildDefinedPayload)({
-            layout: layoutValue,
-            labelAlign: changes.labelAlign,
-            labelWidth: changes.labelWidth,
-            labelWrap: changes.labelWrap,
-            colon: changes.colon
-          })
-        } : {},
-        ...(0, import_service_utils.hasOwnDefined)(changes, "assignRules") ? { assignRules: { value: changes.assignRules } } : {}
-      });
-    }
-    if (use === "EditFormModel" && (0, import_service_utils.hasOwnDefined)(changes, "dataScope")) {
-      nextStepParams.formSettings = {
-        dataScope: {
-          filter: changes.dataScope
-        }
-      };
+    (0, import_service_utils.assertSupportedSimpleChanges)("tree", changes, allowedKeys);
+    const nextFieldNames = import_lodash.default.isPlainObject(changes.fieldNames) ? import_lodash.default.merge({}, ((_a = current == null ? void 0 : current.props) == null ? void 0 : _a.fieldNames) || {}, changes.fieldNames) : import_lodash.default.cloneDeep(((_b = current == null ? void 0 : current.props) == null ? void 0 : _b.fieldNames) || {});
+    if ((0, import_service_utils.hasOwnDefined)(changes, "titleField")) {
+      nextFieldNames.title = String(changes.titleField || "").trim();
     }
+    const hasFieldNamesPatch = (0, import_service_utils.hasOwnDefined)(changes, "titleField") || import_lodash.default.isPlainObject(changes.fieldNames);
     return this.updateSettings(
       {
         target,
         props: (0, import_service_utils.buildDefinedPayload)({
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
-        }),
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
-        }),
-        stepParams: Object.keys(nextStepParams).length ? nextStepParams : void 0
-      },
-      options
-    );
-  }
-  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)({
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+          ...(0, import_service_utils.hasOwnDefined)(changes, "searchable") ? { searchable: changes.searchable !== false } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "defaultExpandAll") ? { defaultExpandAll: changes.defaultExpandAll === true } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "includeDescendants") ? { includeDescendants: changes.includeDescendants !== false } : {},
+          ...hasFieldNamesPatch ? { fieldNames: nextFieldNames } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: changes.pageSize } : {}
         }),
         decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+          height: changes.height,
+          heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
         }),
         stepParams: {
           ...cardSettings ? { cardSettings } : {},
@@ -9884,28 +10228,22 @@ class FlowSurfacesService {
             }
           } : {},
           ...(0, import_service_utils.hasDefinedValue)(changes, [
-            "layout",
-            "labelAlign",
-            "labelWidth",
-            "labelWrap",
-            "colon",
-            "sorting",
+            "searchable",
+            "defaultExpandAll",
+            "includeDescendants",
+            "titleField",
+            "pageSize",
             "dataScope",
-            "linkageRules"
+            "sorting"
           ]) ? {
-            detailsSettings: (0, import_service_utils.buildDefinedPayload)({
-              ...(0, import_service_utils.hasOwnDefined)(changes, "layout") || (0, import_service_utils.hasOwnDefined)(changes, "labelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "labelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "labelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "colon") ? {
-                layout: (0, import_service_utils.buildDefinedPayload)({
-                  layout: layoutValue,
-                  labelAlign: changes.labelAlign,
-                  labelWidth: changes.labelWidth,
-                  labelWrap: changes.labelWrap,
-                  colon: changes.colon
-                })
-              } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+            treeSettings: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "searchable") ? { searchable: { searchable: changes.searchable !== false } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "defaultExpandAll") ? { defaultExpandAll: { defaultExpandAll: changes.defaultExpandAll === true } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "includeDescendants") ? { includeDescendants: { includeDescendants: changes.includeDescendants !== false } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "titleField") ? { titleField: { titleField: nextFieldNames.title } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: { pageSize: changes.pageSize } } : {},
               ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
-              ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {}
             })
           } : {}
         }
@@ -9913,23 +10251,447 @@ class FlowSurfacesService {
       options
     );
   }
-  async configureFilterFormBlock(target, changes, options) {
-    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("FilterFormBlockModel");
-    (0, import_service_utils.assertSupportedSimpleChanges)("filterForm", 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 } : {}
-        }),
-        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
-          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
-        }),
+  async configureKanbanBlock(target, current, changes, options) {
+    var _a;
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("KanbanBlockModel");
+    const blockCardSettings = (0, import_service_utils.buildBlockTitleDescriptionFromSemanticChanges)(changes);
+    (0, import_service_utils.assertSupportedSimpleChanges)("kanban", changes, allowedKeys);
+    if (!import_lodash.default.isUndefined(changes.dragEnabled) && !import_lodash.default.isBoolean(changes.dragEnabled)) {
+      (0, import_errors.throwBadRequest)("flowSurfaces configure kanban dragEnabled must be a boolean");
+    }
+    if (!import_lodash.default.isUndefined(changes.quickCreateEnabled) && !import_lodash.default.isBoolean(changes.quickCreateEnabled)) {
+      (0, import_errors.throwBadRequest)("flowSurfaces configure kanban quickCreateEnabled must be a boolean");
+    }
+    if (!import_lodash.default.isUndefined(changes.enableCardClick) && !import_lodash.default.isBoolean(changes.enableCardClick)) {
+      (0, import_errors.throwBadRequest)("flowSurfaces configure kanban enableCardClick must be a boolean");
+    }
+    if (!import_lodash.default.isUndefined(changes.cardLabelWrap) && !import_lodash.default.isBoolean(changes.cardLabelWrap)) {
+      (0, import_errors.throwBadRequest)("flowSurfaces configure kanban cardLabelWrap must be a boolean");
+    }
+    if (!import_lodash.default.isUndefined(changes.cardColon) && !import_lodash.default.isBoolean(changes.cardColon)) {
+      (0, import_errors.throwBadRequest)("flowSurfaces configure kanban cardColon must be a boolean");
+    }
+    if (!import_lodash.default.isUndefined(changes.styleVariant)) {
+      const normalizedStyleVariant = String(changes.styleVariant || "").trim();
+      if (normalizedStyleVariant !== "default" && normalizedStyleVariant !== "filled") {
+        (0, import_errors.throwBadRequest)(`flowSurfaces configure kanban styleVariant must be 'default' or 'filled'`);
+      }
+    }
+    const currentResourceInit = this.getKanbanBlockResourceInit(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, dataSourceKey } = this.assertKanbanCollectionCompatible(
+      "configure",
+      nextResourceInit
+    );
+    const currentItemNode = (0, import_service_utils.getSingleNodeSubModel)((_a = current == null ? void 0 : current.subModels) == null ? void 0 : _a.item);
+    if (!(currentItemNode == null ? void 0 : currentItemNode.uid)) {
+      (0, import_errors.throwConflict)(
+        `flowSurfaces configure kanban block '${(current == null ? void 0 : current.uid) || target.uid}' is missing its item subtree`,
+        "FLOW_SURFACE_KANBAN_ITEM_SUBTREE_MISSING"
+      );
+    }
+    const currentProps = import_lodash.default.cloneDeep((current == null ? void 0 : current.props) || {});
+    const currentGroupFieldName = String(currentProps.groupField || this.getKanbanDefaultGroupFieldName(collection) || "").trim() || void 0;
+    let nextGroupFieldName = (0, import_service_utils.hasOwnDefined)(changes, "groupField") ? this.normalizeKanbanFieldNameInput(changes.groupField, "flowSurfaces configure kanban groupField", {
+      allowEmpty: true
+    }) || void 0 : currentGroupFieldName;
+    let nextGroupField = this.getKanbanGroupField(collection, nextGroupFieldName);
+    if (!nextGroupField || !this.isKanbanGroupField(nextGroupField)) {
+      nextGroupFieldName = this.getKanbanDefaultGroupFieldName(collection);
+      nextGroupField = this.getKanbanGroupField(collection, nextGroupFieldName);
+    }
+    if (!nextGroupFieldName || !nextGroupField || !this.isKanbanGroupField(nextGroupField)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces configure kanban collection '${dataSourceKey}.${collectionName}' must resolve a supported groupField`
+      );
+    }
+    const groupFieldChanged = resourceChanged || nextGroupFieldName !== currentGroupFieldName;
+    const isRelationGroupField = this.isKanbanAssociationGroupField(nextGroupField);
+    const defaultGroupTitleField = this.getKanbanDefaultRelationTitleFieldName(nextGroupField, dataSourceKey);
+    const nextGroupTitleField = isRelationGroupField ? (() => {
+      const requested = (0, import_service_utils.hasOwnDefined)(changes, "groupTitleField") ? this.normalizeKanbanFieldNameInput(
+        changes.groupTitleField,
+        "flowSurfaces configure kanban groupTitleField",
+        { allowEmpty: true }
+      ) || void 0 : groupFieldChanged ? defaultGroupTitleField : this.normalizeKanbanFieldNameInput(currentProps.groupTitleField || defaultGroupTitleField, "", {
+        allowEmpty: true
+      }) || void 0;
+      if (requested) {
+        this.assertKanbanRelationFieldBinding({
+          actionName: "configure",
+          collectionName,
+          dataSourceKey,
+          groupField: nextGroupField,
+          fieldName: requested,
+          kind: "groupTitleField"
+        });
+      }
+      return requested;
+    })() : void 0;
+    const nextGroupColorField = isRelationGroupField ? (() => {
+      const requested = (0, import_service_utils.hasOwnDefined)(changes, "groupColorField") ? this.normalizeKanbanFieldNameInput(
+        changes.groupColorField,
+        "flowSurfaces configure kanban groupColorField",
+        { allowEmpty: true }
+      ) || void 0 : groupFieldChanged ? void 0 : this.normalizeKanbanFieldNameInput(currentProps.groupColorField, "", { allowEmpty: true }) || void 0;
+      if (requested) {
+        this.assertKanbanRelationFieldBinding({
+          actionName: "configure",
+          collectionName,
+          dataSourceKey,
+          groupField: nextGroupField,
+          fieldName: requested,
+          kind: "groupColorField"
+        });
+      }
+      return requested;
+    })() : void 0;
+    const inlineGroupOptions = this.buildKanbanInlineGroupOptions(nextGroupField);
+    const explicitGroupOptions = Object.prototype.hasOwnProperty.call(changes, "groupOptions") ? this.normalizeKanbanGroupOptions(changes.groupOptions, "flowSurfaces configure kanban groupOptions") : void 0;
+    const currentGroupOptions = Array.isArray(currentProps.groupOptions) ? import_lodash.default.cloneDeep(currentProps.groupOptions) : void 0;
+    const nextGroupOptions = this.mergeKanbanInlineGroupOptions(
+      inlineGroupOptions,
+      !import_lodash.default.isUndefined(explicitGroupOptions) ? explicitGroupOptions : groupFieldChanged ? inlineGroupOptions : currentGroupOptions,
+      "flowSurfaces configure kanban groupOptions"
+    );
+    let nextDragSortBy;
+    if ((0, import_service_utils.hasOwnDefined)(changes, "dragSortBy")) {
+      const requested = this.resolveKanbanCompatibleSortFieldName({
+        actionName: "configure",
+        collection,
+        groupField: nextGroupField,
+        requested: changes.dragSortBy,
+        allowEmpty: true
+      });
+      nextDragSortBy = requested || void 0;
+    } else {
+      try {
+        const requested = currentProps.dragSortBy ? this.resolveKanbanCompatibleSortFieldName({
+          actionName: "configure",
+          collection,
+          groupField: nextGroupField,
+          requested: currentProps.dragSortBy,
+          allowEmpty: true
+        }) : void 0;
+        nextDragSortBy = requested || void 0;
+      } catch (error) {
+        nextDragSortBy = void 0;
+      }
+    }
+    const requestedDragEnabled = (0, import_service_utils.hasOwnDefined)(changes, "dragEnabled") ? changes.dragEnabled : currentProps.dragEnabled;
+    const nextDragEnabled = requestedDragEnabled === true && !!nextDragSortBy;
+    const nextStyleVariantProp = (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? String(changes.styleVariant || "").trim() === "default" ? "default" : "color" : void 0;
+    const nextStyleVariantSetting = (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? String(changes.styleVariant || "").trim() : void 0;
+    const quickCreatePopup = Object.prototype.hasOwnProperty.call(changes, "quickCreatePopup") ? await this.normalizeKanbanPopupConfigureValue({
+      actionName: "configure kanban quickCreatePopup",
+      blockUid: current.uid,
+      actionKey: "quickCreateAction",
+      value: changes.quickCreatePopup,
+      transaction: options.transaction
+    }) : void 0;
+    const cardPopup = Object.prototype.hasOwnProperty.call(changes, "cardPopup") ? await this.normalizeKanbanPopupConfigureValue({
+      actionName: "configure kanban cardPopup",
+      blockUid: current.uid,
+      actionKey: "cardViewAction",
+      value: changes.cardPopup,
+      transaction: options.transaction
+    }) : void 0;
+    const nextCardLayout = (0, import_service_utils.hasOwnDefined)(changes, "cardLayout") ? (0, import_service_utils.normalizeSimpleLayoutValue)(changes.cardLayout) : void 0;
+    const shouldWriteGrouping = resourceChanged || (0, import_service_utils.hasOwnDefined)(changes, "groupField") || (0, import_service_utils.hasOwnDefined)(changes, "groupTitleField") || (0, import_service_utils.hasOwnDefined)(changes, "groupColorField") || (0, import_service_utils.hasOwnDefined)(changes, "groupOptions") || groupFieldChanged;
+    const shouldWriteDrag = resourceChanged || (0, import_service_utils.hasOwnDefined)(changes, "dragEnabled") || (0, import_service_utils.hasOwnDefined)(changes, "dragSortBy") || groupFieldChanged;
+    const blockProps = (0, import_service_utils.buildDefinedPayload)({
+      ...shouldWriteGrouping ? {
+        groupField: nextGroupFieldName,
+        groupTitleField: nextGroupTitleField ?? null,
+        groupColorField: nextGroupColorField ?? null,
+        groupOptions: nextGroupOptions || []
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? { styleVariant: nextStyleVariantProp } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { globalSort: changes.sorting } : {},
+      ...shouldWriteDrag ? {
+        dragEnabled: nextDragEnabled,
+        dragSortBy: nextDragSortBy ?? null
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreateEnabled") ? {
+        quickCreateEnabled: changes.quickCreateEnabled === true
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? { pageSize: changes.pageSize } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "columnWidth") ? { columnWidth: changes.columnWidth } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") ? {
+        popupMode: (quickCreatePopup == null ? void 0 : quickCreatePopup.mode) ?? null,
+        popupSize: (quickCreatePopup == null ? void 0 : quickCreatePopup.size) ?? null,
+        popupTemplateUid: (quickCreatePopup == null ? void 0 : quickCreatePopup.popupTemplateUid) ?? null,
+        popupPageModelClass: (quickCreatePopup == null ? void 0 : quickCreatePopup.pageModelClass) ?? null,
+        popupTargetUid: (quickCreatePopup == null ? void 0 : quickCreatePopup.uid) ?? null
+      } : {}
+    });
+    const blockStepParams = (0, import_service_utils.buildDefinedPayload)({
+      ...blockCardSettings ? { cardSettings: blockCardSettings } : {},
+      ...changes.resource ? {
+        resourceSettings: {
+          init: nextResourceInit
+        }
+      } : {},
+      ...shouldWriteGrouping || (0, import_service_utils.hasOwnDefined)(changes, "styleVariant") || (0, import_service_utils.hasOwnDefined)(changes, "sorting") || shouldWriteDrag || (0, import_service_utils.hasOwnDefined)(changes, "quickCreateEnabled") || (0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "columnWidth") || (0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? {
+        kanbanSettings: (0, import_service_utils.buildDefinedPayload)({
+          ...shouldWriteGrouping ? {
+            grouping: (0, import_service_utils.buildDefinedPayload)({
+              groupField: nextGroupFieldName,
+              groupTitleField: nextGroupTitleField ?? null,
+              groupColorField: nextGroupColorField ?? null,
+              groupOptions: nextGroupOptions || []
+            })
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "styleVariant") ? {
+            styleVariant: {
+              styleVariant: nextStyleVariantSetting
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? {
+            defaultSorting: {
+              sort: changes.sorting
+            }
+          } : {},
+          ...shouldWriteDrag ? {
+            dragEnabled: {
+              dragEnabled: nextDragEnabled
+            },
+            dragSortBy: {
+              dragSortBy: nextDragSortBy ?? null
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreateEnabled") ? {
+            quickCreate: {
+              quickCreateEnabled: changes.quickCreateEnabled === true
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "quickCreatePopup") ? {
+            popup: quickCreatePopup || {}
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? {
+            pageSize: {
+              pageSize: changes.pageSize
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "columnWidth") ? {
+            columnWidth: {
+              columnWidth: changes.columnWidth
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? {
+            dataScope: {
+              filter: changes.dataScope
+            }
+          } : {}
+        })
+      } : {}
+    });
+    const itemProps = (0, import_service_utils.buildDefinedPayload)({
+      ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") ? {
+        enableCardClick: changes.enableCardClick === true
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardPopup") ? {
+        openMode: (cardPopup == null ? void 0 : cardPopup.mode) ?? null,
+        popupSize: (cardPopup == null ? void 0 : cardPopup.size) ?? null,
+        popupTemplateUid: (cardPopup == null ? void 0 : cardPopup.popupTemplateUid) ?? null,
+        pageModelClass: (cardPopup == null ? void 0 : cardPopup.pageModelClass) ?? null,
+        popupTargetUid: (cardPopup == null ? void 0 : cardPopup.uid) ?? null
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardLayout") ? {
+        layout: nextCardLayout
+      } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") ? { labelAlign: changes.cardLabelAlign } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") ? { labelWidth: changes.cardLabelWidth ?? null } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") ? { labelWrap: changes.cardLabelWrap === true } : {},
+      ...(0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? { colon: changes.cardColon === true } : {}
+    });
+    const itemStepParams = (0, import_service_utils.buildDefinedPayload)({
+      ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") || (0, import_service_utils.hasOwnDefined)(changes, "cardPopup") || (0, import_service_utils.hasOwnDefined)(changes, "cardLayout") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? {
+        cardSettings: (0, import_service_utils.buildDefinedPayload)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "enableCardClick") ? {
+            click: {
+              enableCardClick: changes.enableCardClick === true
+            }
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "cardPopup") ? {
+            popup: cardPopup || {}
+          } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "cardLayout") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? {
+            layout: (0, import_service_utils.buildDefinedPayload)({
+              layout: nextCardLayout,
+              labelAlign: changes.cardLabelAlign,
+              labelWidth: (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWidth") ? changes.cardLabelWidth ?? null : void 0,
+              labelWrap: (0, import_service_utils.hasOwnDefined)(changes, "cardLabelWrap") ? changes.cardLabelWrap === true : void 0,
+              colon: (0, import_service_utils.hasOwnDefined)(changes, "cardColon") ? changes.cardColon === true : void 0
+            })
+          } : {}
+        })
+      } : {}
+    });
+    const updated = /* @__PURE__ */ new Set();
+    if (Object.keys(blockProps).length || Object.keys(blockStepParams).length || (0, import_service_utils.hasDefinedValue)(changes, ["height", "heightMode"])) {
+      const blockResult = await this.updateSettings(
+        {
+          target,
+          props: blockProps,
+          decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+            height: changes.height,
+            heightMode: (0, import_service_utils.normalizePublicBlockHeightMode)(changes.heightMode)
+          }),
+          stepParams: blockStepParams
+        },
+        options
+      );
+      import_lodash.default.castArray((blockResult == null ? void 0 : blockResult.updated) || []).forEach((key) => updated.add(String(key)));
+    }
+    if (Object.keys(itemProps).length || Object.keys(itemStepParams).length) {
+      const itemResult = await this.updateSettings(
+        {
+          target: {
+            uid: currentItemNode.uid
+          },
+          props: itemProps,
+          stepParams: itemStepParams
+        },
+        options
+      );
+      import_lodash.default.castArray((itemResult == null ? void 0 : itemResult.updated) || []).forEach((key) => updated.add(String(key)));
+    }
+    const reloaded = await this.repository.findModelById(current.uid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    });
+    await this.ensureKanbanBlockPopupHosts(reloaded, options.transaction);
+    return (0, import_service_utils.buildDefinedPayload)({
+      uid: current.uid,
+      ...updated.size ? { updated: Array.from(updated) } : {}
+    });
+  }
+  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)
+      };
+    }
+    if ((0, import_service_utils.hasDefinedValue)(changes, ["layout", "labelAlign", "labelWidth", "labelWrap", "assignRules", "colon"])) {
+      nextStepParams.formModelSettings = (0, import_service_utils.buildDefinedPayload)({
+        ...(0, import_service_utils.hasOwnDefined)(changes, "layout") || (0, import_service_utils.hasOwnDefined)(changes, "labelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "labelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "labelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "colon") ? {
+          layout: (0, import_service_utils.buildDefinedPayload)({
+            layout: layoutValue,
+            labelAlign: changes.labelAlign,
+            labelWidth: changes.labelWidth,
+            labelWrap: changes.labelWrap,
+            colon: changes.colon
+          })
+        } : {},
+        ...(0, import_service_utils.hasOwnDefined)(changes, "assignRules") ? { assignRules: { value: changes.assignRules } } : {}
+      });
+    }
+    if (use === "EditFormModel" && (0, import_service_utils.hasOwnDefined)(changes, "dataScope")) {
+      nextStepParams.formSettings = {
+        dataScope: {
+          filter: changes.dataScope
+        }
+      };
+    }
+    return this.updateSettings(
+      {
+        target,
+        props: (0, import_service_utils.buildDefinedPayload)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+        }),
+        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+        }),
+        stepParams: Object.keys(nextStepParams).length ? nextStepParams : void 0
+      },
+      options
+    );
+  }
+  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)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+        }),
+        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+        }),
+        stepParams: {
+          ...cardSettings ? { cardSettings } : {},
+          ...changes.resource ? {
+            resourceSettings: {
+              init: (0, import_service_utils.normalizeSimpleResourceInit)(changes.resource)
+            }
+          } : {},
+          ...(0, import_service_utils.hasDefinedValue)(changes, [
+            "layout",
+            "labelAlign",
+            "labelWidth",
+            "labelWrap",
+            "colon",
+            "sorting",
+            "dataScope",
+            "linkageRules"
+          ]) ? {
+            detailsSettings: (0, import_service_utils.buildDefinedPayload)({
+              ...(0, import_service_utils.hasOwnDefined)(changes, "layout") || (0, import_service_utils.hasOwnDefined)(changes, "labelAlign") || (0, import_service_utils.hasOwnDefined)(changes, "labelWidth") || (0, import_service_utils.hasOwnDefined)(changes, "labelWrap") || (0, import_service_utils.hasOwnDefined)(changes, "colon") ? {
+                layout: (0, import_service_utils.buildDefinedPayload)({
+                  layout: layoutValue,
+                  labelAlign: changes.labelAlign,
+                  labelWidth: changes.labelWidth,
+                  labelWrap: changes.labelWrap,
+                  colon: changes.colon
+                })
+              } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "sorting") ? { defaultSorting: { sort: changes.sorting } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "dataScope") ? { dataScope: { filter: changes.dataScope } } : {},
+              ...(0, import_service_utils.hasOwnDefined)(changes, "linkageRules") ? { linkageRules: { value: changes.linkageRules } } : {}
+            })
+          } : {}
+        }
+      },
+      options
+    );
+  }
+  async configureFilterFormBlock(target, changes, options) {
+    const allowedKeys = (0, import_configure_options.getConfigureOptionKeysForUse)("FilterFormBlockModel");
+    (0, import_service_utils.assertSupportedSimpleChanges)("filterForm", 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 } : {}
+        }),
+        decoratorProps: (0, import_service_utils.buildDefinedPayload)({
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWidth") ? { labelWidth: changes.labelWidth } : {},
+          ...(0, import_service_utils.hasOwnDefined)(changes, "labelWrap") ? { labelWrap: changes.labelWrap } : {}
+        }),
         stepParams: {
           ...changes.resource ? {
             resourceSettings: {
@@ -10357,10 +11119,22 @@ class FlowSurfacesService {
     );
   }
   async configureFieldWrapper(target, current, changes, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const enabledPackages = await this.resolveEnabledPluginPackages(options);
     (0, import_service_utils.assertSupportedSimpleChanges)("field wrapper", changes, (0, import_configure_options.getConfigureOptionKeysForUse)(current == null ? void 0 : current.use));
-    const rawWrapperChanges = import_lodash.default.omit(changes, ["clickToOpen", "openView", "code", "version", "fieldComponent"]);
+    const rawWrapperChanges = import_lodash.default.omit(changes, [
+      "clickToOpen",
+      "openView",
+      "code",
+      "version",
+      "fieldType",
+      "fields",
+      "selectorFields",
+      "openMode",
+      "popupSize",
+      "pageSize",
+      "showIndex"
+    ]);
     const wrapperChanges = (current == null ? void 0 : current.use) === "TableColumnModel" && !(0, import_service_utils.hasOwnDefined)(rawWrapperChanges, "title") && (0, import_service_utils.hasOwnDefined)(rawWrapperChanges, "label") ? {
       ...rawWrapperChanges,
       title: rawWrapperChanges.label
@@ -10394,6 +11168,8 @@ class FlowSurfacesService {
     });
     const shouldSyncTitleField = titleFieldSyncDecision.shouldSync;
     const syncedTitleField = titleFieldSyncDecision.titleField;
+    const shouldPatchTableColumnTitle = (current == null ? void 0 : current.use) === "TableColumnModel" && (0, import_service_utils.hasOwnDefined)(wrapperChanges, "title");
+    const shouldPatchFieldSettings = (0, import_service_utils.hasDefinedValue)(wrapperChanges, ["fieldPath", "associationPathName"]) || shouldPatchTableColumnTitle;
     if (Object.keys(wrapperChanges).length) {
       await this.updateSettings(
         {
@@ -10428,8 +11204,8 @@ class FlowSurfacesService {
             labelWidth: wrapperChanges.labelWidth,
             labelWrap: wrapperChanges.labelWrap
           }),
-          stepParams: (0, import_service_utils.hasDefinedValue)(wrapperChanges, ["fieldPath", "associationPathName"]) || (current == null ? void 0 : current.use) === "TableColumnModel" && (0, import_service_utils.hasOwnDefined)(wrapperChanges, "title") ? (0, import_service_utils.buildDefinedPayload)({
-            ...(current == null ? void 0 : current.use) === "TableColumnModel" && (0, import_service_utils.hasOwnDefined)(wrapperChanges, "title") ? {
+          stepParams: shouldPatchFieldSettings ? (0, import_service_utils.buildDefinedPayload)({
+            ...shouldPatchTableColumnTitle ? {
               tableColumnSettings: {
                 title: {
                   title: wrapperChanges.title
@@ -10465,24 +11241,69 @@ class FlowSurfacesService {
         );
       }
     }
-    if ((0, import_service_utils.hasOwnDefined)(changes, "fieldComponent")) {
+    let effectiveInnerFieldUse = innerField == null ? void 0 : innerField.use;
+    let fieldTypeResolution;
+    let relationTitleFieldToApply;
+    if ((0, import_service_utils.hasOwnDefined)(changes, "fieldType") || (0, import_service_utils.hasOwnDefined)(changes, "fields") || (0, import_service_utils.hasOwnDefined)(changes, "selectorFields") || (0, import_service_utils.hasOwnDefined)(changes, "titleField") || (0, import_service_utils.hasOwnDefined)(changes, "openMode") || (0, import_service_utils.hasOwnDefined)(changes, "popupSize") || (0, import_service_utils.hasOwnDefined)(changes, "pageSize") || (0, import_service_utils.hasOwnDefined)(changes, "showIndex")) {
       if (!innerUid) {
         (0, import_errors.throwConflict)(
           `flowSurfaces configure field wrapper '${current == null ? void 0 : current.use}' cannot resolve inner field`,
           "FLOW_SURFACE_INNER_FIELD_MISSING"
         );
       }
+      const fieldSource = this.resolveFieldComponentFieldSource(current, normalizedBinding);
+      const currentPublicFieldType = (0, import_field_type_resolver.getPublicFieldTypeForUse)(
+        ((_k = (_j = innerField == null ? void 0 : innerField.stepParams) == null ? void 0 : _j.fieldBinding) == null ? void 0 : _k.use) || (innerField == null ? void 0 : innerField.use)
+      );
+      const shouldApplyResolverDefaults = (0, import_service_utils.hasOwnDefined)(changes, "fieldType") && changes.fieldType !== currentPublicFieldType;
+      fieldTypeResolution = (0, import_field_type_resolver.resolveRelationFieldType)({
+        fieldType: (0, import_service_utils.hasOwnDefined)(changes, "fieldType") ? changes.fieldType : currentPublicFieldType,
+        containerUse: current == null ? void 0 : current.use,
+        field: fieldSource.field,
+        dataSourceKey: (_l = fieldSource.fieldSettingsInit) == null ? void 0 : _l.dataSourceKey,
+        getCollection: (dataSourceKey, collectionName) => this.getCollection(dataSourceKey, collectionName),
+        fields: changes.fields,
+        selectorFields: changes.selectorFields,
+        titleField: (0, import_service_utils.hasOwnDefined)(wrapperChanges, "titleField") ? wrapperChanges.titleField : void 0,
+        openMode: (0, import_service_utils.hasOwnDefined)(changes, "openMode") ? changes.openMode : void 0,
+        popupSize: (0, import_service_utils.hasOwnDefined)(changes, "popupSize") ? changes.popupSize : void 0,
+        pageSize: (0, import_service_utils.hasOwnDefined)(changes, "pageSize") ? changes.pageSize : void 0,
+        showIndex: (0, import_service_utils.hasOwnDefined)(changes, "showIndex") ? changes.showIndex : void 0,
+        applyDefaults: shouldApplyResolverDefaults,
+        context: "configure"
+      });
+      if (!fieldTypeResolution) {
+        (0, import_errors.throwBadRequest)("flowSurfaces configure fieldType is required when configuring relation fields");
+      }
+      const shouldApplyFieldTypeDefaults = shouldApplyResolverDefaults;
+      const shouldApplyRelationTitleField = (0, import_service_utils.hasOwnDefined)(wrapperChanges, "titleField") || shouldApplyFieldTypeDefaults;
+      relationTitleFieldToApply = shouldApplyRelationTitleField ? fieldTypeResolution.titleField : void 0;
       const normalizedFieldComponentUse = await this.rebuildFieldSubModelOnServer({
         wrapperNode: current,
         innerField,
-        targetFieldUse: changes.fieldComponent,
+        targetFieldUse: fieldTypeResolution.fieldUse,
         normalizedBinding,
         enabledPackages,
         transaction: options.transaction
       });
-      await this.syncFieldComponentStepParams(current, normalizedFieldComponentUse, options.transaction);
+      effectiveInnerFieldUse = normalizedFieldComponentUse;
+      await this.syncFieldTypeStepParams(current, normalizedFieldComponentUse, options.transaction);
+      await this.applyResolvedRelationFieldType({
+        fieldUid: innerUid,
+        fieldUse: normalizedFieldComponentUse,
+        targetCollection: fieldTypeResolution.targetCollection,
+        fields: (0, import_service_utils.hasOwnDefined)(changes, "fields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.fields : void 0,
+        selectorFields: (0, import_service_utils.hasOwnDefined)(changes, "selectorFields") || shouldApplyFieldTypeDefaults ? fieldTypeResolution.selectorFields : void 0,
+        titleField: relationTitleFieldToApply,
+        openMode: fieldTypeResolution.openMode,
+        popupSize: fieldTypeResolution.popupSize,
+        pageSize: fieldTypeResolution.pageSize,
+        showIndex: fieldTypeResolution.showIndex,
+        transaction: options.transaction
+      });
     }
-    if (shouldSyncTitleField) {
+    const effectiveSyncedTitleField = relationTitleFieldToApply ?? syncedTitleField;
+    if ((shouldSyncTitleField || !import_lodash.default.isUndefined(relationTitleFieldToApply)) && this.supportsFieldTitleFieldProp(effectiveInnerFieldUse)) {
       if (!innerUid) {
         (0, import_errors.throwConflict)(
           `flowSurfaces configure field wrapper '${current == null ? void 0 : current.use}' cannot resolve inner field`,
@@ -10495,7 +11316,7 @@ class FlowSurfacesService {
             uid: innerUid
           },
           props: {
-            titleField: syncedTitleField
+            titleField: effectiveSyncedTitleField
           }
         },
         options
@@ -10563,6 +11384,7 @@ class FlowSurfacesService {
     });
     const shouldSyncTitleField = titleFieldSyncDecision.shouldSync;
     const syncedTitleField = titleFieldSyncDecision.titleField;
+    const canSyncInnerTitleField = this.supportsFieldTitleFieldProp(current == null ? void 0 : current.use);
     if ((parentWrapper == null ? void 0 : parentWrapper.uid) && canSyncWrapperTitleField && shouldSyncTitleField) {
       await this.updateSettings(
         {
@@ -10625,7 +11447,7 @@ class FlowSurfacesService {
           quickCreate: changes.quickCreate,
           displayStyle: changes.displayStyle,
           options: changes.options,
-          ...shouldSyncTitleField ? { titleField: syncedTitleField } : {},
+          ...shouldSyncTitleField && canSyncInnerTitleField ? { titleField: syncedTitleField } : {},
           ...(0, import_service_utils.hasOwnDefined)(changes, "clickToOpen") || !import_lodash.default.isUndefined(changes.openView) ? { clickToOpen: effectiveClickToOpen } : {}
         }),
         stepParams: (0, import_service_utils.buildDefinedPayload)({
@@ -10692,6 +11514,7 @@ class FlowSurfacesService {
     return import_lodash.default.cloneDeep(value);
   }
   async configureActionNode(target, use, changes, options) {
+    changes = await this.normalizeActionPanelActionChanges(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;
@@ -10914,6 +11737,21 @@ class FlowSurfacesService {
       }
     );
   }
+  async normalizeActionPanelActionChanges(changes, options) {
+    var _a;
+    if (!(0, import_service_utils.hasOwnDefined)(changes, "type") || !((_a = options.current) == null ? void 0 : _a.uid)) {
+      return changes;
+    }
+    const parentUid = options.current.parentId || await this.locator.findParentUid(options.current.uid, options.transaction);
+    const parentNode = parentUid ? await this.repository.findModelById(parentUid, {
+      transaction: options.transaction,
+      includeAsyncNode: true
+    }) : null;
+    if ((parentNode == null ? void 0 : parentNode.use) !== "ActionPanelBlockModel") {
+      return changes;
+    }
+    return import_lodash.default.omit(changes, ["type"]);
+  }
   async buildFieldCatalog(target, options = {}) {
     const resolved = await this.locator.resolve(target, { transaction: options.transaction });
     const container = await this.surfaceContext.resolveFieldContainer(resolved.uid, options.transaction).catch(() => null);
@@ -11071,7 +11909,7 @@ class FlowSurfacesService {
         continue;
       }
       const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").trim();
-      if (import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
+      if (import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(fieldInterface)) {
         continue;
       }
       const associationFieldName = (0, import_service_helpers.getFieldName)(field);
@@ -11869,30 +12707,436 @@ 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 = {}) {
+  normalizeKanbanFieldNameInput(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`);
+      return options.allowEmpty ? "" : void 0;
     }
-    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`);
+    const normalized = String(value || "").trim();
+    if (!normalized) {
+      return options.allowEmpty ? "" : void 0;
     }
     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
+  getKanbanCollectionFilterTargetKey(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.length === 1 ? String(filterTargetKey[0] || "").trim() || void 0 : void 0;
+    }
+    return typeof filterTargetKey === "string" ? filterTargetKey.trim() || void 0 : void 0;
+  }
+  isKanbanMultipleGroupField(field) {
+    return (/* @__PURE__ */ new Set(["m2m", "o2m", "mbm"])).has(String((0, import_service_helpers.getFieldInterface)(field) || "").trim());
+  }
+  isKanbanAssociationGroupField(field) {
+    return String((0, import_service_helpers.getFieldInterface)(field) || "").trim() === "m2o";
+  }
+  isKanbanGroupField(field) {
+    const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").trim();
+    return (fieldInterface === "select" || fieldInterface === "m2o") && !this.isKanbanMultipleGroupField(field);
+  }
+  getKanbanGroupFieldCandidates(collection) {
+    return (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isKanbanGroupField(field) && (0, import_service_helpers.getFieldName)(field));
+  }
+  getKanbanDefaultGroupFieldName(collection) {
+    return this.getKanbanGroupFieldCandidates(collection).map((field) => (0, import_service_helpers.getFieldName)(field)).find(Boolean);
+  }
+  getKanbanGroupField(collection, fieldName) {
+    const normalizedFieldName = String(fieldName || "").trim();
+    if (!normalizedFieldName) {
+      return void 0;
+    }
+    return (0, import_service_helpers.getCollectionFields)(collection).find((field) => (0, import_service_helpers.getFieldName)(field) === normalizedFieldName);
+  }
+  getKanbanCollectionOrThrow(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} kanban block requires resource.collectionName`);
+    }
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} kanban collection '${dataSourceKey}.${collectionName}' not found`);
+    }
+    return {
+      dataSourceKey,
+      collectionName,
+      collection
+    };
+  }
+  assertKanbanCollectionCompatible(actionName, resourceInit) {
+    const resolved = this.getKanbanCollectionOrThrow(actionName, resourceInit);
+    const filterTargetKey = this.getKanbanCollectionFilterTargetKey(resolved.collection);
+    if (!filterTargetKey) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} kanban collection '${resolved.dataSourceKey}.${resolved.collectionName}' must declare filterTargetKey`
+      );
+    }
+    const groupFieldCandidates = this.getKanbanGroupFieldCandidates(resolved.collection);
+    if (!groupFieldCandidates.length) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} kanban collection '${resolved.dataSourceKey}.${resolved.collectionName}' must contain at least one supported grouping field`
+      );
+    }
+    return {
+      ...resolved,
+      filterTargetKey,
+      groupFieldCandidates
+    };
+  }
+  getKanbanRelationTargetCollection(groupField, dataSourceKey) {
+    if (!this.isKanbanAssociationGroupField(groupField)) {
+      return null;
+    }
+    return (0, import_service_helpers.resolveFieldTargetCollection)(
+      groupField,
+      dataSourceKey,
+      (nextDataSourceKey, collectionName) => this.getCollection(nextDataSourceKey, collectionName)
+    );
+  }
+  getKanbanRelationFieldCandidateNames(groupField, dataSourceKey) {
+    const targetCollection = this.getKanbanRelationTargetCollection(groupField, dataSourceKey);
+    if (!targetCollection) {
+      return [];
+    }
+    return (0, import_service_helpers.getCollectionFields)(targetCollection).map((field) => (0, import_service_helpers.getFieldName)(field)).filter(Boolean);
+  }
+  getKanbanDefaultRelationTitleFieldName(groupField, dataSourceKey) {
+    var _a;
+    const targetCollection = this.getKanbanRelationTargetCollection(groupField, dataSourceKey);
+    if (!targetCollection) {
+      return void 0;
+    }
+    return (targetCollection == null ? void 0 : targetCollection.titleField) || ((_a = targetCollection == null ? void 0 : targetCollection.titleCollectionField) == null ? void 0 : _a.name) || this.getKanbanCollectionFilterTargetKey(targetCollection);
+  }
+  assertKanbanRelationFieldBinding(input) {
+    const normalizedFieldName = String(input.fieldName || "").trim();
+    if (!normalizedFieldName) {
+      return;
+    }
+    const targetCollection = this.getKanbanRelationTargetCollection(input.groupField, input.dataSourceKey);
+    if (!targetCollection) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} kanban ${input.kind} is only supported when groupField targets a relation`
+      );
+    }
+    const field = (0, import_service_helpers.resolveFieldFromCollection)(targetCollection, normalizedFieldName);
+    if (!field) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} kanban ${input.kind} '${normalizedFieldName}' does not exist in relation target collection for '${input.collectionName}'`
+      );
+    }
+  }
+  getKanbanGroupFieldSortScopeKeys(groupField) {
+    const groupFieldName = (0, import_service_helpers.getFieldName)(groupField);
+    if (!groupFieldName) {
+      return [];
+    }
+    if (!this.isKanbanAssociationGroupField(groupField) || !(groupField == null ? void 0 : groupField.foreignKey)) {
+      return [groupFieldName];
+    }
+    return [...new Set([groupField.foreignKey, groupFieldName].filter(Boolean))];
+  }
+  getKanbanCompatibleSortFieldNames(collection, groupField) {
+    const scopeKeys = new Set(this.getKanbanGroupFieldSortScopeKeys(groupField));
+    return (0, import_service_helpers.getCollectionFields)(collection).filter((field) => String((0, import_service_helpers.getFieldInterface)(field) || "").trim() === "sort").filter((field) => {
+      var _a;
+      return scopeKeys.has(String((field == null ? void 0 : field.scopeKey) || ((_a = field == null ? void 0 : field.options) == null ? void 0 : _a.scopeKey) || "").trim());
+    }).map((field) => (0, import_service_helpers.getFieldName)(field)).filter(Boolean);
+  }
+  resolveKanbanCompatibleSortFieldName(input) {
+    const normalizedRequested = this.normalizeKanbanFieldNameInput(input.requested, "", {
+      allowEmpty: input.allowEmpty
+    });
+    if (import_lodash.default.isUndefined(normalizedRequested)) {
+      return void 0;
+    }
+    if (!normalizedRequested) {
+      return "";
+    }
+    const compatibleFieldNames = this.getKanbanCompatibleSortFieldNames(input.collection, input.groupField);
+    if (!compatibleFieldNames.includes(normalizedRequested)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} kanban dragSortBy '${normalizedRequested}' is not compatible with the current groupField`
+      );
+    }
+    return normalizedRequested;
+  }
+  normalizeKanbanGroupOptions(value, context) {
+    if (import_lodash.default.isUndefined(value)) {
+      return void 0;
+    }
+    if (import_lodash.default.isNull(value)) {
+      return [];
+    }
+    if (!Array.isArray(value)) {
+      (0, import_errors.throwBadRequest)(`${context} must be an array`);
+    }
+    const seen = /* @__PURE__ */ new Set();
+    return value.map((item, index) => {
+      if (!import_lodash.default.isPlainObject(item)) {
+        (0, import_errors.throwBadRequest)(`${context}[${index}] must be an object`);
+      }
+      const normalizedValue = String(item.value || "").trim();
+      if (!normalizedValue) {
+        (0, import_errors.throwBadRequest)(`${context}[${index}].value is required`);
+      }
+      if (seen.has(normalizedValue)) {
+        (0, import_errors.throwBadRequest)(`${context}[${index}].value '${normalizedValue}' is duplicated`);
+      }
+      seen.add(normalizedValue);
+      const label = typeof item.label === "string" ? item.label.trim() : typeof item.label === "number" || typeof item.label === "boolean" ? String(item.label) : normalizedValue;
+      const color = typeof item.color === "string" ? item.color.trim() || void 0 : typeof item.color === "number" || typeof item.color === "boolean" ? String(item.color) : void 0;
+      return (0, import_service_utils.buildDefinedPayload)({
+        value: normalizedValue,
+        label,
+        color,
+        ...item.isUnknown === true ? { isUnknown: true } : {}
+      });
+    });
+  }
+  buildKanbanInlineGroupOptions(groupField) {
+    var _a, _b, _c;
+    if (this.isKanbanAssociationGroupField(groupField)) {
+      return void 0;
+    }
+    const enumOptions = ((_a = groupField == null ? void 0 : groupField.uiSchema) == null ? void 0 : _a.enum) || ((_c = (_b = groupField == null ? void 0 : groupField.options) == null ? void 0 : _b.uiSchema) == null ? void 0 : _c.enum);
+    if (!Array.isArray(enumOptions)) {
+      return void 0;
+    }
+    return this.normalizeKanbanGroupOptions(
+      enumOptions.map((item) => {
+        var _a2;
+        return {
+          value: item == null ? void 0 : item.value,
+          label: (item == null ? void 0 : item.label) ?? (item == null ? void 0 : item.title) ?? ((_a2 = item == null ? void 0 : item.uiSchema) == null ? void 0 : _a2.title) ?? (item == null ? void 0 : item.name) ?? (item == null ? void 0 : item.value),
+          color: item == null ? void 0 : item.color
+        };
+      }),
+      "flowSurfaces kanban inline groupOptions"
+    );
+  }
+  mergeKanbanInlineGroupOptions(inlineOptions, configuredOptions, context) {
+    if (!(inlineOptions == null ? void 0 : inlineOptions.length)) {
+      return configuredOptions;
+    }
+    if (!(configuredOptions == null ? void 0 : configuredOptions.length)) {
+      return inlineOptions;
+    }
+    const inlineMap = new Map(inlineOptions.map((item) => [String(item.value), item]));
+    configuredOptions.forEach((item) => {
+      if (!inlineMap.has(String(item.value))) {
+        (0, import_errors.throwBadRequest)(`${context} value '${item.value}' is not available on the current select groupField`);
+      }
+    });
+    return configuredOptions.map((item) => {
+      const inline = inlineMap.get(String(item.value));
+      return (0, import_service_utils.buildDefinedPayload)({
+        ...inline,
+        ...item,
+        label: item.label || (inline == null ? void 0 : inline.label) || String(item.value),
+        color: item.color || (inline == null ? void 0 : inline.color)
+      });
+    });
+  }
+  normalizeKanbanPopupSettings(actionKey, popupSettings, blockUid) {
+    const nextParams = import_lodash.default.cloneDeep(popupSettings || {});
+    const actionUid = blockUid && actionKey ? this.getKanbanPopupActionUid(blockUid, actionKey) : void 0;
+    const popupTemplateUidProvided = Object.prototype.hasOwnProperty.call(nextParams, "popupTemplateUid");
+    const popupTemplateUid = typeof nextParams.popupTemplateUid === "string" ? nextParams.popupTemplateUid.trim() : nextParams.popupTemplateUid;
+    if (popupTemplateUidProvided && (popupTemplateUid === void 0 || popupTemplateUid === null || popupTemplateUid === "")) {
+      delete nextParams.popupTemplateUid;
+      delete nextParams.popupTemplateContext;
+      delete nextParams.popupTemplateHasFilterByTk;
+      delete nextParams.popupTemplateHasSourceId;
+      delete nextParams.uid;
+    }
+    const normalizedUid = typeof nextParams.uid === "string" ? nextParams.uid.trim() : nextParams.uid;
+    if (!normalizedUid || normalizedUid === blockUid || normalizedUid === actionUid) {
+      delete nextParams.uid;
+    } else {
+      nextParams.uid = normalizedUid;
+    }
+    if (typeof nextParams.mode === "string") {
+      nextParams.mode = OPEN_VIEW_MODE_ALIASES[nextParams.mode] || nextParams.mode;
+    }
+    if (typeof nextParams.size === "string" && !nextParams.size.trim()) {
+      delete nextParams.size;
+    }
+    if (typeof nextParams.pageModelClass === "string" && !nextParams.pageModelClass.trim()) {
+      delete nextParams.pageModelClass;
+    }
+    return nextParams;
+  }
+  getKanbanPopupActionUse(actionKey) {
+    return actionKey === "quickCreateAction" ? "KanbanQuickCreateActionModel" : "KanbanCardViewActionModel";
+  }
+  getKanbanPopupActionUid(kanbanUid, actionKey) {
+    return `${kanbanUid}${KANBAN_POPUP_ACTION_UID_SUFFIX_BY_KEY[actionKey]}`;
+  }
+  getKanbanBlockResourceInit(blockNode) {
+    const resourceInit = import_lodash.default.cloneDeep(import_lodash.default.get(blockNode, ["stepParams", "resourceSettings", "init"]) || {});
+    if (resourceInit.collectionName && !resourceInit.dataSourceKey) {
+      resourceInit.dataSourceKey = "main";
+    }
+    return resourceInit;
+  }
+  getKanbanPopupStoredSettings(blockNode, actionKey) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    const itemNode = (0, import_service_utils.getSingleNodeSubModel)((_a = blockNode == null ? void 0 : blockNode.subModels) == null ? void 0 : _a.item);
+    const rawPopupSettings = actionKey === "quickCreateAction" ? import_lodash.default.get(blockNode, ["stepParams", "kanbanSettings", "popup"]) || {
+      mode: (_b = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _b.popupMode,
+      size: (_c = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _c.popupSize,
+      popupTemplateUid: (_d = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _d.popupTemplateUid,
+      pageModelClass: (_e = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _e.popupPageModelClass,
+      uid: (_f = blockNode == null ? void 0 : blockNode.props) == null ? void 0 : _f.popupTargetUid
+    } : import_lodash.default.get(itemNode, ["stepParams", "cardSettings", "popup"]) || {
+      mode: (_g = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _g.openMode,
+      size: (_h = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _h.popupSize,
+      popupTemplateUid: (_i = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _i.popupTemplateUid,
+      pageModelClass: (_j = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _j.pageModelClass,
+      uid: (_k = itemNode == null ? void 0 : itemNode.props) == null ? void 0 : _k.popupTargetUid
+    };
+    return this.normalizeKanbanPopupSettings(actionKey, rawPopupSettings, blockNode == null ? void 0 : blockNode.uid);
+  }
+  buildKanbanPopupOpenView(input) {
+    const actionUid = this.getKanbanPopupActionUid(input.blockNode.uid, input.actionKey);
+    const resourceInit = input.resourceInit || this.getKanbanBlockResourceInit(input.blockNode);
+    const defaults = (0, import_service_utils.buildDefinedPayload)({
+      mode: "drawer",
+      size: "medium",
+      pageModelClass: "ChildPageModel",
+      uid: actionUid,
+      collectionName: resourceInit.collectionName,
+      dataSourceKey: resourceInit.dataSourceKey || (resourceInit.collectionName ? "main" : void 0)
+    });
+    const current = this.getKanbanPopupStoredSettings(input.blockNode, input.actionKey);
+    return (0, import_service_utils.buildDefinedPayload)({
+      ...defaults,
+      ...current,
+      uid: current.uid || defaults.uid,
+      collectionName: current.collectionName || defaults.collectionName,
+      dataSourceKey: current.dataSourceKey || defaults.dataSourceKey
+    });
+  }
+  async normalizeKanbanPopupConfigureValue(input) {
+    if (import_lodash.default.isUndefined(input.value)) {
+      return void 0;
+    }
+    if (import_lodash.default.isNull(input.value)) {
+      return {};
+    }
+    const actionUid = this.getKanbanPopupActionUid(input.blockUid, input.actionKey);
+    const normalized = await this.normalizeOpenView(input.actionName, input.value, {
+      transaction: input.transaction,
+      popupTemplateHostUid: actionUid,
+      popupActionContext: {
+        hasCurrentRecord: input.actionKey === "cardViewAction"
+      }
+    });
+    return this.normalizeKanbanPopupSettings(input.actionKey, normalized || {}, input.blockUid);
+  }
+  buildKanbanInitialBlockProps(input) {
+    const { collection, collectionName, dataSourceKey } = this.assertKanbanCollectionCompatible(
+      input.actionName,
+      input.resourceInit
+    );
+    const currentProps = import_lodash.default.cloneDeep(input.props || {});
+    const defaultGroupFieldName = this.getKanbanDefaultGroupFieldName(collection);
+    const nextGroupFieldName = String(currentProps.groupField || defaultGroupFieldName || "").trim();
+    const nextGroupField = this.getKanbanGroupField(collection, nextGroupFieldName);
+    if (!nextGroupField || !this.isKanbanGroupField(nextGroupField)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${input.actionName} kanban collection '${dataSourceKey}.${collectionName}' must resolve a supported groupField`
+      );
+    }
+    const configuredInlineGroupOptions = this.normalizeKanbanGroupOptions(
+      currentProps.groupOptions,
+      `flowSurfaces ${input.actionName} kanban groupOptions`
+    );
+    const inlineGroupOptions = this.buildKanbanInlineGroupOptions(nextGroupField);
+    const nextGroupOptions = this.mergeKanbanInlineGroupOptions(
+      inlineGroupOptions,
+      configuredInlineGroupOptions,
+      `flowSurfaces ${input.actionName} kanban groupOptions`
+    );
+    const nextDragSortBy = this.resolveKanbanCompatibleSortFieldName({
+      actionName: input.actionName,
+      collection,
+      groupField: nextGroupField,
+      requested: currentProps.dragSortBy,
+      allowEmpty: true
+    });
+    const nextDragEnabled = currentProps.dragEnabled === true && !!nextDragSortBy;
+    const nextGroupTitleField = this.isKanbanAssociationGroupField(nextGroupField) ? this.normalizeKanbanFieldNameInput(
+      currentProps.groupTitleField || this.getKanbanDefaultRelationTitleFieldName(nextGroupField, dataSourceKey),
+      `flowSurfaces ${input.actionName} kanban groupTitleField`,
+      { allowEmpty: true }
+    ) || void 0 : void 0;
+    const nextGroupColorField = this.isKanbanAssociationGroupField(nextGroupField) ? this.normalizeKanbanFieldNameInput(
+      currentProps.groupColorField,
+      `flowSurfaces ${input.actionName} kanban groupColorField`,
+      { allowEmpty: true }
+    ) || void 0 : void 0;
+    if (nextGroupTitleField) {
+      this.assertKanbanRelationFieldBinding({
+        actionName: input.actionName,
+        collectionName,
+        dataSourceKey,
+        groupField: nextGroupField,
+        fieldName: nextGroupTitleField,
+        kind: "groupTitleField"
+      });
+    }
+    if (nextGroupColorField) {
+      this.assertKanbanRelationFieldBinding({
+        actionName: input.actionName,
+        collectionName,
+        dataSourceKey,
+        groupField: nextGroupField,
+        fieldName: nextGroupColorField,
+        kind: "groupColorField"
+      });
+    }
+    return (0, import_service_utils.buildDefinedPayload)({
+      ...currentProps,
+      groupField: nextGroupFieldName,
+      groupTitleField: nextGroupTitleField,
+      groupColorField: nextGroupColorField,
+      groupOptions: nextGroupOptions,
+      styleVariant: currentProps.styleVariant || "color",
+      quickCreateEnabled: currentProps.quickCreateEnabled === true,
+      dragEnabled: nextDragEnabled,
+      dragSortBy: nextDragSortBy || void 0
+    });
+  }
+  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)));
   }
@@ -12094,14 +13338,17 @@ class FlowSurfacesService {
       delete nextParams.uid;
     }
     if (actionKey === "quickCreateAction") {
-      if (nextParams.popupTemplateHasFilterByTk) {
+      const hasRecordScopedTemplate = !!nextParams.popupTemplateHasFilterByTk || !!nextParams.popupTemplateHasSourceId || !import_lodash.default.isUndefined(nextParams.filterByTk) || !import_lodash.default.isUndefined(nextParams.sourceId) || !!String(nextParams.associationName || "").trim();
+      if (hasRecordScopedTemplate) {
         delete nextParams.popupTemplateUid;
         delete nextParams.popupTemplateContext;
         delete nextParams.popupTemplateHasFilterByTk;
         delete nextParams.popupTemplateHasSourceId;
         delete nextParams.uid;
       }
+      delete nextParams.associationName;
       delete nextParams.filterByTk;
+      delete nextParams.sourceId;
     }
     return nextParams;
   }
@@ -12210,7 +13457,280 @@ class FlowSurfacesService {
         await this.reconcilePopupOpenViewTransition(expectedUid, currentOpenView, openView, transaction);
       }
       const nextActionNode = {
-        ...(existing == null ? void 0 : existing.uid) && existing.uid === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
+        ...(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;
+    }
+    let current = node;
+    if (current.use === "CalendarBlockModel") {
+      current = await this.ensureCalendarBlockPopupHosts(current, transaction);
+    }
+    for (const [subKey, value] of Object.entries(current.subModels || {})) {
+      if (Array.isArray(value)) {
+        const nextItems = [];
+        let changed = false;
+        for (const item of value) {
+          const nextItem = await this.ensureCalendarBlockPopupHostsInTree(item, transaction);
+          nextItems.push(nextItem);
+          changed = changed || nextItem !== item;
+        }
+        if (changed) {
+          current.subModels[subKey] = nextItems;
+        }
+        continue;
+      }
+      const nextValue = await this.ensureCalendarBlockPopupHostsInTree(value, transaction);
+      if (nextValue !== value) {
+        current.subModels[subKey] = nextValue;
+      }
+    }
+    return current;
+  }
+  projectCalendarBlockPopupHosts(node) {
+    var _a;
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    const current = node;
+    if (!(current == null ? void 0 : current.uid) || current.use !== "CalendarBlockModel") {
+      return node;
+    }
+    const resourceInit = this.getCalendarBlockResourceInit(current);
+    let nextSubModels = current.subModels;
+    let changed = false;
+    for (const actionKey of CALENDAR_POPUP_ACTION_KEYS) {
+      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = current.subModels) == null ? void 0 : _a[actionKey]);
+      const expectedUid = this.getCalendarPopupActionUid(current.uid, actionKey);
+      const expectedUse = this.getCalendarPopupActionUse(actionKey);
+      const openView = this.buildCalendarPopupOpenView({
+        blockNode: current,
+        actionKey,
+        resourceInit
+      });
+      const currentOpenView = this.resolvePopupHostOpenView(existing);
+      if ((existing == null ? void 0 : existing.uid) === expectedUid && existing.use === expectedUse && import_lodash.default.isEqual(currentOpenView, openView)) {
+        continue;
+      }
+      const nextActionNode = {
+        ...(existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
+        uid: expectedUid,
+        use: expectedUse,
+        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
+          popupSettings: {
+            openView
+          }
+        })
+      };
+      if (!changed) {
+        nextSubModels = {
+          ...current.subModels || {}
+        };
+        changed = true;
+      }
+      nextSubModels[actionKey] = nextActionNode;
+    }
+    if (!changed) {
+      return node;
+    }
+    return {
+      ...current,
+      subModels: nextSubModels
+    };
+  }
+  projectCalendarBlockPopupHostsInTree(node) {
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    let current = this.projectCalendarBlockPopupHosts(node);
+    let nextSubModels = current == null ? void 0 : current.subModels;
+    let changed = current !== node;
+    if (!nextSubModels || typeof nextSubModels !== "object") {
+      return current;
+    }
+    for (const [subKey, value] of Object.entries(nextSubModels)) {
+      if (Array.isArray(value)) {
+        const nextItems = [];
+        let itemsChanged = false;
+        for (const item of value) {
+          const nextItem = this.projectCalendarBlockPopupHostsInTree(item);
+          nextItems.push(nextItem);
+          itemsChanged = itemsChanged || nextItem !== item;
+        }
+        if (!itemsChanged) {
+          continue;
+        }
+        if (!changed) {
+          current = {
+            ...current,
+            subModels: {
+              ...nextSubModels
+            }
+          };
+          nextSubModels = current.subModels;
+          changed = true;
+        }
+        nextSubModels[subKey] = nextItems;
+        continue;
+      }
+      const nextValue = this.projectCalendarBlockPopupHostsInTree(value);
+      if (nextValue === value) {
+        continue;
+      }
+      if (!changed) {
+        current = {
+          ...current,
+          subModels: {
+            ...nextSubModels
+          }
+        };
+        nextSubModels = current.subModels;
+        changed = true;
+      }
+      nextSubModels[subKey] = nextValue;
+    }
+    return current;
+  }
+  async ensureKanbanBlockPopupHosts(blockNode, transaction) {
+    var _a;
+    if (!(blockNode == null ? void 0 : blockNode.uid) || blockNode.use !== "KanbanBlockModel") {
+      return blockNode;
+    }
+    const resourceInit = this.getKanbanBlockResourceInit(blockNode);
+    let changed = false;
+    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
+      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = blockNode.subModels) == null ? void 0 : _a[actionKey]);
+      const expectedUid = this.getKanbanPopupActionUid(blockNode.uid, actionKey);
+      const expectedUse = this.getKanbanPopupActionUse(actionKey);
+      const openView = this.buildKanbanPopupOpenView({
+        blockNode,
+        actionKey,
+        resourceInit
+      });
+      const currentOpenView = this.resolvePopupHostOpenView(existing);
+      const shouldReplaceExisting = (existing == null ? void 0 : existing.uid) && existing.uid !== expectedUid;
+      const shouldUpsert = !(existing == null ? void 0 : existing.uid) || shouldReplaceExisting || existing.use !== expectedUse || !import_lodash.default.isEqual(currentOpenView, openView);
+      if (!shouldUpsert) {
+        continue;
+      }
+      if (shouldReplaceExisting) {
+        await this.removeNodeTreeWithBindings(existing.uid, transaction);
+      }
+      if ((existing == null ? void 0 : existing.uid) && existing.uid === expectedUid && !import_lodash.default.isEqual(currentOpenView, openView)) {
+        await this.reconcilePopupOpenViewTransition(expectedUid, currentOpenView, openView, transaction);
+      }
+      const nextActionNode = {
+        ...(existing == null ? void 0 : existing.uid) && existing.uid === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
+        uid: expectedUid,
+        use: expectedUse,
+        stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
+          popupSettings: {
+            openView
+          }
+        })
+      };
+      await this.repository.upsertModel(
+        {
+          parentId: blockNode.uid,
+          subKey: actionKey,
+          subType: "object",
+          ...nextActionNode
+        },
+        { transaction }
+      );
+      changed = true;
+    }
+    if (!changed) {
+      return blockNode;
+    }
+    return this.repository.findModelById(blockNode.uid, {
+      transaction,
+      includeAsyncNode: true
+    });
+  }
+  async ensureKanbanBlockPopupHostsInTree(node, transaction) {
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    let current = node;
+    if (current.use === "KanbanBlockModel") {
+      current = await this.ensureKanbanBlockPopupHosts(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.ensureKanbanBlockPopupHostsInTree(item, transaction);
+          nextItems.push(nextItem);
+          changed = changed || nextItem !== item;
+        }
+        if (changed) {
+          current.subModels[subKey] = nextItems;
+        }
+        continue;
+      }
+      const nextValue = await this.ensureKanbanBlockPopupHostsInTree(value, transaction);
+      if (nextValue !== value) {
+        current.subModels[subKey] = nextValue;
+      }
+    }
+    return current;
+  }
+  projectKanbanBlockPopupHosts(node) {
+    var _a;
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    const current = node;
+    if (!(current == null ? void 0 : current.uid) || current.use !== "KanbanBlockModel") {
+      return node;
+    }
+    const resourceInit = this.getKanbanBlockResourceInit(current);
+    let nextSubModels = current.subModels;
+    let changed = false;
+    for (const actionKey of KANBAN_POPUP_ACTION_KEYS) {
+      const existing = (0, import_service_utils.getSingleNodeSubModel)((_a = current.subModels) == null ? void 0 : _a[actionKey]);
+      const expectedUid = this.getKanbanPopupActionUid(current.uid, actionKey);
+      const expectedUse = this.getKanbanPopupActionUse(actionKey);
+      const openView = this.buildKanbanPopupOpenView({
+        blockNode: current,
+        actionKey,
+        resourceInit
+      });
+      const currentOpenView = this.resolvePopupHostOpenView(existing);
+      if ((existing == null ? void 0 : existing.uid) === expectedUid && existing.use === expectedUse && import_lodash.default.isEqual(currentOpenView, openView)) {
+        continue;
+      }
+      const nextActionNode = {
+        ...(existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing) : {},
         uid: expectedUid,
         use: expectedUse,
         stepParams: import_lodash.default.merge({}, (existing == null ? void 0 : existing.uid) === expectedUid ? import_lodash.default.cloneDeep(existing.stepParams || {}) : {}, {
@@ -12219,54 +13739,100 @@ class FlowSurfacesService {
           }
         })
       };
-      await this.repository.upsertModel(
-        {
-          parentId: blockNode.uid,
-          subKey: actionKey,
-          subType: "object",
-          ...nextActionNode
-        },
-        { transaction }
-      );
-      changed = true;
+      if (!changed) {
+        nextSubModels = {
+          ...current.subModels || {}
+        };
+        changed = true;
+      }
+      nextSubModels[actionKey] = nextActionNode;
     }
     if (!changed) {
-      return blockNode;
+      return node;
     }
-    return this.repository.findModelById(blockNode.uid, {
-      transaction,
-      includeAsyncNode: true
-    });
+    return {
+      ...current,
+      subModels: nextSubModels
+    };
   }
-  async ensureCalendarBlockPopupHostsInTree(node, transaction) {
+  projectKanbanBlockPopupHostsInTree(node) {
     if (!node || typeof node !== "object") {
       return node;
     }
-    const current = node;
-    if (current.use === "CalendarBlockModel") {
-      return await this.ensureCalendarBlockPopupHosts(current, transaction);
+    let current = this.projectKanbanBlockPopupHosts(node);
+    let nextSubModels = current == null ? void 0 : current.subModels;
+    let changed = current !== node;
+    if (!nextSubModels || typeof nextSubModels !== "object") {
+      return current;
     }
-    for (const [subKey, value] of Object.entries(current.subModels || {})) {
+    for (const [subKey, value] of Object.entries(nextSubModels)) {
       if (Array.isArray(value)) {
         const nextItems = [];
-        let changed = false;
+        let itemsChanged = false;
         for (const item of value) {
-          const nextItem = await this.ensureCalendarBlockPopupHostsInTree(item, transaction);
+          const nextItem = this.projectKanbanBlockPopupHostsInTree(item);
           nextItems.push(nextItem);
-          changed = changed || nextItem !== item;
+          itemsChanged = itemsChanged || nextItem !== item;
         }
-        if (changed) {
-          current.subModels[subKey] = nextItems;
+        if (!itemsChanged) {
+          continue;
         }
+        if (!changed) {
+          current = {
+            ...current,
+            subModels: {
+              ...nextSubModels
+            }
+          };
+          nextSubModels = current.subModels;
+          changed = true;
+        }
+        nextSubModels[subKey] = nextItems;
         continue;
       }
-      const nextValue = await this.ensureCalendarBlockPopupHostsInTree(value, transaction);
-      if (nextValue !== value) {
-        current.subModels[subKey] = nextValue;
+      const nextValue = this.projectKanbanBlockPopupHostsInTree(value);
+      if (nextValue === value) {
+        continue;
+      }
+      if (!changed) {
+        current = {
+          ...current,
+          subModels: {
+            ...nextSubModels
+          }
+        };
+        nextSubModels = current.subModels;
+        changed = true;
       }
+      nextSubModels[subKey] = nextValue;
     }
     return current;
   }
+  getCalendarSettingValue(node, propKey, stepParamsPath) {
+    if (import_lodash.default.has(node, ["props", propKey])) {
+      return import_lodash.default.get(node, ["props", propKey]);
+    }
+    return import_lodash.default.get(node, ["stepParams", ...stepParamsPath]);
+  }
+  validateCalendarSettingValues(actionName, values) {
+    if (!import_lodash.default.isUndefined(values.defaultView)) {
+      const defaultView = typeof values.defaultView === "string" ? values.defaultView.trim() : String(values.defaultView || "").trim();
+      if (!CALENDAR_DEFAULT_VIEWS.has(defaultView)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar defaultView must be one of: month, week, day`);
+      }
+    }
+    if (!import_lodash.default.isUndefined(values.quickCreateEvent) && !import_lodash.default.isBoolean(values.quickCreateEvent)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar quickCreateEvent must be a boolean`);
+    }
+    if (!import_lodash.default.isUndefined(values.showLunar) && !import_lodash.default.isBoolean(values.showLunar)) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar showLunar must be a boolean`);
+    }
+    if (!import_lodash.default.isUndefined(values.weekStart)) {
+      if (!Number.isInteger(values.weekStart) || !CALENDAR_WEEK_STARTS.has(values.weekStart)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar weekStart must be 0 or 1`);
+      }
+    }
+  }
   validateCalendarBlockState(actionName, node) {
     var _a;
     if ((node == null ? void 0 : node.use) !== "CalendarBlockModel") {
@@ -12303,6 +13869,79 @@ class FlowSurfacesService {
         kind
       });
     }
+    this.validateCalendarSettingValues(actionName, {
+      defaultView: this.getCalendarSettingValue(node, "defaultView", [
+        "calendarSettings",
+        "defaultView",
+        "defaultView"
+      ]),
+      quickCreateEvent: this.getCalendarSettingValue(node, "enableQuickCreateEvent", [
+        "calendarSettings",
+        "quickCreateEvent",
+        "enableQuickCreateEvent"
+      ]),
+      showLunar: this.getCalendarSettingValue(node, "showLunar", ["calendarSettings", "showLunar", "showLunar"]),
+      weekStart: this.getCalendarSettingValue(node, "weekStart", ["calendarSettings", "weekStart", "weekStart"])
+    });
+  }
+  validateKanbanBlockState(actionName, node) {
+    var _a, _b, _c, _d, _e;
+    if ((node == null ? void 0 : node.use) !== "KanbanBlockModel") {
+      return;
+    }
+    const resourceInit = this.getKanbanBlockResourceInit(node);
+    const { collection, collectionName, dataSourceKey } = this.assertKanbanCollectionCompatible(
+      actionName,
+      resourceInit
+    );
+    const groupFieldName = String(((_a = node == null ? void 0 : node.props) == null ? void 0 : _a.groupField) || this.getKanbanDefaultGroupFieldName(collection) || "").trim() || void 0;
+    const groupField = this.getKanbanGroupField(collection, groupFieldName);
+    if (!groupField || !this.isKanbanGroupField(groupField)) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} kanban groupField '${groupFieldName || ""}' is not supported by KanbanBlockModel`
+      );
+    }
+    if (this.isKanbanAssociationGroupField(groupField)) {
+      const groupTitleField = this.normalizeKanbanFieldNameInput((_b = node == null ? void 0 : node.props) == null ? void 0 : _b.groupTitleField, "", { allowEmpty: true }) || void 0;
+      const groupColorField = this.normalizeKanbanFieldNameInput((_c = node == null ? void 0 : node.props) == null ? void 0 : _c.groupColorField, "", { allowEmpty: true }) || void 0;
+      if (groupTitleField) {
+        this.assertKanbanRelationFieldBinding({
+          actionName,
+          collectionName,
+          dataSourceKey,
+          groupField,
+          fieldName: groupTitleField,
+          kind: "groupTitleField"
+        });
+      }
+      if (groupColorField) {
+        this.assertKanbanRelationFieldBinding({
+          actionName,
+          collectionName,
+          dataSourceKey,
+          groupField,
+          fieldName: groupColorField,
+          kind: "groupColorField"
+        });
+      }
+    }
+    const inlineGroupOptions = this.buildKanbanInlineGroupOptions(groupField);
+    if (Array.isArray((_d = node == null ? void 0 : node.props) == null ? void 0 : _d.groupOptions)) {
+      this.mergeKanbanInlineGroupOptions(
+        inlineGroupOptions,
+        import_lodash.default.cloneDeep(node.props.groupOptions),
+        `flowSurfaces ${actionName} kanban groupOptions`
+      );
+    }
+    if ((_e = node == null ? void 0 : node.props) == null ? void 0 : _e.dragSortBy) {
+      this.resolveKanbanCompatibleSortFieldName({
+        actionName,
+        collection,
+        groupField,
+        requested: node.props.dragSortBy,
+        allowEmpty: true
+      });
+    }
   }
   async resolveFieldDefinition(input) {
     const collection = this.getCollection(input.dataSourceKey, input.collectionName);
@@ -12468,6 +14107,19 @@ class FlowSurfacesService {
     );
     return (0, import_service_helpers.resolveFieldFromCollection)(targetCollection, titleFieldName) || input.field;
   }
+  supportsFieldTitleFieldProp(use) {
+    return (0, import_configure_options.getConfigureOptionKeysForUse)(use).includes("titleField");
+  }
+  normalizeFieldPropsForUse(use, props) {
+    const normalizedProps = import_lodash.default.cloneDeep(props || {});
+    if (this.supportsFieldTitleFieldProp(use)) {
+      return normalizedProps;
+    }
+    if (Object.prototype.hasOwnProperty.call(normalizedProps, "titleField")) {
+      delete normalizedProps.titleField;
+    }
+    return normalizedProps;
+  }
   async ensureGridChild(parentUid, use, transaction) {
     const existing = await this.repository.findModelByParentId(parentUid, {
       transaction,
@@ -12647,7 +14299,7 @@ class FlowSurfacesService {
     );
     const associationInterface = (0, import_service_helpers.getFieldInterface)(parsed.associationField);
     const leafField = (0, import_service_helpers.resolveFieldFromCollection)(parsed.leafCollection, parsed.leafFieldPath);
-    const shouldBindAssociationValue = DISPLAY_FIELD_WRAPPER_USES.has(input.wrapperUse || "") && !!parsed.associationPathName && parsed.fieldPath !== parsed.associationPathName && import_field_semantics.MULTI_VALUE_ASSOCIATION_INTERFACES.has(associationInterface || "");
+    const shouldBindAssociationValue = DISPLAY_FIELD_WRAPPER_USES.has(input.wrapperUse || "") && !!parsed.associationPathName && parsed.fieldPath !== parsed.associationPathName && import_association_interfaces.MULTI_VALUE_ASSOCIATION_INTERFACES.has(associationInterface || "");
     if (shouldBindAssociationValue) {
       const associationFieldPath = parsed.associationPathName;
       if (!associationFieldPath) {
@@ -12689,6 +14341,357 @@ class FlowSurfacesService {
       usesAssociationValueBinding: false
     };
   }
+  getCollectionFieldOrBadRequest(collection, fieldPath, context) {
+    const field = (0, import_service_helpers.resolveFieldFromCollection)(collection, fieldPath);
+    if (!field) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${context} field '${fieldPath}' does not exist on relation target collection`);
+    }
+    return field;
+  }
+  buildRelationTargetFieldInit(collection, fieldPath) {
+    return (0, import_service_utils.buildDefinedPayload)({
+      dataSourceKey: (collection == null ? void 0 : collection.dataSourceKey) || "main",
+      collectionName: (0, import_service_helpers.getCollectionName)(collection),
+      fieldPath
+    });
+  }
+  buildRelationTargetTableColumnNode(input) {
+    const field = this.getCollectionFieldOrBadRequest(input.collection, input.fieldPath, "fieldType.fields");
+    const fieldUse = input.columnUse === "SubTableColumnModel" ? (0, import_service_helpers.inferFieldMenuEditableFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "InputFieldModel" : (0, import_service_helpers.inferAssociationLeafDisplayFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "DisplayTextFieldModel";
+    const title = (0, import_service_helpers.getFieldTitle)(field);
+    const fieldInit = this.buildRelationTargetFieldInit(input.collection, input.fieldPath);
+    return {
+      uid: (0, import_utils.uid)(),
+      use: input.columnUse,
+      props: (0, import_service_utils.buildDefinedPayload)({
+        title,
+        dataIndex: (0, import_service_helpers.getFieldName)(field)
+      }),
+      stepParams: {
+        fieldSettings: {
+          init: fieldInit
+        },
+        ...input.columnUse === "TableColumnModel" ? {
+          tableColumnSettings: {
+            title: {
+              title
+            }
+          }
+        } : {}
+      },
+      subModels: {
+        field: {
+          uid: (0, import_utils.uid)(),
+          use: fieldUse,
+          props: this.normalizeFieldPropsForUse(
+            fieldUse,
+            (0, import_service_utils.getFieldBindingDefaultProps)("TableColumnModel", fieldUse, field)
+          ),
+          stepParams: {
+            fieldSettings: {
+              init: fieldInit
+            },
+            fieldBinding: {
+              use: fieldUse
+            }
+          }
+        }
+      }
+    };
+  }
+  buildRelationTargetGridItemNode(input) {
+    const field = this.getCollectionFieldOrBadRequest(input.collection, input.fieldPath, "fieldType.fields");
+    const fieldUse = input.wrapperUse === "FormItemModel" ? (0, import_service_helpers.inferFieldMenuEditableFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "InputFieldModel" : (0, import_service_helpers.inferAssociationLeafDisplayFieldUse)((0, import_service_helpers.getFieldInterface)(field)) || "DisplayTextFieldModel";
+    const title = (0, import_service_helpers.getFieldTitle)(field);
+    const fieldInit = this.buildRelationTargetFieldInit(input.collection, input.fieldPath);
+    return {
+      uid: (0, import_utils.uid)(),
+      use: input.wrapperUse,
+      props: (0, import_service_utils.buildDefinedPayload)({
+        label: title
+      }),
+      stepParams: {
+        fieldSettings: {
+          init: fieldInit
+        }
+      },
+      subModels: {
+        field: {
+          uid: (0, import_utils.uid)(),
+          use: fieldUse,
+          props: this.normalizeFieldPropsForUse(
+            fieldUse,
+            (0, import_service_utils.getFieldBindingDefaultProps)(input.wrapperUse, fieldUse, field)
+          ),
+          stepParams: {
+            fieldSettings: {
+              init: fieldInit
+            },
+            fieldBinding: {
+              use: fieldUse
+            }
+          }
+        }
+      }
+    };
+  }
+  async replaceFieldSubModelArray(input) {
+    var _a, _b;
+    const parentNode = await this.repository.findModelById(input.parentUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    const keptChildren = [];
+    for (const child of import_lodash.default.castArray(((_a = parentNode == null ? void 0 : parentNode.subModels) == null ? void 0 : _a[input.subKey]) || [])) {
+      if (!(child == null ? void 0 : child.uid)) {
+        continue;
+      }
+      if ((_b = input.keepUses) == null ? void 0 : _b.includes(child.use)) {
+        keptChildren.push(child);
+        continue;
+      }
+      await this.removeNodeTreeWithBindings(child.uid, input.transaction);
+    }
+    for (const child of keptChildren.reverse()) {
+      await this.repository.attach(
+        child.uid,
+        {
+          parentId: input.parentUid,
+          subKey: input.subKey,
+          subType: "array",
+          position: "first"
+        },
+        { transaction: input.transaction }
+      );
+    }
+    for (const child of input.children) {
+      await this.repository.upsertModel(
+        {
+          parentId: input.parentUid,
+          subKey: input.subKey,
+          subType: "array",
+          ...child
+        },
+        { transaction: input.transaction }
+      );
+    }
+  }
+  buildPopupSubTableActionsColumnNode(existing) {
+    var _a, _b;
+    const defaultActionColumn = import_lodash.default.cloneDeep(
+      (_b = (_a = (0, import_builder.getStandaloneFieldDefaults)("PopupSubTableFieldModel").subModels) == null ? void 0 : _a.subTableColumns) == null ? void 0 : _b[0]
+    );
+    return {
+      ...defaultActionColumn || {
+        use: "PopupSubTableActionsColumnModel"
+      },
+      ...existing || {},
+      uid: (existing == null ? void 0 : existing.uid) || (defaultActionColumn == null ? void 0 : defaultActionColumn.uid) || (0, import_utils.uid)()
+    };
+  }
+  async ensureFieldGridSubModel(input) {
+    var _a;
+    const fieldNode = await this.repository.findModelById(input.fieldUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    const existingGrid = (_a = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _a.grid;
+    if (existingGrid == null ? void 0 : existingGrid.uid) {
+      return existingGrid.uid;
+    }
+    const gridUid = (0, import_utils.uid)();
+    await this.repository.upsertModel(
+      {
+        uid: gridUid,
+        parentId: input.fieldUid,
+        subKey: "grid",
+        subType: "object",
+        use: input.gridUse
+      },
+      { transaction: input.transaction }
+    );
+    return gridUid;
+  }
+  async applyResolvedRelationFieldType(input) {
+    var _a;
+    if (input.titleField || !import_lodash.default.isUndefined(input.pageSize) || !import_lodash.default.isUndefined(input.showIndex)) {
+      const fieldNode = await this.repository.findModelById(input.fieldUid, {
+        transaction: input.transaction,
+        includeAsyncNode: true
+      });
+      const props = (0, import_service_utils.buildDefinedPayload)({
+        ...input.titleField && this.supportsFieldTitleFieldProp(input.fieldUse) ? { titleField: input.titleField } : {},
+        pageSize: input.pageSize,
+        showIndex: input.showIndex
+      });
+      if (Object.keys(props).length) {
+        await this.repository.patch(
+          {
+            uid: input.fieldUid,
+            props: {
+              ...(fieldNode == null ? void 0 : fieldNode.props) || {},
+              ...props
+            }
+          },
+          { transaction: input.transaction }
+        );
+      }
+    }
+    const fields = input.fields;
+    if ((0, import_field_type_resolver.usesNestedRelationFields)(input.fieldUse) && fields) {
+      if (["SubTableFieldModel", "DisplaySubTableFieldModel"].includes(input.fieldUse)) {
+        await this.replaceFieldSubModelArray({
+          parentUid: input.fieldUid,
+          subKey: "columns",
+          children: fields.map(
+            (fieldPath) => this.buildRelationTargetTableColumnNode({
+              collection: input.targetCollection,
+              fieldPath,
+              columnUse: input.fieldUse === "SubTableFieldModel" ? "SubTableColumnModel" : "TableColumnModel"
+            })
+          ),
+          transaction: input.transaction
+        });
+      } else if (input.fieldUse === "PopupSubTableFieldModel") {
+        const fieldNode = await this.repository.findModelById(input.fieldUid, {
+          transaction: input.transaction,
+          includeAsyncNode: true
+        });
+        const existingActionsColumn = import_lodash.default.castArray(((_a = fieldNode == null ? void 0 : fieldNode.subModels) == null ? void 0 : _a.subTableColumns) || []).find(
+          (item) => (item == null ? void 0 : item.use) === "PopupSubTableActionsColumnModel"
+        );
+        await this.replaceFieldSubModelArray({
+          parentUid: input.fieldUid,
+          subKey: "subTableColumns",
+          children: [
+            this.buildPopupSubTableActionsColumnNode(existingActionsColumn),
+            ...fields.map(
+              (fieldPath) => this.buildRelationTargetTableColumnNode({
+                collection: input.targetCollection,
+                fieldPath,
+                columnUse: "TableColumnModel"
+              })
+            )
+          ],
+          transaction: input.transaction
+        });
+      } else {
+        const gridUse = ["SubFormFieldModel", "SubFormListFieldModel"].includes(input.fieldUse) ? "FormGridModel" : "DetailsGridModel";
+        const wrapperUse = ["SubFormFieldModel", "SubFormListFieldModel"].includes(input.fieldUse) ? "FormItemModel" : "DetailsItemModel";
+        const gridUid = await this.ensureFieldGridSubModel({
+          fieldUid: input.fieldUid,
+          gridUse,
+          transaction: input.transaction
+        });
+        await this.replaceFieldSubModelArray({
+          parentUid: gridUid,
+          subKey: "items",
+          children: fields.map(
+            (fieldPath) => this.buildRelationTargetGridItemNode({
+              collection: input.targetCollection,
+              fieldPath,
+              wrapperUse
+            })
+          ),
+          transaction: input.transaction
+        });
+      }
+    }
+    if (input.fieldUse === "RecordPickerFieldModel") {
+      await this.applyRecordPickerFieldTypeSettings(input);
+    }
+  }
+  async applyRecordPickerFieldTypeSettings(input) {
+    var _a, _b, _c;
+    const fieldNode = await this.repository.findModelById(input.fieldUid, {
+      transaction: input.transaction,
+      includeAsyncNode: true
+    });
+    const openView = (0, import_service_utils.buildDefinedPayload)({
+      mode: input.openMode,
+      size: input.popupSize,
+      pageModelClass: "ChildPageModel",
+      dataSourceKey: ((_a = input.targetCollection) == null ? void 0 : _a.dataSourceKey) || "main",
+      collectionName: (0, import_service_helpers.getCollectionName)(input.targetCollection)
+    });
+    if (Object.keys(openView).length > 2) {
+      await this.repository.patch(
+        {
+          uid: input.fieldUid,
+          stepParams: import_lodash.default.merge({}, (fieldNode == null ? void 0 : fieldNode.stepParams) || {}, {
+            popupSettings: {
+              openView
+            }
+          })
+        },
+        { transaction: input.transaction }
+      );
+    }
+    if (!input.selectorFields) {
+      return;
+    }
+    let grid = await this.repository.findModelByParentId(input.fieldUid, {
+      transaction: input.transaction,
+      subKey: "grid-block",
+      includeAsyncNode: true
+    });
+    if (!(grid == null ? void 0 : grid.uid)) {
+      const gridUid = (0, import_utils.uid)();
+      await this.repository.upsertModel(
+        {
+          uid: gridUid,
+          parentId: input.fieldUid,
+          subKey: "grid-block",
+          subType: "object",
+          use: "BlockGridModel"
+        },
+        { transaction: input.transaction }
+      );
+      grid = await this.repository.findModelById(gridUid, {
+        transaction: input.transaction,
+        includeAsyncNode: true
+      });
+    }
+    if (!(grid == null ? void 0 : grid.uid)) {
+      return;
+    }
+    const existingTable = import_lodash.default.castArray(((_b = grid == null ? void 0 : grid.subModels) == null ? void 0 : _b.items) || []).find(
+      (item) => (item == null ? void 0 : item.use) === "TableBlockModel"
+    );
+    const tableUid = (existingTable == null ? void 0 : existingTable.uid) || (0, import_utils.uid)();
+    if (!(existingTable == null ? void 0 : existingTable.uid)) {
+      await this.repository.upsertModel(
+        {
+          uid: tableUid,
+          parentId: grid.uid,
+          subKey: "items",
+          subType: "array",
+          use: "TableBlockModel",
+          stepParams: {
+            resourceSettings: {
+              init: {
+                dataSourceKey: ((_c = input.targetCollection) == null ? void 0 : _c.dataSourceKey) || "main",
+                collectionName: (0, import_service_helpers.getCollectionName)(input.targetCollection)
+              }
+            }
+          }
+        },
+        { transaction: input.transaction }
+      );
+    }
+    await this.replaceFieldSubModelArray({
+      parentUid: tableUid,
+      subKey: "columns",
+      children: input.selectorFields.map(
+        (fieldPath) => this.buildRelationTargetTableColumnNode({
+          collection: input.targetCollection,
+          fieldPath,
+          columnUse: "TableColumnModel"
+        })
+      ),
+      transaction: input.transaction
+    });
+  }
   buildExactFieldSettingsInitPayload(input) {
     return (0, import_service_utils.buildDefinedPayload)({
       dataSourceKey: input.dataSourceKey,
@@ -12796,7 +14799,7 @@ class FlowSurfacesService {
     const targetFieldUse = input.targetFieldUse;
     const normalizedTargetUse = String(targetFieldUse || "").trim();
     if (!normalizedTargetUse) {
-      (0, import_errors.throwBadRequest)("flowSurfaces configure fieldComponent cannot be empty");
+      (0, import_errors.throwBadRequest)("flowSurfaces configure fieldType cannot be empty");
     }
     const normalizedWrapperUse = String(wrapperUse || "").trim();
     const containerUse = normalizedWrapperUse === "FormAssociationItemModel" ? "DetailsItemModel" : normalizedWrapperUse;
@@ -12811,7 +14814,7 @@ class FlowSurfacesService {
         });
         if (!(supportedFieldUses == null ? void 0 : supportedFieldUses.has(normalizedTargetUse))) {
           (0, import_errors.throwBadRequest)(
-            `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldComponent '${normalizedTargetUse}'`
+            `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldType '${normalizedTargetUse}'`
           );
         }
         return normalizedTargetUse;
@@ -12822,7 +14825,7 @@ class FlowSurfacesService {
       });
       if (!(contract == null ? void 0 : contract.fieldUse)) {
         (0, import_errors.throwBadRequest)(
-          `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldComponent '${normalizedTargetUse}'`
+          `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldType '${normalizedTargetUse}'`
         );
       }
       return contract.fieldUse;
@@ -12838,7 +14841,7 @@ class FlowSurfacesService {
         });
         if (!(supportedFieldUses == null ? void 0 : supportedFieldUses.has(normalizedTargetUse))) {
           (0, import_errors.throwBadRequest)(
-            `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldComponent '${normalizedTargetUse}'`
+            `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldType '${normalizedTargetUse}'`
           );
         }
         return normalizedTargetUse;
@@ -12849,19 +14852,22 @@ class FlowSurfacesService {
       });
       if (!(contract == null ? void 0 : contract.fieldUse)) {
         (0, import_errors.throwBadRequest)(
-          `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldComponent '${normalizedTargetUse}'`
+          `flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldType '${normalizedTargetUse}'`
         );
       }
       return contract.fieldUse;
     }
-    (0, import_errors.throwBadRequest)(`flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldComponent`);
+    (0, import_errors.throwBadRequest)(`flowSurfaces configure field wrapper '${normalizedWrapperUse}' does not support fieldType`);
   }
-  async syncFieldComponentStepParams(wrapperNode, targetFieldUse, transaction) {
+  async syncFieldTypeStepParams(wrapperNode, targetFieldUse, transaction) {
     const flowDomain = this.inferFieldComponentFlowDomain(wrapperNode == null ? void 0 : wrapperNode.use);
     if (!flowDomain || !(wrapperNode == null ? void 0 : wrapperNode.uid)) {
       return;
     }
-    const nextStepParams = import_lodash.default.merge({}, wrapperNode.stepParams || {}, {
+    const latestWrapper = await this.repository.findModelById(wrapperNode.uid, {
+      transaction
+    });
+    const nextStepParams = import_lodash.default.merge({}, (latestWrapper == null ? void 0 : latestWrapper.stepParams) || wrapperNode.stepParams || {}, {
       [flowDomain.flowKey]: {
         [flowDomain.stepKey]: {
           use: targetFieldUse
@@ -12877,7 +14883,7 @@ class FlowSurfacesService {
     );
   }
   async rebuildFieldSubModelOnServer(input) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const innerField = input.innerField;
     if (!(innerField == null ? void 0 : innerField.uid)) {
       (0, import_errors.throwConflict)(
@@ -12893,16 +14899,38 @@ class FlowSurfacesService {
       dataSourceKey: (_c = fieldSource.fieldSettingsInit) == null ? void 0 : _c.dataSourceKey,
       enabledPackages: input.enabledPackages
     });
+    if (innerField.use === normalizedTargetUse) {
+      await this.repository.patch(
+        {
+          uid: innerField.uid,
+          stepParams: import_lodash.default.merge({}, innerField.stepParams || {}, {
+            fieldBinding: {
+              use: normalizedTargetUse
+            },
+            fieldSettings: {
+              init: fieldSource.fieldSettingsInit
+            }
+          })
+        },
+        { transaction: input.transaction }
+      );
+      return normalizedTargetUse;
+    }
     const defaultProps = (0, import_service_utils.getFieldBindingDefaultProps)((_d = input.wrapperNode) == null ? void 0 : _d.use, normalizedTargetUse, fieldSource.field);
+    const fieldDefaults = (0, import_builder.getStandaloneFieldDefaults)(normalizedTargetUse);
     const shouldPreservePatternFormField = ((_e = input.wrapperNode) == null ? void 0 : _e.use) === "PatternFormItemModel";
+    const preservedPopupPageSubModel = ((_f = input.innerField) == null ? void 0 : _f.subModels) && Object.prototype.hasOwnProperty.call(input.innerField.subModels, "page") ? {
+      page: import_lodash.default.cloneDeep(input.innerField.subModels.page)
+    } : {};
+    const nextSubModels = {
+      ...fieldDefaults.subModels ? import_lodash.default.cloneDeep(fieldDefaults.subModels) : {},
+      ...preservedPopupPageSubModel
+    };
     const nextFieldNode = {
       uid: innerField.uid,
       use: shouldPreservePatternFormField ? "PatternFormFieldModel" : normalizedTargetUse,
       props: import_lodash.default.pickBy(
-        {
-          ...innerField.props || {},
-          ...defaultProps
-        },
+        this.normalizeFieldPropsForUse(normalizedTargetUse, { ...innerField.props || {}, ...defaultProps }),
         (value) => !import_lodash.default.isUndefined(value)
       ),
       decoratorProps: import_lodash.default.cloneDeep(innerField.decoratorProps || {}),
@@ -12914,7 +14942,8 @@ class FlowSurfacesService {
         fieldSettings: {
           init: fieldSource.fieldSettingsInit
         }
-      })
+      }),
+      subModels: nextSubModels
     };
     await this.repository.patch(nextFieldNode, { transaction: input.transaction });
     return normalizedTargetUse;
@@ -12955,7 +14984,7 @@ class FlowSurfacesService {
       associationField
     };
   }
-  async loadResolvedNode(resolved, transaction) {
+  async loadResolvedNode(resolved, transaction, options = {}) {
     var _a;
     let node;
     if ((resolved == null ? void 0 : resolved.kind) === "page" && (resolved == null ? void 0 : resolved.pageRoute)) {
@@ -12967,7 +14996,13 @@ class FlowSurfacesService {
     } else {
       node = await this.repository.findModelById(resolved.uid, { transaction, includeAsyncNode: true });
     }
-    return this.ensureCalendarBlockPopupHostsInTree(node, transaction);
+    if (options.persistCalendarPopupHosts === false) {
+      return this.projectKanbanBlockPopupHostsInTree(this.projectCalendarBlockPopupHostsInTree(node));
+    }
+    return this.ensureKanbanBlockPopupHostsInTree(
+      await this.ensureCalendarBlockPopupHostsInTree(node, transaction),
+      transaction
+    );
   }
   normalizePopupTreeShape(node) {
     if (!node || typeof node !== "object") {