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

package/es/contexts.js

@@ -13,7 +13,7 @@ import { loadGoogleApi, loadGoogleMaps } from '@folklore/services';
 import { useIntl } from 'react-intl';
 import { getDisplayName } from '@panneau/core/utils';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { generatePath, useHistory } from 'react-router';
+import { generatePath, useNavigate } from 'react-router';
 import { TrackingContext, TrackingContainer } from '@folklore/tracking';
 export { TrackingContext } from '@folklore/tracking';
 import { v1 } from 'uuid';
@@ -24,6 +24,7 @@ var FORMS_NAMESPACE = 'forms';
 var FILTERS_NAMESPACE = 'filters';
 var LISTS_NAMESPACE = 'lists';
 var DISPLAYS_NAMESPACE = 'displays';
+var PAGES_NAMESPACE = 'pages';
 var APP_NAMESPACE = 'app';
 var ComponentsContext = /*#__PURE__*/React.createContext(null);
 /**
@@ -147,6 +148,21 @@ var useDisplayComponent = function useDisplayComponent(name) {
   var defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   return useComponent(name, defaultComponent, DISPLAYS_NAMESPACE);
 };
+/**
+ * Pages hooks
+ */
+
+var usePagesComponentsManager = function usePagesComponentsManager() {
+  return useComponentsManager(PAGES_NAMESPACE);
+};
+var usePagesComponents = function usePagesComponents() {
+  var defaultComponents = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return useComponents(PAGES_NAMESPACE, defaultComponents);
+};
+var usePageComponent = function usePageComponent(name) {
+  var defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  return useComponent(name, defaultComponent, PAGES_NAMESPACE);
+};
 /**
  * App hooks
  */
@@ -233,6 +249,14 @@ var toggle = PropTypes.shape({
   label: PropTypes.string
 });
 PropTypes.arrayOf(toggle);
+var tableColumn = PropTypes.shape({
+  id: PropTypes.string,
+  component: PropTypes.string,
+  path: PropTypes.string,
+  field: PropTypes.string,
+  columnClassName: PropTypes.string
+});
+PropTypes.arrayOf(tableColumn);
 /**
  * Panneau Definitions
  */
@@ -244,6 +268,7 @@ var routes = PropTypes.shape({
   'resources.show': PropTypes.string.isRequired,
   'resources.edit': PropTypes.string.isRequired,
   'resources.update': PropTypes.string.isRequired,
+  'resources.delete': PropTypes.string.isRequired,
   'resources.destroy': PropTypes.string.isRequired
 });
 var intl = PropTypes.shape({
@@ -256,10 +281,10 @@ var page = PropTypes.shape({
 });
 var pages = PropTypes.objectOf(page);
 var field = PropTypes.shape({
-  // type: PropTypes.string.isRequired,
-  name: PropTypes.isRequired,
-  component: PropTypes.string.isRequired,
-  label: PropTypes.isRequired
+  name: PropTypes.string.isRequired,
+  type: PropTypes.string,
+  component: PropTypes.string,
+  label: PropTypes.node
 });
 var fields = PropTypes.arrayOf(field);
 var form = PropTypes.shape({
@@ -270,11 +295,10 @@ var form = PropTypes.shape({
 PropTypes.arrayOf(form);
 var resource = PropTypes.shape({
   id: PropTypes.string.isRequired,
-  label: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
   intl: intl,
   fields: fields,
   forms: PropTypes.shape({}),
-  has_routes: PropTypes.bool,
   shows_in_navbar: PropTypes.bool
 });
 var resources = PropTypes.arrayOf(resource);
@@ -311,6 +335,11 @@ var formError = PropTypes.shape({
   message: PropTypes.string
 });
 PropTypes.arrayOf(formError);
+PropTypes.shape({
+  tus: PropTypes.object
+}); // eslint-disable-line
+
+PropTypes.string;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React.createContext(null);
@@ -1063,14 +1092,16 @@ var useUrlGenerator = function useUrlGenerator() {
 };
 var useRoutePush = function useRoutePush() {
   var url = useUrlGenerator();
-  var history = useHistory();
+  var navigate = useNavigate();
   var push = useCallback(function (route, data) {
     for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
       args[_key - 2] = arguments[_key];
     }
 
     if (isString(route)) {
-      history.push.apply(history, [url(route, data)].concat(args));
+      var _history;
+
+      (_history = history).push.apply(_history, [url(route, data)].concat(args));
     } else {
       var _ref = route || {},
           _ref$pathname = _ref.pathname,
@@ -1078,20 +1109,20 @@ var useRoutePush = function useRoutePush() {
           _ref$search = _ref.search,
           search = _ref$search === void 0 ? null : _ref$search;
 
-      history.push.apply(history, [{
+      navigate.apply(void 0, [{
         pathname: url(pathname, data),
         search: search
       }].concat(args));
     }
-  }, [history, url]);
+  }, [navigate, url]);
   return push;
 };
 var useRouteBack = function useRouteBack() {
   var url = useUrlGenerator();
-  var history = useHistory();
+  var navigate = useNavigate();
   var back = useCallback(function () {
-    return history.goBack();
-  }, [history, url]);
+    return navigate(-1);
+  }, [navigate, url]);
   return back;
 };
 var propTypes$2 = {
@@ -1175,7 +1206,7 @@ var useUppyCore = function useUppyCore() {
     }
 
     import('@uppy/core').then(function (_ref) {
-      var Uppy = _ref.Uppy;
+      var Uppy = _ref["default"];
       packageCache = Uppy;
 
       if (!canceled) {
@@ -1251,71 +1282,6 @@ var _excluded$2 = ["default"];
 
 var packagesCache$1 = {};
 var defaultPackagesMap$1 = {
-  transloadit: function transloadit() {
-    return import('@uppy/transloadit');
-  },
-  tus: function tus() {
-    return import('@uppy/tus');
-  },
-  xhr: function xhr() {
-    return import('@uppy/xhr-upload');
-  }
-};
-
-var useUppyTransport = function useUppyTransport(transport) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      _ref$packagesMap = _ref.packagesMap,
-      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap$1 : _ref$packagesMap;
-
-  // transport
-  var _useState = useState({
-    "package": packagesCache$1[transport] || null
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      loadedPackage = _useState2[0]["package"],
-      setLoadedPackage = _useState2[1];
-
-  var packageLoader = packagesMap[transport] || null;
-  useEffect(function () {
-    var canceled = false;
-
-    if (loadedPackage !== null || packageLoader === null) {
-      return function () {
-        canceled = true;
-      };
-    }
-
-    packageLoader().then(function (_ref2) {
-      var pack = _ref2["default"],
-          others = _objectWithoutProperties(_ref2, _excluded$2);
-
-      var dep = Object.keys(others).reduce(function (map, key) {
-        map[key] = others[key]; // eslint-disable-line no-param-reassign
-
-        return map;
-      }, pack);
-      packagesCache$1[transport] = dep;
-
-      if (!canceled) {
-        setLoadedPackage({
-          "package": dep
-        });
-      }
-    });
-    return function () {
-      canceled = true;
-    };
-  }, [packageLoader, loadedPackage, setLoadedPackage]);
-  return loadedPackage;
-};
-
-var _excluded$1 = ["default"];
-/**
- * Locale loader
- */
-
-var packagesCache = {};
-var defaultPackagesMap = {
   webcam: function webcam() {
     return import('@uppy/webcam');
   },
@@ -1336,12 +1302,12 @@ var defaultPackagesMap = {
 var useUppySources = function useUppySources(sources) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
       _ref$packagesMap = _ref.packagesMap,
-      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap : _ref$packagesMap;
+      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap$1 : _ref$packagesMap;
 
   // transport
   var _useState = useState({
     packages: sources.reduce(function (map, source) {
-      var sourcePackage = packagesCache[source] || null;
+      var sourcePackage = packagesCache$1[source] || null;
 
       if (sourcePackage === null) {
         return map;
@@ -1383,7 +1349,7 @@ var useUppySources = function useUppySources(sources) {
       var newLoadedPackages = sourcesToLoad.reduce(function (map, source, index) {
         var _packagesLoaded$index = packagesLoaded[index],
             pack = _packagesLoaded$index["default"],
-            others = _objectWithoutProperties(_packagesLoaded$index, _excluded$1);
+            others = _objectWithoutProperties(_packagesLoaded$index, _excluded$2);
 
         return _objectSpread(_objectSpread({}, map), {}, _defineProperty({}, source, Object.keys(others).reduce(function (otherMap, key) {
           otherMap[key] = others[key]; // eslint-disable-line no-param-reassign
@@ -1391,7 +1357,7 @@ var useUppySources = function useUppySources(sources) {
           return otherMap;
         }, pack)));
       }, {});
-      packagesCache = _objectSpread(_objectSpread({}, packagesCache), newLoadedPackages);
+      packagesCache$1 = _objectSpread(_objectSpread({}, packagesCache$1), newLoadedPackages);
 
       if (!canceled) {
         setLoadedPackages({
@@ -1406,6 +1372,71 @@ var useUppySources = function useUppySources(sources) {
   return sourcesToLoad.length === 0 ? loadedPackages : null;
 };
 
+var _excluded$1 = ["default"];
+/**
+ * Locale loader
+ */
+
+var packagesCache = {};
+var defaultPackagesMap = {
+  transloadit: function transloadit() {
+    return import('@uppy/transloadit');
+  },
+  tus: function tus() {
+    return import('@uppy/tus');
+  },
+  xhr: function xhr() {
+    return import('@uppy/xhr-upload');
+  }
+};
+
+var useUppyTransport = function useUppyTransport(transport) {
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+      _ref$packagesMap = _ref.packagesMap,
+      packagesMap = _ref$packagesMap === void 0 ? defaultPackagesMap : _ref$packagesMap;
+
+  // transport
+  var _useState = useState({
+    "package": packagesCache[transport] || null
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      loadedPackage = _useState2[0]["package"],
+      setLoadedPackage = _useState2[1];
+
+  var packageLoader = packagesMap[transport] || null;
+  useEffect(function () {
+    var canceled = false;
+
+    if (loadedPackage !== null || packageLoader === null) {
+      return function () {
+        canceled = true;
+      };
+    }
+
+    packageLoader().then(function (_ref2) {
+      var pack = _ref2["default"],
+          others = _objectWithoutProperties(_ref2, _excluded$1);
+
+      var dep = Object.keys(others).reduce(function (map, key) {
+        map[key] = others[key]; // eslint-disable-line no-param-reassign
+
+        return map;
+      }, pack);
+      packagesCache[transport] = dep;
+
+      if (!canceled) {
+        setLoadedPackage({
+          "package": dep
+        });
+      }
+    });
+    return function () {
+      canceled = true;
+    };
+  }, [packageLoader, loadedPackage, setLoadedPackage]);
+  return loadedPackage;
+};
+
 var convertToMedia = function convertToMedia(it) {
   // console.log('upload', it);
   var type = it.data.type.split('/')[0];
@@ -1466,12 +1497,16 @@ var useUppy = function useUppy() {
   } : _ref$getFileName,
       _ref$meta = _ref.meta,
       meta = _ref$meta === void 0 ? null : _ref$meta,
+      _ref$allowMultipleUpl = _ref.allowMultipleUploads,
+      allowMultipleUploads = _ref$allowMultipleUpl === void 0 ? false : _ref$allowMultipleUpl,
       _ref$maxNumberOfFiles = _ref.maxNumberOfFiles,
-      maxNumberOfFiles = _ref$maxNumberOfFiles === void 0 ? 30 : _ref$maxNumberOfFiles,
+      maxNumberOfFiles = _ref$maxNumberOfFiles === void 0 ? 1 : _ref$maxNumberOfFiles,
       _ref$allowedFileTypes = _ref.allowedFileTypes,
       allowedFileTypes = _ref$allowedFileTypes === void 0 ? null : _ref$allowedFileTypes,
       _ref$autoProceed = _ref.autoProceed,
-      autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed;
+      autoProceed = _ref$autoProceed === void 0 ? false : _ref$autoProceed,
+      _ref$debug = _ref.debug,
+      debug = _ref$debug === void 0 ? false : _ref$debug;
 
   var _ref3 = useContext(UppyContext) || null,
       buildUppy = _ref3.buildUppy,
@@ -1480,13 +1515,15 @@ var useUppy = function useUppy() {
   var uppy = useMemo(function () {
     return buildUppy !== null ? buildUppy({
       meta: meta,
+      allowMultipleUploads: allowMultipleUploads,
       restrictions: {
         maxNumberOfFiles: maxNumberOfFiles,
         allowedFileTypes: allowedFileTypes
       },
-      autoProceed: autoProceed
+      autoProceed: autoProceed,
+      debug: debug
     }) : null;
-  }, [buildUppy, meta, maxNumberOfFiles, allowedFileTypes, autoProceed]);
+  }, [buildUppy, meta, allowMultipleUploads, debug, maxNumberOfFiles, allowedFileTypes, autoProceed]);
   useEffect(function () {
     if (uppy === null) {
       return function () {};
@@ -1548,6 +1585,7 @@ var useUppy = function useUppy() {
   return uppy;
 };
 var propTypes = {
+  id: PropTypes.string,
   children: PropTypes.node.isRequired,
   transport: PropTypes.oneOf(['xhr', 'transloadit', 'tus']),
   locale: PropTypes.string,
@@ -1569,6 +1607,7 @@ var propTypes = {
   })])
 };
 var defaultProps = {
+  id: 'uppy',
   transport: null,
   locale: null,
   sources: null,
@@ -1578,7 +1617,8 @@ var defaultProps = {
   xhr: null
 };
 var UppyProvider = function UppyProvider(_ref5) {
-  var children = _ref5.children,
+  var id = _ref5.id,
+      children = _ref5.children,
       providedTransport = _ref5.transport,
       providedLocale = _ref5.locale,
       providedSources = _ref5.sources,
@@ -1631,6 +1671,7 @@ var UppyProvider = function UppyProvider(_ref5) {
           uppyOpts = _objectWithoutProperties(_ref7, _excluded);
 
       var newUppy = new Uppy(_objectSpread({
+        id: id,
         locale: uppyLocale
       }, uppyOpts));
 
@@ -1687,9 +1728,10 @@ var UppyProvider = function UppyProvider(_ref5) {
 
       return newUppy;
     };
-  }, [Uppy, uppyLocale, uppyTransport, uppySources, transport, sources, transloadit, companion, tus, xhr]);
-  return /*#__PURE__*/React.createElement(UppyContext.Provider, {
-    value: {
+  }, [id, Uppy, uppyLocale, uppyTransport, uppySources, transport, sources, transloadit, companion, tus, xhr]);
+  var value = useMemo(function () {
+    return {
+      id: id,
       transport: transport,
       locale: locale,
       sources: sources,
@@ -1702,10 +1744,13 @@ var UppyProvider = function UppyProvider(_ref5) {
       uppySources: uppySources,
       uppyLocale: uppyLocale,
       buildUppy: buildUppy
-    }
+    };
+  }, [id, transport, locale, sources, transloadit, companion, tus, xhr, Uppy, uppyTransport, uppySources, uppyLocale, buildUppy]);
+  return /*#__PURE__*/React.createElement(UppyContext.Provider, {
+    value: value
   }, children);
 };
 UppyProvider.propTypes = propTypes;
 UppyProvider.defaultProps = defaultProps;
 
-export { APP_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesContext, LocalesProvider, MODALS_NAMESPACE, ModalsContext, ModalsProvider, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, RoutesContext, RoutesProvider, TrackingProvider, UppyContext, UppyProvider, useAppComponent, useAppComponents, useAppComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useField, useFieldComponent, useFields, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocales, useModalComponent, useModals, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withModals, withPanels };
+export { APP_NAMESPACE, ComponentsContext, ComponentsProvider, DISPLAYS_NAMESPACE, DefinitionProvider, FIELDS_NAMESPACE, FILTERS_NAMESPACE, FORMS_NAMESPACE, FieldsContext, FieldsProvider, FontsContext, FontsProvider, FormProvider, GoogleApiClientContext, GoogleApiClientProvider, GoogleKeysContext, GoogleKeysProvider, GoogleMapsClientContext, GoogleMapsClientProvider, LISTS_NAMESPACE, LocalesContext, LocalesProvider, MODALS_NAMESPACE, ModalsContext, ModalsProvider, PAGES_NAMESPACE, PanelsContext, PanelsProvider, PanneauProvider, ResourceProvider, RoutesContext, RoutesProvider, TrackingProvider, UppyContext, UppyProvider, useAppComponent, useAppComponents, useAppComponentsManager, useComponent, useComponents, useComponentsManager, useDefinition, useDefinitionContext, useDisplayComponent, useDisplaysComponents, useDisplaysComponentsManager, useField, useFieldComponent, useFields, useFieldsComponents, useFieldsComponentsManager, useFieldsManager, useFilterComponent, useFiltersComponents, useFiltersComponentsManager, useFonts, useForm, useFormComponent, useFormSetValue, useFormValue, useFormsComponents, useFormsComponentsManager, useGoogleApiClient, useGoogleFonts, useGoogleKeys, useGoogleMapsClient, useListComponent, useListsComponents, useListsComponentsManager, useLocales, useModalComponent, useModals, useModalsComponents, useModalsComponentsManager, useOtherLocales, usePageComponent, usePagesComponents, usePagesComponentsManager, usePanels, usePanneau, usePanneauAuth, usePanneauColorScheme, usePanneauComponent, usePanneauComponents, usePanneauResource, usePanneauResources, usePanneauSettings, useResource, useRouteBack, useRoutePush, useRoutes, useTracking, useUppy, useUrlGenerator, withGoogleApiClient, withGoogleMapsClient, withModals, withPanels };

package/es/hooks.js

@@ -10,8 +10,10 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { getCsrfToken, postJSON, getCSRFHeaders } from '@folklore/fetch';
+import get from 'lodash/get';
+import isArray from 'lodash/isArray';
 import isObject from 'lodash/isObject';
-import { useFieldsManager, usePanneauResources, useUrlGenerator } from '@panneau/core/contexts';
+import { useFieldsManager, usePanneauResources, useResource, useUrlGenerator } from '@panneau/core/contexts';
 import { match } from 'css-mediaquery';
 
 var useAnimationFrame = function useAnimationFrame(onFrame) {
@@ -116,6 +118,7 @@ var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
       _onChange = _ref.onChange,
       props = _objectWithoutProperties(_ref, _excluded$1);
 
+  var locales = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   return fields.reduce(function (allFields, field) {
     var _ref2 = isObject(field) ? field : {},
         _ref2$name = _ref2.name,
@@ -123,11 +126,18 @@ var getFieldsPropsFromFields = function getFieldsPropsFromFields(fields, _ref) {
         _ref2$component = _ref2.component,
         component = _ref2$component === void 0 ? null : _ref2$component;
 
+    var fieldErrors = errors !== null ? errors[name] || [] : [];
+    var localizedErrors = component === 'localized' ? (locales || []).reduce(function (previousErrors, locale) {
+      var items = errors !== null ? get(errors, "".concat(name, ".").concat(locale), []) || [] : [];
+      var finalItems = isArray(items) ? items : [items];
+      var finalPrevious = isArray(previousErrors) ? previousErrors : [];
+      return [].concat(_toConsumableArray(finalPrevious), _toConsumableArray(finalItems));
+    }, fieldErrors) : fieldErrors;
     return [].concat(_toConsumableArray(allFields), [_objectSpread(_objectSpread({}, isObject(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);
       }
@@ -162,7 +172,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 = useState(initialValue || providedValue),
       _useState2 = _slicedToArray(_useState, 2),
@@ -202,7 +214,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 = useCallback(function (fieldName, fieldValue) {
     var fieldErrors = errors !== null ? errors[fieldName] || null : null;
 
@@ -217,7 +229,7 @@ var useForm = function useForm() {
       value: value,
       errors: errors,
       onChange: onFieldChange
-    });
+    }, locales);
   }, fieldsKey);
   var csrfToken = useMemo(function () {
     return getCsrfToken();
@@ -248,7 +260,10 @@ var useForm = function useForm() {
       error: false
     });
     setResponse(resp);
-    onComplete(resp);
+
+    if (onComplete !== null) {
+      onComplete(resp);
+    }
   };
 
   var finalPostForm = useCallback(function (postAction, postData) {
@@ -952,21 +967,27 @@ var getResource = function getResource(resources, resourceId) {
 var useResourceUrlGenerator = function useResourceUrlGenerator() {
   var resourceId = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var resources = usePanneauResources();
-  var resource = getResource(resources, resourceId);
+  var contextResource = useResource();
+  var resource = getResource(resources, resourceId) || contextResource;
   var route = 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(_objectSpread({}, 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(_objectSpread({}, finalParams), {}, {
       resource: id
-    }));
+    })) : null;
   };
 };
 

package/es/index.js

@@ -11,10 +11,13 @@ import 'snake-case';
 import isObject from 'lodash/isObject';
 import 'react';
 import { pascalCase } from 'change-case';
-import 'lodash/isString';
+import ReactIs from 'react-is';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import 'lodash/isString';
 import isArray from 'lodash/isArray';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import 'lodash/get';
+import 'lodash/capitalize';
 import 'slugify';
 import uniqBy from 'lodash/uniqBy';
 import uniq from 'lodash/uniq';
@@ -60,6 +63,14 @@ var toggle = PropTypes$1.shape({
   label: PropTypes$1.string
 });
 var toggles = PropTypes$1.arrayOf(toggle);
+var tableColumn = PropTypes$1.shape({
+  id: PropTypes$1.string,
+  component: PropTypes$1.string,
+  path: PropTypes$1.string,
+  field: PropTypes$1.string,
+  columnClassName: PropTypes$1.string
+});
+var tableColumns = PropTypes$1.arrayOf(tableColumn);
 /**
  * Panneau Definitions
  */
@@ -71,6 +82,7 @@ var routes = PropTypes$1.shape({
   'resources.show': PropTypes$1.string.isRequired,
   'resources.edit': PropTypes$1.string.isRequired,
   'resources.update': PropTypes$1.string.isRequired,
+  'resources.delete': PropTypes$1.string.isRequired,
   'resources.destroy': PropTypes$1.string.isRequired
 });
 var intl = PropTypes$1.shape({
@@ -83,10 +95,10 @@ var page = PropTypes$1.shape({
 });
 var pages = PropTypes$1.objectOf(page);
 var field = PropTypes$1.shape({
-  // type: PropTypes.string.isRequired,
-  name: PropTypes$1.isRequired,
-  component: PropTypes$1.string.isRequired,
-  label: PropTypes$1.isRequired
+  name: PropTypes$1.string.isRequired,
+  type: PropTypes$1.string,
+  component: PropTypes$1.string,
+  label: PropTypes$1.node
 });
 var fields = PropTypes$1.arrayOf(field);
 var form = PropTypes$1.shape({
@@ -97,11 +109,10 @@ var form = PropTypes$1.shape({
 var forms = PropTypes$1.arrayOf(form);
 var resource = PropTypes$1.shape({
   id: PropTypes$1.string.isRequired,
-  label: PropTypes$1.string.isRequired,
+  name: PropTypes$1.string.isRequired,
   intl: intl,
   fields: fields,
   forms: PropTypes$1.shape({}),
-  has_routes: PropTypes$1.bool,
   shows_in_navbar: PropTypes$1.bool
 });
 var resources = PropTypes$1.arrayOf(resource);
@@ -138,6 +149,11 @@ var formError = PropTypes$1.shape({
   message: PropTypes$1.string
 });
 var formErrors = PropTypes$1.arrayOf(formError);
+var uppy = PropTypes$1.shape({
+  tus: PropTypes$1.object
+}); // eslint-disable-line
+
+var triggerUpdate = PropTypes$1.string;
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -158,6 +174,8 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     fieldOptions: fieldOptions,
     toggle: toggle,
     toggles: toggles,
+    tableColumn: tableColumn,
+    tableColumns: tableColumns,
     routes: routes,
     intl: intl,
     page: page,
@@ -178,9 +196,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.isValidElementType(components[key]) ? _objectSpread(_objectSpread({}, newMap), {}, _defineProperty({}, prefix !== null ? "".concat(prefix, ".").concat(key) : key, components[key])) : _objectSpread(_objectSpread({}, 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;
@@ -213,7 +245,7 @@ var ComponentsManager = /*#__PURE__*/function (_EventEmitter) {
     _classCallCheck(this, ComponentsManager);
 
     _this = _super.call(this);
-    _this.components = components;
+    _this.components = flattenComponents(components);
     return _this;
   }
 
@@ -453,7 +485,7 @@ var FieldsManager$1 = /*#__PURE__*/function (_DefinitionsManager) {
     return _super.apply(this, arguments);
   }
 
-  return FieldsManager;
+  return _createClass(FieldsManager);
 }(DefinitionsManager);
 
 var _excluded$2 = ["fonts"];
@@ -598,7 +630,7 @@ var FieldsManager = /*#__PURE__*/function (_ComponentsManager) {
     return _super.apply(this, arguments);
   }
 
-  return FieldsManager;
+  return _createClass(FieldsManager);
 }(ComponentsManager);
 
 var _excluded$1 = ["medias"];