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

package/lib/server/migrations/20230221071831-calculation-expression.js

@@ -0,0 +1,143 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _server() {
+  const data = require("@nocobase/server");
+
+  _server = function _server() {
+    return data;
+  };
+
+  return data;
+}
+
+const _excluded = ["calculation"];
+
+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 _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; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function addQuote(v) {
+  if (typeof v !== 'string') {
+    return v;
+  }
+
+  if (v.match(/^{{\s*([^{}]+)\s*}}$/)) {
+    return v;
+  }
+
+  return `'${v}'`;
+}
+
+const calculatorsMap = {
+  'equal': '==',
+  '===': '==',
+  'notEqual': '!=',
+  '!==': '!=',
+  'gt': '>',
+  'gte': '>=',
+  'lt': '<',
+  'lte': '<=',
+  'add': '+',
+  'minus': '-',
+  'multiple': '*',
+  'divide': '/',
+  'mod': '%',
+
+  includes(a, b) {
+    return `SEARCH(${b}, ${a}) >= 0`;
+  },
+
+  notIncludes(a, b) {
+    return `SEARCH(${b}, ${a}) < 0`;
+  },
+
+  startsWith(a, b) {
+    return `SEARCH(${b}, ${a}) == 0`;
+  },
+
+  endsWith(a, b) {
+    return `RIGHT(${a}, LEN(${b})) == ${b}`;
+  },
+
+  notStartsWith(a, b) {
+    return `SEARCH(${b}, ${a}) != 0`;
+  },
+
+  notEndsWith(a, b) {
+    return `RIGHT(${a}, LEN(${b})) != ${b}`;
+  },
+
+  concat(a, b) {
+    return `CONCATENATE(${a}, ${b})`;
+  }
+
+};
+
+function migrateConfig(_ref = {}) {
+  var _calculation$operands, _calculator$operands;
+
+  let calculation = _ref.calculation,
+      config = _objectWithoutProperties(_ref, _excluded);
+
+  if (!(calculation === null || calculation === void 0 ? void 0 : calculation.calculator) || !(calculation === null || calculation === void 0 ? void 0 : (_calculation$operands = calculation.operands) === null || _calculation$operands === void 0 ? void 0 : _calculation$operands.length)) {
+    return config;
+  }
+
+  const calculator = calculatorsMap[calculation.calculator];
+  const operands = ((_calculator$operands = calculator.operands) !== null && _calculator$operands !== void 0 ? _calculator$operands : []).map(operand => addQuote(operand));
+  return {
+    engine: 'formula.js',
+    expression: typeof calculator === 'function' ? calculator(...operands) : operands.join(` ${calculator !== null && calculator !== void 0 ? calculator : calculation.calculator} `)
+  };
+}
+
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const match = yield _this.app.version.satisfies('<0.9.0-alpha.3');
+
+      if (!match) {
+        return;
+      }
+
+      const NodeRepo = _this.context.db.getRepository('flow_nodes');
+
+      yield _this.context.db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* (transaction) {
+          const nodes = yield NodeRepo.find({
+            filter: {
+              type: 'calculation'
+            },
+            transaction
+          });
+          console.log('%d nodes need to be migrated.', nodes.length);
+          yield nodes.reduce((promise, node) => promise.then(() => {
+            return node.update({
+              config: migrateConfig(node.config)
+            }, {
+              transaction
+            });
+          }), Promise.resolve());
+        });
+
+        return function (_x) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+
+}
+
+exports.default = _default;

package/lib/server/migrations/20230221121203-condition-calculation.d.ts

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

package/lib/server/migrations/20230221121203-condition-calculation.js

@@ -0,0 +1,126 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _server() {
+  const data = require("@nocobase/server");
+
+  _server = function _server() {
+    return data;
+  };
+
+  return data;
+}
+
+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); }); }; }
+
+const calculatorsMap = {
+  'equal': '==',
+  '===': '==',
+  'notEqual': '!=',
+  '!==': '!=',
+  'gt': '>',
+  'gte': '>=',
+  'lt': '<',
+  'lte': '<=',
+
+  includes(a, b) {
+    return `SEARCH('${b}', '${a}') >= 0`;
+  },
+
+  notIncludes(a, b) {
+    return `SEARCH('${b}', '${a}') < 0`;
+  },
+
+  startsWith(a, b) {
+    return `SEARCH('${b}', '${a}') == 0`;
+  },
+
+  endsWith(a, b) {
+    return `RIGHT('${a}', LEN('${b}')) == '${b}'`;
+  },
+
+  notStartsWith(a, b) {
+    return `SEARCH('${b}', '${a}') != 0`;
+  },
+
+  notEndsWith(a, b) {
+    return `RIGHT('${a}', LEN('${b}')) != '${b}'`;
+  }
+
+};
+
+function migrateConfig({
+  group: {
+    type = 'and',
+    calculations = []
+  }
+}) {
+  return {
+    group: {
+      type,
+      calculations: calculations.map(({
+        calculator = '===',
+        operands = []
+      }) => {
+        return `(${operands.map(operand => (operand === null || operand === void 0 ? void 0 : operand.group) ? migrateConfig(operand) : operand).join(` ${calculatorsMap[calculator]} `)})`;
+      })
+    }
+  };
+}
+
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      const match = yield _this.app.version.satisfies('<0.9.0-alpha.3');
+
+      if (!match) {
+        return;
+      }
+
+      const NodeRepo = _this.context.db.getRepository('flow_nodes');
+
+      yield _this.context.db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          const nodes = yield NodeRepo.find({
+            filter: {
+              type: 'condition'
+            },
+            transaction
+          });
+          console.log('%d nodes need to be migrated.', nodes.length);
+          yield nodes.reduce((promise, node) => promise.then(() => {
+            return node.update({
+              config: _objectSpread(_objectSpread({}, node.config), {}, {
+                engine: 'basic' // calculation: migrateConfig(node.config.calculation)
+
+              })
+            }, {
+              transaction
+            });
+          }), Promise.resolve());
+        });
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+
+}
+
+exports.default = _default;

package/lib/server/migrations/20230221162902-jsonb-to-json.d.ts

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

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

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _sequelize() {
+  const data = require("sequelize");
+
+  _sequelize = function _sequelize() {
+    return data;
+  };
+
+  return data;
+}
+
+function _server() {
+  const data = require("@nocobase/server");
+
+  _server = function _server() {
+    return data;
+  };
+
+  return data;
+}
+
+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 _default extends _server().Migration {
+  up() {
+    var _arguments = arguments,
+        _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 db = _this.app.db;
+      yield sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          yield queryInterface.changeColumn(db.getCollection('workflows').model.getTableName(), 'config', {
+            type: _sequelize().DataTypes.JSON
+          }, {
+            transaction
+          });
+          yield queryInterface.changeColumn(db.getCollection('flow_nodes').model.getTableName(), 'config', {
+            type: _sequelize().DataTypes.JSON
+          }, {
+            transaction
+          });
+          yield queryInterface.changeColumn(db.getCollection('executions').model.getTableName(), 'context', {
+            type: _sequelize().DataTypes.JSON
+          }, {
+            transaction
+          });
+          yield queryInterface.changeColumn(db.getCollection('jobs').model.getTableName(), 'result', {
+            type: _sequelize().DataTypes.JSON
+          }, {
+            transaction
+          });
+        });
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+
+}
+
+exports.default = _default;

package/lib/server/triggers/schedule.js

@@ -69,8 +69,12 @@ ScheduleModes.set(SCHEDULE_MODE.CONSTANT, {
     }
 
     if (repeat) {
-      if (typeof repeat === 'number' && repeat > this.cacheCycle && (timestamp - startTime) % repeat > this.cacheCycle) {
-        return false;
+      if (typeof repeat === 'number') {
+        const next = timestamp - (timestamp - startTime) % repeat + repeat;
+
+        if (next <= timestamp || next > timestamp + this.cacheCycle) {
+          return false;
+        }
       }
 
       if (endsOn) {
@@ -156,6 +160,10 @@ function getOnTimestampWithOffset(on, now) {
 }
 
 function getDataOptionTime(data, on, dir = 1) {
+  if (!on) {
+    return null;
+  }
+
   switch (typeof on) {
     case 'string':
       const time = parseDateWithoutMs(on);
@@ -551,7 +559,7 @@ class ScheduleTrigger extends _.Trigger {
         const should = yield _this6.shouldCache(workflow, now);
 
         if (should) {
-          console.log('caching schedule workflow:', workflow.id);
+          _this6.plugin.app.logger.info('caching scheduled workflow will run in next minute:', workflow.id);
         }
 
         _this6.setCache(workflow, !should);

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.0-alpha.2",
-    "@nocobase/client": "0.9.0-alpha.2",
-    "@nocobase/database": "0.9.0-alpha.2",
-    "@nocobase/server": "0.9.0-alpha.2",
-    "@nocobase/utils": "0.9.0-alpha.2",
+    "@nocobase/actions": "0.9.1-alpha.1",
+    "@nocobase/client": "0.9.1-alpha.1",
+    "@nocobase/database": "0.9.1-alpha.1",
+    "@nocobase/evaluators": "0.9.1-alpha.1",
+    "@nocobase/resourcer": "0.9.1-alpha.1",
+    "@nocobase/server": "0.9.1-alpha.1",
+    "@nocobase/utils": "0.9.1-alpha.1",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
-    "ejs": "^3.1.8",
     "json-templates": "^4.2.0",
     "moment": "^2.29.2",
-    "react-copy-to-clipboard": "^5.1.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.9.0-alpha.2",
+    "@nocobase/test": "0.9.1-alpha.1",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
 }

package/lib/client/calculators.d.ts

@@ -1,89 +0,0 @@
-import React from "react";
-import { Registry } from "@nocobase/utils/client";
-interface Calculator {
-    name: string;
-    type: 'boolean' | 'number' | 'string' | 'date' | 'unknown' | 'null' | 'array';
-    group: string;
-}
-export declare const calculators: Registry<Calculator>;
-export declare function parseValue(value: any, Types: any): {
-    type: string;
-    value?: any;
-    options?: any;
-};
-export declare const BaseTypeSet: Set<string>;
-export declare const VariableTypes: {
-    constant: {
-        title: string;
-        value: string;
-        options: {
-            value: string;
-            label: string;
-        }[];
-        component(props: any): any;
-        appendTypeValue({ options }: {
-            options?: {
-                type: string;
-            };
-        }): string[];
-        onTypeChange([type, optionsType]: [any, any], onChange: any): void;
-        parse(path: any): {
-            path: any;
-        };
-    };
-    $jobsMapByNodeId: {
-        title: string;
-        value: string;
-        options(): any[];
-        component(props: any): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
-        appendTypeValue({ options }: {
-            type: string;
-            options: any;
-        }): number[];
-        onTypeChange([type, nodeId]: [any, any], onChange: any): void;
-        parse([nodeId, ...path]: [any, ...any[]]): {
-            nodeId: any;
-            path: string;
-        };
-        stringify(next: any): string;
-    };
-    $context: {
-        title: string;
-        value: string;
-        options(): {
-            label: string;
-            value: any;
-            key: string;
-        }[];
-        component(props: any): React.ReactNode;
-        appendTypeValue({ options }: {
-            options: any;
-        }): any[];
-        onTypeChange([type, optionType]: [any, any], onChange: any): void;
-        parse([type, ...path]: [any, ...any[]]): {
-            path?: string;
-            type: any;
-        };
-        stringify(next: any): string;
-    };
-};
-export declare const VariableTypesContext: React.Context<{}>;
-export declare function useVariableTypes(): {};
-interface OperandProps {
-    value: any;
-    onChange(v: any): void;
-    children?: React.ReactNode;
-}
-export declare function useOperandContext(): any;
-export declare function Operand({ value, onChange, children }: OperandProps): JSX.Element;
-export declare function Calculation({ calculator, operands, onChange }: {
-    calculator: any;
-    operands?: any[];
-    onChange: any;
-}): JSX.Element;
-export declare function VariableComponent({ value, onChange, renderSchemaComponent }: {
-    value: any;
-    onChange: any;
-    renderSchemaComponent: any;
-}): JSX.Element;
-export {};