@nocobase/plugin-workflow 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/client/FlowContext.js

@@ -5,25 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FlowContext = void 0;
 exports.useFlowContext = useFlowContext;
-
 function _react() {
   const data = _interopRequireWildcard(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 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); }
-
 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; }
-
 const FlowContext = _react().default.createContext({});
-
 exports.FlowContext = FlowContext;
-
 function useFlowContext() {
   return (0, _react().useContext)(FlowContext);
 }

package/lib/client/WorkflowCanvas.js

@@ -4,149 +4,98 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowCanvas = WorkflowCanvas;
-
 function _react() {
   const data = _interopRequireWildcard(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 _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _icons() {
   const data = require("@ant-design/icons");
-
   _icons = function _icons() {
     return data;
   };
-
   return data;
 }
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _classnames() {
   const data = _interopRequireDefault(require("classnames"));
-
   _classnames = function _classnames() {
     return data;
   };
-
   return data;
 }
-
 function _reactI18next() {
   const data = require("react-i18next");
-
   _reactI18next = function _reactI18next() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _FlowContext = require("./FlowContext");
-
 var _style = require("./style");
-
 var _triggers = require("./triggers");
-
 var _Branch = require("./Branch");
-
 var _executions = require("./schemas/executions");
-
 var _ExecutionLink = require("./ExecutionLink");
-
 var _locale = require("./locale");
-
 var _utils = require("./utils");
-
 const _excluded = ["request", "filter"],
-      _excluded2 = ["nodes", "revisions"];
-
+  _excluded2 = ["nodes", "revisions"];
 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); }
-
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 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."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ExecutionResourceProvider(_ref) {
   var _request$params;
-
   let request = _ref.request,
-      _ref$filter = _ref.filter,
-      filter = _ref$filter === void 0 ? {} : _ref$filter,
-      others = _objectWithoutProperties(_ref, _excluded);
-
+    _ref$filter = _ref.filter,
+    filter = _ref$filter === void 0 ? {} : _ref$filter,
+    others = _objectWithoutProperties(_ref, _excluded);
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
-        workflow = _useFlowContext.workflow;
-
+    workflow = _useFlowContext.workflow;
   const props = _objectSpread(_objectSpread({}, others), {}, {
     request: _objectSpread(_objectSpread({}, request), {}, {
       params: _objectSpread(_objectSpread({}, request === null || request === void 0 ? void 0 : request.params), {}, {
@@ -156,57 +105,42 @@ function ExecutionResourceProvider(_ref) {
       })
     })
   });
-
   return _react().default.createElement(_client().ResourceActionProvider, _objectSpread({}, props));
 }
-
 function WorkflowCanvas() {
   var _data$data2;
-
   const history = (0, _reactRouterDom().useHistory)();
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const _useResourceActionCon = (0, _client().useResourceActionContext)(),
-        data = _useResourceActionCon.data,
-        refresh = _useResourceActionCon.refresh,
-        loading = _useResourceActionCon.loading;
-
+    data = _useResourceActionCon.data,
+    refresh = _useResourceActionCon.refresh,
+    loading = _useResourceActionCon.loading;
   const _useResourceContext = (0, _client().useResourceContext)(),
-        resource = _useResourceContext.resource;
-
+    resource = _useResourceContext.resource;
   const _useDocumentTitle = (0, _client().useDocumentTitle)(),
-        setTitle = _useDocumentTitle.setTitle;
-
+    setTitle = _useDocumentTitle.setTitle;
   const _useState = (0, _react().useState)(false),
-        _useState2 = _slicedToArray(_useState, 2),
-        visible = _useState2[0],
-        setVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   (0, _react().useEffect)(() => {
     var _data$data;
-
     const _ref2 = (_data$data = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data !== void 0 ? _data$data : {},
-          title = _ref2.title;
-
+      title = _ref2.title;
     setTitle === null || setTitle === void 0 ? void 0 : setTitle(`${(0, _locale.lang)('Workflow')}${title ? `: ${title}` : ''}`);
   }, [data === null || data === void 0 ? void 0 : data.data]);
-
   if (!(data === null || data === void 0 ? void 0 : data.data) && !loading) {
     return _react().default.createElement("div", null, (0, _locale.lang)('Load failed'));
   }
-
   const _ref3 = (_data$data2 = data === null || data === void 0 ? void 0 : data.data) !== null && _data$data2 !== void 0 ? _data$data2 : {},
-        _ref3$nodes = _ref3.nodes,
-        nodes = _ref3$nodes === void 0 ? [] : _ref3$nodes,
-        _ref3$revisions = _ref3.revisions,
-        revisions = _ref3$revisions === void 0 ? [] : _ref3$revisions,
-        workflow = _objectWithoutProperties(_ref3, _excluded2);
-
+    _ref3$nodes = _ref3.nodes,
+    nodes = _ref3$nodes === void 0 ? [] : _ref3$nodes,
+    _ref3$revisions = _ref3.revisions,
+    revisions = _ref3$revisions === void 0 ? [] : _ref3$revisions,
+    workflow = _objectWithoutProperties(_ref3, _excluded2);
   (0, _utils.linkNodes)(nodes);
   const entry = nodes.find(item => !item.upstream);
-
   function onSwitchVersion({
     key
   }) {
@@ -214,11 +148,9 @@ function WorkflowCanvas() {
       history.push(key);
     }
   }
-
-  function onToggle(_x) {
+  function onToggle(_x2) {
     return _onToggle.apply(this, arguments);
   }
-
   function _onToggle() {
     _onToggle = _asyncToGenerator(function* (value) {
       yield resource.update({
@@ -231,32 +163,26 @@ function WorkflowCanvas() {
     });
     return _onToggle.apply(this, arguments);
   }
-
   function onRevision() {
     return _onRevision.apply(this, arguments);
   }
-
   function _onRevision() {
     _onRevision = _asyncToGenerator(function* () {
       const _yield$resource$revis = yield resource.revision({
-        filterByTk: workflow.id,
-        filter: {
-          key: workflow.key
-        }
-      }),
-            revision = _yield$resource$revis.data.data;
-
+          filterByTk: workflow.id,
+          filter: {
+            key: workflow.key
+          }
+        }),
+        revision = _yield$resource$revis.data.data;
       _antd().message.success(t('Operation succeeded'));
-
       history.push(`${revision.id}`);
     });
     return _onRevision.apply(this, arguments);
   }
-
-  function onMenuCommand(_x2) {
+  function onMenuCommand(_x3) {
     return _onMenuCommand.apply(this, arguments);
   }
-
   function _onMenuCommand() {
     _onMenuCommand = _asyncToGenerator(function* ({
       key
@@ -265,24 +191,20 @@ function WorkflowCanvas() {
         case 'history':
           setVisible(true);
           return;
-
         case 'revision':
           return onRevision();
-
         default:
           break;
       }
     });
     return _onMenuCommand.apply(this, arguments);
   }
-
   const revisionable = workflow.executed && !revisions.find(item => !item.executed && new Date(item.createdAt) > new Date(workflow.createdAt));
   return _react().default.createElement(_FlowContext.FlowContext.Provider, {
     value: {
       workflow,
       nodes,
-      onNodeAdded: refresh,
-      onNodeRemoved: refresh
+      refresh
     }
   }, _react().default.createElement("div", {
     className: "workflow-toolbar"
@@ -295,16 +217,19 @@ function WorkflowCanvas() {
     overlay: _react().default.createElement(_antd().Menu, {
       onClick: onSwitchVersion,
       defaultSelectedKeys: [`${workflow.id}`],
-      className: (0, _css().cx)(_style.workflowVersionDropdownClass)
-    }, revisions.sort((a, b) => b.id - a.id).map((item, index) => _react().default.createElement(_antd().Menu.Item, {
-      key: `${item.id}`,
-      icon: item.current ? _react().default.createElement(_icons().RightOutlined, null) : null,
-      className: (0, _classnames().default)({
-        executed: item.executed,
-        unexecuted: !item.executed,
-        enabled: item.enabled
-      })
-    }, _react().default.createElement("strong", null, `#${item.id}`), _react().default.createElement("time", null, new Date(item.createdAt).toLocaleString()))))
+      className: (0, _css().cx)(_style.workflowVersionDropdownClass),
+      items: revisions.sort((a, b) => b.id - a.id).map((item, index) => ({
+        key: `${item.id}`,
+        icon: item.current ? _react().default.createElement(_icons().RightOutlined, null) : null,
+        label: _react().default.createElement("span", {
+          className: (0, _classnames().default)({
+            executed: item.executed,
+            unexecuted: !item.executed,
+            enabled: item.enabled
+          })
+        }, _react().default.createElement("strong", null, `#${item.id}`), _react().default.createElement("time", null, new Date(item.createdAt).toLocaleString()))
+      }))
+    })
   }, _react().default.createElement(_antd().Button, {
     type: "text"
   }, _react().default.createElement("label", null, (0, _locale.lang)('Version')), _react().default.createElement("span", null, (workflow === null || workflow === void 0 ? void 0 : workflow.id) ? `#${workflow.id}` : null), _react().default.createElement(_icons().DownOutlined, null)))), _react().default.createElement(_antd().Switch, {
@@ -314,14 +239,17 @@ function WorkflowCanvas() {
     unCheckedChildren: (0, _locale.lang)('Off')
   }), _react().default.createElement(_antd().Dropdown, {
     overlay: _react().default.createElement(_antd().Menu, {
+      items: [{
+        key: 'history',
+        label: (0, _locale.lang)('Execution history'),
+        disabled: !workflow.allExecuted
+      }, {
+        key: 'revision',
+        label: (0, _locale.lang)('Copy to new version'),
+        disabled: !revisionable
+      }],
       onClick: onMenuCommand
-    }, _react().default.createElement(_antd().Menu.Item, {
-      key: "history",
-      disabled: !workflow.allExecuted
-    }, (0, _locale.lang)('Execution history')), _react().default.createElement(_antd().Menu.Item, {
-      key: "revision",
-      disabled: !revisionable
-    }, (0, _locale.lang)('Copy to new version')))
+    })
   }, _react().default.createElement(_antd().Button, {
     type: "text",
     icon: _react().default.createElement(_icons().EllipsisOutlined, null)
@@ -343,7 +271,7 @@ function WorkflowCanvas() {
   }, _react().default.createElement(_Branch.Branch, {
     entry: entry
   })), _react().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeCardClass)
+    className: (0, _css().cx)('end', _style.nodeCardClass)
   }, _react().default.createElement("div", {
     className: (0, _css().cx)(_style.nodeMetaClass)
   }, _react().default.createElement(_antd().Tag, {

package/lib/client/WorkflowLink.js

@@ -4,63 +4,45 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowLink = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _reactI18next() {
   const data = require("react-i18next");
-
   _reactI18next = function _reactI18next() {
     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;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const WorkflowLink = () => {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const _useRecord = (0, _client().useRecord)(),
-        id = _useRecord.id;
-
+    id = _useRecord.id;
   const _useActionContext = (0, _client().useActionContext)(),
-        setVisible = _useActionContext.setVisible;
-
+    setVisible = _useActionContext.setVisible;
   return _react().default.createElement(_reactRouterDom().Link, {
     to: `/admin/settings/workflow/workflows/${id}`,
     onClick: () => setVisible(false)
   }, t('View'));
 };
-
 exports.WorkflowLink = WorkflowLink;

package/lib/client/WorkflowPage.js

@@ -4,57 +4,40 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.WorkflowPage = void 0;
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 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 _style = require("./style");
-
 var _WorkflowCanvas = require("./WorkflowCanvas");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const WorkflowPage = () => {
   const _useRouteMatch = (0, _reactRouterDom().useRouteMatch)(),
-        params = _useRouteMatch.params;
-
+    params = _useRouteMatch.params;
   return _react().default.createElement("div", {
     className: (0, _css().cx)(_style.workflowPageClass)
   }, _react().default.createElement(_client().SchemaComponent, {
@@ -88,5 +71,4 @@ const WorkflowPage = () => {
     }
   }));
 };
-
 exports.WorkflowPage = WorkflowPage;