@tachybase/plugin-workflow-approval 1.6.0 → 1.6.3

package/dist/externalVersion.js

@@ -1,17 +1,17 @@
 module.exports = {
-  "@tachybase/client": "1.6.0",
-  "@tego/server": "1.3.52",
-  "@tachybase/module-workflow": "1.6.0",
+  "@tachybase/client": "1.6.3",
+  "@tego/server": "1.6.1",
+  "@tachybase/module-workflow": "1.6.3",
   "lodash": "4.17.21",
   "react": "18.3.1",
-  "@tachybase/schema": "1.3.52",
+  "@tachybase/schema": "1.6.1",
   "antd": "5.22.5",
-  "@tachybase/module-ui-schema": "1.6.0",
+  "@tachybase/module-ui-schema": "1.6.3",
   "sequelize": "6.37.5",
-  "@tego/client": "1.3.52",
+  "@tego/client": "1.6.1",
   "react-i18next": "16.2.1",
   "react-router-dom": "6.28.1",
-  "@ant-design/icons": "5.6.1",
+  "@ant-design/icons": "6.1.0",
   "dayjs": "1.11.13",
   "ahooks": "3.9.0"
 };

package/dist/locale/en-US.json

@@ -196,7 +196,7 @@
   "Notice Center": "Notice Center",
   "Notice blocks": "Notice blocks",
   "Null": "Null",
-  "Off": "Off",
+  "Off": "Disabled",
   "On": "On",
   "On going": "On going",
   "Only support standard JSON data": "Only support standard JSON data",
@@ -286,6 +286,7 @@
   "Unprocessed": "Unprocessed",
   "Update record": "Update record",
   "Update record form": "Update record form",
+  "Updated time": "Updated time",
   "Usage of SQL query result is not supported yet.": "Usage of SQL query result is not supported yet.",
   "Use a collection to match form data.": "Use a collection to match form data.",
   "Use variable": "Use variable",

package/dist/locale/zh-CN.json

@@ -234,7 +234,7 @@
   "Notice": "通知",
   "Notice Center": "通知中心",
   "Notice blocks": "通知卡片",
-  "Off": "停用",
+  "Off": "禁用",
   "On": "启用",
   "On going": "进行中",
   "Only support standard JSON data": "仅支持标准 JSON 数据",
@@ -357,6 +357,7 @@
   "Update record": "更新数据",
   "Update record form": "更新数据表单",
   "Update records of a collection. You can use variables from upstream nodes as query conditions and field values.": "更新一个数据表中的数据。可以使用上游节点里的变量作为查询条件和数据值。",
+  "Updated time": "更新时间",
   "Use transaction": "启用事务",
   "Use variable": "使用变量",
   "Used to store expressions for use in workflows so that different expressions can be called for different data.": "用于存储表达式，在工作流中使用，以便针对不同的数据调用不同的表达式。",

package/dist/server/actions/approvalCarbonCopy.d.ts

@@ -1,3 +1,3 @@
 export declare const approvalCarbonCopy: {
-    listCentralized(context: any, next: any): Promise<void>;
+    listCentralized(ctx: any, next: any): Promise<void>;
 };

package/dist/server/actions/approvalCarbonCopy.js

@@ -25,15 +25,15 @@ var import_server = require("@tego/server");
 var import_status = require("../constants/status");
 var import_utils = require("../utils");
 const approvalCarbonCopy = {
-  async listCentralized(context, next) {
-    const centralizedApprovalFlow = await context.db.getRepository(import_module_workflow.COLLECTION_WORKFLOWS_NAME).find({
+  async listCentralized(ctx, next) {
+    const centralizedApprovalFlow = await ctx.db.getRepository(import_module_workflow.COLLECTION_WORKFLOWS_NAME).find({
       filter: {
         type: "approval",
         "config.centralized": true
       },
       fields: ["id"]
     });
-    context.action.mergeParams({
+    ctx.action.mergeParams({
       filter: {
         workflowId: centralizedApprovalFlow.map((item) => item.id),
         approval: {
@@ -43,10 +43,10 @@ const approvalCarbonCopy = {
         }
       }
     });
-    await import_server.actions.list(context, next);
-    if (context.body.rows) {
-      context.body.rows = (0, import_utils.findUniqueObjects)(
-        context.body.rows,
+    await import_server.actions.list(ctx, next);
+    if (ctx.body.rows) {
+      ctx.body.rows = (0, import_utils.findUniqueObjects)(
+        ctx.body.rows,
         ["userId", "approvalId"],
         "createdAt",
         (a, b) => new Date(a).getTime() - new Date(b).getTime()

package/dist/server/actions/approvalRecords.d.ts

@@ -1,4 +1,4 @@
 export declare const approvalRecords: {
-    listCentralized(context: any, next: any): Promise<void>;
-    submit(context: any, next: any): Promise<any>;
+    listCentralized(ctx: any, next: any): Promise<void>;
+    submit(ctx: any, next: any): Promise<any>;
 };

package/dist/server/actions/approvalRecords.js

@@ -25,29 +25,29 @@ var import_server = require("@tego/server");
 var import_error_code = require("../constants/error-code");
 var import_status = require("../constants/status");
 const approvalRecords = {
-  async listCentralized(context, next) {
-    const centralizedApprovalFlow = await context.db.getRepository("workflows").find({
+  async listCentralized(ctx, next) {
+    const centralizedApprovalFlow = await ctx.db.getRepository("workflows").find({
       filter: {
         type: "approval",
         "config.centralized": true
       },
       fields: ["id"]
     });
-    context.action.mergeParams({
+    ctx.action.mergeParams({
       filter: {
         workflowId: centralizedApprovalFlow.map((item) => item.id)
       }
     });
-    return import_server.actions.list(context, next);
+    return import_server.actions.list(ctx, next);
   },
-  async submit(context, next) {
+  async submit(ctx, next) {
     var _a, _b;
-    const repository = import_server.utils.getRepositoryFromParams(context);
-    const { filterByTk, values } = context.action.params;
+    const repository = import_server.utils.getRepositoryFromParams(ctx);
+    const { filterByTk, values } = ctx.action.params;
     const { data, status, needUpdateRecord } = values || {};
-    const { currentUser } = context.state;
+    const { currentUser } = ctx.state;
     if (!currentUser) {
-      return context.throw(401);
+      return ctx.throw(401);
     }
     const approvalRecord = await repository.findOne({
       filterByTk,
@@ -55,22 +55,22 @@ const approvalRecords = {
         userId: currentUser == null ? void 0 : currentUser.id
       },
       appends: ["job", "node", "execution", "workflow", "approval"],
-      context
+      context: ctx
     });
     if (!approvalRecord) {
-      return context.throw(404);
+      return ctx.throw(404);
     }
     switch (true) {
       // case !approvalRecord.workflow.enabled:
-      //   return context.throw(400, ERROR_CODE_MAP['not_enable_workflow']);
+      //   return ctx.throw(400, ERROR_CODE_MAP['not_enable_workflow']);
       case ((_a = approvalRecord.execution) == null ? void 0 : _a.status):
-        return context.throw(400, import_error_code.ERROR_CODE_MAP["execution_finished"]);
+        return ctx.throw(400, import_error_code.ERROR_CODE_MAP["execution_finished"]);
       case ((_b = approvalRecord.job) == null ? void 0 : _b.status):
-        return context.throw(400, import_error_code.ERROR_CODE_MAP["job_finished"]);
+        return ctx.throw(400, import_error_code.ERROR_CODE_MAP["job_finished"]);
       case approvalRecord.status !== import_status.APPROVAL_ACTION_STATUS.PENDING:
-        return context.throw(400, import_error_code.ERROR_CODE_MAP["not_approval_pending"]);
+        return ctx.throw(400, import_error_code.ERROR_CODE_MAP["not_approval_pending"]);
       case (!needUpdateRecord && !(approvalRecord.node.config.actions ?? []).includes(status)):
-        return context.throw(400, import_error_code.ERROR_CODE_MAP["not_need_update"]);
+        return ctx.throw(400, import_error_code.ERROR_CODE_MAP["not_need_update"]);
       default:
         break;
     }
@@ -81,13 +81,13 @@ const approvalRecords = {
       summary: approvalRecord.approval.summary,
       collectionName: approvalRecord.approval.collectionName
     });
-    context.body = approvalRecord.get();
-    context.status = 202;
+    ctx.body = approvalRecord.get();
+    ctx.status = 202;
     await next();
     approvalRecord.execution.workflow = approvalRecord.workflow;
     approvalRecord.job.execution = approvalRecord.execution;
     approvalRecord.job.latestUserJob = approvalRecord.get();
-    const workflow = context.app.getPlugin(import_module_workflow.PluginWorkflow);
+    const workflow = ctx.tego.pm.get(import_module_workflow.PluginWorkflow);
     const processor = workflow.createProcessor(approvalRecord.execution);
     processor.logger.info(
       `approval node (${approvalRecord.nodeId}) action trigger execution (${approvalRecord.execution.id}) to resume`

package/dist/server/actions/approvals.d.ts

@@ -1,8 +1,8 @@
 export declare const approvals: {
-    create(context: any, next: any): Promise<any>;
-    update(context: any, next: any): Promise<void>;
-    destroy(context: any, next: any): Promise<any>;
-    withdraw(context: any, next: any): Promise<any>;
-    listCentralized(context: any, next: any): Promise<void>;
-    reminder(context: any, next: any): Promise<any>;
+    create(ctx: any, next: any): Promise<any>;
+    update(ctx: any, next: any): Promise<void>;
+    destroy(ctx: any, next: any): Promise<any>;
+    withdraw(ctx: any, next: any): Promise<any>;
+    listCentralized(ctx: any, next: any): Promise<void>;
+    reminder(ctx: any, next: any): Promise<any>;
 };

package/dist/server/actions/approvals.js

@@ -26,69 +26,48 @@ var import_constants = require("../../common/constants");
 var import_status = require("../constants/status");
 var import_tools = require("../tools");
 const approvals = {
-  async create(context, next) {
-    const { status, collectionName, data, workflowId, workflowKey } = context.action.params.values ?? {};
+  async create(ctx, next) {
+    const { status, collectionName, data, workflowId, workflowKey } = ctx.action.params.values ?? {};
     const [dataSourceName, cName] = (0, import_server.parseCollectionName)(collectionName);
-    const dataSource = context.app.dataSourceManager.dataSources.get(dataSourceName);
+    const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceName);
     if (!dataSource) {
-      return context.throw(400, `Data source "${dataSourceName}" not found`);
+      return ctx.throw(400, `Data source "${dataSourceName}" not found`);
     }
     const collection = dataSource.collectionManager.getCollection(cName);
     if (!collection) {
-      return context.throw(400, `Collection "${cName}" not found`);
+      return ctx.throw(400, `Collection "${cName}" not found`);
     }
     let workflow;
     if (workflowKey) {
-      workflow = await context.db.getRepository("workflows").findOne({
+      workflow = await ctx.db.getRepository("workflows").findOne({
         filter: {
           key: workflowKey,
           enabled: true
         }
       });
     } else {
-      workflow = await context.db.getRepository("workflows").findOne({
+      workflow = await ctx.db.getRepository("workflows").findOne({
         filterByTk: workflowId
       });
     }
     if (!workflow) {
-      return context.throw(400, "Current workflow not found or disabled, please refresh and try again");
+      return ctx.throw(400, "Current workflow not found or disabled, please refresh and try again");
     }
     if (status !== import_status.APPROVAL_STATUS.DRAFT) {
-      context.action.mergeParams({
+      ctx.action.mergeParams({
         values: {
           status: import_status.APPROVAL_STATUS.SUBMITTED
         }
       });
     }
     const { repository, model } = collection;
-    let dataToCreate = (0, import_server.traverseJSON)(data, { collection });
-    if (workflowKey) {
-      Object.values(collection.model.associations || {}).forEach((assocUnknown) => {
-        var _a, _b;
-        const assoc = assocUnknown;
-        if (assoc.foreignKey && Object.prototype.hasOwnProperty.call(dataToCreate, assoc.foreignKey)) {
-          delete dataToCreate[assoc.foreignKey];
-        }
-        if (assoc.associationType === "BelongsToMany" && assoc.as && Array.isArray(dataToCreate[assoc.as])) {
-          const targetKey = assoc.targetKey && typeof assoc.targetKey === "string" ? assoc.targetKey : (
-            // fallback: 一般为 target model 的主键
-            ((_a = assoc.target) == null ? void 0 : _a.primaryKeyAttribute) || ((_b = assoc.target) == null ? void 0 : _b.primaryKey) || "id"
-          );
-          dataToCreate[assoc.as].forEach((item) => {
-            if (item && typeof item === "object" && Object.prototype.hasOwnProperty.call(item, targetKey)) {
-              delete item[targetKey];
-            }
-          });
-        }
-      });
-    }
     const values = await repository.create({
       values: {
-        ...dataToCreate,
-        createdBy: context.state.currentUser.id,
-        updatedBy: context.state.currentUser.id
+        ...(0, import_server.traverseJSON)(data, { collection }),
+        createdBy: ctx.state.currentUser.id,
+        updatedBy: ctx.state.currentUser.id
       },
-      context
+      context: ctx
     });
     const instance = values.get();
     const summary = (0, import_tools.getSummary)({
@@ -98,28 +77,28 @@ const approvals = {
         ...data
       },
       collection,
-      app: context.app
+      app: ctx.tego
     });
     Object.keys(model.associations).forEach((key) => {
       delete instance[key];
     });
-    context.action.mergeParams({
+    ctx.action.mergeParams({
       values: {
         collectionName,
         data: instance,
         dataKey: values[collection.filterTargetKey],
         workflowKey: workflow.key,
         workflowId: workflow.id,
-        applicantRoleName: context.state.currentRole,
+        applicantRoleName: ctx.state.currentRole,
         summary
       }
     });
-    return import_server.actions.create(context, next);
+    return import_server.actions.create(ctx, next);
   },
-  async update(context, next) {
-    const { collectionName, data, status, updateAssociationValues, summaryConfig } = context.action.params.values ?? {};
+  async update(ctx, next) {
+    const { collectionName, data, status, updateAssociationValues, summaryConfig } = ctx.action.params.values ?? {};
     const [dataSourceName, cName] = (0, import_server.parseCollectionName)(collectionName);
-    const dataSource = context.app.dataSourceManager.dataSources.get(dataSourceName);
+    const dataSource = ctx.tego.dataSourceManager.dataSources.get(dataSourceName);
     const collection = dataSource.collectionManager.getCollection(cName);
     const [target] = await collection.repository.update({
       filterByTk: data[collection.filterTargetKey],
@@ -130,55 +109,55 @@ const approvals = {
       summaryConfig,
       data,
       collection,
-      app: context.app
+      app: ctx.tego
     });
-    context.action.mergeParams({
+    ctx.action.mergeParams({
       values: {
         status: status ?? import_status.APPROVAL_STATUS.SUBMITTED,
         data,
-        applicantRoleName: context.state.currentRole,
+        applicantRoleName: ctx.state.currentRole,
         summary
       }
     });
-    return import_server.actions.update(context, next);
+    return import_server.actions.update(ctx, next);
   },
-  async destroy(context, next) {
+  async destroy(ctx, next) {
     const {
       filterByTk,
       values: { status }
-    } = context.action.params ?? {};
+    } = ctx.action.params ?? {};
     if (status !== import_status.APPROVAL_STATUS.DRAFT) {
-      return context.throw(400);
+      return ctx.throw(400);
     }
-    const repository = import_server.utils.getRepositoryFromParams(context);
+    const repository = import_server.utils.getRepositoryFromParams(ctx);
     const approval = await repository.findOne({
       filterByTk,
       filter: {
-        createdById: context.state.currentUser.id
+        createdById: ctx.state.currentUser.id
       }
     });
     if (!approval) {
-      return context.throw(404);
+      return ctx.throw(404);
     }
-    return import_server.actions.destroy(context, next);
+    return import_server.actions.destroy(ctx, next);
   },
-  async withdraw(context, next) {
+  async withdraw(ctx, next) {
     var _a, _b;
-    const { filterByTk } = context.action.params;
-    const repository = import_server.utils.getRepositoryFromParams(context);
+    const { filterByTk } = ctx.action.params;
+    const repository = import_server.utils.getRepositoryFromParams(ctx);
     const approval = await repository.findOne({
       filterByTk,
       appends: ["workflow"],
       except: ["workflow.options"]
     });
     if (!approval) {
-      return context.throw(404);
+      return ctx.throw(404);
     }
-    if (approval.createdById !== ((_a = context.state.currentUser) == null ? void 0 : _a.id)) {
-      return context.throw(403);
+    if (approval.createdById !== ((_a = ctx.state.currentUser) == null ? void 0 : _a.id)) {
+      return ctx.throw(403);
     }
     if (approval.status !== import_status.APPROVAL_STATUS.SUBMITTED || !approval.workflow.config.withdrawable) {
-      return context.throw(400);
+      return ctx.throw(400);
     }
     const [execution] = await approval.getExecutions({
       where: {
@@ -187,10 +166,10 @@ const approvals = {
       limit: 1
     });
     if (!execution) {
-      return context.throw(404, "Execution not found! Please contact the administrator.");
+      return ctx.throw(404, "Execution not found! Please contact the administrator.");
     }
     if (!approval.workflow.enabled && ((_b = approval.workflow) == null ? void 0 : _b.key)) {
-      const latestWorkflow = await context.db.getRepository("workflows").findOne({
+      const latestWorkflow = await ctx.db.getRepository("workflows").findOne({
         filter: {
           key: approval.workflow.key,
           enabled: true
@@ -204,13 +183,13 @@ const approvals = {
             workflowId: latestWorkflow.id
           },
           {
-            transaction: context.transaction
+            transaction: ctx.transaction
           }
         );
       }
     }
     execution.workflow = approval.workflow;
-    await context.db.sequelize.transaction(async (transaction) => {
+    await ctx.db.sequelize.transaction(async (transaction) => {
       const records = await approval.getRecords({
         where: {
           executionId: execution.id
@@ -226,7 +205,7 @@ const approvals = {
         ],
         transaction
       });
-      await context.db.getRepository("approvalRecords").destroy({
+      await ctx.db.getRepository("approvalRecords").destroy({
         filter: {
           id: records.map((record) => record.id)
         },
@@ -243,52 +222,52 @@ const approvals = {
       }, /* @__PURE__ */ new Map());
       return Array.from(jobsMap.values());
     });
-    context.body = approval;
-    context.status = 202;
+    ctx.body = approval;
+    ctx.status = 202;
     await next();
     await execution.update({
       status: import_module_workflow.EXECUTION_STATUS.CANCELED
     });
   },
-  async listCentralized(context, next) {
-    const centralizedApprovalFlow = await context.db.getRepository("workflows").find({
+  async listCentralized(ctx, next) {
+    const centralizedApprovalFlow = await ctx.db.getRepository("workflows").find({
       filter: {
         type: "approval",
         "config.centralized": true
       },
       fields: ["id"]
     });
-    context.action.mergeParams({
+    ctx.action.mergeParams({
       filter: {
         workflowId: centralizedApprovalFlow.map((item) => item.id)
       }
     });
-    return await import_server.actions.list(context, next);
+    return await import_server.actions.list(ctx, next);
   },
-  async reminder(context, next) {
+  async reminder(ctx, next) {
     var _a, _b, _c;
-    const { filterByTk } = context.action.params;
-    const repository = import_server.utils.getRepositoryFromParams(context);
+    const { filterByTk } = ctx.action.params;
+    const repository = import_server.utils.getRepositoryFromParams(ctx);
     const approval = await repository.findOne({
       filterByTk,
       appends: ["records", "workflow", "createdBy.nickname"]
     });
     if (!approval) {
-      return context.throw(404);
+      return ctx.throw(404);
     }
-    if (approval.createdById !== ((_a = context.state.currentUser) == null ? void 0 : _a.id)) {
-      return context.throw(403);
+    if (approval.createdById !== ((_a = ctx.state.currentUser) == null ? void 0 : _a.id)) {
+      return ctx.throw(403);
     }
     if ([import_status.APPROVAL_STATUS.APPROVED, import_status.APPROVAL_STATUS.REJECTED, import_status.APPROVAL_STATUS.ERROR].includes(approval.status)) {
-      return context.throw(400);
+      return ctx.throw(400);
     }
     if (((_b = approval.records) == null ? void 0 : _b.length) === 0) {
-      return context.throw(400);
+      return ctx.throw(400);
     }
     const assignees = approval.records.map((record) => record.userId);
     for (const userId of assignees) {
       const [dataSourceName] = (0, import_server.parseCollectionName)(approval.collectionName);
-      const collection = context.app.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
+      const collection = ctx.tego.dataSourceManager.dataSources.get(dataSourceName).collectionManager.getCollection(approval.collectionName);
       const message = {
         userId,
         title: `{{t("Approval", { ns: '${import_constants.NAMESPACE}' })}}`,
@@ -298,11 +277,11 @@ const approvals = {
         schemaName: (_c = approval.workflow) == null ? void 0 : _c.config.applyDetail,
         dataKey: approval.data[collection.filterTargetKey]
       };
-      context.app.messageManager.sendMessage(+userId, message);
+      ctx.tego.messageManager.sendMessage(+userId, message);
     }
     await next();
-    context.status = 200;
-    context.body = {
+    ctx.status = 200;
+    ctx.body = {
       message: "reminder sent",
       success: true
     };

package/dist/server/actions/index.js

@@ -35,7 +35,7 @@ function make(name, mod) {
   );
 }
 function init({ app }) {
-  app.actions({
+  app.resourcer.registerActions({
     ...make("workflows", import_workflows.workflows),
     ...make("approvals", import_approvals.approvals),
     ...make("approvalRecords", import_approvalRecords.approvalRecords),

package/dist/server/actions/workflows.d.ts

@@ -1,3 +1,3 @@
 export declare const workflows: {
-    listApprovalFlows(context: any, next: any): Promise<void>;
+    listApprovalFlows(ctx: any, next: any): Promise<void>;
 };

package/dist/server/actions/workflows.js

@@ -22,15 +22,15 @@ __export(workflows_exports, {
 module.exports = __toCommonJS(workflows_exports);
 var import_server = require("@tego/server");
 const workflows = {
-  async listApprovalFlows(context, next) {
-    context.action.mergeParams({
+  async listApprovalFlows(ctx, next) {
+    ctx.action.mergeParams({
       filter: {
         type: "approval",
         enabled: true
         // TODO: 仅显示当前用户有权限的流程
       }
     });
-    return import_server.actions.list(context, next);
+    return import_server.actions.list(ctx, next);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/plugin.js

@@ -62,9 +62,6 @@ class PluginWorkflowApproval extends import_server.Plugin {
         plugin: this
       }
     });
-    await db.import({
-      directory: import_node_path.default.resolve(__dirname, "collections")
-    });
     (0, import_actions.init)(this);
     this.app.acl.allow("workflows", ["listApprovalFlows"], "loggedIn");
     this.app.acl.allow("approvals", "*", "loggedIn");

package/dist/server/triggers/Approval.d.ts

@@ -11,10 +11,10 @@ export default class ApprovalTrigger extends Trigger {
     onExecutionUpdate: (execution: any, { transaction }: {
         transaction: any;
     }) => Promise<void>;
-    middleware: (context: any, next: any) => Promise<any>;
+    middleware: (ctx: any, next: any) => Promise<any>;
     constructor(workflow: any);
-    workflowTriggerAction(context: any, next: any): Promise<any>;
-    collectionTriggerAction(context: any, workflowList: any): Promise<void>;
+    workflowTriggerAction(ctx: any, next: any): Promise<any>;
+    collectionTriggerAction(ctx: any, workflowList: any): Promise<void>;
     on(workflow: any): void;
     off(workflow: any): void;
     duplicateConfig(workflow: any, { transaction }: {