@nocobase/plugin-workflow 0.8.0-alpha.9 → 0.8.1-alpha.4

package/lib/client/schemas/executions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.executionSchema = void 0;
+exports.executionSchema = exports.executionCollection = void 0;
 
 function _react() {
   const data = _interopRequireDefault(require("react"));
@@ -37,9 +37,11 @@ function _client() {
 
 var _constants = require("../constants");
 
+var _locale = require("../locale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const collection = {
+const executionCollection = {
   name: 'executions',
   fields: [{
     interface: 'createdAt',
@@ -48,7 +50,7 @@ const collection = {
     name: 'createdAt',
     uiSchema: {
       type: 'datetime',
-      title: '{{t("Triggered at")}}',
+      title: `{{t("Triggered at", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-component': 'DatePicker',
       'x-component-props': {},
       'x-read-pretty': true
@@ -59,7 +61,7 @@ const collection = {
     name: 'workflowId',
     uiSchema: {
       type: 'number',
-      title: '{{t("Version")}}',
+      title: `{{t("Version", { ns: "${_locale.NAMESPACE}" })}}`,
 
       ['x-component']({
         value
@@ -79,7 +81,7 @@ const collection = {
     name: 'status',
     interface: 'select',
     uiSchema: {
-      title: '{{t("Status")}}',
+      title: `{{t("Status", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
@@ -87,105 +89,109 @@ const collection = {
     }
   }]
 };
+exports.executionCollection = executionCollection;
 const executionSchema = {
-  provider: {
-    type: 'void',
-    'x-decorator': 'ExecutionResourceProvider',
-    'x-decorator-props': {
-      collection,
-      resourceName: 'executions',
-      request: {
-        resource: 'executions',
-        action: 'list',
-        params: {
-          appends: ['workflow.id', 'workflow.title'],
-          pageSize: 50,
-          sort: ['-createdAt']
-        }
-      }
-    },
-    'x-component': 'CollectionProvider',
-    'x-component-props': {
-      collection
-    },
-    properties: {
-      actions: {
-        type: 'void',
-        'x-component': 'ActionBar',
-        'x-component-props': {
-          style: {
-            marginBottom: 16
+  type: 'void',
+  name: 'executionHistoryDrawer',
+  title: `{{t("Execution history", { ns: "${_locale.NAMESPACE}" })}}`,
+  'x-component': 'Action.Drawer',
+  properties: {
+    content: {
+      type: 'void',
+      'x-decorator': 'ExecutionResourceProvider',
+      'x-decorator-props': {
+        collection: executionCollection,
+        resourceName: 'executions',
+        request: {
+          resource: 'executions',
+          action: 'list',
+          params: {
+            appends: ['workflow.id', 'workflow.title'],
+            pageSize: 20,
+            sort: ['-createdAt'],
+            filter: {}
           }
-        },
-        properties: {// filter: {
-          //   type: 'object',
-          //   'x-component': 'Filter',
-          // }
         }
       },
-      table: {
-        type: 'void',
-        'x-component': 'Table.Void',
-        'x-component-props': {
-          rowKey: 'id',
-          useDataSource: '{{ cm.useDataSourceFromRAC }}'
-        },
-        properties: {
-          createdAt: {
-            type: 'void',
-            'x-decorator': 'Table.Column.Decorator',
-            'x-component': 'Table.Column',
-            properties: {
-              createdAt: {
-                type: 'datetime',
-                'x-component': 'CollectionField',
-                'x-component-props': {
-                  showTime: true
-                },
-                'x-read-pretty': true
-              }
+      properties: {
+        actions: {
+          type: 'void',
+          'x-component': 'ActionBar',
+          'x-component-props': {
+            style: {
+              marginBottom: 16
             }
           },
-          workflowId: {
-            type: 'void',
-            'x-decorator': 'Table.Column.Decorator',
-            'x-component': 'Table.Column',
-            properties: {
-              workflowId: {
-                type: 'number',
-                'x-component': 'CollectionField',
-                'x-read-pretty': true
-              }
-            }
+          properties: {// filter: {
+            //   type: 'object',
+            //   'x-component': 'Filter',
+            // }
+          }
+        },
+        table: {
+          type: 'void',
+          'x-component': 'Table.Void',
+          'x-component-props': {
+            rowKey: 'id',
+            useDataSource: '{{ cm.useDataSourceFromRAC }}'
           },
-          status: {
-            type: 'void',
-            'x-decorator': 'Table.Column.Decorator',
-            'x-component': 'Table.Column',
-            properties: {
-              status: {
-                type: 'number',
-                'x-component': 'CollectionField',
-                'x-read-pretty': true
+          properties: {
+            createdAt: {
+              type: 'void',
+              'x-decorator': 'Table.Column.Decorator',
+              'x-component': 'Table.Column',
+              properties: {
+                createdAt: {
+                  type: 'datetime',
+                  'x-component': 'CollectionField',
+                  'x-component-props': {
+                    showTime: true
+                  },
+                  'x-read-pretty': true
+                }
               }
-            }
-          },
-          actions: {
-            type: 'void',
-            title: '{{ t("Actions") }}',
-            'x-component': 'Table.Column',
-            properties: {
-              actions: {
-                type: 'void',
-                'x-component': 'Space',
-                'x-component-props': {
-                  split: '|'
-                },
-                properties: {
-                  config: {
-                    type: 'void',
-                    title: '{{t("Details")}}',
-                    'x-component': 'ExecutionLink'
+            },
+            workflowId: {
+              type: 'void',
+              'x-decorator': 'Table.Column.Decorator',
+              'x-component': 'Table.Column',
+              properties: {
+                workflowId: {
+                  type: 'number',
+                  'x-component': 'CollectionField',
+                  'x-read-pretty': true
+                }
+              }
+            },
+            status: {
+              type: 'void',
+              'x-decorator': 'Table.Column.Decorator',
+              'x-component': 'Table.Column',
+              properties: {
+                status: {
+                  type: 'number',
+                  'x-component': 'CollectionField',
+                  'x-read-pretty': true
+                }
+              }
+            },
+            actions: {
+              type: 'void',
+              title: '{{ t("Actions") }}',
+              'x-component': 'Table.Column',
+              properties: {
+                actions: {
+                  type: 'void',
+                  'x-component': 'Space',
+                  'x-component-props': {
+                    split: '|'
+                  },
+                  properties: {
+                    config: {
+                      type: 'void',
+                      title: `{{t("Details", { ns: "${_locale.NAMESPACE}" })}}`,
+                      'x-component': 'ExecutionLink'
+                    }
                   }
                 }
               }

package/lib/client/schemas/workflows.js

@@ -5,10 +5,46 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.workflowSchema = void 0;
 
+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;
+}
+
+var _locale = require("../locale");
+
 var _triggers = require("../triggers");
 
 var _executions = require("./executions");
 
+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); }); }; }
+
 const collection = {
   name: 'workflows',
   fields: [{
@@ -26,7 +62,7 @@ const collection = {
     name: 'type',
     interface: 'select',
     uiSchema: {
-      title: '{{t("Trigger type")}}',
+      title: `{{t("Trigger type", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
@@ -53,20 +89,30 @@ const collection = {
     name: 'enabled',
     interface: 'radio',
     uiSchema: {
-      title: '{{t("Status")}}',
+      title: `{{t("Status", { ns: "${_locale.NAMESPACE}" })}}`,
       type: 'string',
       enum: [{
-        label: '{{t("On")}}',
+        label: `{{t("On", { ns: "${_locale.NAMESPACE}" })}}`,
         value: true,
         color: '#52c41a'
       }, {
-        label: '{{t("Off")}}',
+        label: `{{t("Off", { ns: "${_locale.NAMESPACE}" })}}`,
         value: false
       }],
       'x-component': 'Radio.Group',
       'x-decorator': 'FormItem',
       default: false
     }
+  }, {
+    type: 'number',
+    name: 'allExecuted',
+    interface: 'integer',
+    uiSchema: {
+      title: `{{t("Executed", { ns: "${_locale.NAMESPACE}" })}}`,
+      type: 'number',
+      'x-component': 'InputNumber',
+      'x-decorator': 'FormItem'
+    }
   }]
 };
 const workflowSchema = {
@@ -82,11 +128,11 @@ const workflowSchema = {
           resource: 'workflows',
           action: 'list',
           params: {
-            pageSize: 50,
+            pageSize: 20,
             filter: {
               current: true
             },
-            sort: ['createdAt'],
+            sort: ['-enabled', '-createdAt'],
             except: ['config']
           }
         }
@@ -223,6 +269,25 @@ const workflowSchema = {
                 }
               }
             },
+            allExecuted: {
+              type: 'void',
+              'x-decorator': 'Table.Column.Decorator',
+              'x-component': 'Table.Column',
+              properties: {
+                allExecuted: {
+                  type: 'number',
+                  'x-decorator': 'OpenDrawer',
+                  'x-decorator-props': {
+                    component: 'a'
+                  },
+                  'x-component': 'CollectionField',
+                  'x-read-pretty': true,
+                  properties: {
+                    drawer: _executions.executionSchema
+                  }
+                }
+              }
+            },
             actions: {
               type: 'void',
               title: '{{ t("Actions") }}',
@@ -239,22 +304,6 @@ const workflowSchema = {
                       type: 'void',
                       'x-component': 'WorkflowLink'
                     },
-                    executions: {
-                      type: 'void',
-                      title: '{{t("Execution history")}}',
-                      'x-component': 'Action.Link',
-                      'x-component-props': {
-                        type: 'primary'
-                      },
-                      properties: {
-                        drawer: {
-                          type: 'void',
-                          title: '{{t("Execution history")}}',
-                          'x-component': 'Action.Drawer',
-                          properties: _executions.executionSchema
-                        }
-                      }
-                    },
                     update: {
                       type: 'void',
                       title: '{{ t("Edit") }}',
@@ -280,6 +329,10 @@ const workflowSchema = {
                               'x-component': 'CollectionField',
                               'x-decorator': 'FormItem'
                             },
+                            description: {
+                              'x-component': 'CollectionField',
+                              'x-decorator': 'FormItem'
+                            },
                             footer: {
                               type: 'void',
                               'x-component': 'Action.Modal.Footer',
@@ -304,6 +357,43 @@ const workflowSchema = {
                           }
                         }
                       }
+                    },
+                    revision: {
+                      type: 'void',
+                      title: `{{t("Duplicate", { ns: "${_locale.NAMESPACE}" })}}`,
+                      'x-component': 'Action.Link',
+                      'x-component-props': {
+                        useAction() {
+                          const _useTranslation = (0, _reactI18next().useTranslation)(),
+                                t = _useTranslation.t;
+
+                          const _useResourceActionCon = (0, _client().useResourceActionContext)(),
+                                refresh = _useResourceActionCon.refresh;
+
+                          const _useResourceContext = (0, _client().useResourceContext)(),
+                                resource = _useResourceContext.resource,
+                                targetKey = _useResourceContext.targetKey;
+
+                          const _useRecord = (0, _client().useRecord)(),
+                                filterByTk = _useRecord[targetKey];
+
+                          return {
+                            run() {
+                              return _asyncToGenerator(function* () {
+                                yield resource.revision({
+                                  filterByTk
+                                });
+
+                                _antd().message.success(t('Operation succeeded'));
+
+                                refresh();
+                              })();
+                            }
+
+                          };
+                        }
+
+                      }
                     } // delete: {
                     //   type: 'void',
                     //   title: '{{ t("Delete") }}',

package/lib/client/style.js

@@ -30,13 +30,7 @@ const workflowPageClass = (0, _css().css)`
     header{
       display: flex;
       align-items: center;
-
-      > *:not(:last-child) {
-        &:after{
-          content: ">";
-          margin: 0 .5em;
-        }
-      }
+      min-height: 2rem;
     }
 
     aside{
@@ -44,6 +38,12 @@ const workflowPageClass = (0, _css().css)`
       align-items: center;
       gap: .5em;
     }
+
+    .workflow-versions{
+      label{
+        margin-right: .5em;
+      }
+    }
   }
 
   .workflow-canvas{

package/lib/client/triggers/collection.d.ts

@@ -31,8 +31,8 @@ declare const _default: {
             'x-component': string;
             'x-component-props': {
                 options: {
-                    value: number;
                     label: string;
+                    value: number;
                 }[];
                 placeholder: string;
             };
@@ -83,6 +83,7 @@ declare const _default: {
     components: {
         FieldsSelect: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
     };
+    getOptions(config: any): any[];
     getter(props: any): JSX.Element;
 };
 export default _default;

package/lib/client/triggers/collection.js

@@ -71,6 +71,10 @@ function _core() {
 
 var _CollectionFieldSelect = _interopRequireDefault(require("../components/CollectionFieldSelect"));
 
+var _locale = require("../locale");
+
+var _calculators = require("../calculators");
+
 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; }
@@ -112,8 +116,27 @@ const FieldsSelect = (0, _react2().observer)(props => {
     }, compile((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title));
   }));
 });
+const COLLECTION_TRIGGER_MODE = {
+  CREATED: 1,
+  UPDATED: 2,
+  SAVED: 3,
+  DELETED: 4
+};
+const collectionModeOptions = [{
+  label: `{{t("After record added", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: COLLECTION_TRIGGER_MODE.CREATED
+}, {
+  label: `{{t("After record updated", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: COLLECTION_TRIGGER_MODE.UPDATED
+}, {
+  label: `{{t("After record added or updated", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: COLLECTION_TRIGGER_MODE.SAVED
+}, {
+  label: `{{t("After record deleted", { ns: "${_locale.NAMESPACE}" })}}`,
+  value: COLLECTION_TRIGGER_MODE.DELETED
+}];
 var _default = {
-  title: '{{t("Collection event")}}',
+  title: `{{t("Collection event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'collection',
   fieldset: {
     'config.collection': _objectSpread(_objectSpread({}, _collection.collection), {}, {
@@ -142,32 +165,20 @@ var _default = {
     }),
     'config.mode': {
       type: 'number',
-      title: '{{t("Trigger on")}}',
+      title: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`,
       name: 'config.mode',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
-        options: [{
-          value: 1,
-          label: '{{t("After record added")}}'
-        }, {
-          value: 2,
-          label: '{{t("After record updated")}}'
-        }, {
-          value: 3,
-          label: '{{t("After record added or updated")}}'
-        }, {
-          value: 4,
-          label: '{{t("After record deleted")}}'
-        }],
-        placeholder: '{{t("Trigger on")}}'
+        options: collectionModeOptions,
+        placeholder: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`
       },
       required: true,
       'x-reactions': [{
         target: 'config.changed',
         fulfill: {
           state: {
-            disabled: '{{!($self.value & 0b010)}}'
+            disabled: `{{!($self.value & ${COLLECTION_TRIGGER_MODE.UPDATED})}}`
           }
         }
       }]
@@ -175,8 +186,8 @@ var _default = {
     'config.changed': {
       type: 'array',
       name: 'changed',
-      title: '{{t("Changed fields")}}',
-      description: '{{t("Triggered only if one of the selected fields changes. If unselected, it means that it will be triggered when any field changes. When record is added or deleted, any field is considered to have been changed.")}}',
+      title: `{{t("Changed fields", { ns: "${_locale.NAMESPACE}" })}}`,
+      description: `{{t("Triggered only if one of the selected fields changes. If unselected, it means that it will be triggered when any field changes. When record is added or deleted, any field is considered to have been changed.", { ns: "${_locale.NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'FieldsSelect',
       'x-component-props': {
@@ -186,7 +197,7 @@ var _default = {
     },
     'config.condition': _objectSpread(_objectSpread({}, _collection.filter), {}, {
       name: 'config.condition',
-      title: '{{t("Only triggers when match conditions")}}'
+      title: `{{t("Only triggers when match conditions", { ns: "${_locale.NAMESPACE}" })}}`
     })
   },
   scope: {
@@ -196,27 +207,31 @@ var _default = {
     FieldsSelect
   },
 
-  getter(props) {
-    var _options$path;
+  getOptions(config) {
+    const _useWorkflowTranslati = (0, _locale.useWorkflowTranslation)(),
+          t = _useWorkflowTranslati.t;
 
-    const type = props.type,
-          options = props.options,
-          _onChange = props.onChange;
+    const options = [{
+      value: 'data',
+      label: t('Trigger data')
+    }];
+    return options;
+  },
+
+  getter(props) {
+    const _onChange = props.onChange;
 
     const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           workflow = _useFlowContext.workflow;
 
-    const value = options === null || options === void 0 ? void 0 : (_options$path = options.path) === null || _options$path === void 0 ? void 0 : _options$path.replace(/^data\./, '');
+    const _useOperandContext = (0, _calculators.useOperandContext)(),
+          options = _useOperandContext.options;
+
     return _react().default.createElement(_CollectionFieldSelect.default, {
       collection: workflow.config.collection,
-      value: value,
-      onChange: value => {
-        _onChange({
-          type,
-          options: _objectSpread(_objectSpread({}, options), {}, {
-            path: `data.${value}`
-          })
-        });
+      value: options === null || options === void 0 ? void 0 : options.path,
+      onChange: path => {
+        _onChange(`{{$context.data.${path}}}`);
       }
     });
   }

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

@@ -4,7 +4,7 @@ import React from "react";
 export interface Trigger {
     title: string;
     type: string;
-    options?: {
+    getOptions?(config: any): {
         label: string;
         value: any;
         key: string;
@@ -19,8 +19,8 @@ export interface Trigger {
     components?: {
         [key: string]: any;
     };
-    render?(props: any): React.ReactElement;
-    getter?(node: any): React.ReactElement;
+    render?(props: any): React.ReactNode;
+    getter?(node: any): React.ReactNode;
 }
 export declare const triggers: Registry<Trigger>;
 export declare const TriggerConfig: () => JSX.Element;