@panneau/app 1.1.0 → 1.1.1

package/es/index.js

@@ -1,12 +1,12 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import PropTypes$1 from 'prop-types';
-import React, { useMemo, useCallback, useState, useEffect, Fragment } from 'react';
-import { useLocation, useNavigate, useParams, Route, Routes, Navigate, MemoryRouter } from 'react-router';
+import React, { useMemo, useCallback, useState, useEffect } from 'react';
+import { useLocation, useHistory, Switch, Route, Redirect, MemoryRouter } from 'react-router';
 import { Link, BrowserRouter } from 'react-router-dom';
 import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
 import { PropTypes } from '@panneau/core';
-import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useFormComponent, useRoutes, usePagesComponentsManager, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
+import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useFormComponent, useRoutes, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
 import { useResourceStore, useResourceUpdate, useResourceDestroy, useResourceItem, useResourceItems, ApiProvider } from '@panneau/data';
 import DisplaysProvider from '@panneau/displays';
 import FieldsProvider from '@panneau/fields';
@@ -14,20 +14,17 @@ import FiltersProvider from '@panneau/filters';
 import FormsProvider from '@panneau/forms';
 import { useResourceValues, IntlProvider } from '@panneau/intl';
 import ListsProvider from '@panneau/lists';
-import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import isObject from 'lodash/isObject';
+import { getComponentFromName } from '@panneau/core/utils';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { parse, stringify } from 'query-string';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
-import { getComponentFromName } from '@panneau/core/utils';
 import classNames from 'classnames';
 import Button from '@panneau/element-button';
 import Form from '@panneau/element-form';
-import isArray from 'lodash/isArray';
-import Menu from '@panneau/element-menu';
 import Navbar from '@panneau/element-navbar';
+import Menu from '@panneau/element-menu';
 import Label from '@panneau/element-label';
 import isString from 'lodash/isString';
 import Alert from '@panneau/element-alert';
@@ -38,8 +35,8 @@ import { faUndo } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import FormGroup from '@panneau/element-form-group';
 
-var _excluded$6 = ["resource", "action", "previous", "status", "value", "onSubmit", "errors", "generalError", "className"];
-var propTypes$m = {
+var _excluded$5 = ["resource", "action", "previous", "status", "value", "onSubmit", "errors", "generalError", "className"];
+var propTypes$n = {
   resource: PropTypes.resource.isRequired,
   action: PropTypes$1.string,
   previous: PropTypes$1.string,
@@ -53,7 +50,7 @@ var propTypes$m = {
   errors: PropTypes$1.objectOf(PropTypes$1.arrayOf(PropTypes$1.string)),
   className: PropTypes$1.string
 };
-var defaultProps$m = {
+var defaultProps$n = {
   action: null,
   previous: null,
   status: null,
@@ -73,7 +70,7 @@ var DeleteForm = function DeleteForm(_ref) {
     _ref.errors;
     var generalError = _ref.generalError,
     className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$6);
+    props = _objectWithoutProperties(_ref, _excluded$5);
   var _ref2 = value || {},
     _ref2$id = _ref2.id,
     id = _ref2$id === void 0 ? null : _ref2$id;
@@ -144,11 +141,11 @@ var DeleteForm = function DeleteForm(_ref) {
     }]
   })))));
 };
-DeleteForm.propTypes = propTypes$m;
-DeleteForm.defaultProps = defaultProps$m;
+DeleteForm.propTypes = propTypes$n;
+DeleteForm.defaultProps = defaultProps$n;
 
-var _excluded$5 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
-var propTypes$l = {
+var _excluded$4 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
+var propTypes$m = {
   component: PropTypes$1.string,
   resource: PropTypes.resource.isRequired,
   item: PropTypes$1.object,
@@ -157,7 +154,7 @@ var propTypes$l = {
   onSuccess: PropTypes$1.func,
   isDelete: PropTypes$1.bool
 };
-var defaultProps$l = {
+var defaultProps$m = {
   component: null,
   item: null,
   type: null,
@@ -171,7 +168,7 @@ var ResourceForm = function ResourceForm(_ref) {
     item = _ref.item,
     type = _ref.type,
     isDelete = _ref.isDelete,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$4);
   var locales = useLocales();
   var FormComponents = useFormsComponents();
   var _resource$fields = resource.fields,
@@ -299,15 +296,15 @@ var ResourceForm = function ResourceForm(_ref) {
     onChange: setValue
   })));
 };
-ResourceForm.propTypes = propTypes$l;
-ResourceForm.defaultProps = defaultProps$l;
+ResourceForm.propTypes = propTypes$m;
+ResourceForm.defaultProps = defaultProps$m;
 
-var propTypes$k = {
+var propTypes$l = {
   className: PropTypes$1.string,
   itemClassName: PropTypes$1.string,
   linkClassName: PropTypes$1.string
 };
-var defaultProps$k = {
+var defaultProps$l = {
   className: null,
   itemClassName: null,
   linkClassName: null
@@ -333,7 +330,7 @@ var AccountMenu = function AccountMenu(_ref) {
           "value": "Account"
         }]
       }),
-      href: route('account'),
+      href: route('panneau.account'),
       dropdown: [
       //   {
       //       label: (
@@ -342,7 +339,7 @@ var AccountMenu = function AccountMenu(_ref) {
       //               description="Menu label"
       //           />
       //       ),
-      //       href: route('account'),
+      //       href: route('panneau.account'),
       //   },
       {
         label: /*#__PURE__*/React.createElement(FormattedMessage, {
@@ -363,7 +360,7 @@ var AccountMenu = function AccountMenu(_ref) {
           "value": "Login"
         }]
       }),
-      href: route('auth.login')
+      href: route('login')
     }];
   }, [user, route, onClickLogout]);
   return items !== null ? /*#__PURE__*/React.createElement(Menu, {
@@ -374,15 +371,15 @@ var AccountMenu = function AccountMenu(_ref) {
     dropdownAlign: "end"
   }) : null;
 };
-AccountMenu.propTypes = propTypes$k;
-AccountMenu.defaultProps = defaultProps$k;
+AccountMenu.propTypes = propTypes$l;
+AccountMenu.defaultProps = defaultProps$l;
 
-var propTypes$j = {
+var propTypes$k = {
   className: PropTypes$1.string,
   itemClassName: PropTypes$1.string,
   linkClassName: PropTypes$1.string
 };
-var defaultProps$j = {
+var defaultProps$k = {
   className: null,
   itemClassName: null,
   linkClassName: null
@@ -419,77 +416,42 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
     linkClassName: linkClassName
   });
 };
-ResourcesMenu.propTypes = propTypes$j;
-ResourcesMenu.defaultProps = defaultProps$j;
+ResourcesMenu.propTypes = propTypes$k;
+ResourcesMenu.defaultProps = defaultProps$k;
 
-var propTypes$i = {};
-var defaultProps$i = {};
+/* eslint-disable react/jsx-props-no-spreading */
+var propTypes$j = {};
+var defaultProps$j = {};
 var MainNavbar = function MainNavbar(props) {
   var _usePanneau = usePanneau(),
-    name = _usePanneau.name,
-    _usePanneau$menus = _usePanneau.menus,
-    menus = _usePanneau$menus === void 0 ? null : _usePanneau$menus;
-  var _ref = menus || {},
-    _ref$main = _ref.main,
-    main = _ref$main === void 0 ? null : _ref$main,
-    _ref$guest = _ref.guest,
-    guest = _ref$guest === void 0 ? null : _ref$guest;
+    name = _usePanneau.name;
   var _usePanneauColorSchem = usePanneauColorScheme(),
     background = _usePanneauColorSchem.background;
   var route = useUrlGenerator();
   var user = useUser();
-  var items = useMemo(function () {
-    var menuItems = (user !== null ? main : guest) || [];
-    var hasResources = menuItems.indexOf('resources') !== -1;
-    var hasAccount = menuItems.indexOf('account') !== -1;
-    return [!hasResources && user !== null ? 'resources' : null].concat(_toConsumableArray(menuItems), [!hasAccount && menuItems.indexOf('separator') === -1 ? 'separator' : null, !hasAccount ? 'account' : null]).filter(function (it) {
-      return it !== null;
-    }).reduce(function (currentItems, item) {
-      if (item === 'resources') {
-        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement(ResourcesMenu, {
-          className: "navbar-nav",
-          itemClassName: "nav-item",
-          linkClassName: "nav-link"
-        })]);
-      }
-      if (item === 'account') {
-        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement(AccountMenu, {
-          className: "navbar-nav",
-          itemClassName: "nav-item",
-          linkClassName: "nav-link"
-        })]);
-      }
-      if (item === 'separator') {
-        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement("span", {
-          className: "ms-auto"
-        })]);
-      }
-      var lastItem = currentItems.length > 0 ? currentItems[currentItems.length - 1] : null;
-      return isArray(lastItem) ? [].concat(_toConsumableArray(currentItems.slice(0, currentItems.length - 1)), [[].concat(_toConsumableArray(lastItem), [item])]) : [].concat(_toConsumableArray(currentItems), [[item]]);
-    }, []).map(function (it) {
-      return isArray(it) ? /*#__PURE__*/React.createElement(Menu, {
-        items: it,
-        className: "navbar-nav",
-        itemClassName: "nav-item",
-        linkClassName: "nav-link"
-      }) : it;
-    });
-  }, [main]);
   return /*#__PURE__*/React.createElement(Navbar, Object.assign({
     theme: background
   }, props), name !== null ? /*#__PURE__*/React.createElement(Link, {
     to: route('home'),
     className: "navbar-brand"
-  }, name) : null, items);
+  }, name) : null, user !== null ? /*#__PURE__*/React.createElement(ResourcesMenu, {
+    className: "navbar-nav ml-4",
+    itemClassName: "nav-item",
+    linkClassName: "nav-link"
+  }) : null, /*#__PURE__*/React.createElement(AccountMenu, {
+    className: "navbar-nav ms-auto",
+    itemClassName: "nav-item",
+    linkClassName: "nav-link"
+  }));
 };
-MainNavbar.propTypes = propTypes$i;
-MainNavbar.defaultProps = defaultProps$i;
+MainNavbar.propTypes = propTypes$j;
+MainNavbar.defaultProps = defaultProps$j;
 
-var propTypes$h = {
+var propTypes$i = {
   children: PropTypes$1.node.isRequired,
   fullscreen: PropTypes$1.bool
 };
-var defaultProps$h = {
+var defaultProps$i = {
   fullscreen: false
 };
 var MainLayout = function MainLayout(_ref) {
@@ -509,17 +471,17 @@ var MainLayout = function MainLayout(_ref) {
     }, _defineProperty(_ref2, "bg-".concat(background), background !== null), _defineProperty(_ref2, "text-".concat(text), text !== null), _ref2)])
   }, children));
 };
-MainLayout.propTypes = propTypes$h;
-MainLayout.defaultProps = defaultProps$h;
+MainLayout.propTypes = propTypes$i;
+MainLayout.defaultProps = defaultProps$i;
 
-var propTypes$g = {
+var propTypes$h = {
   title: PropTypes.label,
   actions: PropTypes$1.node,
   small: PropTypes$1.bool,
   className: PropTypes$1.string,
   children: PropTypes$1.node
 };
-var defaultProps$g = {
+var defaultProps$h = {
   title: null,
   actions: null,
   small: false,
@@ -557,22 +519,22 @@ var PageHeader = function PageHeader(_ref) {
     className: "col-12 col-md-8 col-lg-7"
   }, inner)) : inner), children);
 };
-PageHeader.propTypes = propTypes$g;
-PageHeader.defaultProps = defaultProps$g;
+PageHeader.propTypes = propTypes$h;
+PageHeader.defaultProps = defaultProps$h;
 
-var propTypes$f = {
+var propTypes$g = {
   resource: PropTypes.resource.isRequired
 };
-var defaultProps$f = {};
+var defaultProps$g = {};
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
-  var navigate = useNavigate();
+  var history = useHistory();
   var _useLocation = useLocation(),
     search = _useLocation.search;
   var resourceRoute = useResourceUrlGenerator(resource);
   var onSuccess = useCallback(function () {
-    navigate("".concat(resourceRoute('index'), "?created=true"));
-  }, [navigate, resourceRoute]);
+    history.push("".concat(resourceRoute('index'), "?created=true"));
+  }, [history, resourceRoute]);
   var _useMemo = useMemo(function () {
       return parse(search);
     }, [search]),
@@ -606,26 +568,26 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     onSuccess: onSuccess
   }))))));
 };
-ResourceCreatePage.propTypes = propTypes$f;
-ResourceCreatePage.defaultProps = defaultProps$f;
+ResourceCreatePage.propTypes = propTypes$g;
+ResourceCreatePage.defaultProps = defaultProps$g;
 
 // import Button from '../buttons/Button';
 
-var propTypes$e = {
-  resource: PropTypes.resource.isRequired
+var propTypes$f = {
+  resource: PropTypes.resource.isRequired,
+  itemId: PropTypes$1.string.isRequired
 };
-var defaultProps$e = {};
+var defaultProps$f = {};
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
-  var resource = _ref.resource;
-  var _useParams = useParams(),
-    itemId = _useParams.id;
-  var navigate = useNavigate();
+  var resource = _ref.resource,
+    itemId = _ref.itemId;
+  var history = useHistory();
   var resourceRoute = useResourceUrlGenerator(resource);
   var _useResourceItem = useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var onSuccess = useCallback(function () {
-    return navigate("".concat(resourceRoute('index'), "?deleted=true"));
-  }, [navigate, resourceRoute]);
+    return history.push("".concat(resourceRoute('index'), "?deleted=true"));
+  }, [history, resourceRoute]);
 
   // Navigate back
   var _ref2 = history || {},
@@ -664,19 +626,19 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
     isDelete: true
   }) : null)))));
 };
-ResourceDeletePage.propTypes = propTypes$e;
-ResourceDeletePage.defaultProps = defaultProps$e;
+ResourceDeletePage.propTypes = propTypes$f;
+ResourceDeletePage.defaultProps = defaultProps$f;
 
 // import Button from '../buttons/Button';
 
-var propTypes$d = {
-  resource: PropTypes.resource.isRequired
+var propTypes$e = {
+  resource: PropTypes.resource.isRequired,
+  itemId: PropTypes$1.string.isRequired
 };
-var defaultProps$d = {};
+var defaultProps$e = {};
 var ResourceEditPage = function ResourceEditPage(_ref) {
-  var resource = _ref.resource;
-  var _useParams = useParams(),
-    itemId = _useParams.id;
+  var resource = _ref.resource,
+    itemId = _ref.itemId;
   var _useResourceItem = useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var _ref2 = item || {},
@@ -721,14 +683,14 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     onSuccess: onSuccess
   }) : null)))));
 };
-ResourceEditPage.propTypes = propTypes$d;
-ResourceEditPage.defaultProps = defaultProps$d;
+ResourceEditPage.propTypes = propTypes$e;
+ResourceEditPage.defaultProps = defaultProps$e;
 
-var propTypes$c = {
+var propTypes$d = {
   resource: PropTypes.resource.isRequired,
   className: PropTypes$1.string
 };
-var defaultProps$c = {
+var defaultProps$d = {
   className: null
 };
 var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
@@ -745,9 +707,10 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
     setDropdownOpened = _useState2[1];
   var onClickDropdown = useCallback(function (e) {
     e.preventDefault();
-    e.stopPropagation();
-    setDropdownOpened(!dropdownOpened);
-  }, [setDropdownOpened, dropdownOpened]);
+    setDropdownOpened(function (opened) {
+      return !opened;
+    });
+  }, [setDropdownOpened]);
   var finalTypes = types !== null ? types.filter(function (_ref2) {
     var _ref2$settings = _ref2.settings,
       _ref2$settings2 = _ref2$settings === void 0 ? {} : _ref2$settings,
@@ -757,10 +720,8 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
   }) : null;
   var hasMultipleTypes = finalTypes !== null && finalTypes.length > 1;
   var onDropdownClickOutside = useCallback(function () {
-    if (dropdownOpened) {
-      setDropdownOpened(false);
-    }
-  }, [setDropdownOpened, dropdownOpened]);
+    setDropdownOpened(false);
+  }, [setDropdownOpened]);
   var button = /*#__PURE__*/React.createElement(Button, {
     href: !hasMultipleTypes ? "".concat(resourceRoute('create')).concat(finalTypes !== null && finalTypes.length === 1 ? "?type=".concat(finalTypes[0].id) : '') : '#',
     size: "lg",
@@ -797,11 +758,11 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
     onClickOutside: onDropdownClickOutside
   })) : button;
 };
-ResourceCreateButtom.propTypes = propTypes$c;
-ResourceCreateButtom.defaultProps = defaultProps$c;
+ResourceCreateButtom.propTypes = propTypes$d;
+ResourceCreateButtom.defaultProps = defaultProps$d;
 
-var _excluded$4 = ["component", "name", "groupLabel"];
-var propTypes$b = {
+var _excluded$3 = ["component", "name", "groupLabel"];
+var propTypes$c = {
   filters: PropTypes$1.arrayOf(PropTypes$1.shape({
     id: PropTypes$1.string.isRequired,
     component: PropTypes$1.string.isRequired
@@ -816,7 +777,7 @@ var propTypes$b = {
   // eslint-disable-line react/forbid-prop-types
   className: PropTypes$1.string
 };
-var defaultProps$b = {
+var defaultProps$c = {
   filters: [],
   value: null,
   onChange: null,
@@ -865,7 +826,7 @@ var ResourceFilters = function ResourceFilters(_ref) {
     var component = _ref3.component,
       name = _ref3.name,
       groupLabel = _ref3.groupLabel,
-      filterProps = _objectWithoutProperties(_ref3, _excluded$4);
+      filterProps = _objectWithoutProperties(_ref3, _excluded$3);
     var FilterComponent = getComponentFromName(component, FilterComponents, null);
     var filterValue = value !== null && value[name] ? value[name] : null;
     var onFilterChange = useCallback(function (newFilterValue) {
@@ -897,12 +858,12 @@ var ResourceFilters = function ResourceFilters(_ref) {
     icon: faUndo
   })) : null);
 };
-ResourceFilters.propTypes = propTypes$b;
-ResourceFilters.defaultProps = defaultProps$b;
+ResourceFilters.propTypes = propTypes$c;
+ResourceFilters.defaultProps = defaultProps$c;
 
-var _excluded$3 = ["component", "showPagination", "filters"],
+var _excluded$2 = ["component", "showPagination", "filters"],
   _excluded2$1 = ["page"];
-var propTypes$a = {
+var propTypes$b = {
   resource: PropTypes.resource.isRequired,
   query: PropTypes$1.object,
   // eslint-disable-line react/forbid-prop-types
@@ -914,7 +875,7 @@ var propTypes$a = {
   onQueryChange: PropTypes$1.func,
   onQueryReset: PropTypes$1.func
 };
-var defaultProps$a = {
+var defaultProps$b = {
   query: null,
   paginated: true,
   component: null,
@@ -938,7 +899,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     showPagination = _resource$index2$show === void 0 ? true : _resource$index2$show,
     _resource$index2$filt = _resource$index2.filters,
     filters = _resource$index2$filt === void 0 ? null : _resource$index2$filt,
-    listProps = _objectWithoutProperties(_resource$index2, _excluded$3);
+    listProps = _objectWithoutProperties(_resource$index2, _excluded$2);
   var _usePanneauColorSchem = usePanneauColorScheme(),
     _usePanneauColorSchem2 = _usePanneauColorSchem.background,
     theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
@@ -988,16 +949,16 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     className: "mt-4 mb-1"
   }) : null);
 };
-ResourceItemsList.propTypes = propTypes$a;
-ResourceItemsList.defaultProps = defaultProps$a;
+ResourceItemsList.propTypes = propTypes$b;
+ResourceItemsList.defaultProps = defaultProps$b;
 
-var _excluded$2 = ["id", "component"];
-var propTypes$9 = {
+var _excluded$1 = ["id", "component"];
+var propTypes$a = {
   resource: PropTypes.resource.isRequired,
   defaultActions: PropTypes$1.arrayOf(PropTypes$1.object) // eslint-disable-line react/forbid-prop-types
 };
 
-var defaultProps$9 = {
+var defaultProps$a = {
   defaultActions: ['create']
 };
 var ResourceIndexPage = function ResourceIndexPage(_ref) {
@@ -1032,7 +993,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   var componentsManager = useComponentsManager();
   var _useLocation = useLocation(),
     search = _useLocation.search;
-  var navigate = useNavigate();
+  var history = useHistory();
   var query = useMemo(function () {
     return parse(search);
   }, [search]);
@@ -1051,21 +1012,19 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var value = submitQuery[key];
       return value !== null ? _objectSpread(_objectSpread({}, currentQuery), {}, _defineProperty({}, key, value)) : currentQuery;
     }, null) : null;
-    navigate("".concat(url).concat(newQuery !== null ? "?".concat(stringify(newQuery, {
+    history.push("".concat(url).concat(newQuery !== null ? "?".concat(stringify(newQuery, {
       arrayFormat: 'bracket'
     })) : ''));
-  }, [navigate, url, query, paginated]);
+  }, [history, url, query, paginated]);
   var onQueryReset = useCallback(function () {
     var queryString = stringify(null, {
       arrayFormat: 'bracket'
     });
-    navigate("".concat(url, "?").concat(queryString));
-  }, [navigate, url, paginated]);
+    history.push("".concat(url, "?").concat(queryString));
+  }, [history, url, paginated]);
   var onClickCloseAlert = useCallback(function () {
-    navigate(url, {
-      replace: true
-    });
-  }, [navigate, url]);
+    history.replace(url);
+  }, [history, url]);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
@@ -1076,7 +1035,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var id = _ref5.id,
         _ref5$component = _ref5.component,
         component = _ref5$component === void 0 ? Button : _ref5$component,
-        actionProps = _objectWithoutProperties(_ref5, _excluded$2);
+        actionProps = _objectWithoutProperties(_ref5, _excluded$1);
       var ActionComponent = isString(component) ? componentsManager.getComponent(component) : component;
       return ActionComponent !== null ? /*#__PURE__*/React.createElement(ActionComponent, Object.assign({
         key: "action-".concat(id)
@@ -1123,13 +1082,13 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     onQueryReset: onQueryReset
   }))));
 };
-ResourceIndexPage.propTypes = propTypes$9;
-ResourceIndexPage.defaultProps = defaultProps$9;
+ResourceIndexPage.propTypes = propTypes$a;
+ResourceIndexPage.defaultProps = defaultProps$a;
 
-var propTypes$8 = {
+var propTypes$9 = {
   resource: PropTypes.resource.isRequired
 };
-var defaultProps$8 = {};
+var defaultProps$9 = {};
 var ResourceShowPage = function ResourceShowPage(_ref) {
   var resource = _ref.resource;
   return /*#__PURE__*/React.createElement(ResourceProvider, {
@@ -1140,12 +1099,12 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
     className: "container-sm"
   }, "Show page")));
 };
-ResourceShowPage.propTypes = propTypes$8;
-ResourceShowPage.defaultProps = defaultProps$8;
+ResourceShowPage.propTypes = propTypes$9;
+ResourceShowPage.defaultProps = defaultProps$9;
 
 /* eslint-disable react/jsx-props-no-spreading */
-var propTypes$7 = {};
-var defaultProps$7 = {};
+var propTypes$8 = {};
+var defaultProps$8 = {};
 var HomePage = function HomePage() {
   var route = useUrlGenerator();
   var resources = usePanneauResources();
@@ -1181,26 +1140,26 @@ var HomePage = function HomePage() {
     }));
   })));
 };
-HomePage.propTypes = propTypes$7;
-HomePage.defaultProps = defaultProps$7;
+HomePage.propTypes = propTypes$8;
+HomePage.defaultProps = defaultProps$8;
 
-var propTypes$6 = {};
-var defaultProps$6 = {};
+var propTypes$7 = {};
+var defaultProps$7 = {};
 var AccountPage = function AccountPage() {
   return /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement("div", {
     className: "container-sm py-4"
   }, "Account page"));
 };
-AccountPage.propTypes = propTypes$6;
-AccountPage.defaultProps = defaultProps$6;
+AccountPage.propTypes = propTypes$7;
+AccountPage.defaultProps = defaultProps$7;
 
 /* eslint-disable react/jsx-props-no-spreading */
-var propTypes$5 = {
+var propTypes$6 = {
   fields: PropTypes.fields,
   className: PropTypes$1.string,
   onSuccess: PropTypes$1.func
 };
-var defaultProps$5 = {
+var defaultProps$6 = {
   fields: [{
     name: 'email',
     type: 'email',
@@ -1272,14 +1231,14 @@ var LoginForm = function LoginForm(_ref) {
     })
   });
 };
-LoginForm.propTypes = propTypes$5;
-LoginForm.defaultProps = defaultProps$5;
+LoginForm.propTypes = propTypes$6;
+LoginForm.defaultProps = defaultProps$6;
 
-var propTypes$4 = {
+var propTypes$5 = {
   children: PropTypes$1.node.isRequired,
   fullscreen: PropTypes$1.bool
 };
-var defaultProps$4 = {
+var defaultProps$5 = {
   fullscreen: false
 };
 var GuestLayout = function GuestLayout(_ref) {
@@ -1305,12 +1264,12 @@ var GuestLayout = function GuestLayout(_ref) {
     })
   }, children)));
 };
-GuestLayout.propTypes = propTypes$4;
-GuestLayout.defaultProps = defaultProps$4;
+GuestLayout.propTypes = propTypes$5;
+GuestLayout.defaultProps = defaultProps$5;
 
 /* eslint-disable react/jsx-props-no-spreading */
-var propTypes$3 = {};
-var defaultProps$3 = {};
+var propTypes$4 = {};
+var defaultProps$4 = {};
 var LoginPage = function LoginPage() {
   var route = useUrlGenerator();
   var onSuccess = useCallback(function () {
@@ -1336,8 +1295,8 @@ var LoginPage = function LoginPage() {
     onSuccess: onSuccess
   })))));
 };
-LoginPage.propTypes = propTypes$3;
-LoginPage.defaultProps = defaultProps$3;
+LoginPage.propTypes = propTypes$4;
+LoginPage.defaultProps = defaultProps$4;
 
 var messages = defineMessages({
   metaTitle401: {
@@ -1432,10 +1391,10 @@ var messages = defineMessages({
     }]
   }
 });
-var propTypes$2 = {
+var propTypes$3 = {
   statusCode: PropTypes.statusCode
 };
-var defaultProps$2 = {
+var defaultProps$3 = {
   statusCode: null
 };
 var ErrorPage = function ErrorPage(_ref) {
@@ -1450,20 +1409,37 @@ var ErrorPage = function ErrorPage(_ref) {
     className: "col-12 col-sm-8 col-md-6"
   }, /*#__PURE__*/React.createElement("h1", null, /*#__PURE__*/React.createElement(Label, null, messages["title".concat(statusCode || 404)])), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement(Label, null, messages["description".concat(statusCode || 404)]))))));
 };
-ErrorPage.propTypes = propTypes$2;
-ErrorPage.defaultProps = defaultProps$2;
+ErrorPage.propTypes = propTypes$3;
+ErrorPage.defaultProps = defaultProps$3;
 
-var _excluded$1 = ["path", "component", "exact"];
-var createResourceRoutes = function createResourceRoutes(resource, _ref) {
-  var route = _ref.route,
-    componentsManager = _ref.componentsManager,
-    _ref$pages = _ref.pages,
-    pages = _ref$pages === void 0 ? {} : _ref$pages;
+var basePages = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    ResourceCreate: ResourceCreatePage,
+    ResourceDelete: ResourceDeletePage,
+    ResourceEdit: ResourceEditPage,
+    ResourceIndex: ResourceIndexPage,
+    ResourceShow: ResourceShowPage,
+    Home: HomePage,
+    Account: AccountPage,
+    Login: LoginPage,
+    Error: ErrorPage
+});
+
+var _excluded = ["path", "component", "exact"],
+  _excluded2 = ["id"];
+var propTypes$2 = {
+  resource: PropTypes.resource.isRequired
+};
+var defaultProps$2 = {};
+var ResourceRoutes = function ResourceRoutes(_ref) {
+  var resource = _ref.resource;
   var resourceId = resource.id,
     _resource$pages = resource.pages,
-    resourcePages = _resource$pages === void 0 ? {} : _resource$pages,
+    pages = _resource$pages === void 0 ? {} : _resource$pages,
     _resource$extraRoutes = resource.extraRoutes,
     extraRoutes = _resource$extraRoutes === void 0 ? [] : _resource$extraRoutes;
+  var route = useUrlGenerator();
+  var componentsManager = useComponentsManager();
 
   // Load custom pages from resource
   var _ref2 = pages || {},
@@ -1477,85 +1453,96 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
     editPage = _ref2$edit === void 0 ? null : _ref2$edit,
     _ref2$delete = _ref2["delete"],
     deletePage = _ref2$delete === void 0 ? null : _ref2$delete;
-  var _ref3 = resourcePages || {},
-    _ref3$index = _ref3.index,
-    resourceIndexPage = _ref3$index === void 0 ? null : _ref3$index,
-    _ref3$show = _ref3.show,
-    resourceShowPage = _ref3$show === void 0 ? null : _ref3$show,
-    _ref3$create = _ref3.create,
-    resourceCreatePage = _ref3$create === void 0 ? null : _ref3$create,
-    _ref3$edit = _ref3.edit,
-    resourceEditPage = _ref3$edit === void 0 ? null : _ref3$edit,
-    _ref3$delete = _ref3["delete"],
-    resourceDeletePage = _ref3$delete === void 0 ? null : _ref3$delete;
-  var ResourceIndexComponent = componentsManager.getComponent(resourceIndexPage === null || resourceIndexPage === void 0 ? void 0 : resourceIndexPage.component) || componentsManager.getComponent(indexPage === null || indexPage === void 0 ? void 0 : indexPage.component) || ResourceIndexPage;
-  var ResourceShowComponent = componentsManager.getComponent(resourceShowPage === null || resourceShowPage === void 0 ? void 0 : resourceShowPage.component) || componentsManager.getComponent(showPage === null || showPage === void 0 ? void 0 : showPage.component) || ResourceShowPage;
-  var ResourceCreateComponent = componentsManager.getComponent(resourceCreatePage === null || resourceCreatePage === void 0 ? void 0 : resourceCreatePage.component) || componentsManager.getComponent(createPage === null || createPage === void 0 ? void 0 : createPage.component) || ResourceCreatePage;
-  var ResourceEditComponent = componentsManager.getComponent(resourceEditPage === null || resourceEditPage === void 0 ? void 0 : resourceEditPage.component) || componentsManager.getComponent(editPage === null || editPage === void 0 ? void 0 : editPage.component) || ResourceEditPage;
-  var ResourceDeleteComponent = componentsManager.getComponent(resourceDeletePage === null || resourceDeletePage === void 0 ? void 0 : resourceDeletePage.component) || componentsManager.getComponent(deletePage === null || deletePage === void 0 ? void 0 : deletePage.component) || ResourceDeletePage;
-  return [/*#__PURE__*/React.createElement(Route, {
+  var ResourceIndexComponent = indexPage !== null && typeof indexPage.component !== 'undefined' ? componentsManager.getComponent(indexPage.component) : ResourceIndexPage;
+  var ResourceShowComponent = showPage !== null && typeof showPage.component !== 'undefined' ? componentsManager.getComponent(showPage.component) : ResourceShowPage;
+  var ResourceCreateComponent = createPage !== null && typeof createPage.component !== 'undefined' ? componentsManager.getComponent(createPage.component) : ResourceCreatePage;
+  var ResourceEditComponent = editPage !== null && typeof editPage.component !== 'undefined' ? componentsManager.getComponent(editPage.component) : ResourceEditPage;
+  var ResourceDeleteComponent = deletePage !== null && typeof deletePage.component !== 'undefined' ? componentsManager.getComponent(deletePage.component) : ResourceDeletePage;
+  return /*#__PURE__*/React.createElement(Switch, null, extraRoutes.map(function (_ref3) {
+    var path = _ref3.path,
+      component = _ref3.component,
+      _ref3$exact = _ref3.exact,
+      exact = _ref3$exact === void 0 ? true : _ref3$exact,
+      pageProps = _objectWithoutProperties(_ref3, _excluded);
+    var RouteComponent = componentsManager.getComponent(component);
+    return RouteComponent !== null ? /*#__PURE__*/React.createElement(Route, {
+      key: "route-".concat(path),
+      path: path,
+      exact: exact,
+      render: function render(_ref4) {
+        var _ref4$match$params = _ref4.match.params,
+          id = _ref4$match$params.id,
+          params = _objectWithoutProperties(_ref4$match$params, _excluded2);
+        return /*#__PURE__*/React.createElement(RouteComponent, Object.assign({
+          resource: resource,
+          itemId: id
+        }, pageProps, params));
+      }
+    }) : null;
+  }), /*#__PURE__*/React.createElement(Route, {
     path: route('resources.index', {
       resource: resourceId
     }),
     exact: true,
-    element: /*#__PURE__*/React.createElement(ResourceIndexComponent, {
-      resource: resource
-    })
+    render: function render() {
+      return /*#__PURE__*/React.createElement(ResourceIndexComponent, {
+        resource: resource
+      });
+    }
   }), /*#__PURE__*/React.createElement(Route, {
     path: route('resources.create', {
       resource: resourceId
     }),
     exact: true,
-    element: /*#__PURE__*/React.createElement(ResourceCreateComponent, {
-      resource: resource
-    })
+    render: function render() {
+      return /*#__PURE__*/React.createElement(ResourceCreateComponent, {
+        resource: resource
+      });
+    }
   }), /*#__PURE__*/React.createElement(Route, {
     path: route('resources.show', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React.createElement(ResourceShowComponent, {
-      resource: resource
-    })
+    render: function render(_ref5) {
+      var id = _ref5.match.params.id;
+      return /*#__PURE__*/React.createElement(ResourceShowComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
   }), /*#__PURE__*/React.createElement(Route, {
     path: route('resources.edit', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React.createElement(ResourceEditComponent, {
-      resource: resource
-    })
+    render: function render(_ref6) {
+      var id = _ref6.match.params.id;
+      return /*#__PURE__*/React.createElement(ResourceEditComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
   }), /*#__PURE__*/React.createElement(Route, {
     path: route('resources.delete', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React.createElement(ResourceDeleteComponent, {
-      resource: resource
-    })
-  })].concat(_toConsumableArray(extraRoutes.map(function (_ref4) {
-    var path = _ref4.path,
-      component = _ref4.component,
-      _ref4$exact = _ref4.exact,
-      exact = _ref4$exact === void 0 ? true : _ref4$exact,
-      pageProps = _objectWithoutProperties(_ref4, _excluded$1);
-    var RouteComponent = componentsManager.getComponent(component);
-    return RouteComponent !== null ? /*#__PURE__*/React.createElement(Route, {
-      key: "route-".concat(path),
-      path: path,
-      exact: exact,
-      element: /*#__PURE__*/React.createElement(RouteComponent, Object.assign({
-        resource: resource
-      }, pageProps))
-    }) : null;
-  })));
+    render: function render(_ref7) {
+      var id = _ref7.match.params.id;
+      return /*#__PURE__*/React.createElement(ResourceDeleteComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
+  }));
 };
+ResourceRoutes.propTypes = propTypes$2;
+ResourceRoutes.defaultProps = defaultProps$2;
 
-var _excluded = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete"],
-  _excluded2 = ["path", "route", "component", "exact"];
 var propTypes$1 = {
   statusCode: PropTypes.statusCode
 };
@@ -1564,9 +1551,13 @@ var defaultProps$1 = {
 };
 var PanneauRoutes = function PanneauRoutes(_ref) {
   var initialStatusCode = _ref.statusCode;
+  var _usePanneau = usePanneau(),
+    _usePanneau$pages = _usePanneau.pages,
+    pages = _usePanneau$pages === void 0 ? {} : _usePanneau$pages;
   var routes = useRoutes();
   var _useLocation = useLocation(),
-    pathname = _useLocation.pathname;
+    pathname = _useLocation.pathname; // search
+
   var _useState = useState({
       statusCode: initialStatusCode,
       pathname: pathname
@@ -1574,26 +1565,27 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     _useState2$ = _useState2[0],
     statusCode = _useState2$.statusCode,
-    lastPathname = _useState2$.pathname,
+    initialPathname = _useState2$.pathname,
     setInitialRequest = _useState2[1];
   var user = useUser();
   var route = useUrlGenerator();
   var resources = usePanneauResources();
-  var componentsManager = usePagesComponentsManager();
+
+  // const nextUrl = useMemo(() => {
+  //     const query = parseQuery(search);
+  //     return query !== null ? query.next || null : null;
+  // }, [search]);
+
   useEffect(function () {
-    if (pathname !== lastPathname) {
+    if (pathname !== initialPathname) {
       setInitialRequest({
         pathname: pathname,
         statusCode: null
       });
     }
-  }, [pathname, lastPathname]);
+  }, [pathname, initialPathname]);
 
   // Custom Pages
-  var _usePanneau = usePanneau(),
-    _usePanneau$pages = _usePanneau.pages,
-    pages = _usePanneau$pages === void 0 ? null : _usePanneau$pages,
-    routesDefinition = _usePanneau.routes;
   var _ref2 = pages || {},
     _ref2$home = _ref2.home,
     homePage = _ref2$home === void 0 ? null : _ref2$home,
@@ -1603,94 +1595,55 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     accountPage = _ref2$account === void 0 ? null : _ref2$account,
     _ref2$error = _ref2.error,
     errorPage = _ref2$error === void 0 ? null : _ref2$error;
-    _ref2.index;
-    _ref2.show;
-    _ref2.create;
-    _ref2.edit;
-    _ref2["delete"];
-    var otherPages = _objectWithoutProperties(_ref2, _excluded);
-  var customRoutes = useMemo(function () {
-    return [].concat(_toConsumableArray(Object.keys(routesDefinition).filter(function (key) {
-      return key.match(/^(resources\.|auth\.)/) === null && key !== 'home' && key !== 'account';
-    }).filter(function (key) {
-      var routeDef = routesDefinition[key];
-      return isObject(routeDef) && typeof routeDef.component !== 'undefined' && typeof routeDef.path !== 'undefined';
-    }).map(function (key) {
-      return routesDefinition[key];
-    })), _toConsumableArray(Object.keys(otherPages).map(function (key) {
-      return otherPages[key];
-    }).filter(function (_ref3) {
-      var _ref3$path = _ref3.path,
-        path = _ref3$path === void 0 ? null : _ref3$path,
-        _ref3$route = _ref3.route,
-        pageRoute = _ref3$route === void 0 ? null : _ref3$route;
-      return path !== null || pageRoute !== null;
-    })));
-  }, [routesDefinition, otherPages]);
-  var HomeComponent = componentsManager.getComponent(homePage === null || homePage === void 0 ? void 0 : homePage.component) || HomePage;
-  var LoginComponent = componentsManager.getComponent(loginPage === null || loginPage === void 0 ? void 0 : loginPage.component) || LoginPage;
-  var AccountComponent = componentsManager.getComponent(accountPage === null || accountPage === void 0 ? void 0 : accountPage.component) || AccountPage;
-  var ErrorComponent = componentsManager.getComponent(errorPage === null || errorPage === void 0 ? void 0 : errorPage.component) || ErrorPage;
-
-  // If there is an error status code
-  if (statusCode !== null) {
-    return /*#__PURE__*/React.createElement(ErrorComponent, {
-      statusCode: statusCode
-    });
-  }
-
-  // If user is unauthenticated
-  if (user === null) {
-    return /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
-      path: routes['auth.login'],
-      exact: true,
-      element: /*#__PURE__*/React.createElement(LoginComponent, null)
-    }), /*#__PURE__*/React.createElement(Route, {
-      path: "*",
-      element: /*#__PURE__*/React.createElement(Navigate, {
-        to: "".concat(route('auth.login'), "?next=").concat(encodeURIComponent(pathname)),
-        replace: true
-      })
-    }));
-  }
-
-  // Normal routes
-  return /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
+  var HomeComponent = getComponentFromName((homePage === null || homePage === void 0 ? void 0 : homePage.component) || 'home', basePages, homePage === null || homePage === void 0 ? void 0 : homePage.component);
+  var LoginComponent = getComponentFromName((loginPage === null || loginPage === void 0 ? void 0 : loginPage.component) || 'login', basePages, loginPage === null || loginPage === void 0 ? void 0 : loginPage.component);
+  var AccountComponent = getComponentFromName((accountPage === null || accountPage === void 0 ? void 0 : accountPage.component) || 'account', basePages, accountPage === null || accountPage === void 0 ? void 0 : accountPage.component);
+  var ErrorComponent = getComponentFromName((errorPage === null || errorPage === void 0 ? void 0 : errorPage.component) || 'error', basePages, errorPage === null || errorPage === void 0 ? void 0 : errorPage.component);
+  return /*#__PURE__*/React.createElement(Switch, null, statusCode !== null ? /*#__PURE__*/React.createElement(Route, {
+    path: "*",
+    render: function render() {
+      return /*#__PURE__*/React.createElement(ErrorComponent, {
+        statusCode: statusCode
+      });
+    }
+  }) : null, user === null ? /*#__PURE__*/React.createElement(Route, {
+    path: "*",
+    exact: true,
+    component: LoginComponent
+  }) : null, user !== null ? /*#__PURE__*/React.createElement(Route, {
     path: routes.home,
     exact: true,
-    element: /*#__PURE__*/React.createElement(HomeComponent, null)
+    component: HomeComponent
+  }) : /*#__PURE__*/React.createElement(Redirect, {
+    from: routes.home,
+    exact: true,
+    to: route('login')
   }), resources.map(function (resource) {
-    var _ref4 = resource || {},
-      resourceId = _ref4.id;
-    return /*#__PURE__*/React.createElement(Fragment, {
-      key: "resource-".concat(resourceId)
-    }, createResourceRoutes(resource, {
-      route: route,
-      componentsManager: componentsManager,
-      pages: pages
-    }));
+    var _ref3 = resource || {},
+      resourceId = _ref3.id;
+    return user !== null ? /*#__PURE__*/React.createElement(Route, {
+      key: "resource-".concat(resourceId),
+      path: route('resources.index', {
+        resource: resourceId
+      }),
+      render: function render() {
+        return /*#__PURE__*/React.createElement(ResourceRoutes, {
+          resource: resource
+        });
+      }
+    }) : /*#__PURE__*/React.createElement(Redirect, {
+      key: "resource-".concat(resourceId),
+      from: route('resources.index', {
+        resource: resourceId
+      }),
+      to: "".concat(route('login'), "?next=").concat(encodeURIComponent(pathname))
+    });
   }), /*#__PURE__*/React.createElement(Route, {
-    path: routes.account,
-    exact: true,
-    element: /*#__PURE__*/React.createElement(AccountComponent, null)
-  }), customRoutes.map(function (_ref5) {
-    var _ref5$path = _ref5.path,
-      path = _ref5$path === void 0 ? null : _ref5$path,
-      _ref5$route = _ref5.route,
-      pageRoute = _ref5$route === void 0 ? null : _ref5$route,
-      component = _ref5.component,
-      _ref5$exact = _ref5.exact,
-      exact = _ref5$exact === void 0 ? true : _ref5$exact,
-      props = _objectWithoutProperties(_ref5, _excluded2);
-    var PageComponent = componentsManager.getComponent(component);
-    return PageComponent !== null ? /*#__PURE__*/React.createElement(Route, {
-      path: path || routes[pageRoute],
-      exact: exact,
-      element: /*#__PURE__*/React.createElement(PageComponent, props)
-    }) : null;
+    path: route('auth.account'),
+    component: AccountComponent
   }), /*#__PURE__*/React.createElement(Route, {
     path: "*",
-    element: /*#__PURE__*/React.createElement(ErrorComponent, null)
+    component: ErrorComponent
   }));
 };
 PanneauRoutes.propTypes = propTypes$1;