@nocobase/plugin-workflow 0.7.7-alpha.1 → 0.8.0-alpha.4

package/lib/client/nodes/condition.js

@@ -67,7 +67,9 @@ function _client() {
 
 var _ = require(".");
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _Branch = require("../Branch");
+
+var _FlowContext = require("../FlowContext");
 
 var _style = require("../style");
 
@@ -292,7 +294,7 @@ var _default = {
     const id = data.id,
           rejectOnFalse = data.config.rejectOnFalse;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
     const trueEntry = nodes.find(item => item.upstreamId === id && item.branchIndex === 1);
@@ -309,11 +311,11 @@ var _default = {
                   }
                 }
               `)
-    }, _react().default.createElement(_WorkflowCanvas.Branch, {
+    }, _react().default.createElement(_Branch.Branch, {
       from: data,
       entry: falseEntry,
       branchIndex: 0
-    }), _react().default.createElement(_WorkflowCanvas.Branch, {
+    }), _react().default.createElement(_Branch.Branch, {
       from: data,
       entry: trueEntry,
       branchIndex: 1

package/lib/client/nodes/create.js

@@ -27,7 +27,7 @@ function _client() {
 
 var _collection = require("../schemas/collection");
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _FlowContext = require("../FlowContext");
 
 var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
 
@@ -74,7 +74,7 @@ var _default = {
           options = props.options,
           _onChange = props.onChange;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
     const _nodes$find = nodes.find(n => n.id == options.nodeId),

package/lib/client/nodes/index.d.ts

@@ -1,6 +1,6 @@
+import React from 'react';
 import { ISchema } from '@formily/react';
 import { Registry } from '@nocobase/utils/client';
-import React from 'react';
 export interface Instruction {
     title: string;
     type: string;
@@ -30,4 +30,5 @@ export declare function Node({ data }: {
     data: any;
 }): JSX.Element;
 export declare function RemoveButton(): JSX.Element;
+export declare function JobButton(): JSX.Element;
 export declare function NodeDefaultView(props: any): JSX.Element;

package/lib/client/nodes/index.js

@@ -3,46 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.JobButton = JobButton;
 exports.Node = Node;
 exports.NodeDefaultView = NodeDefaultView;
 exports.RemoveButton = RemoveButton;
 exports.instructions = void 0;
 exports.useNodeContext = useNodeContext;
 
-function _icons() {
-  const data = require("@ant-design/icons");
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
 
-  _icons = function _icons() {
+  _react = function _react() {
     return data;
   };
 
   return data;
 }
 
-function _css() {
-  const data = require("@emotion/css");
+function _icons() {
+  const data = require("@ant-design/icons");
 
-  _css = function _css() {
+  _icons = function _icons() {
     return data;
   };
 
   return data;
 }
 
-function _react() {
-  const data = require("@formily/react");
+function _css() {
+  const data = require("@emotion/css");
 
-  _react = function _react() {
+  _css = function _css() {
     return data;
   };
 
   return data;
 }
 
-function _client() {
-  const data = require("@nocobase/utils/client");
+function _react2() {
+  const data = require("@formily/react");
 
-  _client = function _client() {
+  _react2 = function _react2() {
     return data;
   };
 
@@ -59,20 +60,20 @@ function _antd() {
   return data;
 }
 
-function _react2() {
-  const data = _interopRequireWildcard(require("react"));
+function _reactI18next() {
+  const data = require("react-i18next");
 
-  _react2 = function _react2() {
+  _reactI18next = function _reactI18next() {
     return data;
   };
 
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
+function _client() {
+  const data = require("@nocobase/utils/client");
 
-  _reactI18next = function _reactI18next() {
+  _client = function _client() {
     return data;
   };
 
@@ -91,7 +92,9 @@ function _client2() {
 
 var _style = require("../style");
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _AddButton = require("../AddButton");
+
+var _FlowContext = require("../FlowContext");
 
 var _calculation = _interopRequireDefault(require("./calculation"));
 
@@ -109,6 +112,8 @@ var _update = _interopRequireDefault(require("./update"));
 
 var _destroy = _interopRequireDefault(require("./destroy"));
 
+var _constants = require("../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -135,7 +140,7 @@ function useUpdateAction() {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
 
-  const form = (0, _react().useForm)();
+  const form = (0, _react2().useForm)();
   const api = (0, _client2().useAPIClient)();
   const ctx = (0, _client2().useActionContext)();
 
@@ -144,7 +149,7 @@ function useUpdateAction() {
 
   const data = useNodeContext();
 
-  const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+  const _useFlowContext = (0, _FlowContext.useFlowContext)(),
         workflow = _useFlowContext.workflow;
 
   return {
@@ -175,25 +180,25 @@ function useUpdateAction() {
 
 ;
 
-const NodeContext = _react2().default.createContext(null);
+const NodeContext = _react().default.createContext(null);
 
 function useNodeContext() {
-  return (0, _react2().useContext)(NodeContext);
+  return (0, _react().useContext)(NodeContext);
 }
 
 function Node({
   data
 }) {
   const instruction = instructions.get(data.type);
-  return _react2().default.createElement(NodeContext.Provider, {
+  return _react().default.createElement(NodeContext.Provider, {
     value: data
-  }, _react2().default.createElement("div", {
+  }, _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeBlockClass)
-  }, instruction.render ? instruction.render(data) : _react2().default.createElement(NodeDefaultView, {
+  }, instruction.render ? instruction.render(data) : _react().default.createElement(NodeDefaultView, {
     data: data
-  }), !instruction.endding ? _react2().default.createElement(_WorkflowCanvas.AddButton, {
+  }), !instruction.endding ? _react().default.createElement(_AddButton.AddButton, {
     upstream: data
-  }) : _react2().default.createElement("div", {
+  }) : _react().default.createElement("div", {
     className: (0, _css().css)`
                 flex-grow: 1;
                 display: flex;
@@ -210,24 +215,29 @@ function Node({
                   line-height: 100%;
                 }
               `
-  }, _react2().default.createElement(_icons().CloseOutlined, null))));
+  }, _react().default.createElement(_icons().CloseOutlined, null))));
 }
 
 function RemoveButton() {
+  var _useFlowContext2;
+
   const _useTranslation2 = (0, _reactI18next().useTranslation)(),
         t = _useTranslation2.t;
 
   const api = (0, _client2().useAPIClient)();
 
-  const _useFlowContext2 = (0, _WorkflowCanvas.useFlowContext)(),
-        workflow = _useFlowContext2.workflow;
+  const _ref = (_useFlowContext2 = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext2 !== void 0 ? _useFlowContext2 : {},
+        workflow = _ref.workflow,
+        nodes = _ref.nodes,
+        onNodeRemoved = _ref.onNodeRemoved;
 
-  const resource = api.resource('workflows.nodes', workflow.id);
   const current = useNodeContext();
 
-  const _useFlowContext3 = (0, _WorkflowCanvas.useFlowContext)(),
-        nodes = _useFlowContext3.nodes,
-        onNodeRemoved = _useFlowContext3.onNodeRemoved;
+  if (!workflow) {
+    return null;
+  }
+
+  const resource = api.resource('workflows.nodes', workflow.id);
 
   function onRemove() {
     return _onRemove.apply(this, arguments);
@@ -263,38 +273,150 @@ function RemoveButton() {
     return _onRemove.apply(this, arguments);
   }
 
-  return workflow.executed ? null : _react2().default.createElement(_antd().Button, {
+  return workflow.executed ? null : _react().default.createElement(_antd().Button, {
     type: "text",
     shape: "circle",
-    icon: _react2().default.createElement(_icons().DeleteOutlined, null),
+    icon: _react().default.createElement(_icons().DeleteOutlined, null),
     onClick: onRemove,
     className: "workflow-node-remove-button"
   });
 }
 
+function JobButton() {
+  var _useNodeContext;
+
+  const _useTranslation3 = (0, _reactI18next().useTranslation)(),
+        t = _useTranslation3.t;
+
+  const compile = (0, _client2().useCompile)();
+
+  const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
+        execution = _useFlowContext3.execution;
+
+  const _ref2 = (_useNodeContext = useNodeContext()) !== null && _useNodeContext !== void 0 ? _useNodeContext : {},
+        id = _ref2.id,
+        type = _ref2.type,
+        title = _ref2.title,
+        job = _ref2.job;
+
+  if (!execution) {
+    return null;
+  }
+
+  if (!job) {
+    return _react().default.createElement("span", {
+      className: (0, _css().cx)('workflow-node-job-button', (0, _css().css)`
+          border: 2px solid #d9d9d9;
+          border-radius: 50%;
+        `)
+    });
+  }
+
+  const instruction = instructions.get(type);
+  const _JobStatusOptionsMap$ = _constants.JobStatusOptionsMap[job.status],
+        value = _JobStatusOptionsMap$.value,
+        icon = _JobStatusOptionsMap$.icon,
+        color = _JobStatusOptionsMap$.color;
+  return _react().default.createElement(_client2().SchemaComponent, {
+    schema: {
+      type: 'void',
+      properties: {
+        [job.id]: {
+          type: 'void',
+          'x-component': 'Action',
+          'x-component-props': {
+            title: icon,
+            shape: 'circle',
+            className: ['workflow-node-job-button', (0, _css().css)`
+                background-color: ${color};
+                &:hover,&:focus{
+                  background-color: ${color}
+                }
+              `]
+          },
+          properties: {
+            [job.id]: {
+              type: 'void',
+              'x-decorator': 'Form',
+              'x-decorator-props': {
+                initialValue: job
+              },
+              'x-component': 'Action.Modal',
+              title: _react().default.createElement("div", {
+                className: (0, _css().cx)(_style.nodeTitleClass)
+              }, _react().default.createElement(_antd().Tag, null, compile(instruction.title)), _react().default.createElement("strong", null, title), _react().default.createElement("span", {
+                className: "workflow-node-id"
+              }, "#", id)),
+              properties: {
+                status: {
+                  type: 'number',
+                  title: '{{t("Status")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Select',
+                  enum: _constants.JobStatusOptions,
+                  'x-read-pretty': true
+                },
+                updatedAt: {
+                  type: 'string',
+                  title: '{{t("Executed at")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'DatePicker',
+                  'x-component-props': {
+                    showTime: true
+                  },
+                  'x-read-pretty': true
+                },
+                result: {
+                  type: 'object',
+                  title: '{{t("Node result")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Input.JSON',
+                  'x-component-props': {
+                    className: (0, _css().css)`
+                        padding: 1em;
+                        background-color: #eee;
+                      `
+                  },
+                  'x-read-pretty': true
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  });
+}
+
 function NodeDefaultView(props) {
+  var _useFlowContext4;
+
   const compile = (0, _client2().useCompile)();
 
-  const _useFlowContext4 = (0, _WorkflowCanvas.useFlowContext)(),
-        workflow = _useFlowContext4.workflow;
+  const _ref3 = (_useFlowContext4 = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext4 !== void 0 ? _useFlowContext4 : {},
+        workflow = _ref3.workflow;
+
+  if (!workflow) {
+    return null;
+  }
 
   const data = props.data,
         children = props.children;
   const instruction = instructions.get(data.type);
   const detailText = workflow.executed ? '{{t("View")}}' : '{{t("Configure")}}';
-  return _react2().default.createElement("div", {
+  return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeClass, `workflow-node-type-${data.type}`)
-  }, _react2().default.createElement("div", {
+  }, _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeCardClass)
-  }, _react2().default.createElement("div", {
+  }, _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeHeaderClass)
-  }, _react2().default.createElement("div", {
+  }, _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeMetaClass)
-  }, _react2().default.createElement(_antd().Tag, null, compile(instruction.title))), _react2().default.createElement("h4", {
+  }, _react().default.createElement(_antd().Tag, null, compile(instruction.title))), _react().default.createElement("h4", {
     className: (0, _css().cx)(_style.nodeTitleClass)
-  }, _react2().default.createElement("strong", null, data.title), _react2().default.createElement("span", {
+  }, _react().default.createElement("strong", null, data.title), _react().default.createElement("span", {
     className: "workflow-node-id"
-  }, "#", data.id)), _react2().default.createElement(RemoveButton, null)), _react2().default.createElement(_client2().SchemaComponent, {
+  }, "#", data.id)), _react().default.createElement(RemoveButton, null), _react().default.createElement(JobButton, null)), _react().default.createElement(_client2().SchemaComponent, {
     scope: instruction.scope,
     components: instruction.components,
     schema: {

package/lib/client/nodes/parallel.js

@@ -67,7 +67,9 @@ function _client() {
 
 var _2 = require(".");
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _Branch = require("../Branch");
+
+var _FlowContext = require("../FlowContext");
 
 var _style = require("../style");
 
@@ -142,7 +144,7 @@ var _default = {
     const _useTranslation = (0, _reactI18next().useTranslation)(),
           t = _useTranslation.t;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
     const branches = nodes.reduce((result, node) => {
@@ -166,12 +168,12 @@ var _default = {
       className: (0, _css().cx)(_style.nodeSubtreeClass)
     }, _react().default.createElement("div", {
       className: (0, _css().cx)(_style.branchBlockClass)
-    }, branches.map(branch => _react().default.createElement(_WorkflowCanvas.Branch, {
+    }, branches.map(branch => _react().default.createElement(_Branch.Branch, {
       key: branch.id,
       from: data,
       entry: branch,
       branchIndex: branch.branchIndex
-    })), tempBranches.map((_, i) => _react().default.createElement(_WorkflowCanvas.Branch, {
+    })), tempBranches.map((_, i) => _react().default.createElement(_Branch.Branch, {
       key: `temp_${branches.length + i}`,
       from: data,
       branchIndex: (lastBranchHead ? lastBranchHead.branchIndex : 0) + i + 1,

package/lib/client/nodes/query.js

@@ -25,7 +25,7 @@ function _client() {
   return data;
 }
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _FlowContext = require("../FlowContext");
 
 var _calculators = require("../calculators");
 
@@ -80,7 +80,7 @@ var _default = {
           options = props.options,
           _onChange = props.onChange;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
     const _nodes$find = nodes.find(n => n.id == options.nodeId),

package/lib/client/nodes/update.js

@@ -17,10 +17,10 @@ function _client() {
 
 var _calculators = require("../calculators");
 
-var _collection = require("../schemas/collection");
-
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
 
+var _collection = require("../schemas/collection");
+
 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; }

package/lib/client/schemas/executions.d.ts

@@ -72,6 +72,7 @@ export declare const executionSchema: {
                 resource: string;
                 action: string;
                 params: {
+                    appends: string[];
                     pageSize: number;
                     sort: string[];
                 };
@@ -202,6 +203,27 @@ export declare const executionSchema: {
                             };
                         };
                     };
+                    actions: {
+                        type: string;
+                        title: string;
+                        'x-component': string;
+                        properties: {
+                            actions: {
+                                type: string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    split: string;
+                                };
+                                properties: {
+                                    config: {
+                                        type: string;
+                                        title: string;
+                                        'x-component': string;
+                                    };
+                                };
+                            };
+                        };
+                    };
                 };
             };
         };

package/lib/client/schemas/executions.js

@@ -4,6 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.executionSchema = void 0;
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _reactRouterDom() {
+  const data = require("react-router-dom");
+
+  _reactRouterDom = function _reactRouterDom() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _constants = require("../constants");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const collection = {
   name: 'executions',
   fields: [{
@@ -13,20 +48,31 @@ const collection = {
     name: 'createdAt',
     uiSchema: {
       type: 'datetime',
-      title: '{{t("Created at")}}',
+      title: '{{t("Triggered at")}}',
       'x-component': 'DatePicker',
       'x-component-props': {},
       'x-read-pretty': true
     }
   }, {
-    interface: 'number',
-    type: 'number',
+    interface: 'object',
+    type: 'belongsTo',
     name: 'workflowId',
     uiSchema: {
       type: 'number',
       title: '{{t("Version")}}',
-      'x-component': 'InputNumber',
-      'x-read-pretty': true
+
+      ['x-component']({
+        value
+      }) {
+        const _useActionContext = (0, _client().useActionContext)(),
+              setVisible = _useActionContext.setVisible;
+
+        return _react().default.createElement(_reactRouterDom().Link, {
+          to: `/admin/settings/workflow/workflows/${value}`,
+          onClick: () => setVisible(false)
+        }, `#${value}`);
+      }
+
     }
   }, {
     type: 'number',
@@ -37,19 +83,7 @@ const collection = {
       type: 'string',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      enum: [{
-        value: 0,
-        label: '{{t("On going")}}'
-      }, {
-        value: 1,
-        label: '{{t("Succeeded")}}'
-      }, {
-        value: -1,
-        label: '{{t("Failed")}}'
-      }, {
-        value: -2,
-        label: '{{t("Canceled")}}'
-      }]
+      enum: _constants.ExecutionStatusOptions
     }
   }]
 };
@@ -64,6 +98,7 @@ const executionSchema = {
         resource: 'executions',
         action: 'list',
         params: {
+          appends: ['workflow.id', 'workflow.title'],
           pageSize: 50,
           sort: ['-createdAt']
         }
@@ -134,28 +169,28 @@ const executionSchema = {
                 'x-read-pretty': true
               }
             }
-          } // actions: {
-          //   type: 'void',
-          //   title: '{{ t("Actions") }}',
-          //   'x-component': 'Table.Column',
-          //   properties: {
-          //     actions: {
-          //       type: 'void',
-          //       'x-component': 'Space',
-          //       'x-component-props': {
-          //         split: '|',
-          //       },
-          //       properties: {
-          //         config: {
-          //           type: 'void',
-          //           title: '查看',
-          //           'x-component': 'ExecutionLink'
-          //         },
-          //       }
-          //     }
-          //   }
-          // }
-
+          },
+          actions: {
+            type: 'void',
+            title: '{{ t("Actions") }}',
+            'x-component': 'Table.Column',
+            properties: {
+              actions: {
+                type: 'void',
+                'x-component': 'Space',
+                'x-component-props': {
+                  split: '|'
+                },
+                properties: {
+                  config: {
+                    type: 'void',
+                    title: '{{t("Details")}}',
+                    'x-component': 'ExecutionLink'
+                  }
+                }
+              }
+            }
+          }
         }
       }
     }