@nocobase/plugin-flow-engine 2.1.0-alpha.18 → 2.1.0-alpha.19

package/dist/server/flow-surfaces/surface-context.d.ts

@@ -19,6 +19,7 @@ export declare class FlowSurfaceContextResolver {
         ensurePopupSurface: (parentUid: string, transaction?: any) => Promise<any>;
         getCollection: (dataSourceKey: string, collectionName: string) => any;
     });
+    private resolveBlockCatalogContainerUse;
     filterBlocksByTarget(targetNode?: any, resolved?: any): import("./types").FlowSurfaceCatalogItem[];
     resolveFilterFormTarget(filterFormOwnerUid: string, targetBlockUid?: string, transaction?: any): Promise<{
         ownerUid: any;

package/dist/server/flow-surfaces/surface-context.js

@@ -43,6 +43,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_catalog = require("./catalog");
 var import_chart_config = require("./chart-config");
 var import_errors = require("./errors");
+var import_approval = require("./approval");
 var import_placement = require("./placement");
 const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
   "TableBlockModel",
@@ -55,18 +56,51 @@ const FILTER_TARGET_BLOCK_USES = /* @__PURE__ */ new Set([
 ]);
 const LIST_LIKE_BLOCK_USES = /* @__PURE__ */ new Set(["ListBlockModel", "GridCardBlockModel"]);
 const LIST_LIKE_ITEM_USES = /* @__PURE__ */ new Set(["ListItemModel", "GridCardItemModel"]);
+function getDefaultGridUse(ownerUse, fallbackUse) {
+  return (0, import_approval.getApprovalDefaultGridUse)(ownerUse) || fallbackUse;
+}
+function getFieldWrapperUse(containerUse, fallbackUse) {
+  return (0, import_approval.getApprovalFieldWrapperUse)(containerUse) || fallbackUse;
+}
 class FlowSurfaceContextResolver {
   constructor(repository, locator, options) {
     this.repository = repository;
     this.locator = locator;
     this.options = options;
   }
+  resolveBlockCatalogContainerUse(targetNode, resolved) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (!targetNode && !resolved) {
+      return void 0;
+    }
+    if ((_b = (_a = targetNode == null ? void 0 : targetNode.use) == null ? void 0 : _a.endsWith) == null ? void 0 : _b.call(_a, "GridModel")) {
+      return targetNode.use;
+    }
+    if ((_d = (_c = targetNode == null ? void 0 : targetNode.subModels) == null ? void 0 : _c.grid) == null ? void 0 : _d.use) {
+      return targetNode.subModels.grid.use;
+    }
+    const firstTab = import_lodash.default.castArray(((_e = targetNode == null ? void 0 : targetNode.subModels) == null ? void 0 : _e.tabs) || [])[0];
+    if ((_g = (_f = firstTab == null ? void 0 : firstTab.subModels) == null ? void 0 : _f.grid) == null ? void 0 : _g.use) {
+      return firstTab.subModels.grid.use;
+    }
+    const directDefaultGridUse = (0, import_approval.getApprovalDefaultGridUse)(targetNode == null ? void 0 : targetNode.use);
+    if (directDefaultGridUse) {
+      return directDefaultGridUse;
+    }
+    const firstTabDefaultGridUse = (0, import_approval.getApprovalDefaultGridUse)(firstTab == null ? void 0 : firstTab.use);
+    if (firstTabDefaultGridUse) {
+      return firstTabDefaultGridUse;
+    }
+    return void 0;
+  }
   filterBlocksByTarget(targetNode, resolved) {
+    const containerUse = this.resolveBlockCatalogContainerUse(targetNode, resolved);
+    const blocks = (0, import_catalog.getAvailableBlockCatalogItems)(containerUse);
     if (!targetNode && !resolved) {
-      return import_catalog.blockCatalog;
+      return blocks;
     }
     if ((0, import_placement.canCatalogAddBlock)({ node: targetNode, resolved })) {
-      return import_catalog.blockCatalog;
+      return blocks;
     }
     return [];
   }
@@ -115,32 +149,40 @@ class FlowSurfaceContextResolver {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     const resolved = await this.locator.resolve(target, { transaction });
     const node = resolved.node || await this.repository.findModelById(resolved.uid, { transaction, includeAsyncNode: true });
+    const normalizedUse = (0, import_approval.normalizeApprovalSemanticUse)(node == null ? void 0 : node.use);
     if ((_a = node == null ? void 0 : node.use) == null ? void 0 : _a.endsWith("GridModel")) {
+      if ((0, import_approval.isApprovalTaskCardGridUse)(node.use)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces addBlock target '${node.use}' does not support blocks`);
+      }
       return {
         parentUid: node.uid,
         subKey: "items",
         subType: "array"
       };
     }
-    if ((node == null ? void 0 : node.use) === "ChildPageTabModel") {
+    if (normalizedUse === "ChildPageTabModel") {
       return {
-        parentUid: ((_c = (_b = node == null ? void 0 : node.subModels) == null ? void 0 : _b.grid) == null ? void 0 : _c.uid) || await this.options.ensureGridChild(node.uid, "BlockGridModel", transaction),
+        parentUid: ((_c = (_b = node == null ? void 0 : node.subModels) == null ? void 0 : _b.grid) == null ? void 0 : _c.uid) || await this.options.ensureGridChild(node.uid, getDefaultGridUse(node.use, "BlockGridModel"), transaction),
         subKey: "items",
         subType: "array"
       };
     }
-    if ((node == null ? void 0 : node.use) === "ChildPageModel") {
+    if (normalizedUse === "ChildPageModel") {
       const firstTab = import_lodash.default.castArray(((_d = node == null ? void 0 : node.subModels) == null ? void 0 : _d.tabs) || [])[0];
       if (!(firstTab == null ? void 0 : firstTab.uid)) {
         (0, import_errors.throwBadRequest)(`flowSurfaces addBlock target '${node.use}' is missing its popup tab subtree`);
       }
       return {
-        parentUid: ((_f = (_e = firstTab == null ? void 0 : firstTab.subModels) == null ? void 0 : _e.grid) == null ? void 0 : _f.uid) || await this.options.ensureGridChild(firstTab.uid, "BlockGridModel", transaction),
+        parentUid: ((_f = (_e = firstTab == null ? void 0 : firstTab.subModels) == null ? void 0 : _e.grid) == null ? void 0 : _f.uid) || await this.options.ensureGridChild(
+          firstTab.uid,
+          getDefaultGridUse(firstTab.use, "BlockGridModel"),
+          transaction
+        ),
         subKey: "items",
         subType: "array"
       };
     }
-    if ((0, import_placement.isPopupHostUse)(node == null ? void 0 : node.use) || ((_h = (_g = node == null ? void 0 : node.subModels) == null ? void 0 : _g.page) == null ? void 0 : _h.use) === "ChildPageModel") {
+    if ((0, import_placement.isPopupHostUse)(node == null ? void 0 : node.use) || (0, import_approval.normalizeApprovalSemanticUse)((_h = (_g = node == null ? void 0 : node.subModels) == null ? void 0 : _g.page) == null ? void 0 : _h.use) === "ChildPageModel") {
       const popupSurface = await this.options.ensurePopupSurface(node.uid, transaction);
       return {
         parentUid: popupSurface.gridUid,
@@ -153,7 +195,7 @@ class FlowSurfaceContextResolver {
       return {
         parentUid: ((_j = (_i = node == null ? void 0 : node.subModels) == null ? void 0 : _i.grid) == null ? void 0 : _j.uid) || await this.options.ensureGridChild(
           ((_l = (_k = resolved.tabRoute) == null ? void 0 : _k.get) == null ? void 0 : _l.call(_k, "schemaUid")) || node.uid,
-          "BlockGridModel",
+          getDefaultGridUse(node == null ? void 0 : node.use, "BlockGridModel"),
           transaction
         ),
         subKey: "items",
@@ -181,17 +223,18 @@ class FlowSurfaceContextResolver {
     const target = await this.locator.resolve({ uid }, { transaction });
     const node = target.node || await this.repository.findModelById(uid, { transaction, includeAsyncNode: true });
     const use = node == null ? void 0 : node.use;
+    const normalizedUse = (0, import_approval.normalizeApprovalSemanticUse)(use);
     if ((0, import_placement.isFormBlockUse)(use)) {
       return {
         ownerUid: node.uid,
         ownerUse: use,
-        parentUid: ((_b = (_a = node.subModels) == null ? void 0 : _a.grid) == null ? void 0 : _b.uid) || await this.options.ensureGridChild(node.uid, "FormGridModel", transaction),
+        parentUid: ((_b = (_a = node.subModels) == null ? void 0 : _a.grid) == null ? void 0 : _b.uid) || await this.options.ensureGridChild(node.uid, getDefaultGridUse(use, "FormGridModel"), transaction),
         subKey: "items",
         subType: "array",
-        wrapperUse: "FormItemModel"
+        wrapperUse: getFieldWrapperUse(use, "FormItemModel")
       };
     }
-    if (use === "FormGridModel") {
+    if (normalizedUse === "FormGridModel") {
       const parentUid = await this.locator.findParentUid(node.uid, transaction);
       const parent = parentUid ? await this.repository.findModelById(parentUid, { transaction }) : null;
       return {
@@ -200,17 +243,17 @@ class FlowSurfaceContextResolver {
         parentUid: node.uid,
         subKey: "items",
         subType: "array",
-        wrapperUse: "FormItemModel"
+        wrapperUse: getFieldWrapperUse((parent == null ? void 0 : parent.use) || use, "FormItemModel")
       };
     }
     if ((0, import_placement.isDetailsBlockUse)(use)) {
       return {
         ownerUid: node.uid,
         ownerUse: use,
-        parentUid: ((_d = (_c = node.subModels) == null ? void 0 : _c.grid) == null ? void 0 : _d.uid) || await this.options.ensureGridChild(node.uid, "DetailsGridModel", transaction),
+        parentUid: ((_d = (_c = node.subModels) == null ? void 0 : _c.grid) == null ? void 0 : _d.uid) || await this.options.ensureGridChild(node.uid, getDefaultGridUse(use, "DetailsGridModel"), transaction),
         subKey: "items",
         subType: "array",
-        wrapperUse: "DetailsItemModel"
+        wrapperUse: getFieldWrapperUse(use, "DetailsItemModel")
       };
     }
     if (LIST_LIKE_BLOCK_USES.has(use)) {
@@ -237,7 +280,7 @@ class FlowSurfaceContextResolver {
         wrapperUse: "DetailsItemModel"
       };
     }
-    if (use === "DetailsGridModel") {
+    if (normalizedUse === "DetailsGridModel") {
       const parentUid = await this.locator.findParentUid(node.uid, transaction);
       const parent = parentUid ? await this.repository.findModelById(parentUid, { transaction }) : null;
       return {
@@ -246,7 +289,7 @@ class FlowSurfaceContextResolver {
         parentUid: node.uid,
         subKey: "items",
         subType: "array",
-        wrapperUse: "DetailsItemModel"
+        wrapperUse: getFieldWrapperUse((parent == null ? void 0 : parent.use) || use, "DetailsItemModel")
       };
     }
     if ((0, import_placement.isFilterFormBlockUse)(use)) {
@@ -317,9 +360,10 @@ class FlowSurfaceContextResolver {
     (0, import_errors.throwBadRequest)(`flowSurfaces addAction target '${(node == null ? void 0 : node.use) || resolved.uid}' is not an action container`);
   }
   async resolveGridNode(uid, transaction) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const resolved = await this.locator.resolve({ uid }, { transaction });
     const node = resolved.node || await this.repository.findModelById(uid, { transaction, includeAsyncNode: true });
+    const normalizedUse = (0, import_approval.normalizeApprovalSemanticUse)(node == null ? void 0 : node.use);
     if ((_a = node == null ? void 0 : node.use) == null ? void 0 : _a.endsWith("GridModel")) {
       return node;
     }
@@ -327,7 +371,7 @@ class FlowSurfaceContextResolver {
       return this.repository.findModelById(
         ((_g = (_f = node == null ? void 0 : node.subModels) == null ? void 0 : _f.grid) == null ? void 0 : _g.uid) || await this.options.ensureGridChild(
           ((_i = (_h = resolved.tabRoute) == null ? void 0 : _h.get) == null ? void 0 : _i.call(_h, "schemaUid")) || node.uid,
-          "BlockGridModel",
+          getDefaultGridUse(node == null ? void 0 : node.use, "BlockGridModel"),
           transaction
         ),
         { transaction, includeAsyncNode: true }
@@ -336,13 +380,49 @@ class FlowSurfaceContextResolver {
     if ((_k = (_j = node == null ? void 0 : node.subModels) == null ? void 0 : _j.grid) == null ? void 0 : _k.uid) {
       return this.repository.findModelById(node.subModels.grid.uid, { transaction, includeAsyncNode: true });
     }
+    if (normalizedUse === "ChildPageTabModel") {
+      return this.repository.findModelById(
+        await this.options.ensureGridChild(node.uid, getDefaultGridUse(node == null ? void 0 : node.use, "BlockGridModel"), transaction),
+        { transaction, includeAsyncNode: true }
+      );
+    }
+    if (normalizedUse === "ChildPageModel") {
+      const firstTab = import_lodash.default.castArray(((_l = node == null ? void 0 : node.subModels) == null ? void 0 : _l.tabs) || [])[0];
+      if (!(firstTab == null ? void 0 : firstTab.uid)) {
+        (0, import_errors.throwBadRequest)(`flowSurfaces setLayout target '${uid}' is missing its popup tab subtree`);
+      }
+      const gridUid = ((_n = (_m = firstTab == null ? void 0 : firstTab.subModels) == null ? void 0 : _m.grid) == null ? void 0 : _n.uid) || await this.options.ensureGridChild(
+        firstTab.uid,
+        getDefaultGridUse(firstTab.use, "BlockGridModel"),
+        transaction
+      );
+      return this.repository.findModelById(gridUid, { transaction, includeAsyncNode: true });
+    }
+    if ((0, import_placement.isFormBlockUse)(node == null ? void 0 : node.use)) {
+      return this.repository.findModelById(
+        await this.options.ensureGridChild(node.uid, getDefaultGridUse(node == null ? void 0 : node.use, "FormGridModel"), transaction),
+        { transaction, includeAsyncNode: true }
+      );
+    }
+    if ((0, import_placement.isDetailsBlockUse)(node == null ? void 0 : node.use)) {
+      return this.repository.findModelById(
+        await this.options.ensureGridChild(node.uid, getDefaultGridUse(node == null ? void 0 : node.use, "DetailsGridModel"), transaction),
+        { transaction, includeAsyncNode: true }
+      );
+    }
+    if ((0, import_placement.isFilterFormBlockUse)(node == null ? void 0 : node.use)) {
+      return this.repository.findModelById(
+        await this.options.ensureGridChild(node.uid, "FilterFormGridModel", transaction),
+        { transaction, includeAsyncNode: true }
+      );
+    }
     (0, import_errors.throwBadRequest)(`flowSurfaces setLayout target '${uid}' is not a grid node`);
   }
   async findOwningBlockGrid(uid, transaction) {
     let cursor = uid;
     while (cursor) {
       const node = await this.repository.findModelById(cursor, { transaction, includeAsyncNode: true });
-      if ((node == null ? void 0 : node.use) === "BlockGridModel") {
+      if ((0, import_approval.normalizeApprovalSemanticUse)(node == null ? void 0 : node.use) === "BlockGridModel") {
         return node;
       }
       cursor = await this.locator.findParentUid(cursor, transaction);

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

@@ -192,7 +192,9 @@ export type FlowSurfaceNodeSpec = {
     uid?: string;
     clientKey?: string;
     sortIndex?: number;
+    async?: boolean;
     use: string;
+    popup?: Record<string, any>;
     props?: Record<string, any>;
     decoratorProps?: Record<string, any>;
     stepParams?: Record<string, any>;
@@ -200,10 +202,11 @@ export type FlowSurfaceNodeSpec = {
     subModels?: Record<string, FlowSurfaceNodeSpec | FlowSurfaceNodeSpec[]>;
 };
 export type FlowSurfaceNodeSubModel = FlowSurfaceNodeSpec | FlowSurfaceNodeSpec[];
-export type FlowSurfaceNodeDefaults = Partial<Pick<FlowSurfaceNodeSpec, 'props' | 'decoratorProps' | 'stepParams' | 'flowRegistry' | 'subModels'>>;
+export type FlowSurfaceNodeDefaults = Partial<Pick<FlowSurfaceNodeSpec, 'async' | 'props' | 'decoratorProps' | 'stepParams' | 'flowRegistry' | 'subModels'>>;
 export type FlowSurfaceApplyMode = 'replace';
 export type FlowSurfaceComposeMode = 'append' | 'replace';
 export type FlowSurfaceApplySpec = {
+    popup?: Record<string, any>;
     props?: Record<string, any>;
     decoratorProps?: Record<string, any>;
     stepParams?: Record<string, any>;