@nocobase/plugin-workflow 0.9.2-alpha.2 → 0.9.2-alpha.3

package/lib/server/migrations/20230221162902-jsonb-to-json.js

@@ -22,16 +22,14 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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 _default extends _server().Migration {
   up() {
-    var _arguments = arguments,
-      _this = this;
+    var _this = this;
     return _asyncToGenerator(function* () {
       const match = yield _this.app.version.satisfies('<0.9.0-alpha.3');
       if (!match) {
         return;
       }
-      const _arguments$0$context = _arguments[0].context,
-        sequelize = _arguments$0$context.sequelize,
-        queryInterface = _arguments$0$context.queryInterface;
+      const sequelize = _this.sequelize;
+      const queryInterface = _this.queryInterface;
       const db = _this.app.db;
       yield sequelize.transaction( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (transaction) {

package/lib/server/migrations/20230411034722-manual-multi-form.js

@@ -185,7 +185,7 @@ function migrateUsedConfig(config, manualForms) {
         }
         return `{{$jobsMapByNodeId.${id}.${manualForms[id]}${path || ''}}}`;
       });
-    } else if (valueType === 'object') {
+    } else if (valueType === 'object' && config[key]) {
       migrateUsedConfig(config[key], manualForms);
     }
   });
@@ -285,8 +285,9 @@ class _default extends _server().Migration {
             }
           });
           yield usedNodes.reduce((promise, node) => promise.then( /*#__PURE__*/_asyncToGenerator(function* () {
+            var _node$config2;
             yield node.update({
-              config: migrateUsedConfig((0, _lodash().cloneDeep)(node.config), nodeForms)
+              config: migrateUsedConfig((0, _lodash().cloneDeep)((_node$config2 = node.config) !== null && _node$config2 !== void 0 ? _node$config2 : {}), nodeForms)
             }, {
               silent: true,
               transaction

package/lib/server/triggers/collection.d.ts

@@ -1,5 +1,5 @@
-import { Trigger } from "..";
-import WorkflowModel from "../models/Workflow";
+import { Trigger } from '..';
+import WorkflowModel from '../models/Workflow';
 export interface CollectionChangeTriggerConfig {
     collection: string;
     mode: number;

package/lib/server/triggers/collection.js

@@ -112,7 +112,7 @@ class CollectionTrigger extends _.Trigger {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        let _step$value = _slicedToArray(_step.value, 2),
+        const _step$value = _slicedToArray(_step.value, 2),
           key = _step$value[0],
           type = _step$value[1];
         const event = `${collection}.${type}`;
@@ -150,7 +150,7 @@ class CollectionTrigger extends _.Trigger {
       _step2;
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        let _step2$value = _slicedToArray(_step2.value, 2),
+        const _step2$value = _slicedToArray(_step2.value, 2),
           key = _step2$value[0],
           type = _step2$value[1];
         const event = `${collection}.${type}`;

package/lib/server/triggers/schedule.js

@@ -106,18 +106,20 @@ function getOnTimestampWithOffset(on, now) {
     case 'string':
       return parseDateWithoutMs(on);
     case 'object':
-      const field = on.field,
-        _on$offset = on.offset,
-        offset = _on$offset === void 0 ? 0 : _on$offset,
-        _on$unit = on.unit,
-        unit = _on$unit === void 0 ? 1000 : _on$unit;
-      if (!field) {
-        return null;
+      {
+        const field = on.field,
+          _on$offset = on.offset,
+          offset = _on$offset === void 0 ? 0 : _on$offset,
+          _on$unit = on.unit,
+          unit = _on$unit === void 0 ? 1000 : _on$unit;
+        if (!field) {
+          return null;
+        }
+        const timestamp = now.getTime();
+        // onDate + offset > now
+        // onDate > now - offset
+        return timestamp - offset * unit;
       }
-      const timestamp = now.getTime();
-      // onDate + offset > now
-      // onDate > now - offset
-      return timestamp - offset * unit;
     default:
       return null;
   }
@@ -128,15 +130,19 @@ function getDataOptionTime(data, on, dir = 1) {
   }
   switch (typeof on) {
     case 'string':
-      const time = parseDateWithoutMs(on);
-      return time ? time : null;
+      {
+        const time = parseDateWithoutMs(on);
+        return time ? time : null;
+      }
     case 'object':
-      const field = on.field,
-        _on$offset2 = on.offset,
-        offset = _on$offset2 === void 0 ? 0 : _on$offset2,
-        _on$unit2 = on.unit,
-        unit = _on$unit2 === void 0 ? 1000 : _on$unit2;
-      return data.get(field) ? data.get(field).getTime() - offset * unit * dir : null;
+      {
+        const field = on.field,
+          _on$offset2 = on.offset,
+          offset = _on$offset2 === void 0 ? 0 : _on$offset2,
+          _on$unit2 = on.unit,
+          unit = _on$unit2 === void 0 ? 1000 : _on$unit2;
+        return data.get(field) ? data.get(field).getTime() - offset * unit * dir : null;
+      }
     default:
       return null;
   }
@@ -365,7 +371,7 @@ function matchNext(workflow, now, range = this.cacheCycle) {
   const interval = _cronParser().default.parseExpression(repeat, {
     currentDate
   });
-  let next = interval.next();
+  const next = interval.next();
   // NOTE: cache all workflows will be matched in current cycle
   if (next.getTime() - timestamp <= range) {
     return true;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.2-alpha.2",
+  "version": "0.9.2-alpha.3",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.2-alpha.2",
-    "@nocobase/client": "0.9.2-alpha.2",
-    "@nocobase/database": "0.9.2-alpha.2",
-    "@nocobase/evaluators": "0.9.2-alpha.2",
-    "@nocobase/logger": "0.9.2-alpha.2",
-    "@nocobase/resourcer": "0.9.2-alpha.2",
-    "@nocobase/server": "0.9.2-alpha.2",
-    "@nocobase/utils": "0.9.2-alpha.2",
+    "@nocobase/actions": "0.9.2-alpha.3",
+    "@nocobase/client": "0.9.2-alpha.3",
+    "@nocobase/database": "0.9.2-alpha.3",
+    "@nocobase/evaluators": "0.9.2-alpha.3",
+    "@nocobase/logger": "0.9.2-alpha.3",
+    "@nocobase/resourcer": "0.9.2-alpha.3",
+    "@nocobase/server": "0.9.2-alpha.3",
+    "@nocobase/utils": "0.9.2-alpha.3",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -24,9 +24,9 @@
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.9.2-alpha.2",
-    "@nocobase/test": "0.9.2-alpha.2",
+    "@nocobase/plugin-formula-field": "0.9.2-alpha.3",
+    "@nocobase/test": "0.9.2-alpha.3",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
+  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
 }