@nocobase/plugin-workflow 0.7.4-alpha.7 → 0.7.6-alpha.1

package/lib/client/index.js

@@ -4,8 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  triggers: true
+  triggers: true,
+  calculators: true
 };
+Object.defineProperty(exports, "calculators", {
+  enumerable: true,
+  get: function get() {
+    return _calculators.calculators;
+  }
+});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
@@ -35,4 +42,6 @@ Object.keys(_nodes).forEach(function (key) {
   });
 });
 
+var _calculators = require("./calculators");
+
 var _WorkflowProvider = require("./WorkflowProvider");

package/lib/client/nodes/create.js

@@ -25,14 +25,14 @@ function _client() {
   return data;
 }
 
-var _calculators = require("../calculators");
-
 var _collection = require("../schemas/collection");
 
 var _WorkflowCanvas = require("../WorkflowCanvas");
 
 var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
 
+var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
+
 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; }
@@ -66,7 +66,7 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    CollectionFieldset: _calculators.CollectionFieldset
+    CollectionFieldset: _CollectionFieldset.default
   },
 
   getter(props) {

package/lib/client/nodes/index.js

@@ -154,9 +154,10 @@ function useUpdateAction() {
           _antd().message.error(t('Node in executed workflow cannot be modified'));
 
           return;
-        }
+        } // TODO: how to do validation separately for each field? especially disabled for dynamic fields?
+        // await form.submit();
+
 
-        yield form.submit();
         yield api.resource('flow_nodes', data.id).update({
           filterByTk: data.id,
           values: {

package/lib/client/nodes/update.js

@@ -19,6 +19,10 @@ var _calculators = require("../calculators");
 
 var _collection = require("../schemas/collection");
 
+var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
+
+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; }
 
 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; }
@@ -42,7 +46,7 @@ var _default = {
   },
   components: {
     VariableComponent: _calculators.VariableComponent,
-    CollectionFieldset: _calculators.CollectionFieldset
+    CollectionFieldset: _CollectionFieldset.default
   }
 };
 exports.default = _default;

package/lib/client/triggers/collection.js

@@ -103,7 +103,7 @@ const FieldsSelect = (0, _react2().observer)(props => {
     className: (0, _css().css)`
         min-width: 6em;
       `
-  }), fields.filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true)).map(field => {
+  }), fields.filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : true) && !['linkTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type)).map(field => {
     var _field$uiSchema;
 
     return _react().default.createElement(_antd().Select.Option, {

package/lib/client/triggers/schedule/EndsByField.js

@@ -25,6 +25,16 @@ function _antd() {
   return data;
 }
 
+function _moment() {
+  const data = _interopRequireDefault(require("moment"));
+
+  _moment = function _moment() {
+    return data;
+  };
+
+  return data;
+}
+
 function _react() {
   const data = _interopRequireWildcard(require("react"));
 
@@ -51,6 +61,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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."); }
@@ -96,7 +108,7 @@ function EndsByField({
     onChange: _onChange
   }) : _react().default.createElement(_antd().DatePicker, {
     showTime: true,
-    value: value,
+    value: (0, _moment().default)(value),
     onChange: _onChange
   }));
 }

package/lib/server/Plugin.d.ts

@@ -15,6 +15,8 @@ export default class WorkflowPlugin extends Plugin {
     getName(): string;
     load(): Promise<void>;
     toggle(workflow: WorkflowModel, enable?: boolean): void;
-    trigger(workflow: WorkflowModel, context: Object, options?: Transactionable): Promise<ExecutionModel | null>;
+    trigger(workflow: WorkflowModel, context: Object, options?: Transactionable & {
+        context?: any;
+    }): Promise<ExecutionModel | null>;
     createProcessor(execution: ExecutionModel, options?: {}): Processor;
 }

package/lib/server/Plugin.js

@@ -272,7 +272,8 @@ class WorkflowPlugin extends _server().Plugin {
       execution.workflow = workflow;
 
       const processor = _this3.createProcessor(execution, {
-        transaction
+        transaction,
+        _context: options.context
       });
 
       yield processor.start(); // @ts-ignore

package/lib/server/Processor.d.ts

@@ -4,11 +4,12 @@ import ExecutionModel from './models/Execution';
 import JobModel from './models/Job';
 import FlowNodeModel from './models/FlowNode';
 export interface ProcessorOptions extends Transactionable {
+    _context?: any;
     plugin: Plugin;
 }
 export default class Processor {
     execution: ExecutionModel;
-    private options;
+    options: ProcessorOptions;
     static StatusMap: {
         [x: number]: number;
     };

package/lib/server/actions/workflows.js

@@ -75,7 +75,20 @@ function migrateConfig(config, oldToNew) {
         return value.map(item => migrate(item));
 
       case 'string':
-        return value.replace(/(\{\{\$jobsMapByNodeId\.)([\w-]+)/, (_, prefix, id) => `${prefix}${oldToNew.get(Number.parseInt(id, 10)).id}`);
+        const matcher = value.match(/(\{\{\$jobsMapByNodeId\.)([\w-]+)/);
+
+        if (!matcher) {
+          return value;
+        }
+
+        const oldNodeId = Number.parseInt(matcher[2], 10);
+        const newNode = oldToNew.get(oldNodeId);
+
+        if (!newNode) {
+          throw new Error('node configurated for result is not existed');
+        }
+
+        return value.replace(matcher[0], `{{$jobsMapByNodeId.${newNode.id}`);
 
       default:
         return value;
@@ -171,10 +184,18 @@ function _revision() {
             const oldNode = originalNodesMap.get(oldId);
             const newUpstream = oldNode.upstreamId ? oldToNew.get(oldNode.upstreamId) : null;
             const newDownstream = oldNode.downstreamId ? oldToNew.get(oldNode.downstreamId) : null;
+            let migratedConfig;
+
+            try {
+              migratedConfig = migrateConfig(oldNode.config, oldToNew);
+            } catch (err) {
+              return context.throw(400, err.message);
+            }
+
             yield newNode.update({
               upstreamId: (_newUpstream$id = newUpstream === null || newUpstream === void 0 ? void 0 : newUpstream.id) !== null && _newUpstream$id !== void 0 ? _newUpstream$id : null,
               downstreamId: (_newDownstream$id = newDownstream === null || newDownstream === void 0 ? void 0 : newDownstream.id) !== null && _newDownstream$id !== void 0 ? _newDownstream$id : null,
-              config: migrateConfig(oldNode.config, oldToNew)
+              config: migratedConfig
             }, {
               transaction
             });

package/lib/server/calculators/index.js

@@ -177,8 +177,9 @@ calculators.register('notStartsWith', notStartsWith);
 calculators.register('endsWith', endsWith);
 calculators.register('notEndsWith', notEndsWith);
 
-function before(a, b) {
-  return a < b;
+function concat(a, b) {
+  return a.concat(b);
 }
 
+calculators.register('concat', concat);
 calculators.register('now', () => new Date()); // TODO: add more common calculators

package/lib/server/instructions/create.js

@@ -27,6 +27,7 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield repo.create(_objectSpread(_objectSpread({}, options), {}, {
+        context: processor.options._context,
         transaction: processor.transaction
       }));
       return {

package/lib/server/instructions/destroy.js

@@ -27,6 +27,7 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield repo.destroy(_objectSpread(_objectSpread({}, options), {}, {
+        context: processor.options._context,
         transaction: processor.transaction
       }));
       return {

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

@@ -11,8 +11,10 @@ export interface Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
     resume?(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
 }
+declare type InstructionConstructor<T> = {
+    new (p: Plugin): T;
+};
 export default function <T extends Instruction>(plugin: any, more?: {
-    [key: string]: T | {
-        new (p: Plugin): T;
-    };
+    [key: string]: T | InstructionConstructor<T>;
 }): void;
+export {};

package/lib/server/instructions/index.js

@@ -48,15 +48,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 function _default(plugin, more = {}) {
   const instructions = plugin.instructions;
   const natives = ['calculation', 'condition', 'parallel', 'delay', 'prompt', 'query', 'create', 'update', 'destroy'].reduce((result, key) => Object.assign(result, {
-    [key]: key
+    [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
 
   for (var _i = 0, _Object$entries = Object.entries(_objectSpread(_objectSpread({}, more), natives)); _i < _Object$entries.length; _i++) {
     const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
           name = _Object$entries$_i[0],
-          value = _Object$entries$_i[1];
+          instruction = _Object$entries$_i[1];
 
-    const instruction = typeof value === 'string' ? (0, _utils().requireModule)(_path().default.isAbsolute(value) ? value : _path().default.join(__dirname, value)) : value;
     instructions.register(name, typeof instruction === 'function' ? new instruction(plugin) : instruction);
   }
 }

package/lib/server/instructions/query.js

@@ -28,6 +28,7 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield (multiple ? repo.find : repo.findOne).call(repo, _objectSpread(_objectSpread({}, options), {}, {
+        context: processor.options._context,
         transaction: processor.transaction
       })); // NOTE: `toJSON()` to avoid getting undefined value from Proxied model instance (#380)
       // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false

package/lib/server/instructions/update.js

@@ -29,6 +29,7 @@ var _default = {
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params);
       const result = yield repo.update(_objectSpread(_objectSpread({}, options), {}, {
+        context: processor.options._context,
         transaction: processor.transaction
       }));
       return {

package/lib/server/triggers/collection.js

@@ -37,6 +37,16 @@ MODE_BITMAP_EVENTS.set(MODE_BITMAP.DESTROY, 'afterDestroy');
 
 function getHookId(workflow, type) {
   return `${type}#${workflow.id}`;
+}
+
+function getFieldRawName(collection, name) {
+  const field = collection.getField(name);
+
+  if (field && field.type === 'belongsTo') {
+    return field.foreignKey;
+  }
+
+  return name;
 } // async function, should return promise
 
 
@@ -49,29 +59,31 @@ function _handler() {
     var _condition$$and;
 
     const _workflow$config3 = workflow.config,
-          collection = _workflow$config3.collection,
+          collectionName = _workflow$config3.collection,
           condition = _workflow$config3.condition,
-          changed = _workflow$config3.changed; // NOTE: if no configured fields changed, do not trigger
+          changed = _workflow$config3.changed;
+    const collection = data.constructor.database.getCollection(collectionName); // NOTE: if no configured fields changed, do not trigger
 
-    if (changed && changed.length && changed.every(name => !data.changed(name))) {// TODO: temp comment out
-      // return;
+    if (changed && changed.length && changed.filter(name => !['linkTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collection.getField(name).type)).every(name => !data.changedWithAssociations(getFieldRawName(collection, name)))) {
+      // TODO: temp comment out
+      return;
     } // NOTE: if no configured condition match, do not trigger
 
 
     if (condition && ((_condition$$and = condition.$and) === null || _condition$$and === void 0 ? void 0 : _condition$$and.length)) {
       // TODO: change to map filter format to calculation format
       // const calculation = toCalculation(condition);
-      const _data$constructor$dat = data.constructor.database.getCollection(collection),
-            repository = _data$constructor$dat.repository,
-            model = _data$constructor$dat.model;
-
-      const transaction = options.transaction;
+      const repository = collection.repository,
+            model = collection.model;
+      const transaction = options.transaction,
+            context = options.context;
       const count = yield repository.count({
         filter: {
           $and: [condition, {
             [model.primaryKeyAttribute]: data[model.primaryKeyAttribute]
           }]
         },
+        context,
         transaction
       });
 
@@ -83,6 +95,7 @@ function _handler() {
     return this.plugin.trigger(workflow, {
       data: data.get()
     }, {
+      context: options.context,
       transaction: options.transaction
     });
   });

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

@@ -15,9 +15,10 @@ export declare const SCHEDULE_MODE: {
     readonly CONSTANT: 0;
     readonly COLLECTION_FIELD: 1;
 };
+declare function matchNext(this: ScheduleTrigger, workflow: any, now: Date, range?: number): boolean;
 export default class ScheduleTrigger extends Trigger {
-    static CacheRules: ((workflow: any, now: any) => any)[];
-    static TriggerRules: ((workflow: any, now: any) => boolean)[];
+    static CacheRules: (typeof matchNext | ((workflow: any, now: any) => any))[];
+    static TriggerRules: ((workflow: any, now: any) => any)[];
     events: Map<any, any>;
     private timer;
     private cache;
@@ -36,3 +37,4 @@ export default class ScheduleTrigger extends Trigger {
     on(workflow: any): void;
     off(workflow: any): void;
 }
+export {};