@nocobase/plugin-workflow 0.9.4-alpha.2 → 0.10.0-alpha.3

package/lib/server/Processor.js

@@ -26,18 +26,18 @@ function _utils() {
   return data;
 }
 var _constants = require("./constants");
+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."); }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 _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 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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."); }
-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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }); }; }
 class Processor {
@@ -123,9 +123,8 @@ class Processor {
           result: execution.context
         });
       } else {
-        yield _this3.exit(null);
+        yield _this3.exit(_constants.JOB_STATUS.RESOLVED);
       }
-      yield _this3.commit();
     })();
   }
   resume(job) {
@@ -138,7 +137,6 @@ class Processor {
       yield _this4.prepare();
       const node = _this4.nodesMap.get(job.nodeId);
       yield _this4.recall(node, job);
-      yield _this4.commit();
     })();
   }
   commit() {
@@ -225,7 +223,7 @@ class Processor {
       }
       // really done for all nodes
       // * should mark execution as done with last job status
-      return _this8.exit(job);
+      return _this8.exit(job.status);
     })();
   }
   recall(node, job) {
@@ -239,17 +237,20 @@ class Processor {
       return _this9.exec(instruction.resume.bind(instruction), node, job);
     })();
   }
-  exit(job) {
+  exit(s) {
     var _this10 = this;
     return _asyncToGenerator(function* () {
-      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;
-      _this10.logger.info(`execution (${_this10.execution.id}) all nodes finished, finishing execution...`);
-      yield _this10.execution.update({
-        status
-      }, {
-        transaction: _this10.transaction
-      });
+      if (typeof s === 'number') {
+        var _this10$constructor$S;
+        const status = (_this10$constructor$S = _this10.constructor.StatusMap[s]) !== null && _this10$constructor$S !== void 0 ? _this10$constructor$S : Math.sign(s);
+        yield _this10.execution.update({
+          status
+        }, {
+          transaction: _this10.transaction
+        });
+      }
+      _this10.logger.info(`execution (${_this10.execution.id}) exiting with status ${_this10.execution.status}`);
+      yield _this10.commit();
       return null;
     })();
   }
@@ -266,15 +267,10 @@ class Processor {
           transaction: _this11.transaction
         });
       } else if (payload.id) {
-        var _yield$model$update = yield model.update(payload, {
-          where: {
-            id: payload.id
-          },
-          returning: true,
+        job = yield model.findByPk(payload.id);
+        yield job.update(payload, {
           transaction: _this11.transaction
         });
-        var _yield$model$update2 = _slicedToArray(_yield$model$update, 1);
-        job = _yield$model$update2[0];
       } else {
         job = yield model.create(_objectSpread(_objectSpread({}, payload), {}, {
           executionId: _this11.execution.id

package/lib/server/instructions/delay.js

@@ -27,7 +27,7 @@ class _default {
         const duration = node.config.duration;
         // add to schedule
         _this.schedule(job, duration);
-        return processor.end(node, job);
+        return processor.exit();
       });
       return function (_x, _x2, _x3) {
         return _ref.apply(this, arguments);

package/lib/server/instructions/loop.d.ts

@@ -6,7 +6,7 @@ declare const _default: {
         status: number;
         result: number;
     }>;
-    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<JobModel>;
+    resume(node: FlowNodeModel, branchJob: any, processor: Processor): Promise<any>;
     getScope(node: any, index: any, processor: any): {
         item: any;
         index: any;

package/lib/server/instructions/loop.js

@@ -68,7 +68,7 @@ var _default = {
         status = job.status;
       // if loop has been done (resolved / rejected), do not care newly executed branch jobs.
       if (status !== _constants.JOB_STATUS.PENDING) {
-        return null;
+        return processor.exit();
       }
       const nextIndex = result + 1;
       const target = processor.getParsedValue(loop.config.target, node);

package/lib/server/instructions/manual/actions.js

@@ -25,6 +25,7 @@ function submit(_x, _x2) {
 }
 function _submit() {
   _submit = _asyncToGenerator(function* (context, next) {
+    var _values$result, _forms$formKey, _forms$formKey$action, _userJob$node$config$2, _userJob$result;
     const repository = _actions().utils.getRepositoryFromParams(context);
     const _context$action$param = context.action.params,
       filterByTk = _context$action$param.filterByTk,
@@ -34,53 +35,47 @@ function _submit() {
       return context.throw(401);
     }
     const plugin = context.app.pm.get('workflow');
-    const userJob = yield context.db.sequelize.transaction( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (transaction) {
-        var _values$result, _forms$form, _forms$form$actions, _instance$node$config2;
-        const instance = yield repository.findOne({
-          filterByTk,
-          // filter: {
-          //   userId: currentUser?.id
-          // },
-          appends: ['job', 'node', 'execution', 'workflow'],
-          context,
-          transaction
-        });
-        if (!instance) {
-          return context.throw(404);
-        }
-        const _instance$node$config = instance.node.config.forms,
-          forms = _instance$node$config === void 0 ? {} : _instance$node$config;
-        const _Object$keys = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}),
-          _Object$keys2 = _slicedToArray(_Object$keys, 1),
-          form = _Object$keys2[0];
-        // NOTE: validate status
-        if (instance.status !== _constants.JOB_STATUS.PENDING || instance.job.status !== _constants.JOB_STATUS.PENDING || instance.execution.status !== _constants.EXECUTION_STATUS.STARTED || !instance.workflow.enabled || !((_forms$form = forms[form]) === null || _forms$form === void 0 ? void 0 : (_forms$form$actions = _forms$form.actions) === null || _forms$form$actions === void 0 ? void 0 : _forms$form$actions.includes(values.status))) {
-          return context.throw(400);
-        }
-        instance.execution.workflow = instance.workflow;
-        const processor = plugin.createProcessor(instance.execution, {
-          transaction
-        });
-        yield processor.prepare();
-        const assignees = processor.getParsedValue((_instance$node$config2 = instance.node.config.assignees) !== null && _instance$node$config2 !== void 0 ? _instance$node$config2 : []);
-        if (!assignees.includes(currentUser.id) || instance.userId !== currentUser.id) {
-          return context.throw(403);
-        }
-        // NOTE: validate assignee
-        yield instance.update({
-          status: values.status,
-          result: values.result
-        }, {
-          transaction
-        });
-        return instance;
-      });
-      return function (_x3) {
-        return _ref.apply(this, arguments);
-      };
-    }());
-    // await transaction.commit();
+    const instruction = plugin.instructions.get('manual');
+    const userJob = yield repository.findOne({
+      filterByTk,
+      // filter: {
+      //   userId: currentUser?.id
+      // },
+      appends: ['job', 'node', 'execution', 'workflow'],
+      context
+    });
+    if (!userJob) {
+      return context.throw(404);
+    }
+    const _userJob$node$config$ = userJob.node.config.forms,
+      forms = _userJob$node$config$ === void 0 ? {} : _userJob$node$config$;
+    const _Object$keys = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}),
+      _Object$keys2 = _slicedToArray(_Object$keys, 1),
+      formKey = _Object$keys2[0];
+    // NOTE: validate status
+    if (userJob.status !== _constants.JOB_STATUS.PENDING || userJob.job.status !== _constants.JOB_STATUS.PENDING || userJob.execution.status !== _constants.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !((_forms$formKey = forms[formKey]) === null || _forms$formKey === void 0 ? void 0 : (_forms$formKey$action = _forms$formKey.actions) === null || _forms$formKey$action === void 0 ? void 0 : _forms$formKey$action.includes(values.status))) {
+      return context.throw(400);
+    }
+    userJob.execution.workflow = userJob.workflow;
+    const processor = plugin.createProcessor(userJob.execution);
+    yield processor.prepare();
+    // NOTE: validate assignee
+    const assignees = processor.getParsedValue((_userJob$node$config$2 = userJob.node.config.assignees) !== null && _userJob$node$config$2 !== void 0 ? _userJob$node$config$2 : []);
+    if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
+      return context.throw(403);
+    }
+    userJob.set({
+      status: values.status,
+      result: values.status ? values.result : Object.assign((_userJob$result = userJob.result) !== null && _userJob$result !== void 0 ? _userJob$result : {}, values.result)
+    });
+    const handler = instruction.formTypes.get(forms[formKey].type);
+    if (handler && userJob.status) {
+      yield handler.call(instruction, userJob, forms[formKey], processor);
+    }
+    yield userJob.save({
+      transaction: processor.transaction
+    });
+    yield processor.exit();
     context.body = userJob;
     context.status = 202;
     yield next();

package/lib/server/instructions/manual/forms/create.d.ts

@@ -0,0 +1,5 @@
+import { Processor } from '../../..';
+import ManualInstruction from '..';
+export default function (this: ManualInstruction, instance: any, { collection }: {
+    collection: any;
+}, processor: Processor): Promise<void>;

package/lib/server/instructions/manual/forms/create.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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."); }
+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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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); }); }; }
+function _default(_x, _x2, _x3) {
+  return _ref.apply(this, arguments);
+}
+function _ref() {
+  _ref = _asyncToGenerator(function* (instance, {
+    collection
+  }, processor) {
+    const repo = this.plugin.db.getRepository(collection);
+    if (!repo) {
+      throw new Error(`collection ${collection} for create data on manual node not found`);
+    }
+    const _Object$values = Object.values(instance.result),
+      _Object$values2 = _slicedToArray(_Object$values, 1),
+      values = _Object$values2[0];
+    yield repo.create({
+      values: _objectSpread(_objectSpread({}, values !== null && values !== void 0 ? values : {}), {}, {
+        createdBy: instance.userId,
+        updatedBy: instance.userId
+      }),
+      context: {
+        executionId: processor.execution.id
+      },
+      transaction: processor.transaction
+    });
+  });
+  return _ref.apply(this, arguments);
+}

package/lib/server/instructions/manual/forms/index.d.ts

@@ -0,0 +1,6 @@
+import { Processor } from '../../..';
+import ManualInstruction from '..';
+export declare type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
+export default function ({ formTypes }: {
+    formTypes: any;
+}): void;

package/lib/server/instructions/manual/forms/index.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _create = _interopRequireDefault(require("./create"));
+var _update = _interopRequireDefault(require("./update"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _default({
+  formTypes
+}) {
+  formTypes.register('create', _create.default);
+  formTypes.register('update', _update.default);
+}

package/lib/server/instructions/manual/forms/update.d.ts

@@ -0,0 +1,6 @@
+import { Processor } from '../../..';
+import ManualInstruction from '..';
+export default function (this: ManualInstruction, instance: any, { collection, filter }: {
+    collection: any;
+    filter?: {};
+}, processor: Processor): Promise<void>;

package/lib/server/instructions/manual/forms/update.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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."); }
+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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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); }); }; }
+function _default(_x, _x2, _x3) {
+  return _ref.apply(this, arguments);
+}
+function _ref() {
+  _ref = _asyncToGenerator(function* (instance, {
+    collection,
+    filter = {}
+  }, processor) {
+    const repo = this.plugin.db.getRepository(collection);
+    if (!repo) {
+      throw new Error(`collection ${collection} for update data on manual node not found`);
+    }
+    const _Object$values = Object.values(instance.result),
+      _Object$values2 = _slicedToArray(_Object$values, 1),
+      values = _Object$values2[0];
+    yield repo.update({
+      filter: processor.getParsedValue(filter),
+      values: _objectSpread(_objectSpread({}, values !== null && values !== void 0 ? values : {}), {}, {
+        updatedBy: instance.userId
+      }),
+      context: {
+        executionId: processor.execution.id
+      },
+      transaction: processor.transaction
+    });
+  });
+  return _ref.apply(this, arguments);
+}

package/lib/server/instructions/manual/index.d.ts

@@ -1,5 +1,7 @@
+import { Registry } from '@nocobase/utils';
 import Plugin from '../..';
 import { Instruction } from '..';
+import { FormHandler } from './forms';
 declare type FormType = {
     type: 'custom' | 'create' | 'update';
     actions: number[];
@@ -19,6 +21,7 @@ export interface ManualConfig {
 }
 export default class implements Instruction {
     protected plugin: Plugin;
+    formTypes: Registry<FormHandler>;
     constructor(plugin: Plugin);
     run(node: any, prevJob: any, processor: any): Promise<any>;
     resume(node: any, job: any, processor: any): Promise<any>;

package/lib/server/instructions/manual/index.js

@@ -11,11 +11,19 @@ function _actions() {
   };
   return data;
 }
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
 var _constants = require("../../constants");
 var _jobs = _interopRequireDefault(require("./collecions/jobs"));
 var _users = _interopRequireDefault(require("./collecions/users"));
 var _users_jobs = _interopRequireDefault(require("./collecions/users_jobs"));
 var _actions2 = require("./actions");
+var _forms = _interopRequireDefault(require("./forms"));
 const _excluded = ["mode"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -81,6 +89,7 @@ function getMode(mode) {
 class _default {
   constructor(plugin) {
     this.plugin = void 0;
+    this.formTypes = new (_utils().Registry)();
     this.plugin = plugin;
     plugin.db.collection(_users_jobs.default);
     plugin.db.extendCollection(_users.default);
@@ -104,6 +113,7 @@ class _default {
         submit: _actions2.submit
       }
     });
+    (0, _forms.default)(this);
   }
   run(node, prevJob, processor) {
     return _asyncToGenerator(function* () {
@@ -135,7 +145,7 @@ class _default {
   }
   resume(node, job, processor) {
     return _asyncToGenerator(function* () {
-      var _job$latestUserJob$re, _job$latestUserJob, _getMode$getStatus;
+      var _getMode$getStatus, _job$latestUserJob$re, _job$latestUserJob;
       // NOTE: check all users jobs related if all done then continue as parallel
       const _node$config2 = node.config,
         _node$config2$assigne = _node$config2.assignees,
@@ -146,12 +156,15 @@ class _default {
         where: {
           jobId: job.id
         },
-        group: ['status']
+        group: ['status'],
+        transaction: processor.transaction
       });
       const submitted = distribution.reduce((count, item) => item.status !== _constants.JOB_STATUS.PENDING ? count + item.count : count, 0);
+      const status = job.status || ((_getMode$getStatus = getMode(mode).getStatus(distribution, assignees)) !== null && _getMode$getStatus !== void 0 ? _getMode$getStatus : _constants.JOB_STATUS.PENDING);
       const result = mode ? (submitted || 0) / assignees.length : (_job$latestUserJob$re = (_job$latestUserJob = job.latestUserJob) === null || _job$latestUserJob === void 0 ? void 0 : _job$latestUserJob.result) !== null && _job$latestUserJob$re !== void 0 ? _job$latestUserJob$re : job.result;
+      processor.logger.debug(`manual resume job and next status: ${status}`);
       job.set({
-        status: job.status || ((_getMode$getStatus = getMode(mode).getStatus(distribution, assignees)) !== null && _getMode$getStatus !== void 0 ? _getMode$getStatus : _constants.JOB_STATUS.PENDING),
+        status,
         result
       });
       return job;

package/lib/server/instructions/parallel.js

@@ -100,7 +100,7 @@ var _default = {
         status = job.status;
       // if parallel has been done (resolved / rejected), do not care newly executed branch jobs.
       if (status !== _constants.JOB_STATUS.PENDING) {
-        return null;
+        return processor.exit();
       }
       // find the index of the node which start the branch
       const jobNode = processor.nodesMap.get(branchJob.nodeId);
@@ -119,7 +119,7 @@ var _default = {
         yield job.save({
           transaction: processor.transaction
         });
-        return processor.end(node, job);
+        return processor.exit();
       }
       return job;
     })();

package/lib/server/instructions/request.js

@@ -76,11 +76,11 @@ class _default {
           result: error.isAxiosError ? error.toJSON() : error.message
         });
       }).finally(() => {
-        _this.plugin.app.logger.info(`[Workflow] request (#${node.id}) response received, status: ${job.get('status')}`);
+        processor.logger.info(`request (#${node.id}) response received, status: ${job.get('status')}`);
         _this.plugin.resume(job);
       });
-      _this.plugin.app.logger.info(`[Workflow] request (#${node.id}) sent to "${config.url}", waiting for response...`);
-      return job;
+      processor.logger.info(`request (#${node.id}) sent to "${config.url}", waiting for response...`);
+      return processor.exit();
     })();
   }
   resume(node, job, processor) {

package/lib/server/instructions/update.js

@@ -15,10 +15,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var _default = {
   run(node, input, processor) {
     return _asyncToGenerator(function* () {
+      var _result$length;
       const _node$config = node.config,
         collection = _node$config.collection,
-        _node$config$multiple = _node$config.multiple,
-        multiple = _node$config$multiple === void 0 ? false : _node$config$multiple,
         _node$config$params = _node$config.params,
         params = _node$config$params === void 0 ? {} : _node$config$params;
       const repo = node.constructor.database.getRepository(collection);
@@ -30,7 +29,7 @@ var _default = {
         transaction: processor.transaction
       }));
       return {
-        result: multiple ? result : result[0] || null,
+        result: (_result$length = result.length) !== null && _result$length !== void 0 ? _result$length : result,
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

package/lib/server/migrations/20230612021134-manual-collection-block.d.ts

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