@steedos-labs/plugin-workflow 3.0.1 → 3.0.3

package/main/default/objects/instance_tasks/listviews/inbox.listview.yml

@@ -19,7 +19,6 @@ mobile_columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('inbox ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/objects/instance_tasks/listviews/outbox.listview.yml

@@ -18,7 +18,6 @@ mobile_columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('outbox ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/objects/instances/buttons/instance_delete.button.yml

@@ -58,7 +58,7 @@ amis_schema: |-
                   }
               },
               "confirmText": "${'CustomLabels.confirm_delete' | t}",
-              "hiddenOn": "!(record.box == 'draft' || (record.box == 'monitor'  && context.user.is_space_admin) \n      || (_.includes(record.flow.perms.users_can_admin, context.user.userId) \n          || _.intersection(record.flow.perms.orgs_can_admin, context.user.organizations_parents) > 0)\n     ) \n  || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
+              "hiddenOn": "!(record.box == 'draft' || (record.box == 'monitor'  && context.user.is_space_admin) \n      || (_.includes(record.flow.perms.users_can_admin, context.user.userId) \n          || _.intersection(record.flow.perms.orgs_can_admin, context.user.organizations_parents) > 0)\n || (record.box == 'inbox' && record.state == 'draft' && record.forward_from_instance))"
           }
       ],
       "regions": [

package/main/default/objects/instances/listviews/completed.listview.yml

@@ -18,7 +18,6 @@ mobile_columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('completed ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/objects/instances/listviews/draft.listview.yml

@@ -9,7 +9,6 @@ columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('draft ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/objects/instances/listviews/monitor.listview.yml

@@ -18,7 +18,6 @@ mobile_columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('monitor ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/objects/instances/listviews/pending.listview.yml

@@ -18,7 +18,6 @@ mobile_columns:
 filter_scope: space
 filters: !!js/function |
     function(filters, data){
-      console.log('pending ===filters ===> ',data, `/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`);
       var result = Steedos.authRequest(`/api/workflow/v2/\${data.listName}/filter?app=\${data.appId}`, {
           type: 'get', async: false
       });

package/main/default/routes/api_workflow_next_step.router.js

@@ -215,4 +215,92 @@ router.post('/api/workflow/v2/nextStep', requireAuthentication, async function (
     }
 });
 
+const calcSteps = async function(instance, flow, flowVersionId, formFields, values, step, track){
+	if (!step) {
+		step = getStep(flow, flowVersionId, instance.traces[0].step);
+	}
+	if (!track) {
+		track = []
+	}
+
+	var _steps = [];
+	var judge = 'approved';
+	
+	_steps.push(step);
+	var nextSteps = await getNextSteps(flow, flowVersionId, instance, step, judge, values);
+    for (const nextStep of nextSteps) {
+        try {
+            if (!_.includes(track, nextStep._id)) {
+                const __steps = await calcSteps(instance, flow, flowVersionId, formFields, values, nextStep, track.concat(_.map(_steps, '_id')));
+                _steps = _steps.concat(__steps)
+            }
+        } catch (e) {
+            console.log(e)
+        }
+    }
+	_steps = _.compact(_.uniqBy(_steps, 'id'));
+	return _steps;
+}
+
+router.post('/api/workflow/v2/nextSteps', requireAuthentication, async function (req, res) {
+    try {
+        const userSession = req.user;
+        const { instanceId, flowId, values, flowVersionId } = req.body;
+        const flow = await objectql.getObject('flows').findOne(flowId);
+        const instance = await objectql.getObject('instances').findOne(instanceId);
+        const form = await objectql.getObject('forms').findOne(instance.form);
+        const { fields } = await UUFlowManager.getFormVersion(form, instance.form_version);
+        const resNextSteps = await calcSteps(instance, flow, flowVersionId, fields, values);
+        res.status(200).send({
+            'nextSteps': resNextSteps
+        });
+    } catch (error) {
+        console.error(error);
+        res.status(200).send({
+            error: error.message
+        });
+    }
+})
+
+router.post('/api/workflow/v2/set_instance_steps', requireAuthentication, async function (req, res) {
+    try {
+        const userSession = req.user;
+        const { instanceId, stepId, selected, handler } = req.body;
+        if(instanceId === 'none'){
+            return res.status(200).send({ status: 0 });
+        }
+        const instance = await objectql.getObject('instances').findOne(instanceId);
+        if(!instance){
+            return res.status(200).send({
+                error: 'not find instance'
+            });
+        }
+        if(instance.state != 'draft'){
+            return res.status(200).send({
+                error: 'not allow'
+            });
+        }
+        const doc = {
+            ['step_approve.' + stepId]: handler
+        };
+        if(selected){
+            doc.$pull = {
+                skip_steps: stepId
+            }
+        }else{
+            doc.$push = {
+                skip_steps: stepId
+            }
+        }
+        await objectql.getObject('instances').update(instanceId, doc);
+
+        return res.status(200).send({ status: 0 });
+    } catch (error) {
+        console.error(error);
+        res.status(200).send({
+            error: error.message
+        });
+    }
+})
+
 exports.default = router;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {
     "build:watch": "tsc --watch",
-    "release": "npm publish --registry https://registry.npmjs.org && open https://npmmirror.com/sync/@steedos-labs/plugin-workflow && cnpm sync @steedos-labs/plugin-workflow"
+    "release": "npm publish --registry https://registry.npmjs.org && npx cnpm sync @steedos-labs/plugin-workflow"
   },
   "dependencies": {
     "graphql-parse-resolve-info": "^4.12.3",
-    "he": "1.2.0",
+    "he": "^1.2.0",
     "lodash": "^4.17.21",
     "node-schedule": "^2.0.0",
-    "formidable": "2.0.1",
-    "jszip": "3.10.1"
+    "formidable": "^2.1.5",
+    "jszip": "^3.10.1"
   },
   "private": false,
   "publishConfig": {

package/public/workflow/index.css

@@ -372,6 +372,11 @@ tbody .color-priority-muted *{
     z-index: 900;
 }
 
+.instances-sidebar-wrapper{
+    overflow-y: auto;
+    height: calc(100vh - 50px);
+}
+
 .steedos-instance-related-view-wrapper{
     .antd-Page-header{
         display: none;