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

package/dist/server/flow-surfaces/default-block-actions.js

@@ -81,6 +81,30 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
     },
     { type: "refresh", scope: "actions" }
   ],
+  calendar: [
+    { type: "filter", scope: "actions" },
+    {
+      type: "addNew",
+      scope: "actions",
+      popup: {
+        tryTemplate: true,
+        [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
+      }
+    },
+    { type: "refresh", scope: "actions" }
+  ],
+  kanban: [
+    { type: "filter", scope: "actions" },
+    {
+      type: "addNew",
+      scope: "actions",
+      popup: {
+        tryTemplate: true,
+        [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
+      }
+    },
+    { type: "refresh", scope: "actions" }
+  ],
   createForm: [{ type: "submit", scope: "actions" }],
   editForm: [{ type: "submit", scope: "actions" }],
   details: [

package/dist/server/flow-surfaces/field-semantics.js

@@ -47,8 +47,10 @@ const DETAILS_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set([
   "DetailsItemModel",
   "ListBlockModel",
   "GridCardBlockModel",
+  "KanbanBlockModel",
   "ListItemModel",
-  "GridCardItemModel"
+  "GridCardItemModel",
+  "KanbanCardItemModel"
 ]);
 const FILTER_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set(["FilterFormBlockModel", "FilterFormGridModel", "FilterFormItemModel"]);
 const TABLE_FIELD_CONTAINER_USES = /* @__PURE__ */ new Set(["TableBlockModel", "TableColumnModel"]);

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

@@ -51,8 +51,13 @@ const FLOW_SURFACE_LOCAL_TRANSLATIONS = {
   }
 };
 function getValues(ctx) {
-  var _a, _b, _c;
-  return ((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) ?? ((_c = ctx.action) == null ? void 0 : _c.params) ?? {};
+  var _a, _b, _c, _d, _e;
+  const values = ((_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.values) ?? ((_c = ctx.action) == null ? void 0 : _c.params) ?? {};
+  const actionName = (_d = ctx.action) == null ? void 0 : _d.actionName;
+  if (isInvalidFlowSurfaceWritePayload(values) && actionName && !((_e = import_constants.FLOW_SURFACE_ACTION_DEFINITIONS[actionName]) == null ? void 0 : _e.read)) {
+    throw new import_errors.FlowSurfaceBadRequestError(getFlowSurfaceWritePayloadMessage(actionName));
+  }
+  return values;
 }
 function isImplicitEmptyValuesBag(value) {
   return !!value && typeof value === "object" && !Array.isArray(value) && Object.getPrototypeOf(value) === Object.prototype && Object.keys(value).length === 0;
@@ -119,6 +124,56 @@ function writeFlowSurfaceErrorResponse(ctx, error) {
   ctx.status = normalized.status;
   ctx.body = normalized.toResponseBody();
 }
+function isFlowSurfaceWriteActionName(value) {
+  return Object.prototype.hasOwnProperty.call(import_constants.FLOW_SURFACE_ACTION_DEFINITIONS, value);
+}
+function getFlowSurfaceRequestActionName(ctx) {
+  var _a, _b;
+  const actionName = String(((_a = ctx.action) == null ? void 0 : _a.actionName) || "").trim();
+  if (isFlowSurfaceWriteActionName(actionName)) {
+    return actionName;
+  }
+  const path = String(ctx.path || ((_b = ctx.request) == null ? void 0 : _b.path) || "").trim();
+  const match = path.match(/(?:^|\/)flowSurfaces:([^/?#]+)$/);
+  const rawActionName = String((match == null ? void 0 : match[1]) || "").trim();
+  return isFlowSurfaceWriteActionName(rawActionName) ? rawActionName : void 0;
+}
+function isFlowSurfaceWriteRequest(ctx) {
+  var _a;
+  if (String(((_a = ctx.request) == null ? void 0 : _a.method) || "").toUpperCase() !== "POST") {
+    return false;
+  }
+  const actionName = getFlowSurfaceRequestActionName(ctx);
+  return !!actionName && import_constants.FLOW_SURFACE_ACTION_DEFINITIONS[actionName].read === false;
+}
+function isInvalidFlowSurfaceWritePayload(value) {
+  if (!value || typeof value !== "object") {
+    return true;
+  }
+  return Array.isArray(value);
+}
+function getFlowSurfaceWritePayloadMessage(actionName) {
+  const noun = actionName === "applyBlueprint" || actionName === "applyApprovalBlueprint" ? "payload" : "values";
+  return `flowSurfaces ${actionName} ${noun} must be an object`;
+}
+function isFlowSurfaceWriteBodyParserShapeError(error) {
+  const parserError = error;
+  return error instanceof SyntaxError && parserError.status === 400 && parserError.message === "invalid JSON, only supports object and array";
+}
+async function runFlowSurfaceWriteBodyParserErrorWrapper(ctx, next) {
+  try {
+    await next();
+  } catch (error) {
+    if (!isFlowSurfaceWriteRequest(ctx) || !isFlowSurfaceWriteBodyParserShapeError(error)) {
+      throw error;
+    }
+    const actionName = getFlowSurfaceRequestActionName(ctx);
+    if (!actionName) {
+      throw error;
+    }
+    writeFlowSurfaceErrorResponse(ctx, new import_errors.FlowSurfaceBadRequestError(getFlowSurfaceWritePayloadMessage(actionName)));
+  }
+}
 function isAclPermissionDeniedForFlowSurfaces(ctx, error) {
   var _a, _b;
   const resourceName = ((_a = ctx.action) == null ? void 0 : _a.resourceName) ?? ((_b = ctx.permission) == null ? void 0 : _b.resourceName);
@@ -231,6 +286,10 @@ function registerFlowSurfacesResource(plugin) {
     after: "allow-manager",
     before: "core"
   });
+  plugin.app.use(runFlowSurfaceWriteBodyParserErrorWrapper, {
+    tag: "flow-surfaces-write-body-errors",
+    before: "bodyParser"
+  });
   plugin.app.resourceManager.define({
     name: "flowSurfaces",
     actions

package/dist/server/flow-surfaces/node-use-sets.js

@@ -39,6 +39,7 @@ var import_approval = require("./approval");
 const COLLECTION_BLOCK_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
   "CalendarBlockModel",
+  "KanbanBlockModel",
   "CreateFormModel",
   "EditFormModel",
   "FormBlockModel",
@@ -109,6 +110,8 @@ const ACTION_BUTTON_USES = /* @__PURE__ */ new Set([
   "CalendarNavActionModel",
   "CalendarTitleActionModel",
   "CalendarViewSelectActionModel",
+  "KanbanQuickCreateActionModel",
+  "KanbanCardViewActionModel",
   "ApplyFormSubmitModel",
   "ApplyFormSaveDraftModel",
   "ApplyFormWithdrawModel",

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

@@ -58,6 +58,8 @@ const FLOW_SURFACE_POPUP_HOST_USES = /* @__PURE__ */ new Set([
   "PopupCollectionActionModel",
   "CalendarQuickCreateActionModel",
   "CalendarEventViewActionModel",
+  "KanbanQuickCreateActionModel",
+  "KanbanCardViewActionModel",
   "ClickableFieldModel",
   "DisplayTextFieldModel",
   "DisplayEnumFieldModel",
@@ -161,6 +163,7 @@ function isActionContainerUse(parentUse) {
   return [
     "TableBlockModel",
     "CalendarBlockModel",
+    "KanbanBlockModel",
     "TableActionsColumnModel",
     "ListBlockModel",
     "GridCardBlockModel",

package/dist/server/flow-surfaces/public-data-surface-default-filter.d.ts

@@ -7,12 +7,16 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 export declare const FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES: Set<string>;
+export declare const FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL = "table/list/gridCard/calendar/kanban";
 export declare function isFlowSurfacePublicDataSurfaceBlockType(blockType?: string): boolean;
 export declare function normalizeFlowSurfacePublicBlockDefaultFilter(actionName: string, defaultFilter: any, options: {
     blockType?: string;
     template?: unknown;
     path?: string;
 }): any;
+export declare function assertFlowSurfaceConcreteDefaultFilterItem(actionName: string, defaultFilter: any, options?: {
+    path?: string;
+}): void;
 export declare function backfillFlowSurfaceDefaultFilterSetting(settings: any, defaultFilter: any): any;
 export declare function backfillFlowSurfaceFilterActionDefaultFilter<T extends {
     type?: string;

package/dist/server/flow-surfaces/public-data-surface-default-filter.js

@@ -37,6 +37,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var public_data_surface_default_filter_exports = {};
 __export(public_data_surface_default_filter_exports, {
   FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES: () => FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES,
+  FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL: () => FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL,
+  assertFlowSurfaceConcreteDefaultFilterItem: () => assertFlowSurfaceConcreteDefaultFilterItem,
   backfillFlowSurfaceDefaultFilterSetting: () => backfillFlowSurfaceDefaultFilterSetting,
   backfillFlowSurfaceFilterActionDefaultFilter: () => backfillFlowSurfaceFilterActionDefaultFilter,
   isFlowSurfacePublicDataSurfaceBlockType: () => isFlowSurfacePublicDataSurfaceBlockType,
@@ -46,7 +48,14 @@ module.exports = __toCommonJS(public_data_surface_default_filter_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_errors = require("./errors");
 var import_filter_group = require("./filter-group");
-const FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES = /* @__PURE__ */ new Set(["table", "list", "gridCard"]);
+const FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES = /* @__PURE__ */ new Set([
+  "table",
+  "list",
+  "gridCard",
+  "calendar",
+  "kanban"
+]);
+const FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL = "table/list/gridCard/calendar/kanban";
 function isFlowSurfacePublicDataSurfaceBlockType(blockType) {
   return FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES.has(String(blockType || "").trim());
 }
@@ -54,14 +63,44 @@ function normalizeFlowSurfacePublicBlockDefaultFilter(actionName, defaultFilter,
   if (import_lodash.default.isUndefined(defaultFilter)) {
     return void 0;
   }
-  const fieldPath = options.path ? `${options.path}.defaultFilter` : "defaultFilter";
+  const fieldPath = buildFlowSurfaceDefaultFilterFieldPath(actionName, options.path);
   if (!isFlowSurfacePublicDataSurfaceBlockType(options.blockType) || !import_lodash.default.isUndefined(options.template)) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${actionName} ${fieldPath} is only supported on direct table/list/gridCard blocks`);
+    (0, import_errors.throwBadRequest)(
+      `flowSurfaces ${actionName} ${fieldPath} is only supported on direct ${FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL} blocks`
+    );
   }
-  return (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
+  const normalized = (0, import_filter_group.normalizeFlowSurfaceFilterGroupValue)(
     defaultFilter,
     `flowSurfaces ${actionName} ${fieldPath} expects FilterGroup like ${import_filter_group.FLOW_SURFACE_FILTER_GROUP_EXAMPLE}`
   );
+  return normalized;
+}
+function assertFlowSurfaceConcreteDefaultFilterItem(actionName, defaultFilter, options = {}) {
+  const fieldPath = buildFlowSurfaceDefaultFilterFieldPath(actionName, options.path);
+  if (!hasConcreteFlowSurfaceFilterItem(defaultFilter)) {
+    (0, import_errors.throwBadRequest)(
+      `flowSurfaces ${actionName} ${fieldPath} must include at least one concrete filter item; empty defaultFilter groups such as {}, null, or { logic, items: [] } are not allowed`
+    );
+  }
+}
+function buildFlowSurfaceDefaultFilterFieldPath(actionName, path) {
+  if (!path) {
+    return "defaultFilter";
+  }
+  const prefix = `flowSurfaces ${actionName} `;
+  const normalizedPath = path.startsWith(prefix) ? path.slice(prefix.length) : path;
+  return normalizedPath.endsWith(".defaultFilter") ? normalizedPath : `${normalizedPath}.defaultFilter`;
+}
+function hasConcreteFlowSurfaceFilterItem(filter) {
+  if (!import_lodash.default.isPlainObject(filter) || !Array.isArray(filter.items)) {
+    return false;
+  }
+  return filter.items.some((item) => {
+    if (import_lodash.default.isPlainObject(item) && "logic" in item && "items" in item) {
+      return hasConcreteFlowSurfaceFilterItem(item);
+    }
+    return import_lodash.default.isPlainObject(item) && typeof item.path === "string" && typeof item.operator === "string";
+  });
 }
 function backfillFlowSurfaceDefaultFilterSetting(settings, defaultFilter) {
   if (import_lodash.default.isUndefined(defaultFilter)) {
@@ -104,6 +143,8 @@ function backfillFlowSurfaceFilterActionDefaultFilter(actions, defaultFilter) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPES,
+  FLOW_SURFACE_PUBLIC_DATA_SURFACE_BLOCK_TYPE_LABEL,
+  assertFlowSurfaceConcreteDefaultFilterItem,
   backfillFlowSurfaceDefaultFilterSetting,
   backfillFlowSurfaceFilterActionDefaultFilter,
   isFlowSurfacePublicDataSurfaceBlockType,

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

@@ -66,6 +66,7 @@ __export(service_helpers_exports, {
 });
 module.exports = __toCommonJS(service_helpers_exports);
 var import_lodash = __toESM(require("lodash"));
+var import_core_field_default_bindings = require("./core-field-default-bindings");
 const FLOW_SURFACE_TEMPLATE_DEFAULT_PAGE = 1;
 const FLOW_SURFACE_TEMPLATE_DEFAULT_PAGE_SIZE = 50;
 function toTemplatePlainRow(row) {
@@ -206,82 +207,14 @@ function getFieldFilterable(field) {
   return (_a = field == null ? void 0 : field.options) == null ? void 0 : _a.filterable;
 }
 function inferAssociationLeafDisplayFieldUse(fieldInterface) {
-  const normalized = String(fieldInterface || "").trim();
-  const map = {
-    richText: "DisplayHtmlFieldModel",
-    number: "DisplayNumberFieldModel",
-    integer: "DisplayNumberFieldModel",
-    id: "DisplayNumberFieldModel",
-    snowflakeId: "DisplayNumberFieldModel",
-    json: "DisplayJSONFieldModel",
-    select: "DisplayTextFieldModel",
-    multipleSelect: "DisplayTextFieldModel",
-    radioGroup: "DisplayTextFieldModel",
-    checkboxGroup: "DisplayTextFieldModel",
-    collection: "DisplayTextFieldModel",
-    tableoid: "DisplayTextFieldModel",
-    icon: "DisplayIconFieldModel",
-    checkbox: "DisplayCheckboxFieldModel",
-    password: "DisplayPasswordFieldModel",
-    percent: "DisplayPercentFieldModel",
-    date: "DisplayDateTimeFieldModel",
-    datetimeNoTz: "DisplayDateTimeFieldModel",
-    createdAt: "DisplayDateTimeFieldModel",
-    datetime: "DisplayDateTimeFieldModel",
-    updatedAt: "DisplayDateTimeFieldModel",
-    unixTimestamp: "DisplayDateTimeFieldModel",
-    formula: "DisplayDateTimeFieldModel",
-    input: "DisplayTextFieldModel",
-    email: "DisplayTextFieldModel",
-    phone: "DisplayTextFieldModel",
-    uuid: "DisplayTextFieldModel",
-    textarea: "DisplayTextFieldModel",
-    nanoid: "DisplayTextFieldModel",
-    url: "DisplayURLFieldModel",
-    color: "DisplayColorFieldModel",
-    time: "DisplayTimeFieldModel"
-  };
-  return map[normalized];
+  return (0, import_core_field_default_bindings.getSharedFieldDefaultBindingUse)("display", fieldInterface);
 }
 function inferFieldMenuEditableFieldUse(fieldInterface) {
   const normalized = String(fieldInterface || "").trim();
   if (["m2m", "m2o", "o2o", "o2m", "oho", "obo", "updatedBy", "createdBy", "mbm"].includes(normalized)) {
     return "RecordSelectFieldModel";
   }
-  const map = {
-    json: "JsonFieldModel",
-    textarea: "TextareaFieldModel",
-    icon: "IconFieldModel",
-    radioGroup: "SelectFieldModel",
-    color: "ColorFieldModel",
-    select: "SelectFieldModel",
-    multipleSelect: "SelectFieldModel",
-    checkboxGroup: "SelectFieldModel",
-    checkbox: "CheckboxFieldModel",
-    password: "PasswordFieldModel",
-    number: "NumberFieldModel",
-    integer: "NumberFieldModel",
-    id: "NumberFieldModel",
-    snowflakeId: "NumberFieldModel",
-    percent: "PercentFieldModel",
-    datetimeNoTz: "DateTimeNoTzFieldModel",
-    date: "DateOnlyFieldModel",
-    datetime: "DateTimeTzFieldModel",
-    createdAt: "DateTimeTzFieldModel",
-    updatedAt: "DateTimeTzFieldModel",
-    unixTimestamp: "DateTimeTzFieldModel",
-    time: "TimeFieldModel",
-    collection: "CollectionSelectorFieldModel",
-    tableoid: "CollectionSelectorFieldModel",
-    richText: "RichTextFieldModel",
-    input: "InputFieldModel",
-    email: "InputFieldModel",
-    phone: "InputFieldModel",
-    uuid: "InputFieldModel",
-    url: "InputFieldModel",
-    nanoid: "InputFieldModel"
-  };
-  return map[normalized];
+  return (0, import_core_field_default_bindings.getSharedFieldDefaultBindingUse)("editable", normalized);
 }
 function isAssociationField(field) {
   if (typeof (field == null ? void 0 : field.isAssociationField) === "function") {

package/dist/server/flow-surfaces/service.d.ts

@@ -271,7 +271,7 @@ export declare class FlowSurfacesService {
     }): Promise<import("./compose-runtime").FlowSurfaceComposeExecutionResult>;
     configure(values: FlowSurfaceConfigureValues, options?: {
         transaction?: any;
-    }): Promise<{
+    }): Promise<_.Dictionary<any> | {
         uid: any;
         updated?: undefined;
     } | {
@@ -607,6 +607,9 @@ export declare class FlowSurfacesService {
     private assertComposeMode;
     private assertMutateAtomicFlag;
     private normalizeWriteTarget;
+    private parseCalendarPopupActionTargetUid;
+    private parseKanbanPopupActionTargetUid;
+    private prepareWriteTarget;
     private normalizeRootUidValue;
     private assertRouteBackedPageUidTarget;
     private assertRouteBackedTabUidTarget;
@@ -662,6 +665,7 @@ export declare class FlowSurfacesService {
     private configureTab;
     private configureTableBlock;
     private configureCalendarBlock;
+    private configureKanbanBlock;
     private configureFormBlock;
     private configureDetailsBlock;
     private configureFilterFormBlock;
@@ -720,6 +724,34 @@ export declare class FlowSurfacesService {
     private resolvePopupSourceRecordCollectionName;
     private resolvePopupContextLevel;
     private getCollection;
+    private normalizeKanbanFieldNameInput;
+    private getKanbanCollectionFilterTargetKey;
+    private isKanbanMultipleGroupField;
+    private isKanbanAssociationGroupField;
+    private isKanbanGroupField;
+    private getKanbanGroupFieldCandidates;
+    private getKanbanDefaultGroupFieldName;
+    private getKanbanGroupField;
+    private getKanbanCollectionOrThrow;
+    private assertKanbanCollectionCompatible;
+    private getKanbanRelationTargetCollection;
+    private getKanbanRelationFieldCandidateNames;
+    private getKanbanDefaultRelationTitleFieldName;
+    private assertKanbanRelationFieldBinding;
+    private getKanbanGroupFieldSortScopeKeys;
+    private getKanbanCompatibleSortFieldNames;
+    private resolveKanbanCompatibleSortFieldName;
+    private normalizeKanbanGroupOptions;
+    private buildKanbanInlineGroupOptions;
+    private mergeKanbanInlineGroupOptions;
+    private normalizeKanbanPopupSettings;
+    private getKanbanPopupActionUse;
+    private getKanbanPopupActionUid;
+    private getKanbanBlockResourceInit;
+    private getKanbanPopupStoredSettings;
+    private buildKanbanPopupOpenView;
+    private normalizeKanbanPopupConfigureValue;
+    private buildKanbanInitialBlockProps;
     private normalizeCalendarFieldPathInput;
     private isCalendarDateField;
     private isCalendarTitleField;
@@ -746,7 +778,16 @@ export declare class FlowSurfacesService {
     private buildCalendarInitialBlockProps;
     private ensureCalendarBlockPopupHosts;
     private ensureCalendarBlockPopupHostsInTree;
+    private projectCalendarBlockPopupHosts;
+    private projectCalendarBlockPopupHostsInTree;
+    private ensureKanbanBlockPopupHosts;
+    private ensureKanbanBlockPopupHostsInTree;
+    private projectKanbanBlockPopupHosts;
+    private projectKanbanBlockPopupHostsInTree;
+    private getCalendarSettingValue;
+    private validateCalendarSettingValues;
     private validateCalendarBlockState;
+    private validateKanbanBlockState;
     private resolveFieldDefinition;
     private getAssociationDefaultTitleFieldName;
     private getAssociationTitleFieldTargetCollection;