@nocobase/plugin-workflow 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/server/instructions/manual/index.js

@@ -11,11 +11,19 @@ function _actions() {
   };
   return data;
 }
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
 var _constants = require("../../constants");
 var _jobs = _interopRequireDefault(require("./collecions/jobs"));
 var _users = _interopRequireDefault(require("./collecions/users"));
 var _users_jobs = _interopRequireDefault(require("./collecions/users_jobs"));
 var _actions2 = require("./actions");
+var _forms = _interopRequireDefault(require("./forms"));
 const _excluded = ["mode"];
 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; }
@@ -81,6 +89,7 @@ function getMode(mode) {
 class _default {
   constructor(plugin) {
     this.plugin = void 0;
+    this.formTypes = new (_utils().Registry)();
     this.plugin = plugin;
     plugin.db.collection(_users_jobs.default);
     plugin.db.extendCollection(_users.default);
@@ -104,6 +113,7 @@ class _default {
         submit: _actions2.submit
       }
     });
+    (0, _forms.default)(this);
   }
   run(node, prevJob, processor) {
     return _asyncToGenerator(function* () {
@@ -135,7 +145,7 @@ class _default {
   }
   resume(node, job, processor) {
     return _asyncToGenerator(function* () {
-      var _job$latestUserJob$re, _job$latestUserJob, _getMode$getStatus;
+      var _getMode$getStatus, _job$latestUserJob$re, _job$latestUserJob;
       // NOTE: check all users jobs related if all done then continue as parallel
       const _node$config2 = node.config,
         _node$config2$assigne = _node$config2.assignees,
@@ -146,12 +156,15 @@ class _default {
         where: {
           jobId: job.id
         },
-        group: ['status']
+        group: ['status'],
+        transaction: processor.transaction
       });
       const submitted = distribution.reduce((count, item) => item.status !== _constants.JOB_STATUS.PENDING ? count + item.count : count, 0);
+      const status = job.status || ((_getMode$getStatus = getMode(mode).getStatus(distribution, assignees)) !== null && _getMode$getStatus !== void 0 ? _getMode$getStatus : _constants.JOB_STATUS.PENDING);
       const result = mode ? (submitted || 0) / assignees.length : (_job$latestUserJob$re = (_job$latestUserJob = job.latestUserJob) === null || _job$latestUserJob === void 0 ? void 0 : _job$latestUserJob.result) !== null && _job$latestUserJob$re !== void 0 ? _job$latestUserJob$re : job.result;
+      processor.logger.debug(`manual resume job and next status: ${status}`);
       job.set({
-        status: job.status || ((_getMode$getStatus = getMode(mode).getStatus(distribution, assignees)) !== null && _getMode$getStatus !== void 0 ? _getMode$getStatus : _constants.JOB_STATUS.PENDING),
+        status,
         result
       });
       return job;

package/lib/server/instructions/request.js

@@ -80,7 +80,7 @@ class _default {
         _this.plugin.resume(job);
       });
       _this.plugin.app.logger.info(`[Workflow] request (#${node.id}) sent to "${config.url}", waiting for response...`);
-      return job;
+      return null;
     })();
   }
   resume(node, job, processor) {

package/lib/server/migrations/20230612021134-manual-collection-block.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class extends Migration {
+    up(): Promise<void>;
+}

package/lib/server/migrations/20230612021134-manual-collection-block.js

@@ -0,0 +1,155 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _server() {
+  const data = require("@nocobase/server");
+  _server = function _server() {
+    return data;
+  };
+  return data;
+}
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
+const _excluded = ["schema"];
+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 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function findSchema(root, filter, onlyLeaf = false) {
+  const result = [];
+  if (!root) {
+    return result;
+  }
+  if (filter(root) && (!onlyLeaf || !root.properties)) {
+    result.push(root);
+    return result;
+  }
+  if (root.properties) {
+    Object.keys(root.properties).forEach(key => {
+      result.push(...findSchema(root.properties[key], filter));
+    });
+  }
+  return result;
+}
+function migrateSchema(schema = {}) {
+  const root = {
+    properties: schema
+  };
+  const collectionBlocks = findSchema(root, item => {
+    return item['x-component'] === 'CardItem' && item['x-designer'] === 'SimpleDesigner' && item['x-decorator'] === 'CollectionProvider';
+  });
+  collectionBlocks.forEach(block => {
+    const id = (0, _utils().uid)();
+    const grid = block.properties.grid;
+    delete block.properties.grid;
+    const fields = findSchema(grid, item => {
+      return item['x-decorator'] === 'FormItem';
+    });
+    fields.forEach(field => {
+      Object.assign(field, {
+        'x-component': 'CollectionField',
+        'x-collection-field': `${block['x-decorator-props'].collection}.${field['x-collection-field']}`
+      });
+    });
+    Object.assign(block, {
+      'x-decorator': 'DetailsBlockProvider',
+      'x-decorator-props': _objectSpread(_objectSpread({}, block['x-decorator-props']), {}, {
+        dataSource: grid['x-context-datasource']
+      }),
+      properties: {
+        [id]: {
+          type: 'void',
+          name: id,
+          'x-component': 'FormV2',
+          'x-component-props': {
+            useProps: '{{useDetailsBlockProps}}'
+          },
+          properties: {
+            grid: {
+              type: 'void',
+              name: 'grid',
+              'x-component': 'Grid',
+              'x-initializer': 'ReadPrettyFormItemInitializers',
+              properties: grid.properties
+            }
+          }
+        }
+      }
+    });
+  });
+  const customForms = findSchema(root, item => {
+    return item['x-decorator'] === 'FormCollectionProvider';
+  });
+  customForms.forEach(item => {
+    Object.assign(item, {
+      'x-decorator': 'CustomFormBlockProvider'
+    });
+  });
+  const customFormFields = findSchema(root, item => {
+    return item['x-interface-options'];
+  });
+  customFormFields.forEach(field => {
+    const options = field['x-interface-options'];
+    delete field['x-interface-options'];
+    Object.assign(field, {
+      'x-component-props': {
+        field: options
+      }
+    });
+  });
+  return schema;
+}
+class _default extends _server().Migration {
+  up() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      const match = yield _this.app.version.satisfies('<0.9.4-alpha.3');
+      if (!match) {
+        return;
+      }
+      const db = _this.context.db;
+      const NodeRepo = db.getRepository('flow_nodes');
+      yield db.sequelize.transaction( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (transaction) {
+          const nodes = yield NodeRepo.find({
+            filter: {
+              type: 'manual'
+            },
+            transaction
+          });
+          console.log('%d nodes need to be migrated.', nodes.length);
+          yield nodes.reduce((promise, node) => promise.then(() => {
+            const _node$config = node.config,
+              schema = _node$config.schema,
+              config = _objectWithoutProperties(_node$config, _excluded);
+            node.set('config', _objectSpread(_objectSpread({}, config), {}, {
+              schema: _objectSpread({}, migrateSchema(schema))
+            }));
+            node.changed('config', true);
+            return node.save({
+              silent: true,
+              transaction
+            });
+          }), Promise.resolve());
+        });
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    })();
+  }
+}
+exports.default = _default;

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.4-alpha.2",
-  "description": "",
+  "displayName": "workflow",
+  "displayName.zh-CN": "工作流",
+  "description": " a powerful workflow plugin designed to support business process management and automation. .",
+  "description.zh-CN": "工作流插件，为业务流程管理和自动化提供支持。",
+  "version": "0.10.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.4-alpha.2",
-    "@nocobase/client": "0.9.4-alpha.2",
-    "@nocobase/database": "0.9.4-alpha.2",
-    "@nocobase/evaluators": "0.9.4-alpha.2",
-    "@nocobase/logger": "0.9.4-alpha.2",
-    "@nocobase/resourcer": "0.9.4-alpha.2",
-    "@nocobase/server": "0.9.4-alpha.2",
-    "@nocobase/utils": "0.9.4-alpha.2",
+    "@nocobase/actions": "0.10.0-alpha.2",
+    "@nocobase/client": "0.10.0-alpha.2",
+    "@nocobase/database": "0.10.0-alpha.2",
+    "@nocobase/evaluators": "0.10.0-alpha.2",
+    "@nocobase/logger": "0.10.0-alpha.2",
+    "@nocobase/resourcer": "0.10.0-alpha.2",
+    "@nocobase/server": "0.10.0-alpha.2",
+    "@nocobase/utils": "0.10.0-alpha.2",
     "antd": "^4.24.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
@@ -23,9 +26,9 @@
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.9.4-alpha.2",
-    "@nocobase/test": "0.9.4-alpha.2",
+    "@nocobase/plugin-formula-field": "0.10.0-alpha.2",
+    "@nocobase/test": "0.10.0-alpha.2",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }

package/lib/client/WorkflowShortcut.d.ts

@@ -1 +0,0 @@
-export declare const WorkflowShortcut: () => JSX.Element;

package/lib/client/WorkflowShortcut.js

@@ -1,48 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WorkflowShortcut = void 0;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
-    return data;
-  };
-  return data;
-}
-function _reactRouterDom() {
-  const data = require("react-router-dom");
-  _reactRouterDom = function _reactRouterDom() {
-    return data;
-  };
-  return data;
-}
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-var _locale = require("./locale");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const WorkflowShortcut = () => {
-  const history = (0, _reactRouterDom().useHistory)();
-  return _react().default.createElement(_client().PluginManager.Toolbar.Item, {
-    key: "workflow",
-    icon: _react().default.createElement(_icons().PartitionOutlined, null),
-    title: (0, _locale.lang)('Workflow'),
-    onClick: () => {
-      history.push('/admin/settings/workflow/workflows');
-    }
-  });
-};
-exports.WorkflowShortcut = WorkflowShortcut;

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

@@ -1,2 +0,0 @@
-/// <reference types="react" />
-export declare function CollectionFieldInitializers(props: any): JSX.Element;

package/lib/client/components/CollectionFieldInitializers.js

@@ -1,70 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CollectionFieldInitializers = CollectionFieldInitializers;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function _lodash() {
-    return data;
-  };
-  return data;
-}
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-const _excluded = ["field"];
-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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-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 CollectionFieldInitializer(_ref) {
-  var _uiSchema$title;
-  let field = _ref.field,
-    props = _objectWithoutProperties(_ref, _excluded);
-  const uiSchema = (0, _lodash().cloneDeep)(field.uiSchema);
-  delete uiSchema['x-uid'];
-  return _react().default.createElement(_client().InitializerWithSwitch, _objectSpread(_objectSpread({}, props), {}, {
-    schema: _objectSpread(_objectSpread({}, uiSchema), {}, {
-      name: field.name,
-      title: (_uiSchema$title = uiSchema.title) !== null && _uiSchema$title !== void 0 ? _uiSchema$title : field.name,
-      'x-decorator': 'FormItem',
-      'x-read-pretty': true,
-      'x-designer': 'FormItem.Designer',
-      'x-collection-field': field.name
-    }),
-    type: "x-collection-field"
-  }));
-}
-function CollectionFieldInitializers(props) {
-  const _useCollection = (0, _client().useCollection)(),
-    fields = _useCollection.fields;
-  const items = fields.filter(field => !['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type) && field.uiSchema).map(field => ({
-    key: field.name,
-    type: 'item',
-    title: field.uiSchema.title,
-    component: CollectionFieldInitializer,
-    field
-  }));
-  return _react().default.createElement(_client().SchemaInitializer.Button, _objectSpread(_objectSpread({}, props), {}, {
-    items: items,
-    title: "{{t('Configure fields')}}",
-    wrap: _client().gridRowColWrap
-  }));
-}

package/lib/client/nodes/manual/forms/customForm.d.ts

@@ -1,40 +0,0 @@
-import React from 'react';
-declare function FormCollectionProvider(props: any): JSX.Element;
-declare function CustomFormBlockInitializer({ insert, ...props }: {
-    [x: string]: any;
-    insert: any;
-}): JSX.Element;
-declare function AddCustomFormField(props: any): JSX.Element;
-declare function useFormBlockProps(): {
-    form: import("@formily/core").Form<any>;
-};
-declare const _default: {
-    title: string;
-    config: {
-        initializer: {
-            key: string;
-            type: string;
-            title: string;
-            component: typeof CustomFormBlockInitializer;
-        };
-        initializers: {
-            AddCustomFormField: typeof AddCustomFormField;
-        };
-        components: {
-            FormCollectionProvider: typeof FormCollectionProvider;
-        };
-    };
-    block: {
-        scope: {
-            useFormBlockProps: typeof useFormBlockProps;
-        };
-        components: {
-            FormCollectionProvider: React.FC<{
-                allowNull?: boolean;
-                name?: string;
-                collection?: import("@nocobase/client").CollectionOptions;
-            }>;
-        };
-    };
-};
-export default _default;