@panneau/core 1.0.0-alpha.19 → 1.0.0-alpha.193

package/lib/hooks.js

@@ -15,6 +15,8 @@ var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var fetch = require('@folklore/fetch');
 var isObject = require('lodash/isObject');
+var isArray = require('lodash/isArray');
+var get = require('lodash/get');
 var contexts = require('@panneau/core/contexts');
 var cssMediaquery = require('css-mediaquery');
 
@@ -48,6 +50,8 @@ var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray)
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
+var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 
 var useAnimationFrame = function useAnimationFrame(onFrame) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -149,6 +153,7 @@ var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
       _onChange = _ref.onChange,
       props = _objectWithoutProperties__default['default'](_ref, ["value", "errors", "onChange"]);
 
+  var locales = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   return fields.reduce(function (allFields, field) {
     var _ref2 = isObject__default['default'](field) ? field : {},
         _ref2$name = _ref2.name,
@@ -156,12 +161,18 @@ var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
         _ref2$component = _ref2.component,
         component = _ref2$component === void 0 ? null : _ref2$component;
 
-    console.log('f', field);
+    var fieldErrors = errors !== null ? errors[name] || [] : [];
+    var localizedErrors = component === 'localized' ? (locales || []).reduce(function (previousErrors, locale) {
+      var items = errors !== null ? get__default['default'](errors, "".concat(name, ".").concat(locale), []) || [] : [];
+      var finalItems = isArray__default['default'](items) ? items : [items];
+      var finalPrevious = isArray__default['default'](previousErrors) ? previousErrors : [];
+      return [].concat(_toConsumableArray__default['default'](finalPrevious), _toConsumableArray__default['default'](finalItems));
+    }, fieldErrors) : fieldErrors;
     return [].concat(_toConsumableArray__default['default'](allFields), [_objectSpread__default['default'](_objectSpread__default['default']({}, isObject__default['default'](field) ? field : null), {}, {
       name: name,
       component: component,
       value: value !== null ? value[name] || null : null,
-      errors: errors !== null ? errors[name] || null : null,
+      errors: localizedErrors.length > 0 ? localizedErrors : null,
       onChange: function onChange(fieldValue) {
         return _onChange(name, fieldValue);
       }
@@ -196,7 +207,9 @@ var useForm = function useForm() {
       _opts$setValue = opts.setValue,
       setProvidedValue = _opts$setValue === void 0 ? null : _opts$setValue,
       _opts$onComplete = opts.onComplete,
-      onComplete = _opts$onComplete === void 0 ? null : _opts$onComplete;
+      onComplete = _opts$onComplete === void 0 ? null : _opts$onComplete,
+      _opts$locales = opts.locales,
+      locales = _opts$locales === void 0 ? [] : _opts$locales;
 
   var _useState = react.useState(initialValue || providedValue),
       _useState2 = _slicedToArray__default['default'](_useState, 2),
@@ -236,7 +249,7 @@ var useForm = function useForm() {
   var hasProvidedGeneralError = setProvidedGeneralError !== null;
   var generalError = hasProvidedGeneralError ? providedGeneralError : stateGeneralError;
   var setGeneralError = hasProvidedGeneralError ? setProvidedGeneralError : setStateGeneralError;
-  var fieldsKey = [value, errors].concat(fields);
+  var fieldsKey = [value, errors, locales].concat(fields);
   var onFieldChange = react.useCallback(function (fieldName, fieldValue) {
     var fieldErrors = errors !== null ? errors[fieldName] || null : null;
 
@@ -251,7 +264,7 @@ var useForm = function useForm() {
       value: value,
       errors: errors,
       onChange: onFieldChange
-    });
+    }, locales);
   }, fieldsKey);
   var csrfToken = react.useMemo(function () {
     return fetch.getCsrfToken();
@@ -986,21 +999,27 @@ var getResource = function getResource(resources, resourceId) {
 var useResourceUrlGenerator = function useResourceUrlGenerator() {
   var resourceId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var resources = contexts.usePanneauResources();
-  var resource = getResource(resources, resourceId);
+  var contextResource = contexts.useResource();
+  var resource = getResource(resources, resourceId) || contextResource;
   var route = contexts.useUrlGenerator();
   return function (routeResourceId) {
     var routeName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     var finalRouteName = resourceId !== null ? routeResourceId : routeName;
     var finalParams = resourceId !== null ? routeName : params;
-    var finalResource = resource || getResource(resources, routeResourceId);
-    var id = finalResource.id,
-        _finalResource$has_ro = finalResource.has_routes,
-        hasRoutes = _finalResource$has_ro === void 0 ? false : _finalResource$has_ro;
-    var routePrefix = hasRoutes ? "resources.".concat(id) : 'resources';
-    return route("".concat(routePrefix, ".").concat(finalRouteName), _objectSpread__default['default'](_objectSpread__default['default']({}, finalParams), {}, {
+    var finalResource = getResource(resources, routeResourceId) || resource;
+
+    var _ref = finalResource || {},
+        _ref$id = _ref.id,
+        id = _ref$id === void 0 ? null : _ref$id; // console.log('gen', finalRouteName, route(`resources.${finalRouteName}`, {
+    //     ...finalParams,
+    //     resource: id,
+    // }));
+
+
+    return id !== null ? route("resources.".concat(finalRouteName), _objectSpread__default['default'](_objectSpread__default['default']({}, finalParams), {}, {
       resource: id
-    }));
+    })) : null;
   };
 };
 

package/lib/index.js

@@ -15,10 +15,12 @@ require('snake-case');
 var isObject = require('lodash/isObject');
 require('react');
 var changeCase = require('change-case');
-require('lodash/isString');
+var ReactIs = require('react-is');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+require('lodash/isString');
 var isArray = require('lodash/isArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+require('lodash/capitalize');
 require('slugify');
 var uniqBy = require('lodash/uniqBy');
 var uniq = require('lodash/uniq');
@@ -35,6 +37,7 @@ var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _createSuper__default = /*#__PURE__*/_interopDefaultLegacy(_createSuper);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var ReactIs__default = /*#__PURE__*/_interopDefaultLegacy(ReactIs);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
@@ -92,6 +95,7 @@ var routes = PropTypes__default['default'].shape({
   'resources.show': PropTypes__default['default'].string.isRequired,
   'resources.edit': PropTypes__default['default'].string.isRequired,
   'resources.update': PropTypes__default['default'].string.isRequired,
+  'resources.delete': PropTypes__default['default'].string.isRequired,
   'resources.destroy': PropTypes__default['default'].string.isRequired
 });
 var intl = PropTypes__default['default'].shape({
@@ -106,8 +110,9 @@ var pages = PropTypes__default['default'].objectOf(page);
 var field = PropTypes__default['default'].shape({
   // type: PropTypes.string.isRequired,
   name: PropTypes__default['default'].isRequired,
-  component: PropTypes__default['default'].string.isRequired,
-  label: PropTypes__default['default'].isRequired
+  type: PropTypes__default['default'].string,
+  component: PropTypes__default['default'].string,
+  label: PropTypes__default['default'].node
 });
 var fields = PropTypes__default['default'].arrayOf(field);
 var form = PropTypes__default['default'].shape({
@@ -118,11 +123,10 @@ var form = PropTypes__default['default'].shape({
 var forms = PropTypes__default['default'].arrayOf(form);
 var resource = PropTypes__default['default'].shape({
   id: PropTypes__default['default'].string.isRequired,
-  label: PropTypes__default['default'].string.isRequired,
+  name: PropTypes__default['default'].string.isRequired,
   intl: intl,
   fields: fields,
   forms: PropTypes__default['default'].shape({}),
-  has_routes: PropTypes__default['default'].bool,
   shows_in_navbar: PropTypes__default['default'].bool
 });
 var resources = PropTypes__default['default'].arrayOf(resource);
@@ -159,6 +163,11 @@ var formError = PropTypes__default['default'].shape({
   message: PropTypes__default['default'].string
 });
 var formErrors = PropTypes__default['default'].arrayOf(formError);
+var uppy = PropTypes__default['default'].shape({
+  tus: PropTypes__default['default'].object
+}); // eslint-disable-line
+
+var triggerUpdate = PropTypes__default['default'].string;
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -199,9 +208,23 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     selectOptions: selectOptions,
     feedback: feedback,
     formError: formError,
-    formErrors: formErrors
+    formErrors: formErrors,
+    uppy: uppy,
+    triggerUpdate: triggerUpdate
 });
 
+var flattenComponents = function flattenComponents(components) {
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
+  if (components === null) {
+    return null;
+  }
+
+  return Object.keys(components).reduce(function (newMap, key) {
+    return ReactIs__default['default'].isValidElementType(components[key]) ? _objectSpread__default['default'](_objectSpread__default['default']({}, newMap), {}, _defineProperty__default['default']({}, prefix !== null ? "".concat(prefix, ".").concat(key) : key, components[key])) : _objectSpread__default['default'](_objectSpread__default['default']({}, newMap), flattenComponents(components[key], key));
+  }, {});
+};
+
 var getComponentFromName = function getComponentFromName() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var components = arguments.length > 1 ? arguments[1] : undefined;
@@ -234,7 +257,7 @@ var ComponentsManager = /*#__PURE__*/function (_EventEmitter) {
     _classCallCheck__default['default'](this, ComponentsManager);
 
     _this = _super.call(this);
-    _this.components = components;
+    _this.components = flattenComponents(components);
     return _this;
   }
 

package/lib/utils.js

@@ -7,24 +7,28 @@ var snakeCase = require('snake-case');
 var isObject = require('lodash/isObject');
 var react = require('react');
 var changeCase = require('change-case');
-var isString = require('lodash/isString');
+var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
+var ReactIs = require('react-is');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+var isString = require('lodash/isString');
 var isArray = require('lodash/isArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
-var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var capitalize = require('lodash/capitalize');
 var slugify = require('slugify');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var isNumber__default = /*#__PURE__*/_interopDefaultLegacy(isNumber);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
-var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
+var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
+var ReactIs__default = /*#__PURE__*/_interopDefaultLegacy(ReactIs);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
-var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var capitalize__default = /*#__PURE__*/_interopDefaultLegacy(capitalize);
 var slugify__default = /*#__PURE__*/_interopDefaultLegacy(slugify);
 
 var convertStyleToString = function convertStyleToString(style) {
@@ -71,6 +75,31 @@ var createUseEvent = function createUseEvent(eventsManager) {
   };
 };
 
+var flattenComponents = function flattenComponents(components) {
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+
+  if (components === null) {
+    return null;
+  }
+
+  return Object.keys(components).reduce(function (newMap, key) {
+    return ReactIs__default['default'].isValidElementType(components[key]) ? _objectSpread__default['default'](_objectSpread__default['default']({}, newMap), {}, _defineProperty__default['default']({}, prefix !== null ? "".concat(prefix, ".").concat(key) : key, components[key])) : _objectSpread__default['default'](_objectSpread__default['default']({}, newMap), flattenComponents(components[key], key));
+  }, {});
+};
+
+var getComponent = function getComponent(component) {
+  var _ref = isObject__default['default'](component) ? component : {
+    component: component
+  };
+      _ref.component;
+      var props = _objectWithoutProperties__default['default'](_ref, ["component"]);
+
+  return {
+    name: component,
+    props: props
+  };
+};
+
 var getColumnFromField = function getColumnFromField(field) {
   if (field === null) {
     return null;
@@ -78,82 +107,43 @@ var getColumnFromField = function getColumnFromField(field) {
 
 
   var name = field.name,
-      _field$components = field.components,
-      components = _field$components === void 0 ? null : _field$components,
-      _field$settings = field.settings;
-  _field$settings = _field$settings === void 0 ? {} : _field$settings;
-  var order = _field$settings.orderInIndex,
+      _field$components = field.components;
+  _field$components = _field$components === void 0 ? {} : _field$components;
+  var _field$components$dis = _field$components.display,
+      display = _field$components$dis === void 0 ? null : _field$components$dis,
       label = field.label;
-  return {
+
+  var _getComponent = getComponent(display),
+      _getComponent$name = _getComponent.name,
+      componentName = _getComponent$name === void 0 ? null : _getComponent$name,
+      _getComponent$props = _getComponent.props,
+      componentProps = _getComponent$props === void 0 ? null : _getComponent$props;
+
+  return _objectSpread__default['default'](_objectSpread__default['default']({}, componentProps), {}, {
     id: name,
     label: label,
     valueKey: name,
-    order: order,
-    component: components !== null ? components.index_column || components.index || null : null,
+    component: componentName,
     field: field
-  };
-};
-var sortColumns = function sortColumns(columns) {
-  return columns.sort(function (_ref, _ref2) {
-    var _ref$order = _ref.order,
-        aOrder = _ref$order === void 0 ? null : _ref$order;
-    var _ref2$order = _ref2.order,
-        bOrder = _ref2$order === void 0 ? null : _ref2$order;
-
-    if (aOrder === bOrder) {
-      return 0;
-    }
-
-    if (aOrder === null) {
-      return 1;
-    }
-
-    if (bOrder === null) {
-      return -1;
-    }
-
-    return aOrder > bOrder ? 1 : -1;
   });
 };
-var getColumnsFromResource = function getColumnsFromResource(resource) {
-  var fields = resource.fields,
-      _resource$columns = resource.columns,
-      resourceColumns = _resource$columns === void 0 ? null : _resource$columns;
-  var newColumns = resourceColumns !== null ? resourceColumns.map(function (column) {
-    var _ref3 = isString__default['default'](column) ? {
+var getColumnsWithFields = function getColumnsWithFields(resource, columns) {
+  var fields = resource.fields;
+  var newColumns = columns !== null ? columns.map(function (column) {
+    var _ref = isString__default['default'](column) ? {
       field: column
     } : column,
-        _ref3$field = _ref3.field,
-        fieldName = _ref3$field === void 0 ? null : _ref3$field;
+        _ref$field = _ref.field,
+        fieldName = _ref$field === void 0 ? null : _ref$field,
+        otherProps = _objectWithoutProperties__default['default'](_ref, ["field"]);
 
-    return fieldName !== null ? getColumnFromField(fields.find(function (it) {
+    return _objectSpread__default['default'](_objectSpread__default['default']({}, fieldName !== null ? getColumnFromField(fields.find(function (it) {
       return it.name === fieldName;
-    }) || null) : column;
+    }) || null) : null), otherProps);
   }).filter(function (it) {
     return it !== null;
-  }) : fields.filter(function (_ref4) {
-    var _ref4$settings = _ref4.settings;
-    _ref4$settings = _ref4$settings === void 0 ? {} : _ref4$settings;
-    var _ref4$settings$hidden = _ref4$settings.hiddenInIndex,
-        hiddenInIndex = _ref4$settings$hidden === void 0 ? false : _ref4$settings$hidden;
-    return !hiddenInIndex;
-  }).map(function (field) {
-    return getColumnFromField(field);
-  });
-  return sortColumns(newColumns);
-};
-
-var getComponent = function getComponent(component) {
-  var _ref = isObject__default['default'](component) ? component : {
-    component: component
-  };
-      _ref.component;
-      var props = _objectWithoutProperties__default['default'](_ref, ["component"]);
-
-  return {
-    name: component,
-    props: props
-  };
+  }) : [];
+  return newColumns;
 };
 
 var getComponentFromName = function getComponentFromName() {
@@ -266,9 +256,27 @@ var getFileName = function getFileName() {
 
 var getSelectOptions = function getSelectOptions(options) {
   return options.map(function (it) {
-    return isObject__default['default'](it) ? it : {
+    if (isObject__default['default'](it)) {
+      var _it$label = it.label,
+          label = _it$label === void 0 ? null : _it$label,
+          value = it.value;
+
+      if (label === null) {
+        return {
+          value: value,
+          label: capitalize__default['default']("".concat(value))
+        };
+      }
+
+      return {
+        value: value,
+        label: "".concat(label)
+      };
+    }
+
+    return {
       value: it,
-      label: it
+      label: capitalize__default['default']("".concat(it))
     };
   });
 };
@@ -345,7 +353,8 @@ Object.defineProperty(exports, 'snakeCase', {
 exports.convertStyleToString = convertStyleToString;
 exports.createNullableOnChange = createNullableOnChange;
 exports.createUseEvent = createUseEvent;
-exports.getColumnsFromResource = getColumnsFromResource;
+exports.flattenComponents = flattenComponents;
+exports.getColumnsWithFields = getColumnsWithFields;
 exports.getComponent = getComponent;
 exports.getComponentFromName = getComponentFromName;
 exports.getDefinitionFromId = getDefinitionFromId;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "1.0.0-alpha.19",
+    "version": "1.0.0-alpha.193",
     "description": "",
     "keywords": [
         "javascript"
@@ -88,7 +88,7 @@
         "@uppy/tus": "^1.8.2",
         "@uppy/webcam": "^1.8.1",
         "@uppy/xhr-upload": "^1.6.8",
-        "bootstrap": "next",
+        "bootstrap": "^5.0.2",
         "change-case": "^4.1.2",
         "classnames": "^2.2.6",
         "css-mediaquery": "^0.1.2",
@@ -100,6 +100,7 @@
         "prop-types": "^15.7.2",
         "react-helmet": "^6.1.0",
         "react-intl": "^5.15.8",
+        "react-is": "^17.0.2",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0",
         "react-use-gesture": "^9.0.0",
@@ -113,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "a15404f113a7c59ea6e5b946b366c3768b6a9db6"
+    "gitHead": "d2ca466ff6c7d5a8cacf0fe7a5c01a10590661cd"
 }