Merge branch '2.3.0' of http://10.73.97.24/oecloud.io/oe-workflow

ISSUES.md

@@ -18,6 +18,15 @@
   * MessageStart seems to be starting even before the message has been received.
   * Designer also seems to be showing invalid editor for MessageStart event
 
+# taskId populated in process-token for the user-task 
+  * contains only one taskId. This works well if it is a normal user task. 
+  * In case of multi-instance tasks, 
+  * Series - works well as it populated one task id after the other.
+  * Parallel - it still contains only one task id even though there are many tasks created. 
+
+# if user task some expression evaluation fails
+previous task remains pending and flow execution stops
+
 # Call-Activity Designer Input/Output-Parameters
   * Call-Activity node in designer does not have means to specify below data and hence this part is not tested fully. (Refer call-activity-main.bpmn: Line#23-26)
   ``` xml

common/activiti-models/activiti-manager.js

@@ -32,7 +32,8 @@ module.exports = function ActivitiManager(ActivitiManager) {
   // ActivitiManager.disableRemoteMethod('deleteWithVersion', true);
 
 
-  ActivitiManager.enable = function enable(baseUrl, options, cb) {
+  ActivitiManager.enable = function enable(payload, options, cb) {
+    let baseUrl = payload.baseUrl;
     var app = ActivitiManager.app;
     helper._enableActiviti(baseUrl, app, options, cb);
   };
@@ -152,10 +153,20 @@ module.exports = function ActivitiManager(ActivitiManager) {
 
   ActivitiManager.remoteMethod('enable', {
     description: 'enable Activiti rest endpoints',
-    accepts: {
-      arg: 'baseUrl',
-      description: 'Activiti server URL to connect',
-      type: 'string'
+    accepts: [{
+      arg: 'payload',
+      type: 'object',
+      http: {
+        source: 'body'
+      },
+      description: 'Activiti server URL to connect'
+    }, {
+      arg: 'options',
+      type: 'object',
+      http: 'optionsFromRequest'
+    }],
+    http: {
+      verb: 'post'
     },
     returns: {
       type: 'object',

common/activiti-models/lib/helper.js

@@ -19,6 +19,13 @@ exports._enableActiviti = function _enableActiviti(baseUrl, app, ctx, done) {
     ctx = {};
   }
 
+  if (!baseUrl) {
+    let err = new Error('Activiti endpoint must be specified');
+    err.statusCode = err.status = 422;
+    err.code = 'INVALID_DATA';
+    return done(err);
+  }
+
   var modelNames = [
     'activiti-deployment',
     'activiti-engine',

common/mixins/maker-checker-mixin-v2.js

@@ -689,6 +689,12 @@ function addOERemoteMethods(Model) {
       }
 
       delete context.isNewChangeRequest;
+      context.beforeWorkflow = true;
+      let observerName = 'before save';
+      var wfConfig = Model.app.get('workflow') || {};
+      if (wfConfig.disableMakerCheckerBeforeSave) {
+        observerName = 'dummy observer';
+      }
       // var RootModel = Model;
       // var beforeSaveArray = Model._observers['before save'] || [];
 
@@ -707,7 +713,8 @@ function addOERemoteMethods(Model) {
       //   return next(err);
       // }
       // dpBeforeSave[0](context, function beforeSaveCb(err) {
-      Model.notifyObserversOf('before save', context, function beforeSaveCb(err) {
+      Model.notifyObserversOf(observerName, context, function beforeSaveCb(err) {
+        delete context.beforeWorkflow;
         if (err) return next(err);
 
         if (context.currentInstance) {
@@ -732,7 +739,7 @@ function addOERemoteMethods(Model) {
             // log.error(options, err);
             return next(err);
           }
-        }, data, context);
+        }, data, context.options);
       });
     });
   }
@@ -741,6 +748,11 @@ function addOERemoteMethods(Model) {
     // get hasOne, hasMany relation metadata
     var relations = [];
     var childData = {};
+    var validateFunction = async.map;
+    var wfConfig = Model.app.get('workflow') || {};
+    if (wfConfig.disableMakerCheckerParallelValidations) {
+      validateFunction = async.mapSeries;
+    }
     for (let r in Model.relations) {
       if (Object.prototype.hasOwnProperty.call(Model.relations, r)) {
         let relation = Model.relations[r];
@@ -774,7 +786,7 @@ function addOERemoteMethods(Model) {
           return next(err);
         }
 
-        async.map(relations,
+        validateFunction(relations,
           function validateEach(relation, cb) {
             let Model = relation.Model;
             let data = relation.data;
@@ -810,7 +822,7 @@ function addOERemoteMethods(Model) {
           return next(err);
         }
 
-        async.map(relations,
+        validateFunction(relations,
           function validateEach(relation, cb) {
             let Model = relation.Model;
             let data = relation.data;

common/mixins/workflow-mixin.js

@@ -185,13 +185,13 @@ function addRemoteHooks(Model) {
       version: 'v0'
     };
 
-    if (operationList.create.indexOf(method) !== -1) {
+    if (operationList.create.indexOf(method) >= 0) {
       operation = 'create';
       filter.operation = { inq: ['save', 'create'] };
-    } else if (operationList.update.indexOf(method) !== -1) {
+    } else if (operationList.update.indexOf(method) >= 0) {
       filter.operation = { inq: ['save', 'update'] };
       operation = 'update';
-    } else if (operationList.delete.indexOf(method) !== -1) {
+    } else if (operationList.delete.indexOf(method) >= 0) {
       operation = 'delete';
       filter.operation = operation;
     } else {