@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.2

package/lib/block-provider/TableBlockProvider.js

@@ -96,7 +96,7 @@ var useAssociationNames = function useAssociationNames(collection) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var collectionField = _step.value;
 
-      if (collectionField.target && collectionField.interface !== 'snapshot') {
+      if (collectionField.target) {
         associationFields.add(collectionField.name);
         var fields = getCollectionFields(collectionField.target);
 

package/lib/block-provider/TableSelectorProvider.js

@@ -88,7 +88,7 @@ var useAssociationNames2 = function useAssociationNames2(collection) {
       getCollectionFields = _useCollectionManager.getCollectionFields;
 
   var names = (_getCollectionFields = getCollectionFields(collection)) === null || _getCollectionFields === void 0 ? void 0 : _getCollectionFields.filter(function (field) {
-    return field.target && field.interface !== 'snapshot';
+    return field.target;
   }).map(function (field) {
     return field.name;
   });
@@ -113,7 +113,7 @@ var useAssociationNames = function useAssociationNames(collection) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var collectionField = _step.value;
 
-      if (collectionField.target && collectionField.interface !== 'snapshot') {
+      if (collectionField.target) {
         associationFields.add(collectionField.name);
         var fields = getCollectionFields(collectionField.target);
 

package/lib/block-provider/hooks/index.js

@@ -15,6 +15,8 @@ var _lodash = require("lodash");
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _omit = _interopRequireDefault(require("lodash/omit"));
+
 var _reactI18next = require("react-i18next");
 
 var _reactRouterDom = require("react-router-dom");
@@ -43,16 +45,16 @@ var _TableFieldProvider = require("../TableFieldProvider");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 var usePickActionProps = function usePickActionProps() {
@@ -118,6 +120,20 @@ var filterValue = function filterValue(value) {
 };
 
 function getFormValues(filterByTk, field, form, fieldNames, getField, resource) {
+  if (filterByTk) {
+    var _field$data;
+
+    var actionFields = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.activeFields;
+
+    if (actionFields) {
+      var keys = Object.keys(form.values).filter(function (key) {
+        var f = getField(key);
+        return !actionFields.has(key) && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(f === null || f === void 0 ? void 0 : f.type);
+      });
+      return (0, _omit.default)(_objectSpread({}, form.values), keys);
+    }
+  }
+
   return form.values;
   var values = {};
 
@@ -1222,13 +1238,13 @@ var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
-        var _field$data, _field$data$selectedR, _field$data2, _service$refresh5;
+        var _field$data2, _field$data2$selected, _field$data3, _service$refresh5;
 
         return regeneratorRuntime.wrap(function _callee17$(_context17) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
-                if (field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : (_field$data$selectedR = _field$data.selectedRowKeys) === null || _field$data$selectedR === void 0 ? void 0 : _field$data$selectedR.length) {
+                if (field === null || field === void 0 ? void 0 : (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : (_field$data2$selected = _field$data2.selectedRowKeys) === null || _field$data2$selected === void 0 ? void 0 : _field$data2$selected.length) {
                   _context17.next = 2;
                   break;
                 }
@@ -1238,7 +1254,7 @@ var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
               case 2:
                 _context17.next = 4;
                 return resource.destroy({
-                  filterByTk: (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.selectedRowKeys
+                  filterByTk: (_field$data3 = field.data) === null || _field$data3 === void 0 ? void 0 : _field$data3.selectedRowKeys
                 });
 
               case 4:

package/lib/collection-manager/CollectionManagerProvider.d.ts

@@ -2,3 +2,4 @@ import React from 'react';
 import { CollectionManagerOptions } from './types';
 export declare const CollectionManagerProvider: React.FC<CollectionManagerOptions>;
 export declare const RemoteCollectionManagerProvider: (props: any) => JSX.Element;
+export declare const CollectionCategroriesProvider: (props: any) => JSX.Element;

package/lib/collection-manager/CollectionManagerProvider.js

@@ -5,25 +5,25 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RemoteCollectionManagerProvider = exports.CollectionManagerProvider = void 0;
+exports.RemoteCollectionManagerProvider = exports.CollectionManagerProvider = exports.CollectionCategroriesProvider = void 0;
 
 var _antd = require("antd");
 
-var _react = _interopRequireWildcard(require("react"));
-
 var _lodash = require("lodash");
 
+var _react = _interopRequireWildcard(require("react"));
+
 var _apiClient = require("../api-client");
 
-var _CollectionManagerSchemaComponentProvider = require("./CollectionManagerSchemaComponentProvider");
+var _templates = require("../collection-manager/Configuration/templates");
 
-var _context2 = require("./context");
+var _CollectionHistoryProvider = require("./CollectionHistoryProvider");
 
-var _templates = require("../collection-manager/Configuration/templates");
+var _CollectionManagerSchemaComponentProvider = require("./CollectionManagerSchemaComponentProvider");
 
-var defaultInterfaces = _interopRequireWildcard(require("./interfaces"));
+var _context3 = require("./context");
 
-var _CollectionHistoryProvider = require("./CollectionHistoryProvider");
+var defaultInterfaces = _interopRequireWildcard(require("./interfaces"));
 
 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); }
 
@@ -37,13 +37,21 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 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."); }
 
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 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; }
 
@@ -61,13 +69,13 @@ var CollectionManagerProvider = function CollectionManagerProvider(props) {
   var defaultTemplates = (0, _lodash.keyBy)((0, _templates.templateOptions)(), function (item) {
     return item.name;
   });
-  var ctx = (0, _react.useContext)(_context2.CollectionManagerContext);
-  return /*#__PURE__*/_react.default.createElement(_context2.CollectionManagerContext.Provider, {
+  var ctx = (0, _react.useContext)(_context3.CollectionManagerContext);
+  return /*#__PURE__*/_react.default.createElement(_context3.CollectionManagerContext.Provider, {
     value: _objectSpread(_objectSpread({}, ctx), {}, {
       service: service,
       interfaces: _objectSpread(_objectSpread(_objectSpread({}, defaultInterfaces), ctx.interfaces), interfaces),
       templates: _objectSpread(_objectSpread({}, defaultTemplates), templates),
-      collections: collections,
+      collections: [].concat(_toConsumableArray(ctx.collections), _toConsumableArray(collections)),
       refreshCM: refreshCM
     })
   }, /*#__PURE__*/_react.default.createElement(_CollectionManagerSchemaComponentProvider.CollectionManagerSchemaComponentProvider, null, props.children));
@@ -93,7 +101,7 @@ var RemoteCollectionManagerProvider = function RemoteCollectionManagerProvider(p
     action: 'list',
     params: {
       paginate: false,
-      appends: ['fields', 'fields.uiSchema'],
+      appends: ['fields', 'fields.uiSchema', 'category'],
       filter: {// inherit: false,
       },
       sort: ['sort']
@@ -157,4 +165,61 @@ var RemoteCollectionManagerProvider = function RemoteCollectionManagerProvider(p
   }, props));
 };
 
-exports.RemoteCollectionManagerProvider = RemoteCollectionManagerProvider;
+exports.RemoteCollectionManagerProvider = RemoteCollectionManagerProvider;
+
+var CollectionCategroriesProvider = function CollectionCategroriesProvider(props) {
+  var _result$data;
+
+  var api = (0, _apiClient.useAPIClient)();
+  var options = {
+    url: 'collectionCategories:list',
+    params: {
+      paginate: false,
+      sort: ['sort']
+    }
+  };
+  var result = (0, _apiClient.useRequest)(options);
+
+  if (result.loading) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Spin, null);
+  }
+
+  return /*#__PURE__*/_react.default.createElement(_context3.CollectionCategroriesContext.Provider, {
+    value: _objectSpread(_objectSpread({}, result), {}, {
+      data: result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.data,
+      refresh: function () {
+        var _refresh = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+          var _yield$api$request2, data;
+
+          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return api.request(options);
+
+                case 2:
+                  _yield$api$request2 = _context2.sent;
+                  data = _yield$api$request2.data;
+                  result.mutate(data);
+                  return _context2.abrupt("return", (data === null || data === void 0 ? void 0 : data.data) || []);
+
+                case 6:
+                case "end":
+                  return _context2.stop();
+              }
+            }
+          }, _callee2);
+        }));
+
+        function refresh() {
+          return _refresh.apply(this, arguments);
+        }
+
+        return refresh;
+      }()
+    })
+  }, props.children);
+};
+
+exports.CollectionCategroriesProvider = CollectionCategroriesProvider;

package/lib/collection-manager/CollectionManagerShortcut.js

@@ -11,8 +11,6 @@ var _icons = require("@ant-design/icons");
 
 var _shared = require("@formily/shared");
 
-var _antd = require("antd");
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -25,6 +23,8 @@ var _schemaComponent = require("../schema-component");
 
 var _Configuration = require("./Configuration");
 
+var _CollectionManagerProvider = require("./CollectionManagerProvider");
+
 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; }
@@ -59,31 +59,41 @@ var schema = {
 var schema2 = {
   type: 'object',
   properties: _defineProperty({}, (0, _shared.uid)(), {
+    'x-decorator': 'CollectionCategroriesProvider',
     'x-component': 'ConfigurationTable'
   })
 };
 
 var CollectionManagerPane = function CollectionManagerPane() {
-  return /*#__PURE__*/_react.default.createElement(_antd.Card, {
-    bordered: false
-  }, /*#__PURE__*/_react.default.createElement(_schemaComponent.SchemaComponent, {
-    schema: schema2,
-    components: {
-      ConfigurationTable: _Configuration.ConfigurationTable,
-      AddFieldAction: _Configuration.AddFieldAction,
-      AddCollectionField: _Configuration.AddCollectionField,
-      AddCollection: _Configuration.AddCollection,
-      AddCollectionAction: _Configuration.AddCollectionAction,
-      EditCollection: _Configuration.EditCollection,
-      EditCollectionAction: _Configuration.EditCollectionAction,
-      EditFieldAction: _Configuration.EditFieldAction,
-      EditCollectionField: _Configuration.EditCollectionField,
-      OverridingCollectionField: _Configuration.OverridingCollectionField,
-      OverridingFieldAction: _Configuration.OverridingFieldAction,
-      ViewCollectionField: _Configuration.ViewCollectionField,
-      ViewFieldAction: _Configuration.ViewFieldAction
-    }
-  }));
+  return (
+    /*#__PURE__*/
+    // <Card bordered={false}>
+    _react.default.createElement(_schemaComponent.SchemaComponent, {
+      schema: schema2,
+      components: {
+        CollectionCategroriesProvider: _CollectionManagerProvider.CollectionCategroriesProvider,
+        ConfigurationTable: _Configuration.ConfigurationTable,
+        ConfigurationTabs: _Configuration.ConfigurationTabs,
+        AddFieldAction: _Configuration.AddFieldAction,
+        AddCollectionField: _Configuration.AddCollectionField,
+        AddCollection: _Configuration.AddCollection,
+        AddCollectionAction: _Configuration.AddCollectionAction,
+        AddCategoryAction: _Configuration.AddCategoryAction,
+        AddCategory: _Configuration.AddCategory,
+        EditCollection: _Configuration.EditCollection,
+        EditCollectionAction: _Configuration.EditCollectionAction,
+        EditFieldAction: _Configuration.EditFieldAction,
+        EditCollectionField: _Configuration.EditCollectionField,
+        OverridingCollectionField: _Configuration.OverridingCollectionField,
+        OverridingFieldAction: _Configuration.OverridingFieldAction,
+        ViewCollectionField: _Configuration.ViewCollectionField,
+        ViewFieldAction: _Configuration.ViewFieldAction,
+        EditCategory: _Configuration.EditCategory,
+        EditCategoryAction: _Configuration.EditCategoryAction
+      }
+    }) // </Card>
+
+  );
 };
 
 exports.CollectionManagerPane = CollectionManagerPane;
@@ -128,12 +138,15 @@ var CollectionManagerShortcut2 = function CollectionManagerShortcut2() {
     schema: schema,
     components: {
       ConfigurationTable: _Configuration.ConfigurationTable,
+      ConfigurationTabs: _Configuration.ConfigurationTabs,
       AddFieldAction: _Configuration.AddFieldAction,
       EditFieldAction: _Configuration.EditFieldAction,
       OverridingFieldAction: _Configuration.OverridingFieldAction,
       ViewFieldAction: _Configuration.ViewFieldAction,
       AddCollectionAction: _Configuration.AddCollectionAction,
-      EditCollectionAction: _Configuration.EditCollectionAction
+      EditCollectionAction: _Configuration.EditCollectionAction,
+      AddCategoryAction: _Configuration.AddCategoryAction,
+      EditCategoryAction: _Configuration.EditCategoryAction
     }
   }));
 };

package/lib/collection-manager/Configuration/AddCategoryAction.d.ts

@@ -0,0 +1,2 @@
+export declare const AddCategory: (props: any) => JSX.Element;
+export declare const AddCategoryAction: (props: any) => JSX.Element;

package/lib/collection-manager/Configuration/AddCategoryAction.js

@@ -0,0 +1,145 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AddCategoryAction = exports.AddCategory = void 0;
+
+var _icons = require("@ant-design/icons");
+
+var _react = require("@formily/react");
+
+var _lodash = require("lodash");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _reactI18next = require("react-i18next");
+
+var _apiClient = require("../../api-client");
+
+var _schemaComponent = require("../../schema-component");
+
+var _actionHooks = require("../action-hooks");
+
+var _context2 = require("../context");
+
+var components = _interopRequireWildcard(require("./components"));
+
+var _collections = require("./schemas/collections");
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+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); }); }; }
+
+var useCreateCategry = function useCreateCategry() {
+  var form = (0, _react.useForm)();
+  var ctx = (0, _schemaComponent.useActionContext)();
+
+  var _useContext = (0, _react2.useContext)(_context2.CollectionCategroriesContext),
+      refresh = _useContext.refresh;
+
+  var api = (0, _apiClient.useAPIClient)();
+  return {
+    run: function run() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var values;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return form.submit();
+
+              case 2:
+                values = (0, _lodash.cloneDeep)(form.values);
+                _context.next = 5;
+                return api.resource('collectionCategories').create({
+                  values: _objectSpread({}, values)
+                });
+
+              case 5:
+                ctx.setVisible(false);
+                _context.next = 8;
+                return form.reset();
+
+              case 8:
+                _context.next = 10;
+                return refresh();
+
+              case 10:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    }
+  };
+};
+
+var AddCategory = function AddCategory(props) {
+  return /*#__PURE__*/_react2.default.createElement(AddCategoryAction, _objectSpread({}, props));
+};
+
+exports.AddCategory = AddCategory;
+
+var AddCategoryAction = function AddCategoryAction(props) {
+  var scope = props.scope,
+      getContainer = props.getContainer,
+      children = props.children;
+
+  var _useState = (0, _react2.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
+  return /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContext.Provider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/_react2.default.createElement("div", {
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    title: t('Add category')
+  }, children || /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null)), /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
+    schema: _collections.collectionCategorySchema,
+    components: _objectSpread({}, components),
+    scope: _objectSpread({
+      getContainer: getContainer,
+      useCancelAction: _actionHooks.useCancelAction,
+      createOnly: true,
+      useCreateCategry: useCreateCategry
+    }, scope)
+  }));
+};
+
+exports.AddCategoryAction = AddCategoryAction;

package/lib/collection-manager/Configuration/AddCollectionAction.js

@@ -73,7 +73,7 @@ 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; }
 
-var getSchema = function getSchema(schema, record, compile) {
+var getSchema = function getSchema(schema, category, compile) {
   if (!schema) {
     return;
   }
@@ -88,7 +88,8 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var initialValue = _objectSpread({
     name: "t_".concat((0, _shared.uid)()),
-    template: schema.name
+    template: schema.name,
+    category: category
   }, (0, _lodash.cloneDeep)(schema.default));
 
   if (initialValue.reverseField) {
@@ -373,6 +374,10 @@ var AddCollectionAction = function AddCollectionAction(props) {
       key: option.name
     };
   });
+
+  var _useResourceActionCon2 = (0, _ResourceActionProvider.useResourceActionContext)(),
+      category = _useResourceActionCon2.state.category;
+
   return /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
     record: record
   }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContext.Provider, {
@@ -390,7 +395,7 @@ var AddCollectionAction = function AddCollectionAction(props) {
         overflow: 'auto'
       },
       onClick: function onClick(info) {
-        var schema = getSchema(getTemplate(info.key), record, compile);
+        var schema = getSchema(getTemplate(info.key), category, compile);
         setSchema(schema);
         setVisible(true);
       },

package/lib/collection-manager/Configuration/AddFieldAction.js

@@ -368,6 +368,7 @@ var AddFieldAction = function AddFieldAction(props) {
       useCancelAction: _actionHooks.useCancelAction,
       createOnly: true,
       isOverride: false,
+      override: false,
       useCreateCollectionField: useCreateCollectionField,
       record: record,
       showReverseFieldConfig: true,

package/lib/collection-manager/Configuration/ConfigurationTable.js

@@ -25,6 +25,8 @@ var _schemaComponent = require("../../schema-component");
 
 var _actionHooks = require("../action-hooks");
 
+var _context5 = require("../context");
+
 var _useCollectionManager4 = require("../hooks/useCollectionManager");
 
 var _subTable = require("../sub-table");
@@ -158,6 +160,7 @@ var ConfigurationTable = function ConfigurationTable() {
   var _useCurrentAppInfo = (0, _appInfo.useCurrentAppInfo)(),
       database = _useCurrentAppInfo.data.database;
 
+  var data = (0, _react2.useContext)(_context5.CollectionCategroriesContext);
   var collectonsRef = (0, _react2.useRef)();
   collectonsRef.current = collections;
   var compile = (0, _schemaComponent.useCompile)();
@@ -175,9 +178,9 @@ var ConfigurationTable = function ConfigurationTable() {
               return _context3.abrupt("return", (_collectonsRef$curren = collectonsRef.current) === null || _collectonsRef$curren === void 0 ? void 0 : _collectonsRef$curren.filter(function (item) {
                 return !(item.autoCreate && item.isThrough);
               }).filter(function (item) {
-                var _targetScope$template, _targetScope$name;
+                var _targetScope$template, _targetScope$field$pr;
 
-                return targetScope ? ((_targetScope$template = targetScope['template']) === null || _targetScope$template === void 0 ? void 0 : _targetScope$template.includes(item.template)) || ((_targetScope$name = targetScope['name']) === null || _targetScope$name === void 0 ? void 0 : _targetScope$name.includes(item.name)) : true;
+                return targetScope ? ((_targetScope$template = targetScope['template']) === null || _targetScope$template === void 0 ? void 0 : _targetScope$template.includes(item.template)) || ((_targetScope$field$pr = targetScope[field.props.name]) === null || _targetScope$field$pr === void 0 ? void 0 : _targetScope$field$pr.includes(item.name)) : true;
               }).map(function (item) {
                 return {
                   label: compile(item.title),
@@ -198,8 +201,34 @@ var ConfigurationTable = function ConfigurationTable() {
     };
   }();
 
+  var loadCategories = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+      return regeneratorRuntime.wrap(function _callee4$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              return _context4.abrupt("return", data.data.map(function (item) {
+                return {
+                  label: compile(item.name),
+                  value: item.id
+                };
+              }));
+
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee4);
+    }));
+
+    return function loadCategories() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
   var ctx = (0, _react2.useContext)(_schemaComponent.SchemaComponentContext);
-  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponentContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponentContext.Provider, {
     value: _objectSpread(_objectSpread({}, ctx), {}, {
       designable: false
     })
@@ -217,13 +246,14 @@ var ConfigurationTable = function ConfigurationTable() {
       useSelectedRowKeys: useSelectedRowKeys,
       useAsyncDataSource: useAsyncDataSource,
       loadCollections: loadCollections,
+      loadCategories: loadCategories,
       useCurrentFields: useCurrentFields,
       useNewId: useNewId,
       useCancelAction: _actionHooks.useCancelAction,
       interfaces: interfaces,
       enableInherits: (database === null || database === void 0 ? void 0 : database.dialect) === 'postgres'
     }
-  })));
+  }));
 };
 
 exports.ConfigurationTable = ConfigurationTable;

package/lib/collection-manager/Configuration/ConfigurationTabs.d.ts

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