@nocobase/plugin-workflow 0.7.2-alpha.1 → 0.7.2-alpha.2

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

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

package/lib/client/components/CollectionFieldSelect.js

@@ -0,0 +1,106 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+
+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 _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;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _default(props) {
+  const collection = props.collection,
+        value = props.value,
+        onChange = props.onChange;
+
+  const _useTranslation = (0, _reactI18next().useTranslation)(),
+        t = _useTranslation.t;
+
+  const compile = (0, _client().useCompile)();
+
+  const _useCollectionManager = (0, _client().useCollectionManager)(),
+        getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  const fields = getCollectionFields(collection).filter(field => field.interface && (!field.target || field.type === 'belongsTo')).map(field => {
+    var _field$uiSchema, _field$uiSchema2;
+
+    return field.type === 'belongsTo' ? {
+      title: `${compile(((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name)} ID`,
+      name: field.foreignKey
+    } : {
+      title: compile(((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name),
+      name: field.name
+    };
+  });
+  return _react().default.createElement(_antd().Select, {
+    placeholder: t('Fields'),
+    value: value,
+    onChange: onChange
+  }, fields.map(field => _react().default.createElement(_antd().Select.Option, {
+    key: field.name,
+    value: field.name
+  }, field.title)));
+}
+
+function SelectWithAssociations(props) {
+  const collection = props.collection,
+        value = props.value,
+        onChange = props.onChange;
+
+  const _useTranslation2 = (0, _reactI18next().useTranslation)(),
+        t = _useTranslation2.t;
+
+  const compile = (0, _client().useCompile)();
+  const fields = (0, _client().useCollectionFilterOptions)(collection);
+  return _react().default.createElement(_antd().Cascader, {
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    changeOnSelect: false,
+    value: Array.isArray(value) ? value : value === null || value === void 0 ? void 0 : value.split('.'),
+    options: compile(fields),
+    onChange: onChange,
+    placeholder: t('Select Field')
+  });
+}

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

@@ -37,10 +37,6 @@ declare const _default: {
     components: {
         CollectionFieldset: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
     };
-    getter({ type, options, onChange }: {
-        type: any;
-        options: any;
-        onChange: any;
-    }): JSX.Element;
+    getter(props: any): JSX.Element;
 };
 export default _default;

package/lib/client/nodes/create.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-function _antd() {
-  const data = require("antd");
-
-  _antd = function _antd() {
-    return data;
-  };
-
-  return data;
-}
-
 function _react() {
   const data = _interopRequireDefault(require("react"));
 
@@ -25,16 +15,6 @@ function _react() {
   return data;
 }
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 function _client() {
   const data = require("@nocobase/client");
 
@@ -51,6 +31,8 @@ var _collection = require("../schemas/collection");
 
 var _WorkflowCanvas = require("../WorkflowCanvas");
 
+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; }
@@ -87,21 +69,10 @@ var _default = {
     CollectionFieldset: _calculators.CollectionFieldset
   },
 
-  getter({
-    type,
-    options,
-    onChange: _onChange
-  }) {
-    var _collections$find;
-
-    const _useTranslation = (0, _reactI18next().useTranslation)(),
-          t = _useTranslation.t;
-
-    const compile = (0, _client().useCompile)();
-
-    const _useCollectionManager = (0, _client().useCollectionManager)(),
-          _useCollectionManager2 = _useCollectionManager.collections,
-          collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
+  getter(props) {
+    const type = props.type,
+          options = props.options,
+          _onChange = props.onChange;
 
     const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
           nodes = _useFlowContext.nodes;
@@ -109,12 +80,10 @@ var _default = {
     const _nodes$find = nodes.find(n => n.id == options.nodeId),
           config = _nodes$find.config;
 
-    const collection = (_collections$find = collections.find(item => item.name === config.collection)) !== null && _collections$find !== void 0 ? _collections$find : {
-      fields: []
-    };
-    return _react().default.createElement(_antd().Select, {
-      value: options.path,
-      placeholder: t('Fields'),
+    const value = options === null || options === void 0 ? void 0 : options.path;
+    return _react().default.createElement(_CollectionFieldSelect.default, {
+      collection: config.collection,
+      value: value,
       onChange: path => {
         _onChange({
           type,
@@ -123,10 +92,7 @@ var _default = {
           })
         });
       }
-    }, collection.fields.filter(field => _calculators.BaseTypeSet.has(field.uiSchema.type)).map(field => _react().default.createElement(_antd().Select.Option, {
-      key: field.name,
-      value: field.name
-    }, compile(field.uiSchema.title))));
+    });
   }
 
 };

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

@@ -61,10 +61,6 @@ declare const _default: {
     components: {
         VariableComponent: typeof VariableComponent;
     };
-    getter({ type, options, onChange }: {
-        type: any;
-        options: any;
-        onChange: any;
-    }): JSX.Element;
+    getter(props: any): JSX.Element;
 };
 export default _default;

package/lib/client/nodes/query.js

@@ -15,26 +15,6 @@ function _react() {
   return data;
 }
 
-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");
 
@@ -51,6 +31,8 @@ var _calculators = require("../calculators");
 
 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; }
@@ -93,21 +75,10 @@ var _default = {
     VariableComponent: _calculators.VariableComponent
   },
 
-  getter({
-    type,
-    options,
-    onChange: _onChange
-  }) {
-    var _collections$find;
-
-    const _useTranslation = (0, _reactI18next().useTranslation)(),
-          t = _useTranslation.t;
-
-    const compile = (0, _client().useCompile)();
-
-    const _useCollectionManager = (0, _client().useCollectionManager)(),
-          _useCollectionManager2 = _useCollectionManager.collections,
-          collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
+  getter(props) {
+    const type = props.type,
+          options = props.options,
+          _onChange = props.onChange;
 
     const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
           nodes = _useFlowContext.nodes;
@@ -115,12 +86,10 @@ var _default = {
     const _nodes$find = nodes.find(n => n.id == options.nodeId),
           config = _nodes$find.config;
 
-    const collection = (_collections$find = collections.find(item => item.name === config.collection)) !== null && _collections$find !== void 0 ? _collections$find : {
-      fields: []
-    };
-    return _react().default.createElement(_antd().Select, {
-      value: options.path,
-      placeholder: t('Fields'),
+    const value = options === null || options === void 0 ? void 0 : options.path;
+    return _react().default.createElement(_CollectionFieldSelect.default, {
+      collection: config.collection,
+      value: value,
       onChange: path => {
         _onChange({
           type,
@@ -129,14 +98,7 @@ var _default = {
           })
         });
       }
-    }, collection.fields.filter(field => {
-      var _field$uiSchema;
-
-      return _calculators.BaseTypeSet.has((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.type);
-    }).map(field => _react().default.createElement(_antd().Select.Option, {
-      key: field.name,
-      value: field.name
-    }, compile(field.uiSchema.title))));
+    });
   }
 
 };

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

@@ -83,10 +83,6 @@ declare const _default: {
     components: {
         FieldsSelect: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
     };
-    getter({ type, options, onChange }: {
-        type: any;
-        options: any;
-        onChange: any;
-    }): JSX.Element;
+    getter(props: any): JSX.Element;
 };
 export default _default;

package/lib/client/triggers/collection.js

@@ -47,20 +47,8 @@ function _client() {
 
 var _WorkflowCanvas = require("../WorkflowCanvas");
 
-var _calculators = require("../calculators");
-
 var _collection = require("../schemas/collection");
 
-function _reactI18next() {
-  const data = require("react-i18next");
-
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-
-  return data;
-}
-
 function _css() {
   const data = require("@emotion/css");
 
@@ -81,6 +69,8 @@ function _core() {
   return data;
 }
 
+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; }
@@ -206,47 +196,29 @@ var _default = {
     FieldsSelect
   },
 
-  getter({
-    type,
-    options,
-    onChange: _onChange
-  }) {
-    var _collections$find, _options$path;
-
-    const _useTranslation = (0, _reactI18next().useTranslation)(),
-          t = _useTranslation.t;
+  getter(props) {
+    var _options$path;
 
-    const compile = (0, _client().useCompile)();
-
-    const _useCollectionManager2 = (0, _client().useCollectionManager)(),
-          _useCollectionManager3 = _useCollectionManager2.collections,
-          collections = _useCollectionManager3 === void 0 ? [] : _useCollectionManager3;
+    const type = props.type,
+          options = props.options,
+          _onChange = props.onChange;
 
     const _useFlowContext = (0, _WorkflowCanvas.useFlowContext)(),
           workflow = _useFlowContext.workflow;
 
-    const collection = (_collections$find = collections.find(item => item.name === workflow.config.collection)) !== null && _collections$find !== void 0 ? _collections$find : {
-      fields: []
-    };
-    return _react().default.createElement(_antd().Select, {
-      placeholder: t('Fields'),
-      value: options === null || options === void 0 ? void 0 : (_options$path = options.path) === null || _options$path === void 0 ? void 0 : _options$path.replace(/^data\./, ''),
-      onChange: path => {
+    const value = options === null || options === void 0 ? void 0 : (_options$path = options.path) === null || _options$path === void 0 ? void 0 : _options$path.replace(/^data\./, '');
+    return _react().default.createElement(_CollectionFieldSelect.default, {
+      collection: workflow.config.collection,
+      value: value,
+      onChange: value => {
         _onChange({
           type,
           options: _objectSpread(_objectSpread({}, options), {}, {
-            path: `data.${path}`
+            path: `data.${value}`
           })
         });
       }
-    }, collection.fields.filter(field => {
-      var _field$uiSchema2;
-
-      return _calculators.BaseTypeSet.has(field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.type);
-    }).map(field => _react().default.createElement(_antd().Select.Option, {
-      key: field.name,
-      value: field.name
-    }, compile(field.uiSchema.title))));
+    });
   }
 
 };

package/lib/server/actions/workflows.js

@@ -57,6 +57,16 @@ function migrateConfig(config, oldToNew) {
   function migrate(value) {
     switch (typeOf(value)) {
       case 'object':
+        if (value.type === '$jobsMapByNodeId') {
+          var _oldToNew$get, _value$options;
+
+          return _objectSpread(_objectSpread({}, value), {}, {
+            options: _objectSpread(_objectSpread({}, value.options), {}, {
+              nodeId: (_oldToNew$get = oldToNew.get((_value$options = value.options) === null || _value$options === void 0 ? void 0 : _value$options.nodeId)) === null || _oldToNew$get === void 0 ? void 0 : _oldToNew$get.id
+            })
+          });
+        }
+
         return Object.keys(value).reduce((result, key) => _objectSpread(_objectSpread({}, result), {}, {
           [key]: migrate(value[key])
         }), {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.7.2-alpha.1",
+  "version": "0.7.2-alpha.2",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,17 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.2-alpha.1",
-    "@nocobase/client": "0.7.2-alpha.1",
-    "@nocobase/database": "0.7.2-alpha.1",
-    "@nocobase/server": "0.7.2-alpha.1",
-    "@nocobase/utils": "0.7.2-alpha.1",
+    "@nocobase/actions": "0.7.2-alpha.2",
+    "@nocobase/client": "0.7.2-alpha.2",
+    "@nocobase/database": "0.7.2-alpha.2",
+    "@nocobase/server": "0.7.2-alpha.2",
+    "@nocobase/utils": "0.7.2-alpha.2",
     "cron-parser": "4.4.0",
     "json-templates": "^4.2.0",
     "react-js-cron": "^1.4.0"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.2-alpha.1"
+    "@nocobase/test": "0.7.2-alpha.2"
   },
-  "gitHead": "2e7958360628d6306845aabcb1e574a8e91d08ad"
+  "gitHead": "a0cc50154cc292248ef107c95a24bcc0c7a586fa"
 }