@panneau/core 1.0.0-y.0 → 1.0.3-alpha.1

package/lib/utils.js

@@ -7,29 +7,35 @@ 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 get = require('lodash/get');
+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 get__default = /*#__PURE__*/_interopDefaultLegacy(get);
+var capitalize__default = /*#__PURE__*/_interopDefaultLegacy(capitalize);
 var slugify__default = /*#__PURE__*/_interopDefaultLegacy(slugify);
 
 var convertStyleToString = function convertStyleToString(style) {
   return style !== null ? Object.keys(style).map(function (key) {
-    return "".concat(snakeCase.snakeCase(key), ":").concat(isNumber__default['default'](style[key]) ? "".concat(style[key], "px") : style[key], ";");
+    return "".concat(snakeCase.snakeCase(key), ":").concat(isNumber__default["default"](style[key]) ? "".concat(style[key], "px") : style[key], ";");
   }).join('\n') : '';
 };
 
@@ -38,7 +44,7 @@ var createNullableOnChange = function createNullableOnChange() {
   return function (newValue) {
     var nullableValue = newValue;
 
-    if (isObject__default['default'](newValue)) {
+    if (isObject__default["default"](newValue)) {
       var allNull = Object.keys(newValue).reduce(function (acc, key) {
         return acc && newValue[key] === null;
       }, true);
@@ -71,6 +77,34 @@ 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 _excluded$1 = ["component"];
+
+var getComponent = function getComponent(component) {
+  var _ref = isObject__default["default"](component) ? component : {
+    component: component
+  };
+      _ref.component;
+      var props = _objectWithoutProperties__default["default"](_ref, _excluded$1);
+
+  return {
+    name: component,
+    props: props
+  };
+};
+
+var _excluded = ["field"];
 var getColumnFromField = function getColumnFromField(field) {
   if (field === null) {
     return null;
@@ -78,84 +112,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, _excluded);
 
-    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 _excluded = ["component"];
-
-var getComponent = function getComponent(component) {
-  var _ref = isObject__default['default'](component) ? component : {
-    component: component
-  };
-      _ref.component;
-      var props = _objectWithoutProperties__default['default'](_ref, _excluded);
-
-  return {
-    name: component,
-    props: props
-  };
+  }) : [];
+  return newColumns;
 };
 
 var getComponentFromName = function getComponentFromName() {
@@ -182,7 +175,7 @@ var getDefinitionFromId = function getDefinitionFromId() {
   var items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var defaultObject = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
 
-  if (items === null || id === null || isArray__default['default'](items) && items.length === 0) {
+  if (items === null || id === null || isArray__default["default"](items) && items.length === 0) {
     return defaultObject;
   }
 
@@ -222,7 +215,7 @@ var getFieldByName = function getFieldByName(fields, name) {
 };
 
 var getFieldFromPath = function getFieldFromPath(path, fields, fieldManager) {
-  return (isArray__default['default'](path) ? path : [path]).reduce(function (foundField, key) {
+  return (isArray__default["default"](path) ? path : [path]).reduce(function (foundField, key) {
     if (foundField === null) {
       return null;
     }
@@ -244,13 +237,13 @@ var getFieldFromPath = function getFieldFromPath(path, fields, fieldManager) {
         itemsField = _ref$itemsField === void 0 ? null : _ref$itemsField;
 
     if (itemsField !== null && key.match(/^[0-9]+$/)) {
-      return _objectSpread__default['default'](_objectSpread__default['default']({}, itemsField), {}, {
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, itemsField), {}, {
         name: path.join('/'),
         listItems: true
       });
     }
 
-    return getFieldByName([].concat(_toConsumableArray__default['default'](fieldFields || []), _toConsumableArray__default['default'](subFields || []), _toConsumableArray__default['default'](settings || [])), key);
+    return getFieldByName([].concat(_toConsumableArray__default["default"](fieldFields || []), _toConsumableArray__default["default"](subFields || []), _toConsumableArray__default["default"](settings || [])), key);
   }, {
     fields: fields
   });
@@ -266,17 +259,42 @@ var getFileName = function getFileName() {
   return url.match(/([^/]+)(\?.*)?$/)[1] || url;
 };
 
+var getPathValue = function getPathValue(it, path) {
+  var value = get__default["default"](it, path, null);
+  return value !== null && isObject__default["default"](value) ? Object.values(value).reduce(function (foundValue, value) {
+    return foundValue !== null ? foundValue : value;
+  }, null) : value;
+};
+
 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))
     };
   });
 };
 
 var isMessage = function isMessage(message) {
-  return isObject__default['default'](message) && typeof message.defaultMessage !== 'undefined';
+  return isObject__default["default"](message) && typeof message.defaultMessage !== 'undefined';
 };
 
 var setValue = function setValue(value, keyParts, fieldValue) {
@@ -286,11 +304,11 @@ var setValue = function setValue(value, keyParts, fieldValue) {
   if (value !== null || fieldValue !== null) {
     if (isArray) {
       var index = parseInt(key, 10);
-      var newArrayValue = fieldValue !== null ? [].concat(_toConsumableArray__default['default'](value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray__default['default'](value.slice(index + 1))) : [].concat(_toConsumableArray__default['default'](value.slice(0, index)), _toConsumableArray__default['default'](value.slice(index + 1)));
+      var newArrayValue = fieldValue !== null ? [].concat(_toConsumableArray__default["default"](value.slice(0, index)), [keyParts.length > 0 ? setValue(value !== null ? value[index] || null : null, keyParts, fieldValue) : fieldValue], _toConsumableArray__default["default"](value.slice(index + 1))) : [].concat(_toConsumableArray__default["default"](value.slice(0, index)), _toConsumableArray__default["default"](value.slice(index + 1)));
       return newArrayValue.length > 0 ? newArrayValue : null;
     }
 
-    return _objectSpread__default['default'](_objectSpread__default['default']({}, value), {}, _defineProperty__default['default']({}, key, keyParts.length > 0 ? setValue(value !== null ? value[key] || null : null, keyParts, fieldValue) : fieldValue));
+    return _objectSpread__default["default"](_objectSpread__default["default"]({}, value), {}, _defineProperty__default["default"]({}, key, keyParts.length > 0 ? setValue(value !== null ? value[key] || null : null, keyParts, fieldValue) : fieldValue));
   }
 
   return null;
@@ -306,7 +324,7 @@ var slug = function slug(str) {
     toSlug = changeCase.snakeCase(str);
   }
 
-  return slugify__default['default'](toSlug, {
+  return slugify__default["default"](toSlug, {
     lower: true
   });
 };
@@ -328,26 +346,21 @@ var validateFields = function validateFields(fields, value) {
 
 Object.defineProperty(exports, 'dashCase', {
     enumerable: true,
-    get: function () {
-        return changeCase.paramCase;
-    }
+    get: function () { return changeCase.paramCase; }
 });
 Object.defineProperty(exports, 'pascalCase', {
     enumerable: true,
-    get: function () {
-        return changeCase.pascalCase;
-    }
+    get: function () { return changeCase.pascalCase; }
 });
 Object.defineProperty(exports, 'snakeCase', {
     enumerable: true,
-    get: function () {
-        return changeCase.snakeCase;
-    }
+    get: function () { return changeCase.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;
@@ -355,6 +368,7 @@ exports.getDisplayName = getDisplayName;
 exports.getFieldByName = getFieldByName;
 exports.getFieldFromPath = getFieldFromPath;
 exports.getFileName = getFileName;
+exports.getPathValue = getPathValue;
 exports.getSelectOptions = getSelectOptions;
 exports.isMessage = isMessage;
 exports.setFieldValue = setValue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "1.0.0-y.0",
+    "version": "1.0.3-alpha.1",
     "description": "",
     "keywords": [
         "javascript"
@@ -60,35 +60,35 @@
         "prepare": "../../scripts/prepare-package.sh --scss"
     },
     "devDependencies": {
-        "react": "^16.8.0",
-        "react-dom": "^16.8.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
     "peerDependencies": {
-        "react": "^16.8.0",
-        "react-dom": "^16.8.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
     },
     "dependencies": {
         "@babel/runtime": "^7.12.5",
-        "@folklore/fetch": "^0.1.10",
+        "@folklore/fetch": "^0.1.15",
         "@folklore/forms": "^0.0.10",
         "@folklore/services": "^0.1.24",
         "@folklore/tracking": "^0.0.9",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "@uppy/core": "^1.16.2",
-        "@uppy/dashboard": "^1.13.0",
-        "@uppy/dropbox": "^1.4.18",
-        "@uppy/facebook": "^1.1.18",
-        "@uppy/google-drive": "^1.5.18",
-        "@uppy/instagram": "^1.4.18",
-        "@uppy/locales": "^1.16.10",
-        "@uppy/react": "^1.11.5",
-        "@uppy/transloadit": "^1.6.14",
-        "@uppy/tus": "^1.8.2",
-        "@uppy/webcam": "^1.8.1",
-        "@uppy/xhr-upload": "^1.6.8",
-        "bootstrap": "next",
+        "@uppy/core": "^2.1.4",
+        "@uppy/dashboard": "^2.1.3",
+        "@uppy/dropbox": "^2.0.5",
+        "@uppy/facebook": "^2.0.5",
+        "@uppy/google-drive": "^2.0.5",
+        "@uppy/instagram": "^2.0.5",
+        "@uppy/locales": "^2.0.5",
+        "@uppy/react": "^2.1.2",
+        "@uppy/transloadit": "^2.1.1",
+        "@uppy/tus": "^2.2.0",
+        "@uppy/webcam": "^2.0.5",
+        "@uppy/xhr-upload": "^2.0.7",
+        "bootstrap": "5.2.0-beta1",
         "change-case": "^4.1.2",
         "classnames": "^2.2.6",
         "css-mediaquery": "^0.1.2",
@@ -99,9 +99,10 @@
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
         "react-helmet": "^6.1.0",
-        "react-intl": "^5.15.8",
-        "react-router": "^5.2.0",
-        "react-router-dom": "^5.2.0",
+        "react-intl": "^5.15.8||^6.0.0",
+        "react-is": "^17.0.2",
+        "react-router": "^6.2.1",
+        "react-router-dom": "^6.2.1",
         "react-use-gesture": "^9.0.0",
         "slugify": "^1.5.0",
         "snake-case": "^3.0.4",
@@ -113,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "168d858d58681ee6c96f00ec460a456576cb512b"
+    "gitHead": "e04e663c7f1eb692f89a0136f2e8f45024fbe355"
 }