@panneau/app 1.0.3-y.0 → 1.0.4

package/lib/index.js

@@ -19,12 +19,11 @@ var FormsProvider = require('@panneau/forms');
 var intl = require('@panneau/intl');
 var ListsProvider = require('@panneau/lists');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var utils = require('@panneau/core/utils');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var queryString = require('query-string');
 var reactIntl = require('react-intl');
 var hooks = require('@panneau/core/hooks');
-var utils = require('@panneau/core/utils');
 var classNames = require('classnames');
 var Button = require('@panneau/element-button');
 var Form = require('@panneau/element-form');
@@ -53,7 +52,6 @@ var FormsProvider__default = /*#__PURE__*/_interopDefaultLegacy(FormsProvider);
 var ListsProvider__default = /*#__PURE__*/_interopDefaultLegacy(ListsProvider);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
-var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var Form__default = /*#__PURE__*/_interopDefaultLegacy(Form);
@@ -68,7 +66,7 @@ var _toPropertyKey__default = /*#__PURE__*/_interopDefaultLegacy(_toPropertyKey)
 var FormGroup__default = /*#__PURE__*/_interopDefaultLegacy(FormGroup);
 
 var _excluded$5 = ["resource", "action", "previous", "status", "value", "onSubmit", "errors", "generalError", "className"];
-var propTypes$m = {
+var propTypes$n = {
   resource: core.PropTypes.resource.isRequired,
   action: PropTypes__default["default"].string,
   previous: PropTypes__default["default"].string,
@@ -82,7 +80,7 @@ var propTypes$m = {
   errors: PropTypes__default["default"].objectOf(PropTypes__default["default"].arrayOf(PropTypes__default["default"].string)),
   className: PropTypes__default["default"].string
 };
-var defaultProps$m = {
+var defaultProps$n = {
   action: null,
   previous: null,
   status: null,
@@ -173,11 +171,11 @@ var DeleteForm = function DeleteForm(_ref) {
     }]
   })))));
 };
-DeleteForm.propTypes = propTypes$m;
-DeleteForm.defaultProps = defaultProps$m;
+DeleteForm.propTypes = propTypes$n;
+DeleteForm.defaultProps = defaultProps$n;
 
 var _excluded$4 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
-var propTypes$l = {
+var propTypes$m = {
   component: PropTypes__default["default"].string,
   resource: core.PropTypes.resource.isRequired,
   item: PropTypes__default["default"].object,
@@ -186,7 +184,7 @@ var propTypes$l = {
   onSuccess: PropTypes__default["default"].func,
   isDelete: PropTypes__default["default"].bool
 };
-var defaultProps$l = {
+var defaultProps$m = {
   component: null,
   item: null,
   type: null,
@@ -328,15 +326,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__default["default"].string,
   itemClassName: PropTypes__default["default"].string,
   linkClassName: PropTypes__default["default"].string
 };
-var defaultProps$k = {
+var defaultProps$l = {
   className: null,
   itemClassName: null,
   linkClassName: null
@@ -362,7 +360,7 @@ var AccountMenu = function AccountMenu(_ref) {
           "value": "Account"
         }]
       }),
-      href: route('account'),
+      href: route('panneau.account'),
       dropdown: [
       //   {
       //       label: (
@@ -371,7 +369,7 @@ var AccountMenu = function AccountMenu(_ref) {
       //               description="Menu label"
       //           />
       //       ),
-      //       href: route('account'),
+      //       href: route('panneau.account'),
       //   },
       {
         label: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
@@ -392,7 +390,7 @@ var AccountMenu = function AccountMenu(_ref) {
           "value": "Login"
         }]
       }),
-      href: route('auth.login')
+      href: route('login')
     }];
   }, [user, route, onClickLogout]);
   return items !== null ? /*#__PURE__*/React__default["default"].createElement(Menu__default["default"], {
@@ -403,15 +401,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__default["default"].string,
   itemClassName: PropTypes__default["default"].string,
   linkClassName: PropTypes__default["default"].string
 };
-var defaultProps$j = {
+var defaultProps$k = {
   className: null,
   itemClassName: null,
   linkClassName: null
@@ -448,12 +446,12 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
     linkClassName: linkClassName
   });
 };
-ResourcesMenu.propTypes = propTypes$j;
-ResourcesMenu.defaultProps = defaultProps$j;
+ResourcesMenu.propTypes = propTypes$k;
+ResourcesMenu.defaultProps = defaultProps$k;
 
 /* eslint-disable react/jsx-props-no-spreading */
-var propTypes$i = {};
-var defaultProps$i = {};
+var propTypes$j = {};
+var defaultProps$j = {};
 var MainNavbar = function MainNavbar(props) {
   var _usePanneau = contexts.usePanneau(),
     name = _usePanneau.name;
@@ -476,14 +474,14 @@ var MainNavbar = function MainNavbar(props) {
     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__default["default"].node.isRequired,
   fullscreen: PropTypes__default["default"].bool
 };
-var defaultProps$h = {
+var defaultProps$i = {
   fullscreen: false
 };
 var MainLayout = function MainLayout(_ref) {
@@ -503,17 +501,17 @@ var MainLayout = function MainLayout(_ref) {
     }, _defineProperty__default["default"](_ref2, "bg-".concat(background), background !== null), _defineProperty__default["default"](_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: core.PropTypes.label,
   actions: PropTypes__default["default"].node,
   small: PropTypes__default["default"].bool,
   className: PropTypes__default["default"].string,
   children: PropTypes__default["default"].node
 };
-var defaultProps$g = {
+var defaultProps$h = {
   title: null,
   actions: null,
   small: false,
@@ -551,22 +549,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: core.PropTypes.resource.isRequired
 };
-var defaultProps$f = {};
+var defaultProps$g = {};
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
-  var navigate = reactRouter.useNavigate();
+  var history = reactRouter.useHistory();
   var _useLocation = reactRouter.useLocation(),
     search = _useLocation.search;
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var onSuccess = React.useCallback(function () {
-    navigate("".concat(resourceRoute('index'), "?created=true"));
-  }, [navigate, resourceRoute]);
+    history.push("".concat(resourceRoute('index'), "?created=true"));
+  }, [history, resourceRoute]);
   var _useMemo = React.useMemo(function () {
       return queryString.parse(search);
     }, [search]),
@@ -600,26 +598,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: core.PropTypes.resource.isRequired
+var propTypes$f = {
+  resource: core.PropTypes.resource.isRequired,
+  itemId: PropTypes__default["default"].string.isRequired
 };
-var defaultProps$e = {};
+var defaultProps$f = {};
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
-  var resource = _ref.resource;
-  var _useParams = reactRouter.useParams(),
-    itemId = _useParams.id;
-  var navigate = reactRouter.useNavigate();
+  var resource = _ref.resource,
+    itemId = _ref.itemId;
+  var history = reactRouter.useHistory();
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var _useResourceItem = data.useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var onSuccess = React.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 || {},
@@ -658,19 +656,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: core.PropTypes.resource.isRequired
+var propTypes$e = {
+  resource: core.PropTypes.resource.isRequired,
+  itemId: PropTypes__default["default"].string.isRequired
 };
-var defaultProps$d = {};
+var defaultProps$e = {};
 var ResourceEditPage = function ResourceEditPage(_ref) {
-  var resource = _ref.resource;
-  var _useParams = reactRouter.useParams(),
-    itemId = _useParams.id;
+  var resource = _ref.resource,
+    itemId = _ref.itemId;
   var _useResourceItem = data.useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var _ref2 = item || {},
@@ -715,14 +713,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: core.PropTypes.resource.isRequired,
   className: PropTypes__default["default"].string
 };
-var defaultProps$c = {
+var defaultProps$d = {
   className: null
 };
 var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
@@ -790,11 +788,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$3 = ["component", "name", "groupLabel"];
-var propTypes$b = {
+var propTypes$c = {
   filters: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
     id: PropTypes__default["default"].string.isRequired,
     component: PropTypes__default["default"].string.isRequired
@@ -809,7 +807,7 @@ var propTypes$b = {
   // eslint-disable-line react/forbid-prop-types
   className: PropTypes__default["default"].string
 };
-var defaultProps$b = {
+var defaultProps$c = {
   filters: [],
   value: null,
   onChange: null,
@@ -890,12 +888,12 @@ var ResourceFilters = function ResourceFilters(_ref) {
     icon: freeSolidSvgIcons.faUndo
   })) : null);
 };
-ResourceFilters.propTypes = propTypes$b;
-ResourceFilters.defaultProps = defaultProps$b;
+ResourceFilters.propTypes = propTypes$c;
+ResourceFilters.defaultProps = defaultProps$c;
 
 var _excluded$2 = ["component", "showPagination", "filters"],
-  _excluded2 = ["page"];
-var propTypes$a = {
+  _excluded2$1 = ["page"];
+var propTypes$b = {
   resource: core.PropTypes.resource.isRequired,
   query: PropTypes__default["default"].object,
   // eslint-disable-line react/forbid-prop-types
@@ -907,7 +905,7 @@ var propTypes$a = {
   onQueryChange: PropTypes__default["default"].func,
   onQueryReset: PropTypes__default["default"].func
 };
-var defaultProps$a = {
+var defaultProps$b = {
   query: null,
   paginated: true,
   component: null,
@@ -940,7 +938,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
       var _ref2 = query || {},
         _ref2$page = _ref2.page,
         currentPage = _ref2$page === void 0 ? 1 : _ref2$page,
-        rest = _objectWithoutProperties__default["default"](_ref2, _excluded2);
+        rest = _objectWithoutProperties__default["default"](_ref2, _excluded2$1);
       return [currentPage, rest];
     }, [query]),
     _useMemo2 = _slicedToArray__default["default"](_useMemo, 2),
@@ -981,16 +979,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$1 = ["id", "component"];
-var propTypes$9 = {
+var propTypes$a = {
   resource: core.PropTypes.resource.isRequired,
   defaultActions: PropTypes__default["default"].arrayOf(PropTypes__default["default"].object) // eslint-disable-line react/forbid-prop-types
 };
 
-var defaultProps$9 = {
+var defaultProps$a = {
   defaultActions: ['create']
 };
 var ResourceIndexPage = function ResourceIndexPage(_ref) {
@@ -1025,7 +1023,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   var componentsManager = contexts.useComponentsManager();
   var _useLocation = reactRouter.useLocation(),
     search = _useLocation.search;
-  var navigate = reactRouter.useNavigate();
+  var history = reactRouter.useHistory();
   var query = React.useMemo(function () {
     return queryString.parse(search);
   }, [search]);
@@ -1044,16 +1042,16 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var value = submitQuery[key];
       return value !== null ? _objectSpread__default["default"](_objectSpread__default["default"]({}, currentQuery), {}, _defineProperty__default["default"]({}, key, value)) : currentQuery;
     }, null) : null;
-    navigate("".concat(url).concat(newQuery !== null ? "?".concat(queryString.stringify(newQuery, {
+    history.push("".concat(url).concat(newQuery !== null ? "?".concat(queryString.stringify(newQuery, {
       arrayFormat: 'bracket'
     })) : ''));
-  }, [navigate, url, query, paginated]);
+  }, [history, url, query, paginated]);
   var onQueryReset = React.useCallback(function () {
     var queryString$1 = queryString.stringify(null, {
       arrayFormat: 'bracket'
     });
-    navigate("".concat(url, "?").concat(queryString$1));
-  }, [navigate, url, paginated]);
+    history.push("".concat(url, "?").concat(queryString$1));
+  }, [history, url, paginated]);
   var onClickCloseAlert = React.useCallback(function () {
     history.replace(url);
   }, [history, url]);
@@ -1114,13 +1112,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: core.PropTypes.resource.isRequired
 };
-var defaultProps$8 = {};
+var defaultProps$9 = {};
 var ResourceShowPage = function ResourceShowPage(_ref) {
   var resource = _ref.resource;
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
@@ -1131,12 +1129,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 = contexts.useUrlGenerator();
   var resources = contexts.usePanneauResources();
@@ -1172,26 +1170,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__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].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: core.PropTypes.fields,
   className: PropTypes__default["default"].string,
   onSuccess: PropTypes__default["default"].func
 };
-var defaultProps$5 = {
+var defaultProps$6 = {
   fields: [{
     name: 'email',
     type: 'email',
@@ -1263,14 +1261,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__default["default"].node.isRequired,
   fullscreen: PropTypes__default["default"].bool
 };
-var defaultProps$4 = {
+var defaultProps$5 = {
   fullscreen: false
 };
 var GuestLayout = function GuestLayout(_ref) {
@@ -1296,12 +1294,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 = contexts.useUrlGenerator();
   var onSuccess = React.useCallback(function () {
@@ -1327,8 +1325,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 = reactIntl.defineMessages({
   metaTitle401: {
@@ -1423,10 +1421,10 @@ var messages = reactIntl.defineMessages({
     }]
   }
 });
-var propTypes$2 = {
+var propTypes$3 = {
   statusCode: core.PropTypes.statusCode
 };
-var defaultProps$2 = {
+var defaultProps$3 = {
   statusCode: null
 };
 var ErrorPage = function ErrorPage(_ref) {
@@ -1441,20 +1439,37 @@ var ErrorPage = function ErrorPage(_ref) {
     className: "col-12 col-sm-8 col-md-6"
   }, /*#__PURE__*/React__default["default"].createElement("h1", null, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, messages["title".concat(statusCode || 404)])), /*#__PURE__*/React__default["default"].createElement("p", null, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, messages["description".concat(statusCode || 404)]))))));
 };
-ErrorPage.propTypes = propTypes$2;
-ErrorPage.defaultProps = defaultProps$2;
+ErrorPage.propTypes = propTypes$3;
+ErrorPage.defaultProps = defaultProps$3;
 
-var _excluded = ["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: core.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 = contexts.useUrlGenerator();
+  var componentsManager = contexts.useComponentsManager();
 
   // Load custom pages from resource
   var _ref2 = pages || {},
@@ -1468,82 +1483,95 @@ 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__default["default"].createElement(reactRouter.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__default["default"].createElement(reactRouter.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__default["default"](_ref3, _excluded);
+    var RouteComponent = componentsManager.getComponent(component);
+    return RouteComponent !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.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__default["default"](_ref4$match$params, _excluded2);
+        return /*#__PURE__*/React__default["default"].createElement(RouteComponent, Object.assign({
+          resource: resource,
+          itemId: id
+        }, pageProps, params));
+      }
+    }) : null;
+  }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: route('resources.index', {
       resource: resourceId
     }),
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(ResourceIndexComponent, {
-      resource: resource
-    })
+    render: function render() {
+      return /*#__PURE__*/React__default["default"].createElement(ResourceIndexComponent, {
+        resource: resource
+      });
+    }
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: route('resources.create', {
       resource: resourceId
     }),
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(ResourceCreateComponent, {
-      resource: resource
-    })
+    render: function render() {
+      return /*#__PURE__*/React__default["default"].createElement(ResourceCreateComponent, {
+        resource: resource
+      });
+    }
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: route('resources.show', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(ResourceShowComponent, {
-      resource: resource
-    })
+    render: function render(_ref5) {
+      var id = _ref5.match.params.id;
+      return /*#__PURE__*/React__default["default"].createElement(ResourceShowComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: route('resources.edit', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(ResourceEditComponent, {
-      resource: resource
-    })
+    render: function render(_ref6) {
+      var id = _ref6.match.params.id;
+      return /*#__PURE__*/React__default["default"].createElement(ResourceEditComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: route('resources.delete', {
       resource: resourceId,
       id: ':id'
     }),
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(ResourceDeleteComponent, {
-      resource: resource
-    })
-  })].concat(_toConsumableArray__default["default"](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__default["default"](_ref4, _excluded);
-    var RouteComponent = componentsManager.getComponent(component);
-    return RouteComponent !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-      key: "route-".concat(path),
-      path: path,
-      exact: exact,
-      element: /*#__PURE__*/React__default["default"].createElement(RouteComponent, Object.assign({
-        resource: resource
-      }, pageProps))
-    }) : null;
-  })));
+    render: function render(_ref7) {
+      var id = _ref7.match.params.id;
+      return /*#__PURE__*/React__default["default"].createElement(ResourceDeleteComponent, {
+        resource: resource,
+        itemId: id
+      });
+    }
+  }));
 };
+ResourceRoutes.propTypes = propTypes$2;
+ResourceRoutes.defaultProps = defaultProps$2;
 
 var propTypes$1 = {
   statusCode: core.PropTypes.statusCode
@@ -1553,9 +1581,13 @@ var defaultProps$1 = {
 };
 var PanneauRoutes = function PanneauRoutes(_ref) {
   var initialStatusCode = _ref.statusCode;
+  var _usePanneau = contexts.usePanneau(),
+    _usePanneau$pages = _usePanneau.pages,
+    pages = _usePanneau$pages === void 0 ? {} : _usePanneau$pages;
   var routes = contexts.useRoutes();
   var _useLocation = reactRouter.useLocation(),
-    pathname = _useLocation.pathname;
+    pathname = _useLocation.pathname; // search
+
   var _useState = React.useState({
       statusCode: initialStatusCode,
       pathname: pathname
@@ -1563,25 +1595,27 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     _useState2 = _slicedToArray__default["default"](_useState, 2),
     _useState2$ = _useState2[0],
     statusCode = _useState2$.statusCode,
-    lastPathname = _useState2$.pathname,
+    initialPathname = _useState2$.pathname,
     setInitialRequest = _useState2[1];
   var user = auth.useUser();
   var route = contexts.useUrlGenerator();
   var resources = contexts.usePanneauResources();
-  var componentsManager = contexts.usePagesComponentsManager();
+
+  // const nextUrl = useMemo(() => {
+  //     const query = parseQuery(search);
+  //     return query !== null ? query.next || null : null;
+  // }, [search]);
+
   React.useEffect(function () {
-    if (pathname !== lastPathname) {
+    if (pathname !== initialPathname) {
       setInitialRequest({
         pathname: pathname,
         statusCode: null
       });
     }
-  }, [pathname, lastPathname]);
+  }, [pathname, initialPathname]);
 
   // Custom Pages
-  var _usePanneau = contexts.usePanneau(),
-    _usePanneau$pages = _usePanneau.pages,
-    pages = _usePanneau$pages === void 0 ? null : _usePanneau$pages;
   var _ref2 = pages || {},
     _ref2$home = _ref2.home,
     homePage = _ref2$home === void 0 ? null : _ref2$home,
@@ -1591,55 +1625,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;
-  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__default["default"].createElement(ErrorComponent, {
-      statusCode: statusCode
-    });
-  }
-
-  // If user is unauthenticated
-  if (user === null) {
-    return /*#__PURE__*/React__default["default"].createElement(reactRouter.Routes, null, /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-      path: routes['auth.login'],
-      exact: true,
-      element: /*#__PURE__*/React__default["default"].createElement(LoginComponent, null)
-    }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-      path: "*",
-      element: /*#__PURE__*/React__default["default"].createElement(reactRouter.Navigate, {
-        to: "".concat(route('auth.login'), "?next=").concat(encodeURIComponent(pathname)),
-        replace: true
-      })
-    }));
-  }
-
-  // Normal routes
-  return /*#__PURE__*/React__default["default"].createElement(reactRouter.Routes, null, /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+  var HomeComponent = utils.getComponentFromName((homePage === null || homePage === void 0 ? void 0 : homePage.component) || 'home', basePages, homePage === null || homePage === void 0 ? void 0 : homePage.component);
+  var LoginComponent = utils.getComponentFromName((loginPage === null || loginPage === void 0 ? void 0 : loginPage.component) || 'login', basePages, loginPage === null || loginPage === void 0 ? void 0 : loginPage.component);
+  var AccountComponent = utils.getComponentFromName((accountPage === null || accountPage === void 0 ? void 0 : accountPage.component) || 'account', basePages, accountPage === null || accountPage === void 0 ? void 0 : accountPage.component);
+  var ErrorComponent = utils.getComponentFromName((errorPage === null || errorPage === void 0 ? void 0 : errorPage.component) || 'error', basePages, errorPage === null || errorPage === void 0 ? void 0 : errorPage.component);
+  return /*#__PURE__*/React__default["default"].createElement(reactRouter.Switch, null, statusCode !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+    path: "*",
+    render: function render() {
+      return /*#__PURE__*/React__default["default"].createElement(ErrorComponent, {
+        statusCode: statusCode
+      });
+    }
+  }) : null, user === null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+    path: "*",
+    exact: true,
+    component: LoginComponent
+  }) : null, user !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: routes.home,
     exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(HomeComponent, null)
+    component: HomeComponent
+  }) : /*#__PURE__*/React__default["default"].createElement(reactRouter.Redirect, {
+    from: routes.home,
+    exact: true,
+    to: route('login')
   }), resources.map(function (resource) {
     var _ref3 = resource || {},
       resourceId = _ref3.id;
-    return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
-      key: "resource-".concat(resourceId)
-    }, createResourceRoutes(resource, {
-      route: route,
-      componentsManager: componentsManager,
-      pages: pages
-    }));
+    return user !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+      key: "resource-".concat(resourceId),
+      path: route('resources.index', {
+        resource: resourceId
+      }),
+      render: function render() {
+        return /*#__PURE__*/React__default["default"].createElement(ResourceRoutes, {
+          resource: resource
+        });
+      }
+    }) : /*#__PURE__*/React__default["default"].createElement(reactRouter.Redirect, {
+      key: "resource-".concat(resourceId),
+      from: route('resources.index', {
+        resource: resourceId
+      }),
+      to: "".concat(route('login'), "?next=").concat(encodeURIComponent(pathname))
+    });
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-    path: routes.account,
-    exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(AccountComponent, null)
+    path: route('auth.account'),
+    component: AccountComponent
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: "*",
-    element: /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)
+    component: ErrorComponent
   }));
 };
 PanneauRoutes.propTypes = propTypes$1;