@steedos-labs/plugin-workflow 3.0.1-beta.7 → 3.0.2

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/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/pages/instance_tasks_list.page.amis.json

@@ -13,7 +13,7 @@
             {
               "type": "wrapper",
               "size": "none",
-              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto sm:rounded shadow bg-white my-4 ml-4 mr-1 lg:order-first lg:flex lg:flex-col ",
+              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto m-0 lg:order-first lg:flex lg:flex-col bg-white border-r",
               "body": [
                 {
                   "type": "service",
@@ -32,7 +32,7 @@
                       "type": "input-tree",
                       "name": "tree",
                       "treeContainerClassName": "h-full",
-                      "className": "instance-box-tree bg-white h-full w-full p-0",
+                      "className": "instance-box-tree h-full w-full p-0",
                       "stacked": true,
                       "multiple": false,
                       "enableNodePath": false,
@@ -155,7 +155,7 @@
             {
               "type": "wrapper",
               "size": "none",
-              "className": "flex-1 focus:outline-none lg:order-last w-96",
+              "className": "flex-1 focus:outline-none lg:order-last",
               "body": [
                 {
                   "type": "steedos-object-listview",

package/main/default/pages/instances_list.page.amis.json

@@ -13,7 +13,7 @@
             {
               "type": "wrapper",
               "size": "none",
-              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto sm:rounded shadow bg-white my-4 ml-4 mr-1 lg:order-first lg:flex lg:flex-col ",
+              "className": "instances-sidebar-wrapper flex-shrink-0 min-w-[240px] overflow-y-auto m-0 lg:order-first lg:flex lg:flex-col bg-white border-r",
               "body": [
                 {
                   "type": "service",
@@ -33,7 +33,7 @@
                       "type": "input-tree",
                       "name": "tree",
                       "treeContainerClassName": "h-full",
-                      "className": "instance-box-tree bg-white h-full w-full p-0",
+                      "className": "instance-box-tree h-full w-full p-0",
                       "id": "u:9f3dd961ca12",
                       "stacked": true,
                       "multiple": false,
@@ -154,7 +154,7 @@
             {
               "type": "wrapper",
               "size": "none",
-              "className": "flex-1 focus:outline-none lg:order-last w-96",
+              "className": "flex-1 focus:outline-none lg:order-last",
               "body": [
                 {
                   "type": "steedos-object-listview",

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,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.1-beta.7",
+  "version": "3.0.2",
   "main": "package.service.js",
   "license": "MIT",
   "scripts": {

package/public/workflow/index.css

@@ -374,10 +374,9 @@ tbody .color-priority-muted *{
 
 .instances-sidebar-wrapper{
     overflow-y: auto;
-    height: calc(100vh - 82px);
+    height: calc(100vh - 50px);
 }
 
-
 .steedos-instance-related-view-wrapper{
     .antd-Page-header{
         display: none;