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

package/lib/client/components/CollectionFieldset.js

@@ -75,10 +75,10 @@ function _client() {
   return data;
 }
 
-var _calculators = require("../calculators");
-
 var _locale = require("../locale");
 
+var _variable = require("../variable");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -96,8 +96,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; }
 
 function AssociationInput(props) {
-  var _data$config;
-
   const _useCollectionManager = (0, _client().useCollectionManager)(),
         getCollectionFields = _useCollectionManager.getCollectionFields;
 
@@ -107,9 +105,9 @@ function AssociationInput(props) {
   const fieldName = path.segments[path.segments.length - 1];
 
   const _useForm = (0, _react2().useForm)(),
-        data = _useForm.values;
+        config = _useForm.values;
 
-  const fields = getCollectionFields(data === null || data === void 0 ? void 0 : (_data$config = data.config) === null || _data$config === void 0 ? void 0 : _data$config.collection);
+  const fields = getCollectionFields(config === null || config === void 0 ? void 0 : config.collection);
 
   const _fields$find = fields.find(item => item.name === fieldName),
         type = _fields$find.type;
@@ -130,26 +128,28 @@ function AssociationInput(props) {
 
 var _default = (0, _react2().observer)(({
   value,
+  disabled,
   onChange: _onChange
 }) => {
-  var _data$config2;
-
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
 
   const compile = (0, _client().useCompile)();
+  const form = (0, _react2().useForm)();
 
   const _useCollectionManager2 = (0, _client().useCollectionManager)(),
         getCollection = _useCollectionManager2.getCollection,
         getCollectionFields = _useCollectionManager2.getCollectionFields;
 
   const _useForm2 = (0, _react2().useForm)(),
-        data = _useForm2.values;
+        config = _useForm2.values;
 
-  const collectionName = data === null || data === void 0 ? void 0 : (_data$config2 = data.config) === null || _data$config2 === void 0 ? void 0 : _data$config2.collection;
-  const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) // && (!['linkTo', 'hasMany', 'hasOne', 'belongsToMany'].includes(field.type))
-  );
+  const collectionName = config === null || config === void 0 ? void 0 : config.collection;
+  const fields = getCollectionFields(collectionName).filter(field => !field.hidden && (field.uiSchema ? !field.uiSchema['x-read-pretty'] : false) // TODO: should use some field option but not type to control this
+  && !['formula'].includes(field.type));
   const unassignedFields = fields.filter(field => !(field.name in value));
+  const scope = (0, _variable.useWorkflowVariableOptions)();
+  const mergedDisabled = disabled || form.disabled;
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
       margin-top: .5em;
@@ -167,16 +167,9 @@ var _default = (0, _react2().observer)(({
   }, fields.filter(field => field.name in value).map(field => {
     var _field$uiSchema$title, _field$uiSchema;
 
-    const VTypes = _objectSpread(_objectSpread({}, ['linkTo', 'hasMany', 'belongsToMany'].includes(field.type) ? {} : _calculators.VariableTypes), {}, {
-      constant: {
-        title: `{{t("Constant", { ns: "${_locale.NAMESPACE}" })}}`,
-        value: 'constant'
-      }
-    });
-
-    const operand = (0, _calculators.parseValue)(value[field.name], VTypes); // constant for associations to use Input, others to use CollectionField
+    // constant for associations to use Input, others to use CollectionField
     // dynamic values only support belongsTo/hasOne association, other association type should disable
-    // TODO: try to use <ObjectField> to replace this map
+    const ConstantCompoent = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? AssociationInput : _client().CollectionField; // TODO: try to use <ObjectField> to replace this map
 
     return _react().default.createElement(_antd().Form.Item, {
       key: field.name,
@@ -187,30 +180,29 @@ var _default = (0, _react2().observer)(({
                       display: flex;
                     }
                   `
-    }, _react().default.createElement(_calculators.VariableTypesContext.Provider, {
-      value: VTypes
-    }, _react().default.createElement(_calculators.Operand, {
+    }, _react().default.createElement(_client().Variable.Input, {
+      scope: ['hasMany', 'belongsToMany'].includes(field.type) ? [] : scope,
       value: value[field.name],
       onChange: next => {
         _onChange(_objectSpread(_objectSpread({}, value), {}, {
           [field.name]: next
         }));
       }
-    }, operand.type === 'constant' ? _react().default.createElement(_client().SchemaComponent, {
+    }, _react().default.createElement(_client().SchemaComponent, {
       schema: {
         type: 'void',
         properties: {
           [field.name]: {
-            'x-component': ['linkTo', 'belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) ? 'AssociationInput' : 'CollectionField'
+            'x-component': ConstantCompoent,
+
+            ['x-validator']() {
+              return '';
+            }
+
           }
         }
-      },
-      components: {
-        CollectionField: _client().CollectionField,
-        AssociationInput
       }
-    }) // ? <SchemaComponent schema={{ ...field.uiSchema, name: field.name }} />
-    : null), _react().default.createElement(_antd().Button, {
+    })), !mergedDisabled ? _react().default.createElement(_antd().Button, {
       type: "link",
       icon: _react().default.createElement(_icons().CloseCircleOutlined, null),
       onClick: () => {
@@ -220,7 +212,7 @@ var _default = (0, _react2().observer)(({
 
         _onChange(rest);
       }
-    })));
+    }) : null);
   }), unassignedFields.length ? _react().default.createElement(_antd().Dropdown, {
     overlay: _react().default.createElement(_antd().Menu, {
       onClick: ({

package/lib/client/components/FilterDynamicComponent.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export declare function FilterDynamicComponent({ value, onChange, renderSchemaComponent }: {
+    value: any;
+    onChange: any;
+    renderSchemaComponent: any;
+}): JSX.Element;

package/lib/client/components/FilterDynamicComponent.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilterDynamicComponent = FilterDynamicComponent;
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _variable = require("../variable");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function FilterDynamicComponent({
+  value,
+  onChange,
+  renderSchemaComponent
+}) {
+  const scope = (0, _variable.useWorkflowVariableOptions)();
+  return _react().default.createElement(_client().Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  });
+}

package/lib/client/components/NullRender.d.ts

@@ -0,0 +1 @@
+export declare function NullRender(): any;

package/lib/client/components/NullRender.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NullRender = NullRender;
+
+function NullRender() {
+  return null;
+}

package/lib/client/components/RadioWithTooltip.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export interface RadioWithTooltipOption {
+    value: any;
+    label: string;
+    tooltip?: string;
+}
+export declare function RadioWithTooltip(props: any): JSX.Element;

package/lib/client/components/RadioWithTooltip.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RadioWithTooltip = RadioWithTooltip;
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    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 _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+const _excluded = ["options"];
+
+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 _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 RadioWithTooltip(props) {
+  const _props$options = props.options,
+        options = _props$options === void 0 ? [] : _props$options,
+        other = _objectWithoutProperties(props, _excluded);
+
+  const compile = (0, _client().useCompile)();
+  return _react().default.createElement(_antd().Radio.Group, _objectSpread({}, other), options.map(option => _react().default.createElement(_antd().Radio, {
+    key: option.value,
+    value: option.value
+  }, _react().default.createElement("span", {
+    className: (0, _css().css)`
+            & + .anticon {
+              margin-left: .25em;
+            }
+          `
+  }, compile(option.label)), option.tooltip && _react().default.createElement(_antd().Tooltip, {
+    title: compile(option.tooltip)
+  }, _react().default.createElement(_icons().QuestionCircleOutlined, {
+    style: {
+      color: '#666'
+    }
+  })))));
+}

package/lib/client/constants.d.ts

@@ -1,25 +1,27 @@
 export declare const EXECUTION_STATUS: {
     QUEUEING: any;
     STARTED: number;
-    SUCCEEDED: number;
+    RESOLVED: number;
     FAILED: number;
+    ERROR: number;
+    ABORTED: number;
     CANCELED: number;
+    REJECTED: number;
 };
-export declare const ExecutionStatusOptions: ({
+export declare const ExecutionStatusOptions: {
     value: any;
     label: string;
     color: string;
-} | {
-    value: number;
-    label: string;
-    color?: undefined;
-})[];
+}[];
 export declare const ExecutionStatusOptionsMap: {};
 export declare const JOB_STATUS: {
     PENDING: number;
     RESOLVED: number;
-    REJECTED: number;
+    FAILED: number;
+    ERROR: number;
+    ABORTED: number;
     CANCELED: number;
+    REJECTED: number;
 };
 export declare const JobStatusOptions: {
     value: number;

package/lib/client/constants.js

@@ -32,9 +32,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const EXECUTION_STATUS = {
   QUEUEING: null,
   STARTED: 0,
-  SUCCEEDED: 1,
+  RESOLVED: 1,
   FAILED: -1,
-  CANCELED: -2
+  ERROR: -2,
+  ABORTED: -3,
+  CANCELED: -4,
+  REJECTED: -5
 };
 exports.EXECUTION_STATUS = EXECUTION_STATUS;
 const ExecutionStatusOptions = [{
@@ -46,16 +49,29 @@ const ExecutionStatusOptions = [{
   label: `{{t("On going", { ns: "${_locale.NAMESPACE}" })}}`,
   color: 'gold'
 }, {
-  value: EXECUTION_STATUS.SUCCEEDED,
-  label: `{{t("Succeeded", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: EXECUTION_STATUS.RESOLVED,
+  label: `{{t("Resolved", { ns: "${_locale.NAMESPACE}" })}}`,
   color: 'green'
 }, {
   value: EXECUTION_STATUS.FAILED,
   label: `{{t("Failed", { ns: "${_locale.NAMESPACE}" })}}`,
   color: 'red'
+}, {
+  value: EXECUTION_STATUS.ERROR,
+  label: `{{t("Error", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'red'
+}, {
+  value: EXECUTION_STATUS.ABORTED,
+  label: `{{t("Aborted", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'red'
 }, {
   value: EXECUTION_STATUS.CANCELED,
-  label: `{{t("Canceled", { ns: "${_locale.NAMESPACE}" })}}`
+  label: `{{t("Canceled", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'volcano'
+}, {
+  value: EXECUTION_STATUS.REJECTED,
+  label: `{{t("Rejected", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'volcano'
 }];
 exports.ExecutionStatusOptions = ExecutionStatusOptions;
 const ExecutionStatusOptionsMap = ExecutionStatusOptions.reduce((map, option) => Object.assign(map, {
@@ -65,30 +81,52 @@ exports.ExecutionStatusOptionsMap = ExecutionStatusOptionsMap;
 const JOB_STATUS = {
   PENDING: 0,
   RESOLVED: 1,
-  REJECTED: -1,
-  CANCELED: -2
+  FAILED: -1,
+  ERROR: -2,
+  ABORTED: -3,
+  CANCELED: -4,
+  REJECTED: -5
 };
 exports.JOB_STATUS = JOB_STATUS;
 const JobStatusOptions = [{
   value: JOB_STATUS.PENDING,
   label: `{{t("Pending", { ns: "${_locale.NAMESPACE}" })}}`,
-  color: '#d4c306',
+  color: 'gold',
   icon: _react().default.createElement(_icons().ClockCircleOutlined, null)
 }, {
   value: JOB_STATUS.RESOLVED,
-  label: `{{t("Succeeded", { ns: "${_locale.NAMESPACE}" })}}`,
-  color: '#67c068',
+  label: `{{t("Resolved", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'green',
   icon: _react().default.createElement(_icons().CheckOutlined, null)
 }, {
-  value: JOB_STATUS.REJECTED,
+  value: JOB_STATUS.FAILED,
   label: `{{t("Failed", { ns: "${_locale.NAMESPACE}" })}}`,
-  color: '#f40',
+  color: 'red',
   icon: _react().default.createElement(_icons().ExclamationOutlined, null)
+}, {
+  value: JOB_STATUS.ERROR,
+  label: `{{t("Error", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'red',
+  icon: _react().default.createElement(_icons().CloseOutlined, null)
+}, {
+  value: JOB_STATUS.ABORTED,
+  label: `{{t("Aborted", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'red',
+  icon: _react().default.createElement(_icons().MinusOutlined, {
+    rotate: 90
+  })
 }, {
   value: JOB_STATUS.CANCELED,
   label: `{{t("Canceled", { ns: "${_locale.NAMESPACE}" })}}`,
-  color: '#f40',
-  icon: _react().default.createElement(_icons().CloseOutlined, null)
+  color: 'volcano',
+  icon: _react().default.createElement(_icons().MinusOutlined, {
+    rotate: 45
+  })
+}, {
+  value: JOB_STATUS.REJECTED,
+  label: `{{t("Rejected", { ns: "${_locale.NAMESPACE}" })}}`,
+  color: 'volcano',
+  icon: _react().default.createElement(_icons().MinusOutlined, null)
 }];
 exports.JobStatusOptions = JobStatusOptions;
 const JobStatusOptionsMap = JobStatusOptions.reduce((map, option) => Object.assign(map, {

package/lib/client/index.d.ts

@@ -1,5 +1,4 @@
 export { triggers } from './triggers';
 export * from './nodes';
-export { calculators } from './calculators';
 export * from './FlowContext';
 export { WorkflowProvider as default } from './WorkflowProvider';

package/lib/client/index.js

@@ -4,15 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  triggers: true,
-  calculators: true
+  triggers: true
 };
-Object.defineProperty(exports, "calculators", {
-  enumerable: true,
-  get: function get() {
-    return _calculators.calculators;
-  }
-});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
@@ -42,8 +35,6 @@ Object.keys(_nodes).forEach(function (key) {
   });
 });
 
-var _calculators = require("./calculators");
-
 var _FlowContext = require("./FlowContext");
 
 Object.keys(_FlowContext).forEach(function (key) {

package/lib/client/locale/en-US.d.ts

@@ -107,24 +107,24 @@ declare const _default: {
     "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.": string;
     "Trigger in executed workflow cannot be modified": string;
     "Node in executed workflow cannot be modified": string;
-    "Can not delete": string;
-    "The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.": string;
-    "HTTP request": string;
+    'Can not delete': string;
+    'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.': string;
+    'HTTP request': string;
+    'HTTP method': string;
     URL: string;
-    "You can use the above available variables in URL.": string;
-    "Request headers": string;
-    "Name(e.g. Content-Type)": string;
-    "Value(e.g. Application/json)": string;
-    "Add request header": string;
-    "HTTP method": string;
-    "Request data": string;
-    "Input request data": string;
-    "You can use the above available variables in request data.": string;
-    "Copy success!": string;
-    "Copy variable output template statement": string;
-    "Default headers is Content-Type: application/json": string;
-    "Ignore fail request and continue workflow": string;
-    "Syntax see": string;
-    "Show available variable tool": string;
+    Headers: string;
+    'Add request header': string;
+    Parameters: string;
+    'Add parameter': string;
+    Body: string;
+    'Use variable': string;
+    Format: string;
+    Insert: string;
+    'Timeout config': string;
+    ms: string;
+    'Input request data': string;
+    'Only support standard JSON data': string;
+    '"Content-Type" only support "application/json", and no need to specify': string;
+    'Ignore fail request and continue workflow': string;
 };
 export default _default;

package/lib/client/locale/en-US.js

@@ -113,24 +113,24 @@ var _default = {
   "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.": "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.",
   "Trigger in executed workflow cannot be modified": "Trigger in executed workflow cannot be modified",
   "Node in executed workflow cannot be modified": "Node in executed workflow cannot be modified",
-  "Can not delete": "Can not delete",
-  "The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.": "The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.",
-  "HTTP request": "HTTP request",
-  "URL": "URL",
-  "You can use the above available variables in URL.": "You can use the above available variables in URL.",
-  "Request headers": "Request headers",
-  "Name(e.g. Content-Type)": "Name(e.g. Content-Type)",
-  "Value(e.g. Application/json)": "Value(e.g. Application/json)",
-  "Add request header": "Add request header",
-  "HTTP method": "HTTP method",
-  "Request data": "Request data",
-  "Input request data": "Input request data",
-  "You can use the above available variables in request data.": "You can use the above available variables in request data.",
-  "Copy success!": "Copy success!",
-  "Copy variable output template statement": "Copy variable output template statement",
-  "Default headers is Content-Type: application/json": "Default headers is Content-Type: application/json",
-  "Ignore fail request and continue workflow": "Ignore fail request and continue workflow",
-  "Syntax see": "Syntax see",
-  "Show available variable tool": "Show available variable tool"
+  'Can not delete': 'Can not delete',
+  'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.': 'The result of this node has been referenced by other nodes ({{nodes}}), please remove the usage before deleting.',
+  'HTTP request': 'HTTP request',
+  'HTTP method': 'HTTP method',
+  'URL': 'URL',
+  'Headers': 'Headers',
+  'Add request header': 'Add request header',
+  'Parameters': 'Parameters',
+  'Add parameter': 'Add parameter',
+  'Body': 'Body',
+  'Use variable': 'Use variable',
+  'Format': 'Format',
+  'Insert': 'Insert',
+  'Timeout config': 'Timeout config',
+  'ms': 'ms',
+  'Input request data': 'Input request data',
+  'Only support standard JSON data': 'Only support standard JSON data',
+  '"Content-Type" only support "application/json", and no need to specify': '"Content-Type" only support "application/json", and no need to specify',
+  'Ignore fail request and continue workflow': 'Ignore fail request and continue workflow'
 };
 exports.default = _default;