@panneau/app 1.0.3-alpha.0 → 1.0.3-alpha.10

package/lib/index.js

@@ -18,17 +18,20 @@ var FiltersProvider = require('@panneau/filters');
 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 _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var isObject = require('lodash/isObject');
 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');
-var Navbar = require('@panneau/element-navbar');
+var isArray = require('lodash/isArray');
 var Menu = require('@panneau/element-menu');
+var Navbar = require('@panneau/element-navbar');
 var Label = require('@panneau/element-label');
 var isString = require('lodash/isString');
 var Alert = require('@panneau/element-alert');
@@ -50,13 +53,16 @@ var FieldsProvider__default = /*#__PURE__*/_interopDefaultLegacy(FieldsProvider)
 var FiltersProvider__default = /*#__PURE__*/_interopDefaultLegacy(FiltersProvider);
 var FormsProvider__default = /*#__PURE__*/_interopDefaultLegacy(FormsProvider);
 var ListsProvider__default = /*#__PURE__*/_interopDefaultLegacy(ListsProvider);
-var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var Form__default = /*#__PURE__*/_interopDefaultLegacy(Form);
-var Navbar__default = /*#__PURE__*/_interopDefaultLegacy(Navbar);
+var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var Menu__default = /*#__PURE__*/_interopDefaultLegacy(Menu);
+var Navbar__default = /*#__PURE__*/_interopDefaultLegacy(Navbar);
 var Label__default = /*#__PURE__*/_interopDefaultLegacy(Label);
 var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var Alert__default = /*#__PURE__*/_interopDefaultLegacy(Alert);
@@ -65,7 +71,7 @@ var Pagination__default = /*#__PURE__*/_interopDefaultLegacy(Pagination);
 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 _excluded$6 = ["resource", "action", "previous", "status", "value", "onSubmit", "errors", "generalError", "className"];
 var propTypes$m = {
   resource: core.PropTypes.resource.isRequired,
   action: PropTypes__default["default"].string,
@@ -90,23 +96,20 @@ var defaultProps$m = {
   errors: null,
   className: null
 };
-
 var DeleteForm = function DeleteForm(_ref) {
   var resource = _ref.resource,
-      action = _ref.action,
-      previous = _ref.previous;
-      _ref.status;
-      var value = _ref.value,
-      onSubmit = _ref.onSubmit;
-      _ref.errors;
-      var generalError = _ref.generalError,
-      className = _ref.className,
-      props = _objectWithoutProperties__default["default"](_ref, _excluded$5);
-
+    action = _ref.action,
+    previous = _ref.previous;
+    _ref.status;
+    var value = _ref.value,
+    onSubmit = _ref.onSubmit;
+    _ref.errors;
+    var generalError = _ref.generalError,
+    className = _ref.className,
+    props = _objectWithoutProperties__default["default"](_ref, _excluded$6);
   var _ref2 = value || {},
-      _ref2$id = _ref2.id,
-      id = _ref2$id === void 0 ? null : _ref2$id;
-
+    _ref2$id = _ref2.id,
+    id = _ref2$id === void 0 ? null : _ref2$id;
   var resourceValues = intl.useResourceValues(resource, {
     id: id
   });
@@ -174,11 +177,10 @@ var DeleteForm = function DeleteForm(_ref) {
     }]
   })))));
 };
-
 DeleteForm.propTypes = propTypes$m;
 DeleteForm.defaultProps = defaultProps$m;
 
-var _excluded$4 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
+var _excluded$5 = ["component", "resource", "onSuccess", "item", "type", "isDelete"];
 var propTypes$l = {
   component: PropTypes__default["default"].string,
   resource: core.PropTypes.resource.isRequired,
@@ -195,129 +197,120 @@ var defaultProps$l = {
   onSuccess: null,
   isDelete: false
 };
-
 var ResourceForm = function ResourceForm(_ref) {
   var component = _ref.component,
-      resource = _ref.resource,
-      onSuccess = _ref.onSuccess,
-      item = _ref.item,
-      type = _ref.type,
-      isDelete = _ref.isDelete,
-      props = _objectWithoutProperties__default["default"](_ref, _excluded$4);
-
+    resource = _ref.resource,
+    onSuccess = _ref.onSuccess,
+    item = _ref.item,
+    type = _ref.type,
+    isDelete = _ref.isDelete,
+    props = _objectWithoutProperties__default["default"](_ref, _excluded$5);
   var locales = contexts.useLocales();
   var FormComponents = contexts.useFormsComponents();
   var _resource$fields = resource.fields,
-      resourceFields = _resource$fields === void 0 ? [] : _resource$fields,
-      _resource$types = resource.types,
-      resourceTypes = _resource$types === void 0 ? [] : _resource$types,
-      forms = resource.forms;
+    resourceFields = _resource$fields === void 0 ? [] : _resource$fields,
+    _resource$types = resource.types,
+    resourceTypes = _resource$types === void 0 ? [] : _resource$types,
+    forms = resource.forms;
   var resourceType = type !== null ? resourceTypes.find(function (it) {
     return it.id === type;
   }) || null : null;
-
   var _ref2 = resourceType || {},
-      _ref2$fields = _ref2.fields,
-      resourceTypeFields = _ref2$fields === void 0 ? null : _ref2$fields;
-
-  var isCreate = item === null || !item.id; // Pick fields from resource root or form
+    _ref2$fields = _ref2.fields,
+    resourceTypeFields = _ref2$fields === void 0 ? null : _ref2$fields;
+  var isCreate = item === null || !item.id;
 
+  // Pick fields from resource root or form
   var _ref3 = forms || {},
-      _ref3$default = _ref3["default"],
-      defaultForm = _ref3$default === void 0 ? null : _ref3$default,
-      _ref3$create = _ref3.create,
-      createForm = _ref3$create === void 0 ? null : _ref3$create,
-      _ref3$edit = _ref3.edit,
-      editForm = _ref3$edit === void 0 ? null : _ref3$edit,
-      _ref3$delete = _ref3["delete"],
-      deleteForm = _ref3$delete === void 0 ? null : _ref3$delete;
-
+    _ref3$default = _ref3["default"],
+    defaultForm = _ref3$default === void 0 ? null : _ref3$default,
+    _ref3$create = _ref3.create,
+    createForm = _ref3$create === void 0 ? null : _ref3$create,
+    _ref3$edit = _ref3.edit,
+    editForm = _ref3$edit === void 0 ? null : _ref3$edit,
+    _ref3$delete = _ref3["delete"],
+    deleteForm = _ref3$delete === void 0 ? null : _ref3$delete;
   var _ref4 = defaultForm || {},
-      _ref4$fields = _ref4.fields,
-      defaultFields = _ref4$fields === void 0 ? null : _ref4$fields,
-      defaultComponent = _ref4.component;
-
+    _ref4$fields = _ref4.fields,
+    defaultFields = _ref4$fields === void 0 ? null : _ref4$fields,
+    defaultComponent = _ref4.component;
   var createOrEditSource = isCreate ? createForm || {} : editForm || {};
-
   var _ref5 = isDelete ? deleteForm || {} : createOrEditSource || {},
-      _ref5$fields = _ref5.fields,
-      formFields = _ref5$fields === void 0 ? null : _ref5$fields,
-      _ref5$component = _ref5.component,
-      formComponent = _ref5$component === void 0 ? null : _ref5$component;
-
+    _ref5$fields = _ref5.fields,
+    formFields = _ref5$fields === void 0 ? null : _ref5$fields,
+    _ref5$component = _ref5.component,
+    formComponent = _ref5$component === void 0 ? null : _ref5$component;
   var finalFields = React.useMemo(function () {
     return (formFields || defaultFields || resourceTypeFields || resourceFields).filter(function (_ref6) {
-      var _ref6$settings = _ref6.settings;
-      _ref6$settings = _ref6$settings === void 0 ? {} : _ref6$settings;
-      var _ref6$settings$hidden = _ref6$settings.hiddenInForm,
-          hiddenInForm = _ref6$settings$hidden === void 0 ? false : _ref6$settings$hidden;
+      var _ref6$settings = _ref6.settings,
+        _ref6$settings2 = _ref6$settings === void 0 ? {} : _ref6$settings,
+        _ref6$settings2$hidde = _ref6$settings2.hiddenInForm,
+        hiddenInForm = _ref6$settings2$hidde === void 0 ? false : _ref6$settings2$hidde;
       return !hiddenInForm;
     });
-  }, [formFields, defaultFields, resourceTypeFields, resourceFields]); // Form routes
+  }, [formFields, defaultFields, resourceTypeFields, resourceFields]);
 
+  // Form routes
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
-
   var _useResourceStore = data.useResourceStore(resource),
-      store = _useResourceStore.store;
-
+    store = _useResourceStore.store;
   var _useResourceUpdate = data.useResourceUpdate(resource, item != null ? item.id : null),
-      update = _useResourceUpdate.update;
-
+    update = _useResourceUpdate.update;
   var _useResourceDestroy = data.useResourceDestroy(resource, item != null ? item.id : null),
-      destroy = _useResourceDestroy.destroy; // Post actions
-
+    destroy = _useResourceDestroy.destroy;
 
+  // Post actions
   var postAction = isCreate ? store : update;
   var postForm = React.useCallback(function (action, data) {
     return isDelete ? destroy() : postAction(data);
-  }, [postAction, isDelete, destroy, store, update]); // Form state
+  }, [postAction, isDelete, destroy, store, update]);
 
+  // Form state
   var getInitialValue = React.useCallback(function () {
     return item !== null ? item : finalFields.reduce(function (defaultValues, _ref7) {
       var name = _ref7.name,
-          _ref7$defaultValue = _ref7.defaultValue,
-          defaultValue = _ref7$defaultValue === void 0 ? null : _ref7$defaultValue;
+        _ref7$defaultValue = _ref7.defaultValue,
+        defaultValue = _ref7$defaultValue === void 0 ? null : _ref7$defaultValue;
       return defaultValue !== null ? _objectSpread__default["default"](_objectSpread__default["default"]({}, defaultValues), {}, _defineProperty__default["default"]({}, name, defaultValue)) : defaultValues;
     }, type !== null ? {
       type: type
     } : null);
   }, [item, type, finalFields]);
-
   var _useState = React.useState(getInitialValue()),
-      _useState2 = _slicedToArray__default["default"](_useState, 2),
-      value = _useState2[0],
-      setValueState = _useState2[1];
-
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
+    value = _useState2[0],
+    setValueState = _useState2[1];
   var setValue = React.useCallback(function (newValue) {
     // console.log('new value in resource form', newValue); // eslint-disable-line
     setValueState(newValue);
   }, [setValueState]);
-
   var _useForm = hooks.useForm({
-    fields: finalFields,
-    value: value,
-    postForm: postForm,
-    setValue: setValue,
-    onComplete: onSuccess,
-    locales: locales
-  }),
-      fields = _useForm.fields,
-      onSubmit = _useForm.onSubmit,
-      status = _useForm.status,
-      generalError = _useForm.generalError,
-      errors = _useForm.errors; // Form action
-
+      fields: finalFields,
+      value: value,
+      postForm: postForm,
+      setValue: setValue,
+      onComplete: onSuccess,
+      locales: locales
+    }),
+    fields = _useForm.fields,
+    onSubmit = _useForm.onSubmit,
+    status = _useForm.status,
+    generalError = _useForm.generalError,
+    errors = _useForm.errors;
 
+  // Form action
   var modifyAction = isCreate ? resourceRoute('store') : resourceRoute('update', {
     id: item.id
   });
   var action = isDelete ? resourceRoute('destroy', {
     id: item.id
   }) : modifyAction;
-  var defaultFormName = isDelete ? component || formComponent || null : component || formComponent || defaultComponent || 'normal'; // Form component
+  var defaultFormName = isDelete ? component || formComponent || null : component || formComponent || defaultComponent || 'normal';
 
-  var FormComponent = utils.getComponentFromName(defaultFormName, FormComponents, isDelete ? DeleteForm : component); // Lisen to item value change - this is important
+  // Form component
+  var FormComponent = utils.getComponentFromName(defaultFormName, FormComponents, isDelete ? DeleteForm : component);
 
+  // Lisen to item value change - this is important
   React.useEffect(function () {
     // console.log('get initial value from the top'); // eslint-disable-line
     setValue(getInitialValue());
@@ -339,7 +332,6 @@ var ResourceForm = function ResourceForm(_ref) {
     onChange: setValue
   })));
 };
-
 ResourceForm.propTypes = propTypes$l;
 ResourceForm.defaultProps = defaultProps$l;
 
@@ -353,11 +345,10 @@ var defaultProps$k = {
   itemClassName: null,
   linkClassName: null
 };
-
 var AccountMenu = function AccountMenu(_ref) {
   var className = _ref.className,
-      itemClassName = _ref.itemClassName,
-      linkClassName = _ref.linkClassName;
+    itemClassName = _ref.itemClassName,
+    linkClassName = _ref.linkClassName;
   var route = contexts.useUrlGenerator();
   var user = auth.useUser();
   var logout = auth.useLogout();
@@ -376,14 +367,15 @@ var AccountMenu = function AccountMenu(_ref) {
         }]
       }),
       href: route('account'),
-      dropdown: [//   {
+      dropdown: [
+      //   {
       //       label: (
       //           <FormattedMessage
       //               defaultMessage="Update account"
       //               description="Menu label"
       //           />
       //       ),
-      //       href: route('panneau.account'),
+      //       href: route('account'),
       //   },
       {
         label: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
@@ -404,7 +396,7 @@ var AccountMenu = function AccountMenu(_ref) {
           "value": "Login"
         }]
       }),
-      href: route('login')
+      href: route('auth.login')
     }];
   }, [user, route, onClickLogout]);
   return items !== null ? /*#__PURE__*/React__default["default"].createElement(Menu__default["default"], {
@@ -415,7 +407,6 @@ var AccountMenu = function AccountMenu(_ref) {
     dropdownAlign: "end"
   }) : null;
 };
-
 AccountMenu.propTypes = propTypes$k;
 AccountMenu.defaultProps = defaultProps$k;
 
@@ -429,23 +420,20 @@ var defaultProps$j = {
   itemClassName: null,
   linkClassName: null
 };
-
 var ResourcesMenu = function ResourcesMenu(_ref) {
   var className = _ref.className,
-      itemClassName = _ref.itemClassName,
-      linkClassName = _ref.linkClassName;
-
+    itemClassName = _ref.itemClassName,
+    linkClassName = _ref.linkClassName;
   var _useLocation = reactRouter.useLocation(),
-      pathname = _useLocation.pathname;
-
+    pathname = _useLocation.pathname;
   var resources = contexts.usePanneauResources();
   var resourceRoute = hooks.useResourceUrlGenerator();
   var items = React.useMemo(function () {
     return resources.filter(function (_ref2) {
-      var _ref2$settings = _ref2.settings;
-      _ref2$settings = _ref2$settings === void 0 ? {} : _ref2$settings;
-      var _ref2$settings$hideIn = _ref2$settings.hideInNavbar,
-          hideInNavbar = _ref2$settings$hideIn === void 0 ? false : _ref2$settings$hideIn;
+      var _ref2$settings = _ref2.settings,
+        _ref2$settings2 = _ref2$settings === void 0 ? {} : _ref2$settings,
+        _ref2$settings2$hideI = _ref2$settings2.hideInNavbar,
+        hideInNavbar = _ref2$settings2$hideI === void 0 ? false : _ref2$settings2$hideI;
       return !hideInNavbar;
     }).map(function (it) {
       var url = resourceRoute(it, 'index');
@@ -464,39 +452,69 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
     linkClassName: linkClassName
   });
 };
-
 ResourcesMenu.propTypes = propTypes$j;
 ResourcesMenu.defaultProps = defaultProps$j;
 
-/* eslint-disable react/jsx-props-no-spreading */
 var propTypes$i = {};
 var defaultProps$i = {};
-
 var MainNavbar = function MainNavbar(props) {
   var _usePanneau = contexts.usePanneau(),
-      name = _usePanneau.name;
-
+    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;
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      background = _usePanneauColorSchem.background;
-
+    background = _usePanneauColorSchem.background;
   var route = contexts.useUrlGenerator();
   var user = auth.useUser();
+  var items = React.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__default["default"](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__default["default"](currentItems), [/*#__PURE__*/React__default["default"].createElement(ResourcesMenu, {
+          className: "navbar-nav",
+          itemClassName: "nav-item",
+          linkClassName: "nav-link"
+        })]);
+      }
+      if (item === 'account') {
+        return [].concat(_toConsumableArray__default["default"](currentItems), [/*#__PURE__*/React__default["default"].createElement(AccountMenu, {
+          className: "navbar-nav",
+          itemClassName: "nav-item",
+          linkClassName: "nav-link"
+        })]);
+      }
+      if (item === 'separator') {
+        return [].concat(_toConsumableArray__default["default"](currentItems), [/*#__PURE__*/React__default["default"].createElement("span", {
+          className: "ms-auto"
+        })]);
+      }
+      var lastItem = currentItems.length > 0 ? currentItems[currentItems.length - 1] : null;
+      return isArray__default["default"](lastItem) ? [].concat(_toConsumableArray__default["default"](currentItems.slice(0, currentItems.length - 1)), [[].concat(_toConsumableArray__default["default"](lastItem), [item])]) : [].concat(_toConsumableArray__default["default"](currentItems), [[item]]);
+    }, []).map(function (it) {
+      return isArray__default["default"](it) ? /*#__PURE__*/React__default["default"].createElement(Menu__default["default"], {
+        items: it,
+        className: "navbar-nav",
+        itemClassName: "nav-item",
+        linkClassName: "nav-link"
+      }) : it;
+    });
+  }, [main]);
   return /*#__PURE__*/React__default["default"].createElement(Navbar__default["default"], Object.assign({
     theme: background
   }, props), name !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
     to: route('home'),
     className: "navbar-brand"
-  }, name) : null, user !== null ? /*#__PURE__*/React__default["default"].createElement(ResourcesMenu, {
-    className: "navbar-nav ml-4",
-    itemClassName: "nav-item",
-    linkClassName: "nav-link"
-  }) : null, /*#__PURE__*/React__default["default"].createElement(AccountMenu, {
-    className: "navbar-nav ms-auto",
-    itemClassName: "nav-item",
-    linkClassName: "nav-link"
-  }));
+  }, name) : null, items);
 };
-
 MainNavbar.propTypes = propTypes$i;
 MainNavbar.defaultProps = defaultProps$i;
 
@@ -507,17 +525,13 @@ var propTypes$h = {
 var defaultProps$h = {
   fullscreen: false
 };
-
 var MainLayout = function MainLayout(_ref) {
   var _ref2;
-
   var children = _ref.children,
-      fullscreen = _ref.fullscreen;
-
+    fullscreen = _ref.fullscreen;
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      background = _usePanneauColorSchem.background,
-      text = _usePanneauColorSchem.text;
-
+    background = _usePanneauColorSchem.background,
+    text = _usePanneauColorSchem.text;
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"](['d-flex', 'flex-column', 'min-vh-100'])
   }, /*#__PURE__*/React__default["default"].createElement(MainNavbar, {
@@ -528,7 +542,6 @@ 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;
 
@@ -546,22 +559,19 @@ var defaultProps$g = {
   className: null,
   children: null
 };
-
 var PageHeader = function PageHeader(_ref) {
   var _ref2;
-
   var title = _ref.title,
-      actions = _ref.actions,
-      small = _ref.small,
-      className = _ref.className,
-      children = _ref.children;
-
+    actions = _ref.actions,
+    small = _ref.small,
+    className = _ref.className,
+    children = _ref.children;
   // TODO: fix page header components
   // const { components } = usePanneau();
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      text = _usePanneauColorSchem.text,
-      background = _usePanneauColorSchem.background; // console.log('page-header', components); // eslint-disable-line
-
+    text = _usePanneauColorSchem.text,
+    background = _usePanneauColorSchem.background;
+  // console.log('page-header', components); // eslint-disable-line
 
   var inner = /*#__PURE__*/React__default["default"].createElement("div", {
     className: "d-flex align-items-center flex-wrap"
@@ -580,7 +590,6 @@ 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;
 
@@ -588,25 +597,20 @@ var propTypes$f = {
   resource: core.PropTypes.resource.isRequired
 };
 var defaultProps$f = {};
-
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
   var navigate = reactRouter.useNavigate();
-
   var _useLocation = reactRouter.useLocation(),
-      search = _useLocation.search;
-
+    search = _useLocation.search;
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var onSuccess = React.useCallback(function () {
     navigate("".concat(resourceRoute('index'), "?created=true"));
   }, [navigate, resourceRoute]);
-
   var _useMemo = React.useMemo(function () {
-    return queryString.parse(search);
-  }, [search]),
-      _useMemo$type = _useMemo.type,
-      type = _useMemo$type === void 0 ? null : _useMemo$type;
-
+      return queryString.parse(search);
+    }, [search]),
+    _useMemo$type = _useMemo.type,
+    type = _useMemo$type === void 0 ? null : _useMemo$type;
   var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
@@ -635,35 +639,31 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     onSuccess: onSuccess
   }))))));
 };
-
 ResourceCreatePage.propTypes = propTypes$f;
 ResourceCreatePage.defaultProps = defaultProps$f;
 
+// import Button from '../buttons/Button';
+
 var propTypes$e = {
   resource: core.PropTypes.resource.isRequired
 };
 var defaultProps$e = {};
-
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resource = _ref.resource;
-
   var _useParams = reactRouter.useParams(),
-      itemId = _useParams.id;
-
+    itemId = _useParams.id;
   var navigate = reactRouter.useNavigate();
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
-
   var _useResourceItem = data.useResourceItem(resource, itemId),
-      item = _useResourceItem.item;
-
+    item = _useResourceItem.item;
   var onSuccess = React.useCallback(function () {
     return navigate("".concat(resourceRoute('index'), "?deleted=true"));
-  }, [navigate, resourceRoute]); // Navigate back
+  }, [navigate, resourceRoute]);
 
+  // Navigate back
   var _ref2 = history || {},
-      _ref2$entries = _ref2.entries,
-      entries = _ref2$entries === void 0 ? [] : _ref2$entries;
-
+    _ref2$entries = _ref2.entries,
+    entries = _ref2$entries === void 0 ? [] : _ref2$entries;
   var previousEntry = entries !== null && entries.length > 1 ? entries[entries.length - 2] : null;
   var previous = (previousEntry === null || previousEntry === void 0 ? void 0 : previousEntry.pathname) || null;
   var resourceValues = intl.useResourceValues(resource);
@@ -697,33 +697,28 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
     isDelete: true
   }) : null)))));
 };
-
 ResourceDeletePage.propTypes = propTypes$e;
 ResourceDeletePage.defaultProps = defaultProps$e;
 
+// import Button from '../buttons/Button';
+
 var propTypes$d = {
   resource: core.PropTypes.resource.isRequired
 };
 var defaultProps$d = {};
-
 var ResourceEditPage = function ResourceEditPage(_ref) {
   var resource = _ref.resource;
-
   var _useParams = reactRouter.useParams(),
-      itemId = _useParams.id;
-
+    itemId = _useParams.id;
   var _useResourceItem = data.useResourceItem(resource, itemId),
-      item = _useResourceItem.item;
-
+    item = _useResourceItem.item;
   var _ref2 = item || {},
-      _ref2$type = _ref2.type,
-      type = _ref2$type === void 0 ? null : _ref2$type;
-
+    _ref2$type = _ref2.type,
+    type = _ref2$type === void 0 ? null : _ref2$type;
   var _useState = React.useState(item),
-      _useState2 = _slicedToArray__default["default"](_useState, 2),
-      editItem = _useState2[0],
-      setEditItem = _useState2[1];
-
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
+    editItem = _useState2[0],
+    setEditItem = _useState2[1];
   var onSuccess = React.useCallback(function (newItem) {
     return setEditItem(newItem);
   }, []);
@@ -759,7 +754,6 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     onSuccess: onSuccess
   }) : null)))));
 };
-
 ResourceEditPage.propTypes = propTypes$d;
 ResourceEditPage.defaultProps = defaultProps$d;
 
@@ -770,38 +764,36 @@ var propTypes$c = {
 var defaultProps$c = {
   className: null
 };
-
 var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
   var resource = _ref.resource,
-      className = _ref.className;
+    className = _ref.className;
   var _resource$types = resource.types,
-      types = _resource$types === void 0 ? null : _resource$types; // const intl = useIntl();
-
+    types = _resource$types === void 0 ? null : _resource$types;
+  // const intl = useIntl();
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var resourceValues = intl.useResourceValues(resource);
-
   var _useState = React.useState(false),
-      _useState2 = _slicedToArray__default["default"](_useState, 2),
-      dropdownOpened = _useState2[0],
-      setDropdownOpened = _useState2[1];
-
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
+    dropdownOpened = _useState2[0],
+    setDropdownOpened = _useState2[1];
   var onClickDropdown = React.useCallback(function (e) {
     e.preventDefault();
-    setDropdownOpened(function (opened) {
-      return !opened;
-    });
-  }, [setDropdownOpened]);
+    e.stopPropagation();
+    setDropdownOpened(!dropdownOpened);
+  }, [setDropdownOpened, dropdownOpened]);
   var finalTypes = types !== null ? types.filter(function (_ref2) {
-    var _ref2$settings = _ref2.settings;
-    _ref2$settings = _ref2$settings === void 0 ? {} : _ref2$settings;
-    var _ref2$settings$canCre = _ref2$settings.canCreate,
-        canCreate = _ref2$settings$canCre === void 0 ? true : _ref2$settings$canCre;
+    var _ref2$settings = _ref2.settings,
+      _ref2$settings2 = _ref2$settings === void 0 ? {} : _ref2$settings,
+      _ref2$settings2$canCr = _ref2$settings2.canCreate,
+      canCreate = _ref2$settings2$canCr === void 0 ? true : _ref2$settings2$canCr;
     return canCreate;
   }) : null;
   var hasMultipleTypes = finalTypes !== null && finalTypes.length > 1;
   var onDropdownClickOutside = React.useCallback(function () {
-    setDropdownOpened(false);
-  }, [setDropdownOpened]);
+    if (dropdownOpened) {
+      setDropdownOpened(false);
+    }
+  }, [setDropdownOpened, dropdownOpened]);
   var button = /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
     href: !hasMultipleTypes ? "".concat(resourceRoute('create')).concat(finalTypes !== null && finalTypes.length === 1 ? "?type=".concat(finalTypes[0].id) : '') : '#',
     size: "lg",
@@ -838,11 +830,10 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
     onClickOutside: onDropdownClickOutside
   })) : button;
 };
-
 ResourceCreateButtom.propTypes = propTypes$c;
 ResourceCreateButtom.defaultProps = defaultProps$c;
 
-var _excluded$3 = ["component", "name", "groupLabel"];
+var _excluded$4 = ["component", "name", "groupLabel"];
 var propTypes$b = {
   filters: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({
     id: PropTypes__default["default"].string.isRequired,
@@ -870,21 +861,18 @@ var defaultProps$b = {
   },
   className: null
 };
-
 var ResourceFilters = function ResourceFilters(_ref) {
   var filters = _ref.filters,
-      value = _ref.value,
-      onChange = _ref.onChange,
-      onReset = _ref.onReset,
-      withContainer = _ref.withContainer,
-      withReset = _ref.withReset,
-      defaultValue = _ref.defaultValue,
-      className = _ref.className;
+    value = _ref.value,
+    onChange = _ref.onChange,
+    onReset = _ref.onReset,
+    withContainer = _ref.withContainer,
+    withReset = _ref.withReset,
+    defaultValue = _ref.defaultValue,
+    className = _ref.className;
   var FilterComponents = contexts.useFiltersComponents();
-
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      background = _usePanneauColorSchem.background;
-
+    background = _usePanneauColorSchem.background;
   var currentFilters = filters || [];
   var onFiltersReset = React.useCallback(function () {
     if (onReset !== null) {
@@ -895,9 +883,10 @@ var ResourceFilters = function ResourceFilters(_ref) {
     if (value !== null && value[item.name]) {
       return true;
     }
-
     return isActive;
-  }, false); // console.log('value', value);
+  }, false);
+
+  // console.log('value', value);
 
   return /*#__PURE__*/React__default["default"].createElement(Navbar__default["default"], {
     className: classNames__default["default"]([_defineProperty__default["default"]({
@@ -907,10 +896,9 @@ var ResourceFilters = function ResourceFilters(_ref) {
     withoutCollapse: true
   }, currentFilters.map(function (_ref3, index) {
     var component = _ref3.component,
-        name = _ref3.name,
-        groupLabel = _ref3.groupLabel,
-        filterProps = _objectWithoutProperties__default["default"](_ref3, _excluded$3);
-
+      name = _ref3.name,
+      groupLabel = _ref3.groupLabel,
+      filterProps = _objectWithoutProperties__default["default"](_ref3, _excluded$4);
     var FilterComponent = utils.getComponentFromName(component, FilterComponents, null);
     var filterValue = value !== null && value[name] ? value[name] : null;
     var onFilterChange = React.useCallback(function (newFilterValue) {
@@ -921,9 +909,8 @@ var ResourceFilters = function ResourceFilters(_ref) {
     var onFilterClear = React.useCallback(function () {
       if (name !== null && onChange !== null) {
         var _ref4 = value || {};
-            _ref4[name];
-            var newValue = _objectWithoutProperties__default["default"](_ref4, [name].map(_toPropertyKey__default["default"]));
-
+          _ref4[name];
+          var newValue = _objectWithoutProperties__default["default"](_ref4, [name].map(_toPropertyKey__default["default"]));
         onChange(_objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), defaultValue));
       }
     }, [onChange, name, value, defaultValue]);
@@ -943,12 +930,11 @@ var ResourceFilters = function ResourceFilters(_ref) {
     icon: freeSolidSvgIcons.faUndo
   })) : null);
 };
-
 ResourceFilters.propTypes = propTypes$b;
 ResourceFilters.defaultProps = defaultProps$b;
 
-var _excluded$2 = ["component", "showPagination", "filters"],
-    _excluded2 = ["page"];
+var _excluded$3 = ["component", "showPagination", "filters"],
+  _excluded2$1 = ["page"];
 var propTypes$a = {
   resource: core.PropTypes.resource.isRequired,
   query: PropTypes__default["default"].object,
@@ -970,51 +956,42 @@ var defaultProps$a = {
   onQueryChange: null,
   onQueryReset: null
 };
-
 var ResourceItemsList = function ResourceItemsList(_ref) {
   var resource = _ref.resource,
-      query = _ref.query,
-      baseUrl = _ref.baseUrl,
-      onQueryChange = _ref.onQueryChange,
-      onQueryReset = _ref.onQueryReset,
-      paginated = _ref.paginated;
-  var _resource$index = resource.index;
-  _resource$index = _resource$index === void 0 ? {} : _resource$index;
-
-  var _resource$index$compo = _resource$index.component,
-      listComponent = _resource$index$compo === void 0 ? null : _resource$index$compo,
-      _resource$index$showP = _resource$index.showPagination,
-      showPagination = _resource$index$showP === void 0 ? true : _resource$index$showP,
-      _resource$index$filte = _resource$index.filters,
-      filters = _resource$index$filte === void 0 ? null : _resource$index$filte,
-      listProps = _objectWithoutProperties__default["default"](_resource$index, _excluded$2);
-
+    query = _ref.query,
+    baseUrl = _ref.baseUrl,
+    onQueryChange = _ref.onQueryChange,
+    onQueryReset = _ref.onQueryReset,
+    paginated = _ref.paginated;
+  var _resource$index = resource.index,
+    _resource$index2 = _resource$index === void 0 ? {} : _resource$index,
+    _resource$index2$comp = _resource$index2.component,
+    listComponent = _resource$index2$comp === void 0 ? null : _resource$index2$comp,
+    _resource$index2$show = _resource$index2.showPagination,
+    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__default["default"](_resource$index2, _excluded$3);
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      _usePanneauColorSchem2 = _usePanneauColorSchem.background,
-      theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
-
+    _usePanneauColorSchem2 = _usePanneauColorSchem.background,
+    theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
   var ListComponents = contexts.useListsComponents();
-
   var _useMemo = React.useMemo(function () {
-    var _ref2 = query || {},
+      var _ref2 = query || {},
         _ref2$page = _ref2.page,
         currentPage = _ref2$page === void 0 ? 1 : _ref2$page,
-        rest = _objectWithoutProperties__default["default"](_ref2, _excluded2);
-
-    return [currentPage, rest];
-  }, [query]),
-      _useMemo2 = _slicedToArray__default["default"](_useMemo, 2),
-      page = _useMemo2[0],
-      queryWithoutPage = _useMemo2[1];
-
+        rest = _objectWithoutProperties__default["default"](_ref2, _excluded2$1);
+      return [currentPage, rest];
+    }, [query]),
+    _useMemo2 = _slicedToArray__default["default"](_useMemo, 2),
+    page = _useMemo2[0],
+    queryWithoutPage = _useMemo2[1];
   var itemsProps = data.useResourceItems(resource, queryWithoutPage, paginated ? parseInt(page, 10) : null);
-
   var _ref3 = itemsProps || {},
-      _ref3$lastPage = _ref3.lastPage,
-      lastPage = _ref3$lastPage === void 0 ? 0 : _ref3$lastPage,
-      _ref3$total = _ref3.total,
-      total = _ref3$total === void 0 ? 0 : _ref3$total;
-
+    _ref3$lastPage = _ref3.lastPage,
+    lastPage = _ref3$lastPage === void 0 ? 0 : _ref3$lastPage,
+    _ref3$total = _ref3.total,
+    total = _ref3$total === void 0 ? 0 : _ref3$total;
   var ListComponent = utils.getComponentFromName(listComponent || 'table', ListComponents);
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, filters !== null ? /*#__PURE__*/React__default["default"].createElement(ResourceFilters, {
     filters: filters,
@@ -1044,39 +1021,34 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     className: "mt-4 mb-1"
   }) : null);
 };
-
 ResourceItemsList.propTypes = propTypes$a;
 ResourceItemsList.defaultProps = defaultProps$a;
 
-var _excluded$1 = ["id", "component"];
+var _excluded$2 = ["id", "component"];
 var propTypes$9 = {
   resource: core.PropTypes.resource.isRequired,
   defaultActions: PropTypes__default["default"].arrayOf(PropTypes__default["default"].object) // eslint-disable-line react/forbid-prop-types
-
 };
+
 var defaultProps$9 = {
   defaultActions: ['create']
 };
-
 var ResourceIndexPage = function ResourceIndexPage(_ref) {
   var resource = _ref.resource,
-      defaultActions = _ref.defaultActions;
+    defaultActions = _ref.defaultActions;
   var name = resource.name,
-      _resource$settings = resource.settings,
-      settings = _resource$settings === void 0 ? {} : _resource$settings,
-      _resource$index = resource.index,
-      index = _resource$index === void 0 ? {} : _resource$index;
-
+    _resource$settings = resource.settings,
+    settings = _resource$settings === void 0 ? {} : _resource$settings,
+    _resource$index = resource.index,
+    index = _resource$index === void 0 ? {} : _resource$index;
   var _ref2 = settings || {},
-      _ref2$canCreate = _ref2.canCreate,
-      canCreate = _ref2$canCreate === void 0 ? true : _ref2$canCreate,
-      _ref2$indexIsPaginate = _ref2.indexIsPaginated,
-      paginated = _ref2$indexIsPaginate === void 0 ? false : _ref2$indexIsPaginate;
-
+    _ref2$canCreate = _ref2.canCreate,
+    canCreate = _ref2$canCreate === void 0 ? true : _ref2$canCreate,
+    _ref2$indexIsPaginate = _ref2.indexIsPaginated,
+    paginated = _ref2$indexIsPaginate === void 0 ? false : _ref2$indexIsPaginate;
   var _ref3 = index || {},
-      _ref3$actions = _ref3.actions,
-      actions = _ref3$actions === void 0 ? null : _ref3$actions;
-
+    _ref3$actions = _ref3.actions,
+    actions = _ref3$actions === void 0 ? null : _ref3$actions;
   var finalActions = React.useMemo(function () {
     return (actions || defaultActions.filter(function (it) {
       return it !== 'create' || canCreate;
@@ -1091,10 +1063,8 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   }, [canCreate, actions]);
   var resourceValues = intl.useResourceValues(resource);
   var componentsManager = contexts.useComponentsManager();
-
   var _useLocation = reactRouter.useLocation(),
-      search = _useLocation.search;
-
+    search = _useLocation.search;
   var navigate = reactRouter.useNavigate();
   var query = React.useMemo(function () {
     return queryString.parse(search);
@@ -1102,13 +1072,11 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
   var listQuery = React.useMemo(function () {
     return query;
   }, [query]); // TODO: omit routes
-
   var _ref4 = query || {},
-      _ref4$created = _ref4.created,
-      created = _ref4$created === void 0 ? false : _ref4$created,
-      _ref4$deleted = _ref4.deleted,
-      deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
-
+    _ref4$created = _ref4.created,
+    created = _ref4$created === void 0 ? false : _ref4$created,
+    _ref4$deleted = _ref4.deleted,
+    deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var url = resourceRoute('index');
   var onQueryChange = React.useCallback(function (submitQuery) {
@@ -1127,8 +1095,10 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     navigate("".concat(url, "?").concat(queryString$1));
   }, [navigate, url, paginated]);
   var onClickCloseAlert = React.useCallback(function () {
-    history.replace(url);
-  }, [history, url]);
+    navigate(url, {
+      replace: true
+    });
+  }, [navigate, url]);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
@@ -1137,10 +1107,9 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       className: "d-flex align-items-center"
     }, finalActions.map(function (_ref5) {
       var id = _ref5.id,
-          _ref5$component = _ref5.component,
-          component = _ref5$component === void 0 ? Button__default["default"] : _ref5$component,
-          actionProps = _objectWithoutProperties__default["default"](_ref5, _excluded$1);
-
+        _ref5$component = _ref5.component,
+        component = _ref5$component === void 0 ? Button__default["default"] : _ref5$component,
+        actionProps = _objectWithoutProperties__default["default"](_ref5, _excluded$2);
       var ActionComponent = isString__default["default"](component) ? componentsManager.getComponent(component) : component;
       return ActionComponent !== null ? /*#__PURE__*/React__default["default"].createElement(ActionComponent, Object.assign({
         key: "action-".concat(id)
@@ -1187,7 +1156,6 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     onQueryReset: onQueryReset
   }))));
 };
-
 ResourceIndexPage.propTypes = propTypes$9;
 ResourceIndexPage.defaultProps = defaultProps$9;
 
@@ -1195,7 +1163,6 @@ var propTypes$8 = {
   resource: core.PropTypes.resource.isRequired
 };
 var defaultProps$8 = {};
-
 var ResourceShowPage = function ResourceShowPage(_ref) {
   var resource = _ref.resource;
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
@@ -1206,30 +1173,27 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
     className: "container-sm"
   }, "Show page")));
 };
-
 ResourceShowPage.propTypes = propTypes$8;
 ResourceShowPage.defaultProps = defaultProps$8;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes$7 = {};
 var defaultProps$7 = {};
-
 var HomePage = function HomePage() {
   var route = contexts.useUrlGenerator();
   var resources = contexts.usePanneauResources();
   var visibleResources = resources.filter(function (_ref) {
-    var _ref$settings = _ref.settings;
-    _ref$settings = _ref$settings === void 0 ? {} : _ref$settings;
-    var _ref$settings$hideInN = _ref$settings.hideInNavbar,
-        hideInNavbar = _ref$settings$hideInN === void 0 ? false : _ref$settings$hideInN;
+    var _ref$settings = _ref.settings,
+      _ref$settings2 = _ref$settings === void 0 ? {} : _ref$settings,
+      _ref$settings2$hideIn = _ref$settings2.hideInNavbar,
+      hideInNavbar = _ref$settings2$hideIn === void 0 ? false : _ref$settings2$hideIn;
     return !hideInNavbar;
   });
   return /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "container-sm py-4"
   }, visibleResources.map(function (resource) {
     var _ref2 = resource || {},
-        resourceId = _ref2.id;
-
+      resourceId = _ref2.id;
     var resourceValues = intl.useResourceValues(resource);
     return /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
       className: "d-block my-2",
@@ -1250,19 +1214,16 @@ var HomePage = function HomePage() {
     }));
   })));
 };
-
 HomePage.propTypes = propTypes$7;
 HomePage.defaultProps = defaultProps$7;
 
 var propTypes$6 = {};
 var defaultProps$6 = {};
-
 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;
 
@@ -1299,35 +1260,30 @@ var defaultProps$5 = {
   className: null,
   onSuccess: null
 };
-
 var LoginForm = function LoginForm(_ref) {
   var formFields = _ref.fields,
-      className = _ref.className,
-      onSuccess = _ref.onSuccess;
+    className = _ref.className,
+    onSuccess = _ref.onSuccess;
   var url = contexts.useUrlGenerator();
-
   var _useAuth = auth.useAuth(),
-      login = _useAuth.login;
-
+    login = _useAuth.login;
   var postForm = React.useCallback(function (action, _ref2) {
     var email = _ref2.email,
-        password = _ref2.password;
+      password = _ref2.password;
     return login(email, password);
   }, [login]);
-
   var _useForm = hooks.useForm({
-    fields: formFields,
-    postForm: postForm,
-    onComplete: onSuccess
-  }),
-      value = _useForm.value,
-      setValue = _useForm.setValue,
-      fields = _useForm.fields,
-      onSubmit = _useForm.onSubmit,
-      status = _useForm.status,
-      generalError = _useForm.generalError,
-      errors = _useForm.errors;
-
+      fields: formFields,
+      postForm: postForm,
+      onComplete: onSuccess
+    }),
+    value = _useForm.value,
+    setValue = _useForm.setValue,
+    fields = _useForm.fields,
+    onSubmit = _useForm.onSubmit,
+    status = _useForm.status,
+    generalError = _useForm.generalError,
+    errors = _useForm.errors;
   var NormalForm = contexts.useFormComponent('normal');
   return /*#__PURE__*/React__default["default"].createElement(NormalForm, {
     action: url('auth.login'),
@@ -1349,7 +1305,6 @@ var LoginForm = function LoginForm(_ref) {
     })
   });
 };
-
 LoginForm.propTypes = propTypes$5;
 LoginForm.defaultProps = defaultProps$5;
 
@@ -1360,17 +1315,13 @@ var propTypes$4 = {
 var defaultProps$4 = {
   fullscreen: false
 };
-
 var GuestLayout = function GuestLayout(_ref) {
   var _classNames;
-
   var fullscreen = _ref.fullscreen,
-      children = _ref.children;
-
+    children = _ref.children;
   var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
-      background = _usePanneauColorSchem.background,
-      text = _usePanneauColorSchem.text;
-
+    background = _usePanneauColorSchem.background,
+    text = _usePanneauColorSchem.text;
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: classNames__default["default"]({
       'd-flex flex-column min-vh-100': fullscreen
@@ -1387,14 +1338,12 @@ var GuestLayout = function GuestLayout(_ref) {
     })
   }, children)));
 };
-
 GuestLayout.propTypes = propTypes$4;
 GuestLayout.defaultProps = defaultProps$4;
 
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes$3 = {};
 var defaultProps$3 = {};
-
 var LoginPage = function LoginPage() {
   var route = contexts.useUrlGenerator();
   var onSuccess = React.useCallback(function () {
@@ -1420,7 +1369,6 @@ var LoginPage = function LoginPage() {
     onSuccess: onSuccess
   })))));
 };
-
 LoginPage.propTypes = propTypes$3;
 LoginPage.defaultProps = defaultProps$3;
 
@@ -1523,7 +1471,6 @@ var propTypes$2 = {
 var defaultProps$2 = {
   statusCode: null
 };
-
 var ErrorPage = function ErrorPage(_ref) {
   var statusCode = _ref.statusCode;
   return /*#__PURE__*/React__default["default"].createElement(GuestLayout, {
@@ -1536,68 +1483,50 @@ 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;
 
-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"];
-
+var _excluded$1 = ["path", "component", "exact"];
 var createResourceRoutes = function createResourceRoutes(resource, _ref) {
   var route = _ref.route,
-      componentsManager = _ref.componentsManager;
+    componentsManager = _ref.componentsManager,
+    _ref$pages = _ref.pages,
+    pages = _ref$pages === void 0 ? {} : _ref$pages;
   var resourceId = resource.id,
-      _resource$pages = resource.pages,
-      pages = _resource$pages === void 0 ? {} : _resource$pages,
-      _resource$extraRoutes = resource.extraRoutes,
-      extraRoutes = _resource$extraRoutes === void 0 ? [] : _resource$extraRoutes; // Load custom pages from resource
+    _resource$pages = resource.pages,
+    resourcePages = _resource$pages === void 0 ? {} : _resource$pages,
+    _resource$extraRoutes = resource.extraRoutes,
+    extraRoutes = _resource$extraRoutes === void 0 ? [] : _resource$extraRoutes;
 
+  // Load custom pages from resource
   var _ref2 = pages || {},
-      _ref2$index = _ref2.index,
-      indexPage = _ref2$index === void 0 ? null : _ref2$index,
-      _ref2$show = _ref2.show,
-      showPage = _ref2$show === void 0 ? null : _ref2$show,
-      _ref2$create = _ref2.create,
-      createPage = _ref2$create === void 0 ? null : _ref2$create,
-      _ref2$edit = _ref2.edit,
-      editPage = _ref2$edit === void 0 ? null : _ref2$edit,
-      _ref2$delete = _ref2["delete"],
-      deletePage = _ref2$delete === void 0 ? null : _ref2$delete;
-
-  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(React__default["default"].Fragment, 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,
-      element: /*#__PURE__*/React__default["default"].createElement(RouteComponent, Object.assign({
-        resource: resource
-      }, pageProps))
-    }) : null;
-  }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+    _ref2$index = _ref2.index,
+    indexPage = _ref2$index === void 0 ? null : _ref2$index,
+    _ref2$show = _ref2.show,
+    showPage = _ref2$show === void 0 ? null : _ref2$show,
+    _ref2$create = _ref2.create,
+    createPage = _ref2$create === void 0 ? null : _ref2$create,
+    _ref2$edit = _ref2.edit,
+    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, {
     path: route('resources.index', {
       resource: resourceId
     }),
@@ -1640,116 +1569,163 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
     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$1);
+    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;
+  })));
 };
 
+var _excluded = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete"],
+  _excluded2 = ["path", "route", "component", "exact"];
 var propTypes$1 = {
   statusCode: core.PropTypes.statusCode
 };
 var defaultProps$1 = {
   statusCode: null
 };
-
 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; // search
-
-
+    pathname = _useLocation.pathname;
   var _useState = React.useState({
-    statusCode: initialStatusCode,
-    pathname: pathname
-  }),
-      _useState2 = _slicedToArray__default["default"](_useState, 2),
-      _useState2$ = _useState2[0],
-      statusCode = _useState2$.statusCode,
-      initialPathname = _useState2$.pathname,
-      setInitialRequest = _useState2[1];
-
+      statusCode: initialStatusCode,
+      pathname: pathname
+    }),
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
+    _useState2$ = _useState2[0],
+    statusCode = _useState2$.statusCode,
+    lastPathname = _useState2$.pathname,
+    setInitialRequest = _useState2[1];
   var user = auth.useUser();
   var route = contexts.useUrlGenerator();
   var resources = contexts.usePanneauResources();
-  var componentsManager = contexts.useComponentsManager(); // const nextUrl = useMemo(() => {
-  //     const query = parseQuery(search);
-  //     return query !== null ? query.next || null : null;
-  // }, [search]);
-
+  var componentsManager = contexts.usePagesComponentsManager();
   React.useEffect(function () {
-    if (pathname !== initialPathname) {
+    if (pathname !== lastPathname) {
       setInitialRequest({
         pathname: pathname,
         statusCode: null
       });
     }
-  }, [pathname, initialPathname]); // Custom Pages
+  }, [pathname, lastPathname]);
 
+  // Custom Pages
+  var _usePanneau = contexts.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,
-      _ref2$login = _ref2.login,
-      loginPage = _ref2$login === void 0 ? null : _ref2$login,
-      _ref2$account = _ref2.account,
-      accountPage = _ref2$account === void 0 ? null : _ref2$account,
-      _ref2$error = _ref2.error,
-      errorPage = _ref2$error === void 0 ? null : _ref2$error;
-
-  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.Routes, null, statusCode !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-    path: "*",
-    element: /*#__PURE__*/React__default["default"].createElement(ErrorComponent, {
+    _ref2$home = _ref2.home,
+    homePage = _ref2$home === void 0 ? null : _ref2$home,
+    _ref2$login = _ref2.login,
+    loginPage = _ref2$login === void 0 ? null : _ref2$login,
+    _ref2$account = _ref2.account,
+    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__default["default"](_ref2, _excluded);
+  var customRoutes = React.useMemo(function () {
+    return [].concat(_toConsumableArray__default["default"](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__default["default"](routeDef) && typeof routeDef.component !== 'undefined' && typeof routeDef.path !== 'undefined';
+    }).map(function (key) {
+      return routesDefinition[key];
+    })), _toConsumableArray__default["default"](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__default["default"].createElement(ErrorComponent, {
       statusCode: statusCode
-    })
-  }) : null, /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-    path: routes.home,
-    exact: true,
-    element: user !== null ? /*#__PURE__*/React__default["default"].createElement(HomeComponent, null) : /*#__PURE__*/React__default["default"].createElement(Navigate, {
-      to: route('login'),
-      replace: true
-    })
-  }), user === null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-    path: routes.login,
-    exact: true,
-    element: /*#__PURE__*/React__default["default"].createElement(LoginComponent, null)
-  }) : null, resources.map(function (resource) {
-    var _ref3 = resource || {},
-        resourceId = _ref3.id;
+    });
+  }
 
-    return user !== null ? createResourceRoutes(resource, {
-      route: route,
-      componentsManager: componentsManager
-    }) : /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-      key: "resource-".concat(resourceId),
-      path: route('resources.index', {
-        resource: resourceId
-      }),
-      element: /*#__PURE__*/React__default["default"].createElement(Navigate, {
-        to: "".concat(route('login'), "?next=").concat(encodeURIComponent(pathname)),
+  // 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, {
+    path: routes.home,
+    exact: true,
+    element: /*#__PURE__*/React__default["default"].createElement(HomeComponent, null)
+  }), resources.map(function (resource) {
+    var _ref4 = resource || {},
+      resourceId = _ref4.id;
+    return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
+      key: "resource-".concat(resourceId)
+    }, createResourceRoutes(resource, {
+      route: route,
+      componentsManager: componentsManager,
+      pages: pages
+    }));
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
-    path: route('account'),
+    path: routes.account,
     exact: true,
-    element: user !== null ? /*#__PURE__*/React__default["default"].createElement(AccountComponent, null) : /*#__PURE__*/React__default["default"].createElement(Navigate, {
-      to: "".concat(route('login'), "?next=").concat(encodeURIComponent(pathname)),
-      replace: true
-    })
+    element: /*#__PURE__*/React__default["default"].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__default["default"](_ref5, _excluded2);
+    var PageComponent = componentsManager.getComponent(component);
+    return PageComponent !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+      path: path || routes[pageRoute],
+      exact: exact,
+      element: /*#__PURE__*/React__default["default"].createElement(PageComponent, props)
+    }) : null;
   }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
     path: "*",
-    elmeent: /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)
+    element: /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)
   }));
 };
-
 PanneauRoutes.propTypes = propTypes$1;
 PanneauRoutes.defaultProps = defaultProps$1;
 
@@ -1770,41 +1746,40 @@ var defaultProps = {
   uppy: null,
   statusCode: null
 };
-
 var Container = function Container(_ref) {
   var definition = _ref.definition,
-      components = _ref.components,
-      user = _ref.user,
-      memoryRouter = _ref.memoryRouter,
-      baseUrl = _ref.baseUrl,
-      uppy = _ref.uppy,
-      statusCode = _ref.statusCode;
-  var _definition$intl = definition.intl;
-  _definition$intl = _definition$intl === void 0 ? {} : _definition$intl;
-  var _definition$intl$loca = _definition$intl.locale,
-      locale = _definition$intl$loca === void 0 ? 'en' : _definition$intl$loca,
-      _definition$intl$loca2 = _definition$intl.locales,
-      locales = _definition$intl$loca2 === void 0 ? [] : _definition$intl$loca2,
-      _definition$routes = definition.routes,
-      routes = _definition$routes === void 0 ? {} : _definition$routes,
-      _definition$settings = definition.settings;
-  _definition$settings = _definition$settings === void 0 ? {} : _definition$settings;
-  var _definition$settings$ = _definition$settings.memoryRouter,
-      usesMemoryRouter = _definition$settings$ === void 0 ? false : _definition$settings$;
+    components = _ref.components,
+    user = _ref.user,
+    memoryRouter = _ref.memoryRouter,
+    baseUrl = _ref.baseUrl,
+    uppy = _ref.uppy,
+    statusCode = _ref.statusCode;
+  var _definition$intl = definition.intl,
+    _definition$intl2 = _definition$intl === void 0 ? {} : _definition$intl,
+    _definition$intl2$loc = _definition$intl2.locale,
+    locale = _definition$intl2$loc === void 0 ? 'en' : _definition$intl2$loc,
+    _definition$intl2$loc2 = _definition$intl2.locales,
+    locales = _definition$intl2$loc2 === void 0 ? [] : _definition$intl2$loc2,
+    _definition$routes = definition.routes,
+    routes = _definition$routes === void 0 ? {} : _definition$routes,
+    _definition$settings = definition.settings,
+    _definition$settings2 = _definition$settings === void 0 ? {} : _definition$settings,
+    _definition$settings3 = _definition$settings2.memoryRouter,
+    usesMemoryRouter = _definition$settings3 === void 0 ? false : _definition$settings3;
   var Router = memoryRouter || usesMemoryRouter ? reactRouter.MemoryRouter : reactRouterDom.BrowserRouter;
   var extraMessages = React.useMemo(function () {
-    var _definition$intl2 = definition.intl;
-    _definition$intl2 = _definition$intl2 === void 0 ? {} : _definition$intl2;
-    var _definition$intl2$mes = _definition$intl2.messages,
-        messages = _definition$intl2$mes === void 0 ? null : _definition$intl2$mes,
-        _definition$resources = definition.resources,
-        resources = _definition$resources === void 0 ? [] : _definition$resources;
+    var _definition$intl3 = definition.intl,
+      _definition$intl4 = _definition$intl3 === void 0 ? {} : _definition$intl3,
+      _definition$intl4$mes = _definition$intl4.messages,
+      messages = _definition$intl4$mes === void 0 ? null : _definition$intl4$mes,
+      _definition$resources = definition.resources,
+      resources = _definition$resources === void 0 ? [] : _definition$resources;
     return _objectSpread__default["default"](_objectSpread__default["default"]({}, messages), resources.reduce(function (allMessages, _ref2) {
       var id = _ref2.id,
-          _ref2$intl = _ref2.intl;
-      _ref2$intl = _ref2$intl === void 0 ? {} : _ref2$intl;
-      var _ref2$intl$messages = _ref2$intl.messages,
-          resourceMessages = _ref2$intl$messages === void 0 ? {} : _ref2$intl$messages;
+        _ref2$intl = _ref2.intl,
+        _ref2$intl2 = _ref2$intl === void 0 ? {} : _ref2$intl,
+        _ref2$intl2$messages = _ref2$intl2.messages,
+        resourceMessages = _ref2$intl2$messages === void 0 ? {} : _ref2$intl2$messages;
       return _objectSpread__default["default"](_objectSpread__default["default"]({}, allMessages), Object.keys(resourceMessages).reduce(function (allResourceMessages, key) {
         return _objectSpread__default["default"](_objectSpread__default["default"]({}, allResourceMessages), {}, _defineProperty__default["default"]({}, "resources.".concat(id, ".").concat(key), resourceMessages[key]));
       }, {}));
@@ -1836,7 +1811,6 @@ var Container = function Container(_ref) {
     statusCode: statusCode
   }))))))))))))));
 };
-
 Container.propTypes = propTypes;
 Container.defaultProps = defaultProps;