@nocobase/plugin-workflow 0.8.0-alpha.8 → 0.8.1-alpha.3

package/lib/client/nodes/index.js

@@ -70,6 +70,16 @@ function _reactI18next() {
   return data;
 }
 
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
+
+  _jsonTemplates = function _jsonTemplates() {
+    return data;
+  };
+
+  return data;
+}
+
 function _client() {
   const data = require("@nocobase/utils/client");
 
@@ -114,6 +124,10 @@ var _destroy = _interopRequireDefault(require("./destroy"));
 
 var _constants = require("../constants");
 
+var _locale = require("../locale");
+
+var _request = _interopRequireDefault(require("./request"));
+
 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,11 +149,9 @@ instructions.register('query', _query.default);
 instructions.register('create', _create.default);
 instructions.register('update', _update.default);
 instructions.register('destroy', _destroy.default);
+instructions.register('request', _request.default);
 
 function useUpdateAction() {
-  const _useTranslation = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation.t;
-
   const form = (0, _react2().useForm)();
   const api = (0, _client2().useAPIClient)();
   const ctx = (0, _client2().useActionContext)();
@@ -156,7 +168,7 @@ function useUpdateAction() {
     run() {
       return _asyncToGenerator(function* () {
         if (workflow.executed) {
-          _antd().message.error(t('Node in executed workflow cannot be modified'));
+          _antd().message.error((0, _locale.lang)('Node in executed workflow cannot be modified'));
 
           return;
         } // TODO: how to do validation separately for each field? especially disabled for dynamic fields?
@@ -221,8 +233,8 @@ function Node({
 function RemoveButton() {
   var _useFlowContext2;
 
-  const _useTranslation2 = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation2.t;
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+        t = _useTranslation.t;
 
   const api = (0, _client2().useAPIClient)();
 
@@ -261,8 +273,31 @@ function RemoveButton() {
         return _onOk.apply(this, arguments);
       }
 
+      const usingNodes = nodes.filter(node => {
+        if (node === current) {
+          return false;
+        }
+
+        const template = (0, _jsonTemplates().default)(node.config);
+        const refs = template.parameters.filter(({
+          key
+        }) => key.startsWith(`$jobsMapByNodeId.${current.id}.`) || key === `$jobsMapByNodeId.${current.id}`);
+        return refs.length;
+      });
+
+      if (usingNodes.length) {
+        _antd().Modal.error({
+          title: (0, _locale.lang)('Can not delete'),
+          content: (0, _locale.lang)('The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.', {
+            nodes: usingNodes.map(item => `#${item.id}`).join(', ')
+          })
+        });
+
+        return;
+      }
+
       const hasBranches = !nodes.find(item => item.upstream === current && item.branchIndex != null);
-      const message = hasBranches ? t('Are you sure you want to delete it?') : t('This node contains branches, deleting will also be preformed to them, are you sure?');
+      const message = hasBranches ? t('Are you sure you want to delete it?') : (0, _locale.lang)('This node contains branches, deleting will also be preformed to them, are you sure?');
 
       _antd().Modal.confirm({
         title: t('Delete'),
@@ -285,9 +320,6 @@ function RemoveButton() {
 function JobButton() {
   var _useNodeContext;
 
-  const _useTranslation3 = (0, _reactI18next().useTranslation)(),
-        t = _useTranslation3.t;
-
   const compile = (0, _client2().useCompile)();
 
   const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
@@ -321,7 +353,7 @@ function JobButton() {
     schema: {
       type: 'void',
       properties: {
-        [job.id]: {
+        job: {
           type: 'void',
           'x-component': 'Action',
           'x-component-props': {
@@ -350,7 +382,7 @@ function JobButton() {
               properties: {
                 status: {
                   type: 'number',
-                  title: '{{t("Status")}}',
+                  title: `{{t("Status", { ns: "${_locale.NAMESPACE}" })}}`,
                   'x-decorator': 'FormItem',
                   'x-component': 'Select',
                   enum: _constants.JobStatusOptions,
@@ -358,7 +390,7 @@ function JobButton() {
                 },
                 updatedAt: {
                   type: 'string',
-                  title: '{{t("Executed at")}}',
+                  title: `{{t("Executed at", { ns: "${_locale.NAMESPACE}" })}}`,
                   'x-decorator': 'FormItem',
                   'x-component': 'DatePicker',
                   'x-component-props': {
@@ -368,7 +400,7 @@ function JobButton() {
                 },
                 result: {
                   type: 'object',
-                  title: '{{t("Node result")}}',
+                  title: `{{t("Node result", { ns: "${_locale.NAMESPACE}" })}}`,
                   'x-decorator': 'FormItem',
                   'x-component': 'Input.JSON',
                   'x-component-props': {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const _default: {
     title: string;
     type: string;

package/lib/client/nodes/parallel.js

@@ -45,26 +45,6 @@ function _antd() {
   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 _2 = require(".");
 
 var _Branch = require("../Branch");
@@ -73,6 +53,8 @@ var _FlowContext = require("../FlowContext");
 
 var _style = require("../style");
 
+var _locale = require("../locale");
+
 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; }
@@ -90,23 +72,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var _default = {
-  title: '{{t("Parallel branch")}}',
+  title: `{{t("Parallel branch", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'parallel',
   group: 'control',
   fieldset: {
     'config.mode': {
       type: 'string',
       name: 'config.mode',
-      title: '{{t("Mode")}}',
+      title: `{{t("Mode", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Radio.Group',
       'x-component-props': {},
       enum: [{
         value: 'all',
         label: _react().default.createElement(_antd().Tooltip, {
-          title: _client().i18n.t('Continue after all branches succeeded'),
+          title: (0, _locale.lang)('Continue after all branches succeeded'),
           placement: "bottom"
-        }, _client().i18n.t('All succeeded'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
+        }, (0, _locale.lang)('All succeeded'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
           style: {
             color: '#999'
           }
@@ -114,9 +96,9 @@ var _default = {
       }, {
         value: 'any',
         label: _react().default.createElement(_antd().Tooltip, {
-          title: _client().i18n.t('Continue after any branch succeeded'),
+          title: (0, _locale.lang)('Continue after any branch succeeded'),
           placement: "bottom"
-        }, _client().i18n.t('Any succeeded'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
+        }, (0, _locale.lang)('Any succeeded'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
           style: {
             color: '#999'
           }
@@ -124,9 +106,9 @@ var _default = {
       }, {
         value: 'race',
         label: _react().default.createElement(_antd().Tooltip, {
-          title: _client().i18n.t('Continue after any branch succeeded, or exit after any branch failed'),
+          title: (0, _locale.lang)('Continue after any branch succeeded, or exit after any branch failed'),
           placement: "bottom"
-        }, _client().i18n.t('Any succeeded or failed'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
+        }, (0, _locale.lang)('Any succeeded or failed'), " ", _react().default.createElement(_icons().QuestionCircleOutlined, {
           style: {
             color: '#999'
           }
@@ -141,9 +123,6 @@ var _default = {
     const id = data.id,
           mode = data.config.mode;
 
-    const _useTranslation = (0, _reactI18next().useTranslation)(),
-          t = _useTranslation.t;
-
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
@@ -198,7 +177,7 @@ var _default = {
               height: 2em;
             `
     }, _react().default.createElement(_antd().Tooltip, {
-      title: t('Add branch')
+      title: (0, _locale.lang)('Add branch')
     }, _react().default.createElement(_antd().Button, {
       icon: _react().default.createElement(_icons().PlusOutlined, null),
       className: (0, _css().css)`

package/lib/client/nodes/query.js

@@ -33,23 +33,19 @@ var _collection = require("../schemas/collection");
 
 var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
 
-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; }
+var _locale = require("../locale");
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = {
-  title: '{{t("Query record")}}',
+  title: `{{t("Query record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'query',
   group: 'collection',
   fieldset: {
     'config.collection': _collection.collection,
     'config.multiple': {
       type: 'boolean',
-      title: '{{t("Multiple records")}}',
+      title: `{{t("Multiple records", { ns: "${_locale.NAMESPACE}" })}}`,
       name: 'config.multiple',
       'x-decorator': 'FormItem',
       'x-component': 'Checkbox',
@@ -76,13 +72,14 @@ var _default = {
   },
 
   getter(props) {
-    const type = props.type,
-          options = props.options,
-          _onChange = props.onChange;
+    const _onChange = props.onChange;
 
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           nodes = _useFlowContext.nodes;
 
+    const _useOperandContext = (0, _calculators.useOperandContext)(),
+          options = _useOperandContext.options;
+
     const _nodes$find = nodes.find(n => n.id == options.nodeId),
           config = _nodes$find.config;
 
@@ -91,12 +88,7 @@ var _default = {
       collection: config.collection,
       value: value,
       onChange: path => {
-        _onChange({
-          type,
-          options: _objectSpread(_objectSpread({}, options), {}, {
-            path
-          })
-        });
+        _onChange(`{{$jobsMapByNodeId.${options.nodeId}.${path}}}`);
       }
     });
   }

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

@@ -0,0 +1,138 @@
+import React from 'react';
+import EjsTextArea from '../components/EjsTextArea';
+declare const _default: {
+    title: string;
+    type: string;
+    group: string;
+    fieldset: {
+        'config.url': {
+            type: string;
+            name: string;
+            required: boolean;
+            title: string;
+            'x-decorator': string;
+            'x-decorator-props': {};
+            'x-component': string;
+            'x-component-props': {
+                autoSize: {
+                    minRows: number;
+                };
+                placeholder: string;
+                description: string;
+            };
+        };
+        'config.timeout': {
+            type: string;
+            name: string;
+            required: boolean;
+            title: string;
+            'x-decorator': string;
+            'x-decorator-props': {};
+            'x-component': string;
+            'x-component-props': {
+                addonAfter: string;
+                min: number;
+                step: number;
+                defaultValue: number;
+            };
+        };
+        'config.headers': {
+            type: string;
+            name: string;
+            'x-component': string;
+            'x-decorator': string;
+            title: string;
+            description: string;
+            items: {
+                type: string;
+                properties: {
+                    space: {
+                        type: string;
+                        'x-component': string;
+                        properties: {
+                            name: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    placeholder: string;
+                                };
+                            };
+                            value: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                                'x-component-props': {
+                                    placeholder: string;
+                                };
+                            };
+                            remove: {
+                                type: string;
+                                'x-decorator': string;
+                                'x-component': string;
+                            };
+                        };
+                    };
+                };
+            };
+            properties: {
+                add: {
+                    type: string;
+                    title: string;
+                    'x-component': string;
+                };
+            };
+        };
+        'config.method': {
+            type: string;
+            name: string;
+            required: boolean;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+            'x-component-props': {
+                defaultValue: string;
+                showSearch: boolean;
+                allowClear: boolean;
+            };
+            enum: {
+                label: string;
+                value: string;
+            }[];
+        };
+        'config.data': {
+            type: string;
+            name: string;
+            'x-hidden': boolean;
+            title: string;
+            'x-decorator': string;
+            'x-decorator-props': {};
+            'x-component': string;
+            'x-component-props': {
+                autoSize: {
+                    minRows: number;
+                };
+                placeholder: string;
+                description: string;
+            };
+        };
+        'config.ignoreFail': {
+            type: string;
+            name: string;
+            title: string;
+            'x-decorator': string;
+            'x-component': string;
+        };
+    };
+    view: {};
+    scope: {};
+    components: {
+        ArrayItems: React.FC<React.HTMLAttributes<HTMLDivElement>> & import("@formily/antd").ArrayBaseMixins & {
+            Item?: React.FC<React.HTMLAttributes<HTMLDivElement> & {
+                type?: "divide" | "card";
+            }>;
+        };
+        EjsTextArea: typeof EjsTextArea;
+    };
+};
+export default _default;

package/lib/client/nodes/request.js

@@ -0,0 +1,167 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _locale = require("../locale");
+
+function _antd() {
+  const data = require("@formily/antd");
+
+  _antd = function _antd() {
+    return data;
+  };
+
+  return data;
+}
+
+var _EjsTextArea = _interopRequireDefault(require("../components/EjsTextArea"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = {
+  title: `{{t("HTTP request", { ns: "${_locale.NAMESPACE}" })}}`,
+  type: 'request',
+  group: 'extended',
+  fieldset: {
+    'config.url': {
+      type: 'string',
+      name: 'config.url',
+      required: true,
+      title: `{{t("URL", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-decorator-props': {},
+      'x-component': 'EjsTextArea',
+      'x-component-props': {
+        autoSize: {
+          minRows: 1
+        },
+        placeholder: 'https://xxxxxx',
+        description: `{{t("You can use the above available variables in URL.", { ns: "${_locale.NAMESPACE}" })}}`
+      }
+    },
+    'config.timeout': {
+      type: 'number',
+      name: 'config.timeout',
+      required: true,
+      title: `{{t("Timeout config", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-decorator-props': {},
+      'x-component': 'InputNumber',
+      'x-component-props': {
+        addonAfter: `{{t("ms", { ns: "${_locale.NAMESPACE}" })}}`,
+        min: 1,
+        step: 1000,
+        defaultValue: 5000
+      }
+    },
+    'config.headers': {
+      type: 'array',
+      name: 'config.headers',
+      'x-component': 'ArrayItems',
+      'x-decorator': 'FormItem',
+      title: `{{t("Request headers", { ns: "${_locale.NAMESPACE}" })}}`,
+      description: `{{t("Default headers is Content-Type: application/json", { ns: "${_locale.NAMESPACE}" })}}`,
+      items: {
+        type: 'object',
+        properties: {
+          space: {
+            type: 'void',
+            'x-component': 'Space',
+            properties: {
+              name: {
+                type: 'string',
+                'x-decorator': 'FormItem',
+                'x-component': 'Input',
+                'x-component-props': {
+                  placeholder: `{{t("Name(e.g. Content-Type)", { ns: "${_locale.NAMESPACE}" })}}`
+                }
+              },
+              value: {
+                type: 'string',
+                'x-decorator': 'FormItem',
+                'x-component': 'Input',
+                'x-component-props': {
+                  placeholder: `{{t("Value(e.g. Application/json)", { ns: "${_locale.NAMESPACE}" })}}`
+                }
+              },
+              remove: {
+                type: 'void',
+                'x-decorator': 'FormItem',
+                'x-component': 'ArrayItems.Remove'
+              }
+            }
+          }
+        }
+      },
+      properties: {
+        add: {
+          type: 'void',
+          title: `{{t("Add request header", { ns: "${_locale.NAMESPACE}" })}}`,
+          'x-component': 'ArrayItems.Addition'
+        }
+      }
+    },
+    'config.method': {
+      type: 'string',
+      name: 'config.method',
+      required: true,
+      title: `{{t("HTTP method", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Select',
+      'x-component-props': {
+        defaultValue: 'POST',
+        showSearch: false,
+        allowClear: false
+      },
+      enum: [{
+        label: 'GET',
+        value: 'GET'
+      }, {
+        label: 'POST',
+        value: 'POST'
+      }, {
+        label: 'PUT',
+        value: 'PUT'
+      }, {
+        label: 'PATCH',
+        value: 'PATCH'
+      }, {
+        label: 'DELETE',
+        value: 'DELETE'
+      }]
+    },
+    'config.data': {
+      type: 'string',
+      name: 'config.data',
+      'x-hidden': false,
+      title: `{{t("Request data", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-decorator-props': {},
+      'x-component': 'EjsTextArea',
+      'x-component-props': {
+        autoSize: {
+          minRows: 5
+        },
+        placeholder: `{{t("Input request data", { ns: "${_locale.NAMESPACE}" })}}`,
+        description: `{{t("You can use the above available variables in request data.", { ns: "${_locale.NAMESPACE}" })}}`
+      }
+    },
+    'config.ignoreFail': {
+      type: 'boolean',
+      name: 'config.ignoreFail',
+      title: `{{t("Ignore fail request and continue workflow", { ns: "${_locale.NAMESPACE}" })}}`,
+      'x-decorator': 'FormItem',
+      'x-component': 'Checkbox'
+    }
+  },
+  view: {},
+  scope: {},
+  components: {
+    ArrayItems: _antd().ArrayItems,
+    EjsTextArea: _EjsTextArea.default
+  }
+};
+exports.default = _default;

package/lib/client/nodes/update.js

@@ -19,6 +19,8 @@ var _calculators = require("../calculators");
 
 var _CollectionFieldset = _interopRequireDefault(require("../components/CollectionFieldset"));
 
+var _locale = require("../locale");
+
 var _collection = require("../schemas/collection");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -30,13 +32,13 @@ 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; }
 
 var _default = {
-  title: '{{t("Update record")}}',
+  title: `{{t("Update record", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'update',
   group: 'collection',
   fieldset: {
     'config.collection': _collection.collection,
     'config.params.filter': _objectSpread(_objectSpread({}, _collection.filter), {}, {
-      title: '{{t("Only update records matching conditions")}}'
+      title: `{{t("Only update records matching conditions", { ns: "${_locale.NAMESPACE}" })}}`
     }),
     'config.params.values': _collection.values
   },

package/lib/client/schemas/collection.js

@@ -35,6 +35,8 @@ function _client() {
   return data;
 }
 
+var _locale = require("../locale");
+
 const collection = {
   type: 'string',
   title: '{{t("Collection")}}',
@@ -60,7 +62,7 @@ const values = {
     `
   },
   'x-component': 'CollectionFieldset',
-  description: '{{t("Fields that are not assigned a value will be set to the default value, and those that do not have a default value are set to null.")}}'
+  description: `{{t("Fields that are not assigned a value will be set to the default value, and those that do not have a default value are set to null.", { ns: "${_locale.NAMESPACE}" })}}`
 };
 exports.values = values;
 const filter = {