@nocobase/plugin-workflow 0.7.7-alpha.1 → 0.8.0-alpha.11

package/lib/client/schemas/workflows.js

@@ -34,7 +34,8 @@ const collection = {
         title
       }]) => ({
         value,
-        label: title
+        label: title,
+        color: 'gold'
       })),
       required: true
     }
@@ -56,7 +57,8 @@ const collection = {
       type: 'string',
       enum: [{
         label: '{{t("On")}}',
-        value: true
+        value: true,
+        color: '#52c41a'
       }, {
         label: '{{t("Off")}}',
         value: false
@@ -68,7 +70,7 @@ const collection = {
   }]
 };
 const workflowSchema = {
-  type: 'object',
+  type: 'void',
   properties: {
     provider: {
       type: 'void',
@@ -239,7 +241,7 @@ const workflowSchema = {
                     },
                     executions: {
                       type: 'void',
-                      title: '{{t("Execution History")}}',
+                      title: '{{t("Execution history")}}',
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         type: 'primary'
@@ -247,7 +249,7 @@ const workflowSchema = {
                       properties: {
                         drawer: {
                           type: 'void',
-                          title: '{{t("Execution History")}}',
+                          title: '{{t("Execution history")}}',
                           'x-component': 'Action.Drawer',
                           properties: _executions.executionSchema
                         }

package/lib/client/style.js

@@ -30,7 +30,13 @@ const workflowPageClass = (0, _css().css)`
     header{
       display: flex;
       align-items: center;
-      gap: .5em;
+
+      > *:not(:last-child) {
+        &:after{
+          content: ">";
+          margin: 0 .5em;
+        }
+      }
     }
 
     aside{
@@ -53,8 +59,20 @@ exports.workflowPageClass = workflowPageClass;
 const workflowVersionDropdownClass = (0, _css().css)`
   .ant-dropdown-menu-item{
 
+    strong{
+      font-weight: normal;
+    }
+
+    &.enabled{
+      strong{
+        font-weight: bold;
+      }
+    }
+
     &.unexecuted{
-      font-style: italic;
+      strong{
+        font-style: italic;
+      }
     }
 
     .ant-dropdown-menu-title-content{
@@ -163,10 +181,14 @@ const nodeCardClass = (0, _css().css)`
   padding: 1em;
   box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
 
-  .workflow-node-remove-button{
+  .workflow-node-remove-button,
+  .workflow-node-job-button{
     position: absolute;
     right: -.5em;
     top: -.5em;
+  }
+
+  .workflow-node-remove-button{
     color: #999;
     opacity: 0;
     transition: opacity .3s ease;
@@ -180,6 +202,23 @@ const nodeCardClass = (0, _css().css)`
     }
   }
 
+  .workflow-node-job-button{
+    display: flex;
+    top: 0;
+    right: 0;
+    width: 1.25rem;
+    height: 1.25rem;
+    min-width: 1.25rem;
+    justify-content: center;
+    align-items: center;
+    font-size: 0.8em;
+    color: #fff;
+
+    &[type="button"]{
+      border: none;
+    }
+  }
+
   &:hover{
     .workflow-node-remove-button{
       opacity: 1;
@@ -196,6 +235,8 @@ const nodeMetaClass = (0, _css().css)`
 `;
 exports.nodeMetaClass = nodeMetaClass;
 const nodeTitleClass = (0, _css().css)`
+  display: flex;
+  align-items: center;
   font-weight: normal;
 
   .workflow-node-id{

package/lib/client/triggers/collection.js

@@ -45,7 +45,7 @@ function _client() {
   return data;
 }
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _FlowContext = require("../FlowContext");
 
 var _collection = require("../schemas/collection");
 
@@ -203,7 +203,7 @@ var _default = {
           options = props.options,
           _onChange = props.onChange;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    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\./, '');

package/lib/client/triggers/index.js

@@ -65,6 +65,16 @@ function _reactI18next() {
   return data;
 }
 
+function _icons() {
+  const data = require("@ant-design/icons");
+
+  _icons = function _icons() {
+    return data;
+  };
+
+  return data;
+}
+
 function _client2() {
   const data = require("@nocobase/client");
 
@@ -77,7 +87,7 @@ function _client2() {
 
 var _style = require("../style");
 
-var _WorkflowCanvas = require("../WorkflowCanvas");
+var _FlowContext = require("../FlowContext");
 
 var _collection = _interopRequireDefault(require("./collection"));
 
@@ -90,14 +100,16 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 function useUpdateConfigAction() {
+  var _useFlowContext;
+
   const _useTranslation = (0, _reactI18next().useTranslation)(),
         t = _useTranslation.t;
 
   const form = (0, _react().useForm)();
   const api = (0, _client2().useAPIClient)();
 
-  const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
-        workflow = _useFlowContext.workflow;
+  const _ref = (_useFlowContext = (0, _FlowContext.useFlowContext)()) !== null && _useFlowContext !== void 0 ? _useFlowContext : {},
+        workflow = _ref.workflow;
 
   const ctx = (0, _client2().useActionContext)();
 
@@ -133,23 +145,93 @@ exports.triggers = triggers;
 triggers.register(_collection.default.type, _collection.default);
 triggers.register(_schedule.default.type, _schedule.default);
 
+function TriggerExecution() {
+  const compile = (0, _client2().useCompile)();
+
+  const _useFlowContext2 = (0, _FlowContext.useFlowContext)(),
+        workflow = _useFlowContext2.workflow,
+        execution = _useFlowContext2.execution;
+
+  if (!execution) {
+    return null;
+  }
+
+  const trigger = triggers.get(workflow.type);
+  return _react2().default.createElement(_client2().SchemaComponent, {
+    schema: {
+      type: 'void',
+      properties: {
+        trigger: {
+          type: 'void',
+          'x-component': 'Action',
+          'x-component-props': {
+            title: _react2().default.createElement(_icons().InfoOutlined, null),
+            shape: 'circle',
+            className: 'workflow-node-job-button',
+            type: 'primary'
+          },
+          properties: {
+            [execution.id]: {
+              type: 'void',
+              'x-decorator': 'Form',
+              'x-decorator-props': {
+                initialValue: execution
+              },
+              'x-component': 'Action.Modal',
+              title: _react2().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", {
+                className: "workflow-node-id"
+              }, "#", execution.id)),
+              properties: {
+                createdAt: {
+                  type: 'string',
+                  title: '{{t("Triggered at")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'DatePicker',
+                  'x-component-props': {
+                    showTime: true
+                  },
+                  'x-read-pretty': true
+                },
+                context: {
+                  type: 'object',
+                  title: '{{t("Trigger context")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Input.JSON',
+                  'x-component-props': {
+                    className: (0, _css().css)`
+                        padding: 1em;
+                        background-color: #eee;
+                      `
+                  },
+                  'x-read-pretty': true
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  });
+}
+
 const TriggerConfig = () => {
   const _useTranslation2 = (0, _reactI18next().useTranslation)(),
         t = _useTranslation2.t;
 
   const compile = (0, _client2().useCompile)();
 
-  const _useResourceActionCon2 = (0, _client2().useResourceActionContext)(),
-        data = _useResourceActionCon2.data;
+  const _useFlowContext3 = (0, _FlowContext.useFlowContext)(),
+        workflow = _useFlowContext3.workflow;
 
-  if (!data) {
+  if (!workflow || !workflow.type) {
     return null;
   }
 
-  const _data$data = data.data,
-        type = _data$data.type,
-        config = _data$data.config,
-        executed = _data$data.executed;
+  const type = workflow.type,
+        config = workflow.config,
+        executed = workflow.executed;
 
   const _triggers$get = triggers.get(type),
         title = _triggers$get.title,
@@ -161,11 +243,13 @@ const TriggerConfig = () => {
   const titleText = `${t('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, {
     color: "gold"
-  }, t('Trigger'))), _react2().default.createElement("h4", null, compile(title)), _react2().default.createElement(_client2().SchemaComponent, {
+  }, t('Trigger'))), _react2().default.createElement("h4", null, compile(title)), _react2().default.createElement(TriggerExecution, null)), _react2().default.createElement(_client2().SchemaComponent, {
     schema: {
       type: 'void',
       title: detailText,
@@ -178,9 +262,14 @@ const TriggerConfig = () => {
           'x-component': 'Action.Drawer',
           'x-decorator': 'Form',
           'x-decorator-props': {
-            initialValue: {
-              config
+            useValues(options) {
+              return (0, _client2().useRequest)(() => Promise.resolve({
+                data: {
+                  config
+                }
+              }), options);
             }
+
           },
           properties: {
             config: {

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

@@ -47,7 +47,7 @@ function _client() {
 
 var _ScheduleConfig = require("./ScheduleConfig");
 
-var _WorkflowCanvas = require("../../WorkflowCanvas");
+var _FlowContext = require("../../FlowContext");
 
 var _calculators = require("../../calculators");
 
@@ -93,7 +93,7 @@ var _default = {
           _useCollectionManager2 = _useCollectionManager.collections,
           collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
 
-    const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
+    const _useFlowContext = (0, _FlowContext.useFlowContext)(),
           workflow = _useFlowContext.workflow;
 
     const collection = (_collections$find = collections.find(item => item.name === workflow.config.collection)) !== null && _collections$find !== void 0 ? _collections$find : {

package/lib/server/Plugin.d.ts

@@ -1,18 +1,17 @@
-import { Plugin } from '@nocobase/server';
 import { Transactionable } from '@nocobase/database';
+import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
-import { Trigger } from './triggers';
 import { Instruction } from './instructions';
-import Processor from './Processor';
-import WorkflowModel from './models/Workflow';
 import ExecutionModel from './models/Execution';
+import WorkflowModel from './models/Workflow';
+import Processor from './Processor';
+import { Trigger } from './triggers';
 export default class WorkflowPlugin extends Plugin {
     instructions: Registry<Instruction>;
     triggers: Registry<Trigger>;
     calculators: Registry<Function>;
     extensions: typeof import("./extensions/assignees").default[];
     onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
-    getName(): string;
     load(): Promise<void>;
     toggle(workflow: WorkflowModel, enable?: boolean): void;
     trigger(workflow: WorkflowModel, context: Object, options?: Transactionable & {

package/lib/server/Plugin.js

@@ -15,20 +15,20 @@ function _path() {
   return data;
 }
 
-function _server() {
-  const data = require("@nocobase/server");
+function _database() {
+  const data = require("@nocobase/database");
 
-  _server = function _server() {
+  _database = function _database() {
     return data;
   };
 
   return data;
 }
 
-function _database() {
-  const data = require("@nocobase/database");
+function _server() {
+  const data = require("@nocobase/server");
 
-  _database = function _database() {
+  _server = function _server() {
     return data;
   };
 
@@ -47,17 +47,17 @@ function _utils() {
 
 var _actions = _interopRequireDefault(require("./actions"));
 
-var _triggers = _interopRequireDefault(require("./triggers"));
+var _calculators = _interopRequireDefault(require("./calculators"));
 
-var _instructions = _interopRequireDefault(require("./instructions"));
+var _constants = require("./constants");
 
-var _Processor = _interopRequireDefault(require("./Processor"));
+var _extensions = _interopRequireDefault(require("./extensions"));
 
-var _calculators = _interopRequireDefault(require("./calculators"));
+var _instructions = _interopRequireDefault(require("./instructions"));
 
-var _extensions = _interopRequireDefault(require("./extensions"));
+var _Processor = _interopRequireDefault(require("./Processor"));
 
-var _constants = require("./constants");
+var _triggers = _interopRequireDefault(require("./triggers"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -136,10 +136,6 @@ class WorkflowPlugin extends _server().Plugin {
     }();
   }
 
-  getName() {
-    return this.getPackageName(__dirname);
-  }
-
   load() {
     var _this2 = this;
 

package/lib/server/actions/jobs.js

@@ -31,7 +31,7 @@ function _submit() {
     });
     context.status = 202;
     yield next();
-    const plugin = context.app.pm.get('@nocobase/plugin-workflow');
+    const plugin = context.app.pm.get('workflow');
     const processor = plugin.createProcessor(instance.execution); // NOTE: resume the process and no `await` for quick returning
 
     processor.resume(instance);

package/lib/server/actions/workflows.d.ts

@@ -1,2 +1,3 @@
 import { Context } from '@nocobase/actions';
+export declare function update(context: Context, next: any): Promise<void>;
 export declare function revision(context: Context, next: any): Promise<void>;

package/lib/server/actions/workflows.js

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.revision = revision;
+exports.update = update;
 
 function _actions() {
-  const data = require("@nocobase/actions");
+  const data = _interopRequireWildcard(require("@nocobase/actions"));
 
   _actions = function _actions() {
     return data;
@@ -15,6 +16,10 @@ function _actions() {
   return data;
 }
 
+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 _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."); }
@@ -27,20 +32,45 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
 
 function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(value) { var ret = this.s.return; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, throw: function _throw(value) { var thr = this.s.return; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
 
+function update(_x, _x2) {
+  return _update.apply(this, arguments);
+}
+
+function _update() {
+  _update = _asyncToGenerator(function* (context, next) {
+    const repository = _actions().utils.getRepositoryFromParams(context);
+
+    const _context$action$param = context.action.params,
+          filterByTk = _context$action$param.filterByTk,
+          values = _context$action$param.values; // only enable/disable
+
+    if (Object.keys(values).sort().join() !== 'enabled,key') {
+      const workflow = yield repository.findById(filterByTk);
+
+      if (workflow.get('executed')) {
+        return context.throw(400, 'executed workflow can not be updated');
+      }
+    }
+
+    return _actions().default.update(context, next);
+  });
+  return _update.apply(this, arguments);
+}
+
 function typeOf(value) {
   if (Array.isArray(value)) {
     return 'array';
@@ -98,7 +128,7 @@ function migrateConfig(config, oldToNew) {
   return migrate(config);
 }
 
-function revision(_x, _x2) {
+function revision(_x3, _x4) {
   return _revision.apply(this, arguments);
 }
 
@@ -218,7 +248,7 @@ function _revision() {
         return instance;
       });
 
-      return function (_x3) {
+      return function (_x5) {
         return _ref.apply(this, arguments);
       };
     }());

package/lib/server/extensions/assignees/actions.js

@@ -67,7 +67,7 @@ function _submit() {
     context.status = 202;
     yield next();
     instance.job.latestUserJob = instance;
-    const plugin = context.app.pm.get('@nocobase/plugin-workflow');
+    const plugin = context.app.pm.get('workflow');
     const processor = plugin.createProcessor(instance.execution); // NOTE: resume the process and no `await` for quick returning
 
     processor.resume(instance.job);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.11",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,18 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.7-alpha.1",
-    "@nocobase/client": "0.7.7-alpha.1",
-    "@nocobase/database": "0.7.7-alpha.1",
-    "@nocobase/server": "0.7.7-alpha.1",
-    "@nocobase/utils": "0.7.7-alpha.1",
+    "@nocobase/actions": "0.8.0-alpha.11",
+    "@nocobase/client": "0.8.0-alpha.11",
+    "@nocobase/database": "0.8.0-alpha.11",
+    "@nocobase/server": "0.8.0-alpha.11",
+    "@nocobase/utils": "0.8.0-alpha.11",
+    "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
     "json-templates": "^4.2.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.7-alpha.1"
+    "@nocobase/test": "0.8.0-alpha.11"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "5c5379e33b9d6f30ca1c45a95504a46b2b878d8c"
 }