@nocobase/plugin-workflow 0.9.0-alpha.2 → 0.9.1-alpha.2

package/lib/client/utils.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.linkNodes = linkNodes;
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+
+function linkNodes(nodes) {
+  const nodesMap = new Map();
+  nodes.forEach(item => nodesMap.set(item.id, item));
+
+  var _iterator = _createForOfIteratorHelper(nodesMap.values()),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      let node = _step.value;
+
+      if (node.upstreamId) {
+        node.upstream = nodesMap.get(node.upstreamId);
+      }
+
+      if (node.downstreamId) {
+        node.downstream = nodesMap.get(node.downstreamId);
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+}

package/lib/client/variable.d.ts

@@ -0,0 +1,21 @@
+export declare type VariableOption = {
+    key: string;
+    value: string;
+    label: string;
+    children?: VariableOption[];
+};
+export declare const TypeSets: {
+    boolean: Set<string>;
+    number: Set<string>;
+    string: Set<string>;
+    date: Set<string>;
+};
+export declare function filterTypedFields(fields: any, types: any): any;
+export declare function useWorkflowVariableOptions(): {
+    label: any;
+    value: any;
+    key: any;
+    children: any;
+    disabled: boolean;
+}[];
+export declare function useCollectionFieldOptions(props: any): any;

package/lib/client/variable.js

@@ -0,0 +1,147 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TypeSets = void 0;
+exports.filterTypedFields = filterTypedFields;
+exports.useCollectionFieldOptions = useCollectionFieldOptions;
+exports.useWorkflowVariableOptions = useWorkflowVariableOptions;
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _nodes = require("./nodes");
+
+var _FlowContext = require("./FlowContext");
+
+var _triggers = require("./triggers");
+
+var _locale = require("./locale");
+
+const VariableTypes = [{
+  title: `{{t("Node result", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: '$jobsMapByNodeId',
+
+  options(types) {
+    const current = (0, _nodes.useNodeContext)();
+    const upstreams = (0, _nodes.useAvailableUpstreams)(current);
+    const options = [];
+    upstreams.forEach(node => {
+      var _instruction$getOptio;
+
+      const instruction = _nodes.instructions.get(node.type);
+
+      const subOptions = (_instruction$getOptio = instruction.getOptions) === null || _instruction$getOptio === void 0 ? void 0 : _instruction$getOptio.call(instruction, node.config, types);
+
+      if (subOptions) {
+        var _node$title;
+
+        options.push({
+          key: node.id.toString(),
+          value: node.id.toString(),
+          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
+          children: subOptions
+        });
+      }
+    });
+    return options;
+  }
+
+}, {
+  title: `{{t("Trigger variables", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: '$context',
+
+  options(types) {
+    var _trigger$getOptions, _trigger$getOptions2;
+
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
+          workflow = _useFlowContext.workflow;
+
+    const trigger = _triggers.triggers.get(workflow.type);
+
+    return (_trigger$getOptions = trigger === null || trigger === void 0 ? void 0 : (_trigger$getOptions2 = trigger.getOptions) === null || _trigger$getOptions2 === void 0 ? void 0 : _trigger$getOptions2.call(trigger, workflow.config, types)) !== null && _trigger$getOptions !== void 0 ? _trigger$getOptions : null;
+  }
+
+}, {
+  title: `{{t("System variables", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: '$system',
+  options: [{
+    key: 'now',
+    value: 'now',
+    label: `{{t("Current time", { ns: "${_locale.NAMESPACE}" })}}`
+  }]
+}];
+const TypeSets = {
+  boolean: new Set(['boolean']),
+  number: new Set(['integer', 'bigInt', 'float', 'double', 'real', 'decimal']),
+  string: new Set(['string', 'text', 'password']),
+  date: new Set(['date', 'time'])
+};
+exports.TypeSets = TypeSets;
+
+function matchFieldType(field, type) {
+  if (typeof type === 'string') {
+    var _TypeSets$type;
+
+    return Boolean((_TypeSets$type = TypeSets[type]) === null || _TypeSets$type === void 0 ? void 0 : _TypeSets$type.has(field.type));
+  }
+
+  if (typeof type === 'object' && type.type === 'reference') {
+    var _type$options, _type$options2;
+
+    return field.collectionName === ((_type$options = type.options) === null || _type$options === void 0 ? void 0 : _type$options.collection) && field.name === 'id' || field.type === 'belongsTo' && field.target === ((_type$options2 = type.options) === null || _type$options2 === void 0 ? void 0 : _type$options2.collection);
+  }
+
+  return false;
+}
+
+function filterTypedFields(fields, types) {
+  return types ? fields.filter(field => types.some(type => matchFieldType(field, type))) : fields;
+}
+
+function useWorkflowVariableOptions() {
+  const compile = (0, _client().useCompile)();
+  const options = VariableTypes.map(item => {
+    const options = typeof item.options === 'function' ? item.options().filter(Boolean) : item.options;
+    return {
+      label: compile(item.title),
+      value: item.value,
+      key: item.value,
+      children: compile(options),
+      disabled: options && !options.length
+    };
+  });
+  return options;
+}
+
+function useCollectionFieldOptions(props) {
+  const fields = props.fields,
+        collection = props.collection,
+        types = props.types;
+  const compile = (0, _client().useCompile)();
+
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+        getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  return filterTypedFields(fields !== null && fields !== void 0 ? fields : getCollectionFields(collection), types).filter(field => field.interface && (!field.target || field.type === 'belongsTo')).map(field => {
+    var _field$uiSchema, _field$uiSchema2;
+
+    return field.type === 'belongsTo' ? {
+      label: `${compile(((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name)} ID`,
+      key: field.foreignKey,
+      value: field.foreignKey
+    } : {
+      label: compile(((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name),
+      key: field.name,
+      value: field.name
+    };
+  });
+}

package/lib/server/Plugin.d.ts

@@ -4,13 +4,13 @@ import { Instruction } from './instructions';
 import ExecutionModel from './models/Execution';
 import JobModel from './models/Job';
 import WorkflowModel from './models/Workflow';
+import Processor from './Processor';
 import { Trigger } from './triggers';
 declare type Pending = [ExecutionModel, JobModel?];
 export default class WorkflowPlugin extends Plugin {
     instructions: Registry<Instruction>;
     triggers: Registry<Trigger>;
-    calculators: Registry<Function>;
-    extensions: typeof import("./extensions/assignees").default[];
+    functions: Registry<Function>;
     executing: ExecutionModel | null;
     pending: Pending[];
     events: [WorkflowModel, any, {
@@ -26,6 +26,6 @@ export default class WorkflowPlugin extends Plugin {
     resume(job: any): Promise<void>;
     private dispatch;
     private process;
-    private createProcessor;
+    createProcessor(execution: ExecutionModel, options?: {}): Processor;
 }
 export {};

package/lib/server/Plugin.js

@@ -47,18 +47,16 @@ function _utils() {
 
 var _actions = _interopRequireDefault(require("./actions"));
 
-var _calculators = _interopRequireDefault(require("./calculators"));
-
 var _constants = require("./constants");
 
-var _extensions = _interopRequireDefault(require("./extensions"));
-
 var _instructions = _interopRequireDefault(require("./instructions"));
 
 var _Processor = _interopRequireDefault(require("./Processor"));
 
 var _triggers = _interopRequireDefault(require("./triggers"));
 
+var _functions = _interopRequireDefault(require("./functions"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -91,8 +89,7 @@ class WorkflowPlugin extends _server().Plugin {
     _this = this;
     this.instructions = new (_utils().Registry)();
     this.triggers = new (_utils().Registry)();
-    this.calculators = _calculators.default;
-    this.extensions = _extensions.default;
+    this.functions = new (_utils().Registry)();
     this.executing = null;
     this.pending = [];
     this.events = [];
@@ -187,7 +184,7 @@ class WorkflowPlugin extends _server().Plugin {
             const execution = yield workflow.createExecution({
               context,
               key: workflow.key,
-              status: _constants.EXECUTION_STATUS.CREATED,
+              status: _constants.EXECUTION_STATUS.QUEUEING,
               useTransaction: workflow.useTransaction
             }, {
               transaction
@@ -248,6 +245,10 @@ class WorkflowPlugin extends _server().Plugin {
     return _asyncToGenerator(function* () {
       const db = _this2.db,
             options = _this2.options;
+      (0, _actions.default)(_this2);
+      (0, _triggers.default)(_this2, options.triggers);
+      (0, _instructions.default)(_this2, options.instructions);
+      (0, _functions.default)(_this2, options.functions);
 
       _this2.app.acl.registerSnippet({
         name: `pm.${_this2.name}.workflows`,
@@ -268,21 +269,13 @@ class WorkflowPlugin extends _server().Plugin {
         }
       });
 
-      (0, _actions.default)(_this2);
-      (0, _triggers.default)(_this2, options.triggers);
-      (0, _instructions.default)(_this2, options.instructions);
       db.on('workflows.beforeSave', _this2.onBeforeSave);
       db.on('workflows.afterSave', model => _this2.toggle(model));
-      db.on('workflows.afterDestroy', model => _this2.toggle(model, false));
-
-      _this2.app.on('afterLoad', /*#__PURE__*/_asyncToGenerator(function* () {
-        _this2.extensions.reduce((promise, extend) => promise.then(() => extend(_this2)), Promise.resolve());
-      })); // [Life Cycle]:
+      db.on('workflows.afterDestroy', model => _this2.toggle(model, false)); // [Life Cycle]:
       //   * load all workflows in db
       //   * add all hooks for enabled workflows
       //   * add hooks for create/update[enabled]/delete workflow to add/remove specific hooks
 
-
       _this2.app.on('beforeStart', /*#__PURE__*/_asyncToGenerator(function* () {
         const collection = db.getCollection('workflows');
         const workflows = yield collection.repository.find({
@@ -375,7 +368,7 @@ class WorkflowPlugin extends _server().Plugin {
       } else {
         const execution = yield _this4.db.getRepository('executions').findOne({
           filter: {
-            status: _constants.EXECUTION_STATUS.CREATED
+            status: _constants.EXECUTION_STATUS.QUEUEING
           },
           sort: 'createdAt'
         });
@@ -385,8 +378,6 @@ class WorkflowPlugin extends _server().Plugin {
         }
       }
 
-      ;
-
       if (next) {
         _this4.process(...next);
       }
@@ -399,7 +390,7 @@ class WorkflowPlugin extends _server().Plugin {
     return _asyncToGenerator(function* () {
       _this5.executing = execution;
 
-      if (execution.status === _constants.EXECUTION_STATUS.CREATED) {
+      if (execution.status === _constants.EXECUTION_STATUS.QUEUEING) {
         yield execution.update({
           status: _constants.EXECUTION_STATUS.STARTED
         });
@@ -407,7 +398,7 @@ class WorkflowPlugin extends _server().Plugin {
 
       const processor = _this5.createProcessor(execution);
 
-      _this5.app.logger.info(`[Workflow] execution ${execution.id} ${job ? 'resuming' : 'starting'} ...`);
+      _this5.app.logger.info(`[Workflow] execution ${execution.id} ${job ? 'resuming' : 'starting'}...`);
 
       try {
         yield job ? processor.resume(job) : processor.start();

package/lib/server/Processor.d.ts

@@ -12,7 +12,7 @@ export default class Processor {
     static StatusMap: {
         [x: number]: number;
     };
-    transaction: Transaction;
+    transaction?: Transaction;
     nodes: FlowNodeModel[];
     nodesMap: Map<number, FlowNodeModel>;
     jobsMap: Map<number, JobModel>;
@@ -23,7 +23,7 @@ export default class Processor {
     private makeNodes;
     private makeJobs;
     private getTransaction;
-    private prepare;
+    prepare(): Promise<void>;
     start(): Promise<void>;
     resume(job: JobModel): Promise<void>;
     private commit;
@@ -37,5 +37,12 @@ export default class Processor {
     findBranchStartNode(node: FlowNodeModel, parent?: FlowNodeModel): FlowNodeModel | null;
     findBranchParentNode(node: FlowNodeModel): FlowNodeModel | null;
     findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null;
+    getScope(node?: any): {
+        $context: any;
+        $jobsMapByNodeId: {
+            [key: number]: any;
+        };
+        $system: {};
+    };
     getParsedValue(value: any, node?: any): any;
 }

package/lib/server/Processor.js

@@ -25,14 +25,18 @@ function _database() {
   return data;
 }
 
-var _calculators = _interopRequireDefault(require("./calculators"));
-
 var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,12 +49,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -206,13 +204,13 @@ class Processor {
           return null;
         }
       } catch (err) {
-        // for uncaught error, set to rejected
+        // for uncaught error, set to error
         job = {
           result: err instanceof Error ? {
             message: err.message,
             stack: process.env.NODE_ENV === 'production' ? [] : err.stack
           } : err,
-          status: _constants.JOB_STATUS.REJECTED
+          status: _constants.JOB_STATUS.ERROR
         }; // if previous job is from resuming
 
         if (prevJob && prevJob.nodeId === node.id) {
@@ -221,20 +219,13 @@ class Processor {
         }
       }
 
-      let savedJob;
-
-      if (job instanceof _database().Model) {
-        savedJob = yield job.save({
-          transaction: _this6.transaction
-        });
-      } else {
-        const upstreamId = prevJob instanceof _database().Model ? prevJob.get('id') : null;
-        savedJob = yield _this6.saveJob(_objectSpread({
-          nodeId: node.id,
-          upstreamId
-        }, job));
+      if (!(job instanceof _database().Model)) {
+        job.upstreamId = prevJob instanceof _database().Model ? prevJob.get('id') : null;
+        job.nodeId = node.id;
       }
 
+      const savedJob = yield _this6.saveJob(job);
+
       if (savedJob.status === _constants.JOB_STATUS.RESOLVED && node.downstream) {
         // run next node
         return _this6.run(node.downstream, savedJob);
@@ -298,7 +289,9 @@ class Processor {
     var _this10 = this;
 
     return _asyncToGenerator(function* () {
-      const status = job ? _this10.constructor.StatusMap[job.status] : _constants.EXECUTION_STATUS.RESOLVED;
+      var _this10$constructor$S;
+
+      const status = job ? (_this10$constructor$S = _this10.constructor.StatusMap[job.status]) !== null && _this10$constructor$S !== void 0 ? _this10$constructor$S : Math.sign(job.status) : _constants.EXECUTION_STATUS.RESOLVED;
       yield _this10.execution.update({
         status
       }, {
@@ -352,7 +345,7 @@ class Processor {
   }
 
   getBranches(node) {
-    return this.nodes.filter(item => item.upstream === node && item.branchIndex !== null).sort((a, b) => a.branchIndex - b.branchIndex);
+    return this.nodes.filter(item => item.upstream === node && item.branchIndex !== null).sort((a, b) => Number(a.branchIndex) - Number(b.branchIndex));
   } // find the first node in current branch
 
 
@@ -393,14 +386,14 @@ class Processor {
     return null;
   }
 
-  getParsedValue(value, node) {
-    const injectedFns = {};
+  getScope(node) {
+    const systemFns = {};
     const scope = {
       execution: this.execution,
       node
     };
 
-    var _iterator = _createForOfIteratorHelper(_calculators.default.getEntities()),
+    var _iterator = _createForOfIteratorHelper(this.options.plugin.functions.getEntities()),
         _step;
 
     try {
@@ -409,7 +402,7 @@ class Processor {
             name = _step$value[0],
             fn = _step$value[1];
 
-        injectedFns[name] = fn.bind(scope);
+        systemFns[name] = fn.bind(scope);
       }
     } catch (err) {
       _iterator.e(err);
@@ -417,11 +410,15 @@ class Processor {
       _iterator.f();
     }
 
-    return (0, _jsonTemplates().default)(value)({
+    return {
       $context: this.execution.context,
       $jobsMapByNodeId: this.jobsMapByNodeId,
-      $fn: injectedFns
-    });
+      $system: systemFns
+    };
+  }
+
+  getParsedValue(value, node) {
+    return (0, _jsonTemplates().default)(value)(this.getScope(node));
   }
 
 }
@@ -430,6 +427,9 @@ exports.default = Processor;
 Processor.StatusMap = {
   [_constants.JOB_STATUS.PENDING]: _constants.EXECUTION_STATUS.STARTED,
   [_constants.JOB_STATUS.RESOLVED]: _constants.EXECUTION_STATUS.RESOLVED,
-  [_constants.JOB_STATUS.REJECTED]: _constants.EXECUTION_STATUS.REJECTED,
-  [_constants.JOB_STATUS.CANCELED]: _constants.EXECUTION_STATUS.CANCELED
+  [_constants.JOB_STATUS.FAILED]: _constants.EXECUTION_STATUS.FAILED,
+  [_constants.JOB_STATUS.ERROR]: _constants.EXECUTION_STATUS.ERROR,
+  [_constants.JOB_STATUS.ABORTED]: _constants.EXECUTION_STATUS.ABORTED,
+  [_constants.JOB_STATUS.CANCELED]: _constants.EXECUTION_STATUS.CANCELED,
+  [_constants.JOB_STATUS.REJECTED]: _constants.EXECUTION_STATUS.REJECTED
 };

package/lib/server/actions/index.js

@@ -9,8 +9,6 @@ var workflows = _interopRequireWildcard(require("./workflows"));
 
 var nodes = _interopRequireWildcard(require("./nodes"));
 
-var jobs = _interopRequireWildcard(require("./jobs"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -30,10 +28,10 @@ function make(name, mod) {
 function _default({
   app
 }) {
-  app.actions(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, make('workflows', workflows)), make('workflows.nodes', {
+  app.actions(_objectSpread(_objectSpread(_objectSpread({}, make('workflows', workflows)), make('workflows.nodes', {
     create: nodes.create,
     destroy: nodes.destroy
   })), make('flow_nodes', {
     update: nodes.update
-  })), make('jobs', jobs)));
+  })));
 }

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

@@ -1,3 +1,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>;