@nocobase/plugin-workflow 0.12.0-alpha.2 → 0.12.0-alpha.4

package/dist/server/Processor.js

@@ -48,20 +48,21 @@ class Processor {
     });
   }
   async getTransaction() {
-    if (!this.execution.useTransaction) {
+    var _a;
+    if (!((_a = this.execution.workflow.options) == null ? void 0 : _a.useTransaction)) {
       return;
     }
     const { options } = this;
     return options.transaction && !options.transaction.finished ? options.transaction : await options.plugin.db.sequelize.transaction();
   }
   async prepare() {
-    const transaction = await this.getTransaction();
-    this.transaction = transaction;
     const { execution } = this;
     if (!execution.workflow) {
-      execution.workflow = await execution.getWorkflow({ transaction });
+      execution.workflow = await execution.getWorkflow();
     }
-    const nodes = await execution.workflow.getNodes({ transaction });
+    const transaction = await this.getTransaction();
+    this.transaction = transaction;
+    const nodes = await execution.workflow.getNodes();
     this.makeNodes(nodes);
     const jobs = await execution.getJobs({
       order: [["id", "ASC"]],

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

@@ -0,0 +1,2 @@
+import { Context } from '@nocobase/actions';
+export declare function destroy(context: Context, next: any): Promise<void>;

package/dist/server/actions/executions.js

@@ -0,0 +1,22 @@
+'use strict';
+
+var actions = require('@nocobase/actions');
+var database = require('@nocobase/database');
+var constants = require('../constants');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var actions__default = /*#__PURE__*/_interopDefault(actions);
+
+async function destroy(context, next) {
+  context.action.mergeParams({
+    filter: {
+      status: {
+        [database.Op.ne]: constants.EXECUTION_STATUS.STARTED
+      }
+    }
+  });
+  await actions__default.default.destroy(context, next);
+}
+
+exports.destroy = destroy;

package/dist/server/actions/index.js

@@ -2,6 +2,7 @@
 
 var workflows = require('./workflows');
 var nodes = require('./nodes');
+var executions = require('./executions');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -23,6 +24,7 @@ function _interopNamespace(e) {
 
 var workflows__namespace = /*#__PURE__*/_interopNamespace(workflows);
 var nodes__namespace = /*#__PURE__*/_interopNamespace(nodes);
+var executions__namespace = /*#__PURE__*/_interopNamespace(executions);
 
 function make(name, mod) {
   return Object.keys(mod).reduce(
@@ -42,7 +44,8 @@ function actions_default({ app }) {
     }),
     ...make("flow_nodes", {
       update: nodes__namespace.update
-    })
+    }),
+    ...make("executions", executions__namespace)
   });
 }
 

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

@@ -2,3 +2,4 @@ import { Context } from '@nocobase/actions';
 export declare function update(context: Context, next: any): Promise<void>;
 export declare function destroy(context: Context, next: any): Promise<void>;
 export declare function revision(context: Context, next: any): Promise<void>;
+export declare function sync(context: Context, next: any): Promise<void>;

package/dist/server/actions/workflows.js

@@ -11,7 +11,7 @@ async function update(context, next) {
   const repository = actions.utils.getRepositoryFromParams(context);
   const { filterByTk, values } = context.action.params;
   context.action.mergeParams({
-    whitelist: ["title", "description", "enabled", "config"]
+    whitelist: ["title", "description", "enabled", "config", "options"]
   });
   if (Object.keys(values).includes("config")) {
     const workflow = await repository.findById(filterByTk);
@@ -94,7 +94,7 @@ function migrateConfig(config, oldToNew) {
 async function revision(context, next) {
   const { db } = context;
   const repository = actions.utils.getRepositoryFromParams(context);
-  const { filterByTk, filter = {} } = context.action.params;
+  const { filterByTk, filter = {}, values = {} } = context.action.params;
   context.body = await db.sequelize.transaction(async (transaction) => {
     const origin = await repository.findOne({
       filterByTk,
@@ -107,7 +107,7 @@ async function revision(context, next) {
       key: filter.key,
       title: origin.title,
       allExecuted: origin.allExecuted
-    } : {};
+    } : values;
     const instance = await repository.create({
       values: {
         title: `${origin.title} copy`,
@@ -160,7 +160,23 @@ async function revision(context, next) {
   });
   await next();
 }
+async function sync(context, next) {
+  const plugin = context.app.getPlugin("workflow");
+  const repository = actions.utils.getRepositoryFromParams(context);
+  const { filterByTk, filter = {} } = context.action.params;
+  const workflows = await repository.find({
+    filterByTk,
+    filter
+  });
+  workflows.forEach((workflow) => {
+    plugin.toggle(workflow, false);
+    plugin.toggle(workflow);
+  });
+  context.status = 204;
+  await next();
+}
 
 exports.destroy = destroy;
 exports.revision = revision;
+exports.sync = sync;
 exports.update = update;

package/dist/server/collections/workflows.js

@@ -75,6 +75,11 @@ function workflows_default() {
         // NOTE: no constraints needed here because tricky self-referencing
         constraints: false,
         onDelete: "NO ACTION"
+      },
+      {
+        type: "jsonb",
+        name: "options",
+        defaultValue: {}
       }
     ],
     // NOTE: use unique index for avoiding deadlock in mysql when setCurrent

package/dist/server/instructions/query.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var actions = require('@nocobase/actions');
 var constants = require('../constants');
 var utils = require('../utils');
 
@@ -7,7 +8,12 @@ var query_default = {
   async run(node, input, processor) {
     const { collection, multiple, params = {}, failOnEmpty = false } = node.config;
     const repo = node.constructor.database.getRepository(collection);
-    const options = processor.getParsedValue(params, node);
+    const {
+      page = actions.DEFAULT_PAGE,
+      pageSize = actions.DEFAULT_PER_PAGE,
+      sort = [],
+      ...options
+    } = processor.getParsedValue(params, node);
     const appends = options.appends ? Array.from(
       options.appends.reduce((set, field) => {
         set.add(field.split(".")[0]);
@@ -17,6 +23,11 @@ var query_default = {
     ) : options.appends;
     const result = await (multiple ? repo.find : repo.findOne).call(repo, {
       ...options,
+      ...actions.utils.pageArgsToLimitArgs(page, pageSize),
+      sort: sort.filter((item) => item.field).map((item) => {
+        var _a;
+        return `${((_a = item.direction) == null ? void 0 : _a.toLowerCase()) === "desc" ? "-" : ""}${item.field}`;
+      }),
       appends,
       transaction: processor.transaction
     });

package/dist/server/migrations/20230809113132-workflow-options.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20230809113132-workflow-options.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var server = require('@nocobase/server');
+
+class workflow_options_default extends server.Migration {
+  async up() {
+    const match = await this.app.version.satisfies("<0.11.0-alpha.2");
+    if (!match) {
+      return;
+    }
+    const { db } = this.context;
+    const WorkflowRepo = db.getRepository("flow_nodes");
+    await db.sequelize.transaction(async (transaction) => {
+      const workflows = await WorkflowRepo.find({
+        transaction
+      });
+      await workflows.reduce(
+        (promise, workflow) => promise.then(() => {
+          workflow.set("options", {
+            useTransaction: workflow.get("useTransaction")
+          });
+          workflow.changed("options", true);
+          return workflow.save({
+            silent: true,
+            transaction
+          });
+        }),
+        Promise.resolve()
+      );
+    });
+  }
+}
+
+module.exports = workflow_options_default;

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

@@ -0,0 +1,11 @@
+import { Trigger } from '.';
+import Plugin from '..';
+import { WorkflowModel } from '../types';
+export default class FormTrigger extends Trigger {
+    constructor(plugin: Plugin);
+    triggerAction: (context: any, next: any) => Promise<any>;
+    middleware: (context: any, next: any) => Promise<void>;
+    trigger(context: any): Promise<void>;
+    on(workflow: WorkflowModel): void;
+    off(workflow: WorkflowModel): void;
+}

package/dist/server/triggers/form.js

@@ -0,0 +1,89 @@
+'use strict';
+
+var lodash = require('lodash');
+var _ = require('.');
+var database = require('@nocobase/database');
+
+class FormTrigger extends _.Trigger {
+  constructor(plugin) {
+    super(plugin);
+    plugin.app.resourcer.use(this.middleware);
+    plugin.app.actions({
+      ["workflows:trigger"]: this.triggerAction
+    });
+  }
+  triggerAction = async (context, next) => {
+    const { triggerWorkflows } = context.action.params;
+    if (!triggerWorkflows) {
+      return context.throw(400);
+    }
+    context.status = 202;
+    await next();
+    this.trigger(context);
+  };
+  middleware = async (context, next) => {
+    await next();
+    const { resourceName, actionName } = context.action;
+    if (resourceName === "workflows" && actionName === "trigger" || !["create", "update"].includes(actionName)) {
+      return;
+    }
+    this.trigger(context);
+  };
+  async trigger(context) {
+    const { triggerWorkflows, values } = context.action.params;
+    if (!triggerWorkflows) {
+      return;
+    }
+    const triggers = triggerWorkflows.split(",").map((trigger) => trigger.split("!"));
+    const workflowRepo = this.plugin.db.getRepository("workflows");
+    const workflows = await workflowRepo.find({
+      filter: {
+        key: triggers.map((trigger) => trigger[0]),
+        current: true,
+        type: "form",
+        enabled: true
+      }
+    });
+    workflows.forEach((workflow) => {
+      var _a;
+      const trigger = triggers.find((trigger2) => trigger2[0] == workflow.key);
+      if ((_a = context.body) == null ? void 0 : _a.data) {
+        const { data } = context.body;
+        (Array.isArray(data) ? data : [data]).forEach(async (row) => {
+          let payload = row;
+          if (trigger[1]) {
+            const paths = trigger[1].split(".");
+            for await (const field of paths) {
+              if (payload.get(field)) {
+                payload = payload.get(field);
+              } else {
+                const association = database.modelAssociationByKey(payload, field);
+                payload = await payload[association.accessors.get]();
+              }
+            }
+          }
+          const { collection, appends = [] } = workflow.config;
+          const model = payload.constructor;
+          if (collection !== model.collection.name) {
+            return;
+          }
+          if (appends.length) {
+            payload = await model.collection.repository.findOne({
+              filterByTk: payload.get(model.primaryKeyAttribute),
+              appends
+            });
+          }
+          this.plugin.trigger(workflow, { data: payload });
+        });
+      } else {
+        this.plugin.trigger(workflow, { data: trigger[1] ? lodash.get(values, trigger[1]) : values });
+      }
+    });
+  }
+  on(workflow) {
+  }
+  off(workflow) {
+  }
+}
+
+module.exports = FormTrigger;

package/dist/server/triggers/index.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var path = require('path');
 var utils = require('@nocobase/utils');
+var path = require('path');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -17,6 +17,7 @@ class Trigger {
 function triggers_default(plugin, more = {}) {
   const { triggers } = plugin;
   triggers.register("collection", new (utils.requireModule(path__default.default.join(__dirname, "collection")))(plugin));
+  triggers.register("form", new (utils.requireModule(path__default.default.join(__dirname, "form")))(plugin));
   triggers.register("schedule", new (utils.requireModule(path__default.default.join(__dirname, "schedule")))(plugin));
   for (const [name, TClass] of Object.entries(more)) {
     triggers.register(name, new TClass(plugin));

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "工作流",
   "description": "A powerful workflow plugin designed to support business process management and automation.",
   "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
-  "version": "0.12.0-alpha.2",
+  "version": "0.12.0-alpha.4",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -40,5 +40,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
+  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
 }

package/dist/client/components/NodeDescription.d.ts

@@ -1,2 +0,0 @@
-import React from 'react';
-export declare function NodeDescription(props: any): React.JSX.Element;