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

package/lib/client/triggers/index.js

@@ -5,176 +5,128 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.triggers = exports.TriggerConfig = void 0;
 exports.useTrigger = useTrigger;
-
+function _react() {
+  const data = _interopRequireWildcard(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
-function _react() {
+function _react2() {
   const data = require("@formily/react");
-
-  _react = function _react() {
+  _react2 = function _react2() {
     return data;
   };
-
   return data;
 }
-
 function _client() {
   const data = require("@nocobase/utils/client");
-
   _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
-  return data;
-}
-
-function _react2() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react2 = function _react2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
   return data;
 }
-
 function _icons() {
   const data = require("@ant-design/icons");
-
   _icons = function _icons() {
     return data;
   };
-
   return data;
 }
-
 function _client2() {
   const data = require("@nocobase/client");
-
   _client2 = function _client2() {
     return data;
   };
-
   return data;
 }
-
 var _style = require("../style");
-
 var _FlowContext = require("../FlowContext");
-
 var _collection = _interopRequireDefault(require("./collection"));
-
 var _schedule = _interopRequireDefault(require("./schedule/"));
-
 var _locale = require("../locale");
-
 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 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 _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 = 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 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 useUpdateConfigAction() {
   var _useFlowContext;
-
-  const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
-  const form = (0, _react().useForm)();
+  const form = (0, _react2().useForm)();
   const api = (0, _client2().useAPIClient)();
-
   const _ref = (_useFlowContext = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext !== void 0 ? _useFlowContext : {},
-        workflow = _ref.workflow;
-
+    workflow = _ref.workflow;
   const ctx = (0, _client2().useActionContext)();
-
   const _useResourceActionCon = (0, _client2().useResourceActionContext)(),
-        refresh = _useResourceActionCon.refresh;
-
+    refresh = _useResourceActionCon.refresh;
   return {
     run() {
       return _asyncToGenerator(function* () {
         var _api$resource$update, _api$resource;
-
         if (workflow.executed) {
-          _antd().message.error(t('Trigger in executed workflow cannot be modified'));
-
+          _antd().message.error((0, _locale.lang)('Trigger in executed workflow cannot be modified'));
           return;
         }
-
         yield form.submit();
         yield (_api$resource$update = (_api$resource = api.resource('workflows')).update) === null || _api$resource$update === void 0 ? void 0 : _api$resource$update.call(_api$resource, {
           filterByTk: workflow.id,
-          values: form.values
+          values: {
+            config: form.values
+          }
         });
         ctx.setVisible(false);
         refresh();
       })();
     }
-
   };
 }
-
 ;
 ;
 const triggers = new (_client().Registry)();
 exports.triggers = triggers;
 triggers.register(_collection.default.type, _collection.default);
 triggers.register(_schedule.default.type, _schedule.default);
-
 function TriggerExecution() {
   const compile = (0, _client2().useCompile)();
-
   const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
-        workflow = _useFlowContext2.workflow,
-        execution = _useFlowContext2.execution;
-
+    workflow = _useFlowContext2.workflow,
+    execution = _useFlowContext2.execution;
   if (!execution) {
     return null;
   }
-
   const trigger = triggers.get(workflow.type);
-  return _react2().default.createElement(_client2().SchemaComponent, {
+  return _react().default.createElement(_client2().SchemaComponent, {
     schema: {
       type: 'void',
       name: 'execution',
       'x-component': 'Action',
       'x-component-props': {
-        title: _react2().default.createElement(_icons().InfoOutlined, null),
+        title: _react().default.createElement(_icons().InfoOutlined, null),
         shape: 'circle',
         className: 'workflow-node-job-button',
         type: 'primary'
@@ -187,9 +139,9 @@ function TriggerExecution() {
             initialValue: execution
           },
           'x-component': 'Action.Modal',
-          title: _react2().default.createElement("div", {
+          title: _react().default.createElement("div", {
             className: (0, _css().cx)(_style.nodeTitleClass)
-          }, _react2().default.createElement(_antd().Tag, null, compile(trigger.title)), _react2().default.createElement("strong", null, workflow.title), _react2().default.createElement("span", {
+          }, _react().default.createElement(_antd().Tag, null, compile(trigger.title)), _react().default.createElement("strong", null, workflow.title), _react().default.createElement("span", {
             className: "workflow-node-id"
           }, "#", execution.id)),
           properties: {
@@ -222,47 +174,103 @@ function TriggerExecution() {
     }
   });
 }
-
 const TriggerConfig = () => {
-  const _useTranslation2 = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation2.t;
-
+  const api = (0, _client2().useAPIClient)();
   const compile = (0, _client2().useCompile)();
-
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
-        workflow = _useFlowContext3.workflow;
-
+    workflow = _useFlowContext3.workflow,
+    refresh = _useFlowContext3.refresh;
+  const _useState = (0, _react().useState)(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    editingTitle = _useState2[0],
+    setEditingTitle = _useState2[1];
+  const _useState3 = (0, _react().useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    editingConfig = _useState4[0],
+    setEditingConfig = _useState4[1];
+  (0, _react().useEffect)(() => {
+    var _workflow$title;
+    setEditingTitle((_workflow$title = workflow.title) !== null && _workflow$title !== void 0 ? _workflow$title : typeTitle);
+  }, [workflow]);
   if (!workflow || !workflow.type) {
     return null;
   }
-
-  const type = workflow.type,
-        config = workflow.config,
-        executed = workflow.executed;
-
+  const title = workflow.title,
+    type = workflow.type,
+    config = workflow.config,
+    executed = workflow.executed;
   const _triggers$get = triggers.get(type),
-        title = _triggers$get.title,
-        fieldset = _triggers$get.fieldset,
-        scope = _triggers$get.scope,
-        components = _triggers$get.components;
-
+    typeTitle = _triggers$get.title,
+    fieldset = _triggers$get.fieldset,
+    scope = _triggers$get.scope,
+    components = _triggers$get.components;
   const detailText = executed ? '{{t("View")}}' : '{{t("Configure")}}';
-  const titleText = `${(0, _locale.lang)('Trigger')}: ${compile(title)}`;
-  return _react2().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeCardClass)
-  }, _react2().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeHeaderClass)
-  }, _react2().default.createElement("div", {
-    className: (0, _css().cx)(_style.nodeMetaClass)
-  }, _react2().default.createElement(_antd().Tag, {
+  const titleText = `${(0, _locale.lang)('Trigger')}: ${compile(typeTitle)}`;
+  function onChangeTitle(_x2) {
+    return _onChangeTitle.apply(this, arguments);
+  }
+  function _onChangeTitle() {
+    _onChangeTitle = _asyncToGenerator(function* (next) {
+      var _api$resource$update2, _api$resource2;
+      const t = next || typeTitle;
+      setEditingTitle(t);
+      if (t === title) {
+        return;
+      }
+      yield (_api$resource$update2 = (_api$resource2 = api.resource('workflows')).update) === null || _api$resource$update2 === void 0 ? void 0 : _api$resource$update2.call(_api$resource2, {
+        filterByTk: workflow.id,
+        values: {
+          title: t
+        }
+      });
+      refresh();
+    });
+    return _onChangeTitle.apply(this, arguments);
+  }
+  function onOpenDrawer(ev) {
+    if (ev.target === ev.currentTarget) {
+      setEditingConfig(true);
+      return;
+    }
+    const whiteSet = new Set(['workflow-node-meta', 'workflow-node-config-button', 'ant-input-disabled']);
+    for (let el = ev.target; el && el !== ev.currentTarget; el = el.parentNode) {
+      if (Array.from(el.classList).some(name => whiteSet.has(name))) {
+        setEditingConfig(true);
+        ev.stopPropagation();
+        return;
+      }
+    }
+  }
+  return _react().default.createElement("div", {
+    className: (0, _css().cx)(_style.nodeCardClass),
+    onClick: onOpenDrawer
+  }, _react().default.createElement("div", {
+    className: (0, _css().cx)(_style.nodeMetaClass, 'workflow-node-meta')
+  }, _react().default.createElement(_antd().Tag, {
     color: "gold"
-  }, (0, _locale.lang)('Trigger'))), _react2().default.createElement("h4", null, compile(title)), _react2().default.createElement(TriggerExecution, null)), _react2().default.createElement(_client2().SchemaComponent, {
+  }, titleText)), _react().default.createElement("div", null, _react().default.createElement(_antd().Input.TextArea, {
+    value: editingTitle,
+    onChange: ev => setEditingTitle(ev.target.value),
+    onBlur: ev => onChangeTitle(ev.target.value),
+    autoSize: true
+  })), _react().default.createElement(TriggerExecution, null), _react().default.createElement(_client2().ActionContext.Provider, {
+    value: {
+      visible: editingConfig,
+      setVisible: setEditingConfig
+    }
+  }, _react().default.createElement(_client2().SchemaComponent, {
     schema: {
       type: 'void',
-      title: detailText,
-      'x-component': 'Action.Link',
-      name: 'drawer',
       properties: {
+        config: {
+          type: 'void',
+          'x-content': detailText,
+          'x-component': _antd().Button,
+          'x-component-props': {
+            type: 'link',
+            className: 'workflow-node-config-button'
+          }
+        },
         drawer: {
           type: 'void',
           title: titleText,
@@ -270,46 +278,41 @@ const TriggerConfig = () => {
           'x-decorator': 'Form',
           'x-decorator-props': {
             disabled: workflow.executed,
-
             useValues(options) {
               return (0, _client2().useRequest)(() => Promise.resolve({
-                data: {
-                  config
-                }
+                data: config
               }), options);
             }
-
           },
-          properties: {
-            config: {
+          properties: _objectSpread(_objectSpread({}, executed ? {
+            alert: {
+              'x-component': _antd().Alert,
+              'x-component-props': {
+                type: 'warning',
+                showIcon: true,
+                message: `{{t("Trigger in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
+                className: (0, _css().css)`
+                          width: 100%;
+                          font-size: 85%;
+                          margin-bottom: 2em;
+                        `
+              }
+            }
+          } : {}), {}, {
+            fieldset: {
               type: 'void',
-              name: 'config',
               'x-component': 'fieldset',
               'x-component-props': {
                 className: (0, _css().css)`
-                      .ant-select{
-                        width: auto;
-                        min-width: 6em;
-                      }
-                    `
+                        .ant-select:not(.full-width){
+                          width: auto;
+                          min-width: 6em;
+                        }
+                      `
               },
-              properties: _objectSpread(_objectSpread({}, executed ? {
-                alert: {
-                  'x-component': _antd().Alert,
-                  'x-component-props': {
-                    type: 'warning',
-                    showIcon: true,
-                    message: `{{t("Trigger in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
-                    className: (0, _css().css)`
-                            width: 100%;
-                            font-size: 85%;
-                            margin-bottom: 2em;
-                          `
-                  }
-                }
-              } : {}), fieldset)
+              properties: fieldset
             },
-            actions: executed ? null : {
+            actions: _objectSpread({}, executed ? {} : {
               type: 'void',
               'x-component': 'Action.Drawer.Footer',
               properties: {
@@ -329,21 +332,18 @@ const TriggerConfig = () => {
                   }
                 }
               }
-            }
-          }
+            })
+          })
         }
       }
     },
     scope: scope,
     components: components
-  }));
+  })));
 };
-
 exports.TriggerConfig = TriggerConfig;
-
 function useTrigger() {
   const _useFlowContext4 = (0, _FlowContext.useFlowContext)(),
-        workflow = _useFlowContext4.workflow;
-
+    workflow = _useFlowContext4.workflow;
   return triggers.get(workflow.type);
 }

package/lib/client/triggers/schedule/DateFieldsSelect.js

@@ -4,85 +4,60 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DateFieldsSelect = void 0;
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 function _react2() {
   const data = require("@formily/react");
-
   _react2 = function _react2() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     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;
 }
-
 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; }
-
 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); }
 const DateFieldsSelect = (0, _react2().observer)(props => {
-  var _values$config;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
+    t = _useTranslation.t;
   const compile = (0, _client().useCompile)();
-
   const _useCollectionManager = (0, _client().useCollectionManager)(),
-        getCollectionFields = _useCollectionManager.getCollectionFields;
-
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   const _useForm = (0, _react2().useForm)(),
-        values = _useForm.values;
-
-  const fields = getCollectionFields(values === null || values === void 0 ? void 0 : (_values$config = values.config) === null || _values$config === void 0 ? void 0 : _values$config.collection);
+    values = _useForm.values;
+  const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
   return _react().default.createElement(_antd().Select, _objectSpread({
     placeholder: t('Select Field')
   }, props), fields.filter(field => !field.hidden && (field.uiSchema ? field.type === 'date' : false)).map(field => {
     var _field$uiSchema;
-
     return _react().default.createElement(_antd().Select.Option, {
       key: field.name,
       value: field.name

package/lib/client/triggers/schedule/EndsByField.js

@@ -4,60 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EndsByField = EndsByField;
-
 function _css() {
   const data = require("@emotion/css");
-
   _css = function _css() {
     return data;
   };
-
   return data;
 }
-
 function _antd() {
   const data = require("antd");
-
   _antd = function _antd() {
     return data;
   };
-
   return data;
 }
-
 function _moment() {
   const data = _interopRequireDefault(require("moment"));
-
   _moment = function _moment() {
     return data;
   };
-
   return data;
 }
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
-
   _react = function _react() {
     return data;
   };
-
   return data;
 }
-
 var _locale = require("../../locale");
-
 var _OnField = require("./OnField");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function EndsByField({
   value,
   onChange: _onChange
 }) {
   const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
-        t = _useWorkflowTranslati.t;
-
+    t = _useWorkflowTranslati.t;
   const type = value != null ? typeof value === 'object' && !(value instanceof Date) ? 'field' : 'date' : null;
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`