@nocobase/plugin-flow-engine 2.1.0-beta.17 → 2.1.0-beta.19

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

@@ -105,6 +105,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 +117,18 @@ 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",
+  "KanbanBlockModel",
   "FormBlockModel",
   "CreateFormModel",
   "EditFormModel",
@@ -133,7 +142,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 +154,7 @@ const OPEN_VIEW_SUPPORTED_MODES = /* @__PURE__ */ new Set(["drawer", "dialog", "
 const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "KanbanBlockModel",
   "DetailsBlockModel",
   "ListBlockModel",
   "GridCardBlockModel",
@@ -193,6 +204,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 +234,8 @@ const POPUP_ACTION_USES = /* @__PURE__ */ new Set([
   "PopupCollectionActionModel",
   "CalendarQuickCreateActionModel",
   "CalendarEventViewActionModel",
+  "KanbanQuickCreateActionModel",
+  "KanbanCardViewActionModel",
   "DuplicateActionModel",
   "AddChildActionModel",
   "MailSendActionModel"
@@ -230,6 +245,7 @@ const POPUP_HOST_DEFAULT_RECORD_CONTEXT_ACTION_USES = /* @__PURE__ */ new Set([
   "EditActionModel",
   "PopupCollectionActionModel",
   "CalendarEventViewActionModel",
+  "KanbanCardViewActionModel",
   "AddChildActionModel",
   "DuplicateActionModel"
 ]);
@@ -277,6 +293,7 @@ const POPUP_COLLECTION_BLOCK_SCENES = {
   CommentsBlockModel: ["one", "many"],
   TableBlockModel: ["many"],
   CalendarBlockModel: ["many"],
+  KanbanBlockModel: ["many"],
   ListBlockModel: ["many"],
   GridCardBlockModel: ["many"],
   MapBlockModel: ["many"],
@@ -829,7 +846,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));
@@ -1124,7 +1143,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 +1818,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 +1907,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 +2143,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 +2217,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 +2449,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 +2831,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 +3252,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 +3485,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 +3693,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 +3795,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 +3814,9 @@ 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) === "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);
     }
@@ -4628,7 +4663,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 +4730,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(
@@ -4794,7 +4829,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);
@@ -4850,7 +4885,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 +4893,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,
@@ -4951,7 +4990,7 @@ 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_service_utils.ensureNoRawDirectAddKeys)("addField", values, [
       "wrapperProps",
       "fieldProps",
@@ -5224,7 +5263,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 +5360,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 +7590,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 +7650,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 +7682,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 +8153,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 +8191,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 +8307,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 +8455,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 +9023,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`
@@ -9278,6 +9392,23 @@ 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 (hasFields && hasFieldGroups) {
       (0, import_errors.throwBadRequest)(`flowSurfaces compose block #${index + 1} cannot mix fields with fieldGroups`);
     }
@@ -9349,7 +9480,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 +9492,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 +9852,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 +9896,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 +9931,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,6 +9950,326 @@ class FlowSurfacesService {
     await this.ensureCalendarBlockPopupHosts(reloaded, options.transaction);
     return result;
   }
+  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);
@@ -11869,102 +12330,59 @@ 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
-    ].filter(Boolean);
-    return candidates.some((item) => supportedTypes.has(String(item)));
-  }
-  isCalendarTitleField(field) {
-    return new Set(this.getCalendarTitleFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
-  }
-  isCalendarColorField(field) {
-    return new Set(this.getCalendarColorFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
-  }
-  getCalendarPluginFieldCapabilities(input) {
-    const calendarPlugin = this.plugin.app.pm.get("calendar");
-    const source = typeof (calendarPlugin == null ? void 0 : calendarPlugin[input.getter]) === "function" ? calendarPlugin[input.getter]() : calendarPlugin == null ? void 0 : calendarPlugin[input.property];
-    return normalizeCalendarFieldCapabilityValues(source, input.defaults);
-  }
-  getCalendarTitleFieldInterfaces() {
-    const defaults = this.plugin.app.pm.get("field-sequence") ? [...DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES, "sequence"] : DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES;
-    return this.getCalendarPluginFieldCapabilities({
-      getter: "getTitleFieldInterfaces",
-      property: "titleFieldInterfaces",
-      defaults
-    });
-  }
-  getCalendarColorFieldInterfaces() {
-    return this.getCalendarPluginFieldCapabilities({
-      getter: "getColorFieldInterfaces",
-      property: "colorFieldInterfaces",
-      defaults: DEFAULT_CALENDAR_COLOR_FIELD_INTERFACES
-    });
-  }
-  getCalendarDateFieldTypes() {
-    return this.getCalendarPluginFieldCapabilities({
-      getter: "getDateTimeFieldInterfaces",
-      property: "dateTimeFieldInterfaces",
-      defaults: DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES
-    });
-  }
-  getCalendarTitleFallbackFieldName(collection) {
+  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[0] || "id";
+      return filterTargetKey.length === 1 ? String(filterTargetKey[0] || "").trim() || void 0 : void 0;
     }
-    return filterTargetKey || "id";
+    return typeof filterTargetKey === "string" ? filterTargetKey.trim() || void 0 : void 0;
   }
-  isCalendarTitleFallbackField(collection, fieldPath) {
-    const normalized = String(fieldPath || "").trim();
-    return normalized === "id" || normalized === this.getCalendarTitleFallbackFieldName(collection);
+  isKanbanMultipleGroupField(field) {
+    return (/* @__PURE__ */ new Set(["m2m", "o2m", "mbm"])).has(String((0, import_service_helpers.getFieldInterface)(field) || "").trim());
   }
-  getCalendarDateFields(collection) {
-    return (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarDateField(field));
+  isKanbanAssociationGroupField(field) {
+    return String((0, import_service_helpers.getFieldInterface)(field) || "").trim() === "m2o";
   }
-  resolveCalendarDefaultFieldNames(collection) {
-    const titleField = (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarTitleField(field)).map((field) => (0, import_service_helpers.getFieldName)(field)).find(Boolean) || this.getCalendarTitleFallbackFieldName(collection);
-    const dateFields = this.getCalendarDateFields(collection).map((field) => (0, import_service_helpers.getFieldName)(field)).filter(Boolean);
-    const startField = dateFields.find((fieldName) => fieldName === "createdAt") || dateFields[0];
-    const endField = dateFields.find((fieldName) => fieldName !== startField);
-    return (0, import_service_utils.buildDefinedPayload)({
-      id: "id",
-      title: titleField,
-      start: startField,
-      end: endField
-    });
+  isKanbanGroupField(field) {
+    const fieldInterface = String((0, import_service_helpers.getFieldInterface)(field) || "").trim();
+    return (fieldInterface === "select" || fieldInterface === "m2o") && !this.isKanbanMultipleGroupField(field);
   }
-  getCalendarCollectionOrThrow(actionName, resourceInit) {
+  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} calendar block requires resource.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} calendar collection '${dataSourceKey}.${collectionName}' not found`);
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} kanban collection '${dataSourceKey}.${collectionName}' not found`);
     }
     return {
       dataSourceKey,
@@ -11972,15 +12390,464 @@ class FlowSurfacesService {
       collection
     };
   }
-  assertCalendarCollectionCompatible(actionName, resourceInit) {
-    const resolved = this.getCalendarCollectionOrThrow(actionName, resourceInit);
-    if (!this.getCalendarDateFields(resolved.collection).length) {
+  assertKanbanCollectionCompatible(actionName, resourceInit) {
+    const resolved = this.getKanbanCollectionOrThrow(actionName, resourceInit);
+    const filterTargetKey = this.getKanbanCollectionFilterTargetKey(resolved.collection);
+    if (!filterTargetKey) {
       (0, import_errors.throwBadRequest)(
-        `flowSurfaces ${actionName} calendar collection '${resolved.dataSourceKey}.${resolved.collectionName}' must contain at least one date field`
+        `flowSurfaces ${actionName} kanban collection '${resolved.dataSourceKey}.${resolved.collectionName}' must declare filterTargetKey`
       );
     }
-    return resolved;
-  }
+    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)));
+  }
+  isCalendarTitleField(field) {
+    return new Set(this.getCalendarTitleFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
+  }
+  isCalendarColorField(field) {
+    return new Set(this.getCalendarColorFieldInterfaces()).has(String((0, import_service_helpers.getFieldInterface)(field) || ""));
+  }
+  getCalendarPluginFieldCapabilities(input) {
+    const calendarPlugin = this.plugin.app.pm.get("calendar");
+    const source = typeof (calendarPlugin == null ? void 0 : calendarPlugin[input.getter]) === "function" ? calendarPlugin[input.getter]() : calendarPlugin == null ? void 0 : calendarPlugin[input.property];
+    return normalizeCalendarFieldCapabilityValues(source, input.defaults);
+  }
+  getCalendarTitleFieldInterfaces() {
+    const defaults = this.plugin.app.pm.get("field-sequence") ? [...DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES, "sequence"] : DEFAULT_CALENDAR_TITLE_FIELD_INTERFACES;
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getTitleFieldInterfaces",
+      property: "titleFieldInterfaces",
+      defaults
+    });
+  }
+  getCalendarColorFieldInterfaces() {
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getColorFieldInterfaces",
+      property: "colorFieldInterfaces",
+      defaults: DEFAULT_CALENDAR_COLOR_FIELD_INTERFACES
+    });
+  }
+  getCalendarDateFieldTypes() {
+    return this.getCalendarPluginFieldCapabilities({
+      getter: "getDateTimeFieldInterfaces",
+      property: "dateTimeFieldInterfaces",
+      defaults: DEFAULT_CALENDAR_DATE_TIME_FIELD_TYPES
+    });
+  }
+  getCalendarTitleFallbackFieldName(collection) {
+    var _a;
+    const filterTargetKey = (collection == null ? void 0 : collection.filterTargetKey) || ((_a = collection == null ? void 0 : collection.options) == null ? void 0 : _a.filterTargetKey);
+    if (Array.isArray(filterTargetKey)) {
+      return filterTargetKey[0] || "id";
+    }
+    return filterTargetKey || "id";
+  }
+  isCalendarTitleFallbackField(collection, fieldPath) {
+    const normalized = String(fieldPath || "").trim();
+    return normalized === "id" || normalized === this.getCalendarTitleFallbackFieldName(collection);
+  }
+  getCalendarDateFields(collection) {
+    return (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarDateField(field));
+  }
+  resolveCalendarDefaultFieldNames(collection) {
+    const titleField = (0, import_service_helpers.getCollectionFields)(collection).filter((field) => this.isCalendarTitleField(field)).map((field) => (0, import_service_helpers.getFieldName)(field)).find(Boolean) || this.getCalendarTitleFallbackFieldName(collection);
+    const dateFields = this.getCalendarDateFields(collection).map((field) => (0, import_service_helpers.getFieldName)(field)).filter(Boolean);
+    const startField = dateFields.find((fieldName) => fieldName === "createdAt") || dateFields[0];
+    const endField = dateFields.find((fieldName) => fieldName !== startField);
+    return (0, import_service_utils.buildDefinedPayload)({
+      id: "id",
+      title: titleField,
+      start: startField,
+      end: endField
+    });
+  }
+  getCalendarCollectionOrThrow(actionName, resourceInit) {
+    const dataSourceKey = String((resourceInit == null ? void 0 : resourceInit.dataSourceKey) || "main").trim() || "main";
+    const collectionName = String((resourceInit == null ? void 0 : resourceInit.collectionName) || "").trim();
+    if (!collectionName) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar block requires resource.collectionName`);
+    }
+    const collection = this.getCollection(dataSourceKey, collectionName);
+    if (!collection) {
+      (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} calendar collection '${dataSourceKey}.${collectionName}' not found`);
+    }
+    return {
+      dataSourceKey,
+      collectionName,
+      collection
+    };
+  }
+  assertCalendarCollectionCompatible(actionName, resourceInit) {
+    const resolved = this.getCalendarCollectionOrThrow(actionName, resourceInit);
+    if (!this.getCalendarDateFields(resolved.collection).length) {
+      (0, import_errors.throwBadRequest)(
+        `flowSurfaces ${actionName} calendar collection '${resolved.dataSourceKey}.${resolved.collectionName}' must contain at least one date field`
+      );
+    }
+    return resolved;
+  }
   assertCalendarFieldBinding(input) {
     const field = (0, import_service_helpers.resolveFieldFromCollection)(input.collection, input.fieldPath);
     if (input.kind === "titleField" && !field && this.isCalendarTitleFallbackField(input.collection, input.fieldPath)) {
@@ -12094,14 +12961,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;
   }
@@ -12242,9 +13112,9 @@ class FlowSurfacesService {
     if (!node || typeof node !== "object") {
       return node;
     }
-    const current = node;
+    let current = node;
     if (current.use === "CalendarBlockModel") {
-      return await this.ensureCalendarBlockPopupHosts(current, transaction);
+      current = await this.ensureCalendarBlockPopupHosts(current, transaction);
     }
     for (const [subKey, value] of Object.entries(current.subModels || {})) {
       if (Array.isArray(value)) {
@@ -12267,6 +13137,325 @@ class FlowSurfacesService {
     }
     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 || {}) : {}, {
+          popupSettings: {
+            openView
+          }
+        })
+      };
+      if (!changed) {
+        nextSubModels = {
+          ...current.subModels || {}
+        };
+        changed = true;
+      }
+      nextSubModels[actionKey] = nextActionNode;
+    }
+    if (!changed) {
+      return node;
+    }
+    return {
+      ...current,
+      subModels: nextSubModels
+    };
+  }
+  projectKanbanBlockPopupHostsInTree(node) {
+    if (!node || typeof node !== "object") {
+      return node;
+    }
+    let current = this.projectKanbanBlockPopupHosts(node);
+    let nextSubModels = current == null ? void 0 : current.subModels;
+    let changed = current !== node;
+    if (!nextSubModels || typeof nextSubModels !== "object") {
+      return current;
+    }
+    for (const [subKey, value] of Object.entries(nextSubModels)) {
+      if (Array.isArray(value)) {
+        const nextItems = [];
+        let itemsChanged = false;
+        for (const item of value) {
+          const nextItem = this.projectKanbanBlockPopupHostsInTree(item);
+          nextItems.push(nextItem);
+          itemsChanged = itemsChanged || nextItem !== item;
+        }
+        if (!itemsChanged) {
+          continue;
+        }
+        if (!changed) {
+          current = {
+            ...current,
+            subModels: {
+              ...nextSubModels
+            }
+          };
+          nextSubModels = current.subModels;
+          changed = true;
+        }
+        nextSubModels[subKey] = nextItems;
+        continue;
+      }
+      const nextValue = this.projectKanbanBlockPopupHostsInTree(value);
+      if (nextValue === value) {
+        continue;
+      }
+      if (!changed) {
+        current = {
+          ...current,
+          subModels: {
+            ...nextSubModels
+          }
+        };
+        nextSubModels = current.subModels;
+        changed = true;
+      }
+      nextSubModels[subKey] = nextValue;
+    }
+    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 +13492,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);
@@ -12955,7 +14217,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 +14229,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") {