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

package/lib/client/triggers/index.js

@@ -6,6 +6,16 @@ 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");
 
@@ -16,10 +26,10 @@ function _css() {
   return data;
 }
 
-function _react() {
+function _react2() {
   const data = require("@formily/react");
 
-  _react = function _react() {
+  _react2 = function _react2() {
     return data;
   };
 
@@ -46,26 +56,6 @@ function _antd() {
   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");
 
@@ -98,12 +88,28 @@ 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 _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 _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); }); }; }
@@ -111,10 +117,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 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 : {},
@@ -131,7 +134,7 @@ function useUpdateConfigAction() {
         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;
         }
@@ -139,7 +142,9 @@ function useUpdateConfigAction() {
         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();
@@ -168,13 +173,13 @@ function TriggerExecution() {
   }
 
   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 +192,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: {
@@ -224,45 +229,114 @@ 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;
 
   if (!workflow || !workflow.type) {
     return null;
   }
 
-  const type = workflow.type,
+  const title = workflow.title,
+        type = workflow.type,
         config = workflow.config,
         executed = workflow.executed;
 
   const _triggers$get = triggers.get(type),
-        title = _triggers$get.title,
+        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)}`;
+
+  const _useState = (0, _react().useState)(title !== null && title !== void 0 ? title : typeTitle),
+        _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];
+
+  function onChangeTitle(_x) {
+    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,
@@ -273,41 +347,38 @@ const TriggerConfig = () => {
 
             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{
+                          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 : {
               type: 'void',
@@ -330,13 +401,13 @@ const TriggerConfig = () => {
                 }
               }
             }
-          }
+          })
         }
       }
     },
     scope: scope,
     components: components
-  }));
+  })));
 };
 
 exports.TriggerConfig = TriggerConfig;

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

@@ -64,8 +64,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 const DateFieldsSelect = (0, _react2().observer)(props => {
-  var _values$config;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
 
@@ -77,7 +75,7 @@ const DateFieldsSelect = (0, _react2().observer)(props => {
   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);
+  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 => {

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

@@ -109,14 +109,14 @@ const ModeFieldsets = {
       'x-decorator': 'FormItem',
       'x-component': 'RepeatField',
       'x-reactions': [{
-        target: 'config.endsOn',
+        target: 'endsOn',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
           }
         }
       }, {
-        target: 'config.limit',
+        target: 'limit',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
@@ -150,7 +150,7 @@ const ModeFieldsets = {
     collection: _objectSpread(_objectSpread({}, _collection.collection), {}, {
       'x-reactions': [..._collection.collection['x-reactions'], {
         // only full path works
-        target: 'config.startsOn',
+        target: 'startsOn',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
@@ -164,7 +164,7 @@ const ModeFieldsets = {
       'x-decorator': 'FormItem',
       'x-component': 'OnField',
       'x-reactions': [{
-        target: 'config.repeat',
+        target: 'repeat',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
@@ -180,14 +180,14 @@ const ModeFieldsets = {
       'x-decorator': 'FormItem',
       'x-component': 'RepeatField',
       'x-reactions': [{
-        target: 'config.endsOn',
+        target: 'endsOn',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
           }
         }
       }, {
-        target: 'config.limit',
+        target: 'limit',
         fulfill: {
           state: {
             visible: '{{!!$self.value}}'
@@ -228,22 +228,19 @@ const ScheduleConfig = () => {
         values = _useForm$values === void 0 ? {} : _useForm$values,
         clearFormGraph = _useForm.clearFormGraph;
 
-  const _values$config = values.config,
-        config = _values$config === void 0 ? {} : _values$config;
-
-  const _useState = (0, _react().useState)(config.mode),
+  const _useState = (0, _react().useState)(values.mode),
         _useState2 = _slicedToArray(_useState, 2),
         mode = _useState2[0],
         setMode = _useState2[1];
 
   (0, _react2().useFormEffects)(() => {
-    (0, _core().onFieldValueChange)('config.mode', field => {
+    (0, _core().onFieldValueChange)('mode', field => {
       setMode(field.value);
-      clearFormGraph('config.collection');
-      clearFormGraph('config.startsOn');
-      clearFormGraph('config.repeat');
-      clearFormGraph('config.endsOn');
-      clearFormGraph('config.limit');
+      clearFormGraph('collection');
+      clearFormGraph('startsOn');
+      clearFormGraph('repeat');
+      clearFormGraph('endsOn');
+      clearFormGraph('limit');
     });
   });
   return _react().default.createElement(_react().default.Fragment, null, _react().default.createElement(_client().SchemaComponent, {
@@ -256,7 +253,8 @@ const ScheduleConfig = () => {
       'x-component-props': {
         options: scheduleModeOptions
       },
-      required: true
+      required: true,
+      default: _constants.SCHEDULE_MODE.STATIC
     }
   }), _react().default.createElement(_client().SchemaComponent, {
     schema: {

package/lib/client/triggers/schedule/index.d.ts

@@ -6,7 +6,6 @@ declare const _default: {
     fieldset: {
         config: {
             type: string;
-            name: string;
             'x-component': string;
             'x-component-props': {};
         };

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

@@ -32,8 +32,7 @@ var _default = {
   type: 'schedule',
   fieldset: {
     config: {
-      type: 'object',
-      name: 'config',
+      type: 'void',
       'x-component': 'ScheduleConfig',
       'x-component-props': {}
     }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.1-alpha.1",
+  "version": "0.9.1-alpha.2",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.1-alpha.1",
-    "@nocobase/client": "0.9.1-alpha.1",
-    "@nocobase/database": "0.9.1-alpha.1",
-    "@nocobase/evaluators": "0.9.1-alpha.1",
-    "@nocobase/resourcer": "0.9.1-alpha.1",
-    "@nocobase/server": "0.9.1-alpha.1",
-    "@nocobase/utils": "0.9.1-alpha.1",
+    "@nocobase/actions": "0.9.1-alpha.2",
+    "@nocobase/client": "0.9.1-alpha.2",
+    "@nocobase/database": "0.9.1-alpha.2",
+    "@nocobase/evaluators": "0.9.1-alpha.2",
+    "@nocobase/resourcer": "0.9.1-alpha.2",
+    "@nocobase/server": "0.9.1-alpha.2",
+    "@nocobase/utils": "0.9.1-alpha.2",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -22,8 +22,8 @@
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.9.1-alpha.1",
+    "@nocobase/test": "0.9.1-alpha.2",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
+  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
 }