@panneau/app 1.0.3 → 1.1.0

package/es/index.js

@@ -14,9 +14,10 @@ import FiltersProvider from '@panneau/filters';
 import FormsProvider from '@panneau/forms';
 import { useResourceValues, IntlProvider } from '@panneau/intl';
 import ListsProvider from '@panneau/lists';
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import isObject from 'lodash/isObject';
 import { parse, stringify } from 'query-string';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
@@ -24,8 +25,9 @@ import { getComponentFromName } from '@panneau/core/utils';
 import classNames from 'classnames';
 import Button from '@panneau/element-button';
 import Form from '@panneau/element-form';
-import Navbar from '@panneau/element-navbar';
+import isArray from 'lodash/isArray';
 import Menu from '@panneau/element-menu';
+import Navbar from '@panneau/element-navbar';
 import Label from '@panneau/element-label';
 import isString from 'lodash/isString';
 import Alert from '@panneau/element-alert';
@@ -36,7 +38,7 @@ import { faUndo } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import FormGroup from '@panneau/element-form-group';
 
-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: PropTypes.resource.isRequired,
   action: PropTypes$1.string,
@@ -71,7 +73,7 @@ var DeleteForm = function DeleteForm(_ref) {
     _ref.errors;
     var generalError = _ref.generalError,
     className = _ref.className,
-    props = _objectWithoutProperties(_ref, _excluded$5);
+    props = _objectWithoutProperties(_ref, _excluded$6);
   var _ref2 = value || {},
     _ref2$id = _ref2.id,
     id = _ref2$id === void 0 ? null : _ref2$id;
@@ -145,7 +147,7 @@ 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$1.string,
   resource: PropTypes.resource.isRequired,
@@ -169,7 +171,7 @@ var ResourceForm = function ResourceForm(_ref) {
     item = _ref.item,
     type = _ref.type,
     isDelete = _ref.isDelete,
-    props = _objectWithoutProperties(_ref, _excluded$4);
+    props = _objectWithoutProperties(_ref, _excluded$5);
   var locales = useLocales();
   var FormComponents = useFormsComponents();
   var _resource$fields = resource.fields,
@@ -420,30 +422,65 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
 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 = 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 = usePanneauColorScheme(),
     background = _usePanneauColorSchem.background;
   var route = useUrlGenerator();
   var user = useUser();
+  var items = useMemo(function () {
+    var menuItems = (user !== null ? main : guest) || [];
+    var hasResources = menuItems.indexOf('resources') !== -1;
+    var hasAccount = menuItems.indexOf('account') !== -1;
+    return [!hasResources && user !== null ? 'resources' : null].concat(_toConsumableArray(menuItems), [!hasAccount && menuItems.indexOf('separator') === -1 ? 'separator' : null, !hasAccount ? 'account' : null]).filter(function (it) {
+      return it !== null;
+    }).reduce(function (currentItems, item) {
+      if (item === 'resources') {
+        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement(ResourcesMenu, {
+          className: "navbar-nav",
+          itemClassName: "nav-item",
+          linkClassName: "nav-link"
+        })]);
+      }
+      if (item === 'account') {
+        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement(AccountMenu, {
+          className: "navbar-nav",
+          itemClassName: "nav-item",
+          linkClassName: "nav-link"
+        })]);
+      }
+      if (item === 'separator') {
+        return [].concat(_toConsumableArray(currentItems), [/*#__PURE__*/React.createElement("span", {
+          className: "ms-auto"
+        })]);
+      }
+      var lastItem = currentItems.length > 0 ? currentItems[currentItems.length - 1] : null;
+      return isArray(lastItem) ? [].concat(_toConsumableArray(currentItems.slice(0, currentItems.length - 1)), [[].concat(_toConsumableArray(lastItem), [item])]) : [].concat(_toConsumableArray(currentItems), [[item]]);
+    }, []).map(function (it) {
+      return isArray(it) ? /*#__PURE__*/React.createElement(Menu, {
+        items: it,
+        className: "navbar-nav",
+        itemClassName: "nav-item",
+        linkClassName: "nav-link"
+      }) : it;
+    });
+  }, [main]);
   return /*#__PURE__*/React.createElement(Navbar, Object.assign({
     theme: background
   }, props), name !== null ? /*#__PURE__*/React.createElement(Link, {
     to: route('home'),
     className: "navbar-brand"
-  }, name) : null, user !== null ? /*#__PURE__*/React.createElement(ResourcesMenu, {
-    className: "navbar-nav ml-4",
-    itemClassName: "nav-item",
-    linkClassName: "nav-link"
-  }) : null, /*#__PURE__*/React.createElement(AccountMenu, {
-    className: "navbar-nav ms-auto",
-    itemClassName: "nav-item",
-    linkClassName: "nav-link"
-  }));
+  }, name) : null, items);
 };
 MainNavbar.propTypes = propTypes$i;
 MainNavbar.defaultProps = defaultProps$i;
@@ -708,10 +745,9 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
     setDropdownOpened = _useState2[1];
   var onClickDropdown = 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$settings2 = _ref2$settings === void 0 ? {} : _ref2$settings,
@@ -721,8 +757,10 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
   }) : null;
   var hasMultipleTypes = finalTypes !== null && finalTypes.length > 1;
   var onDropdownClickOutside = useCallback(function () {
-    setDropdownOpened(false);
-  }, [setDropdownOpened]);
+    if (dropdownOpened) {
+      setDropdownOpened(false);
+    }
+  }, [setDropdownOpened, dropdownOpened]);
   var button = /*#__PURE__*/React.createElement(Button, {
     href: !hasMultipleTypes ? "".concat(resourceRoute('create')).concat(finalTypes !== null && finalTypes.length === 1 ? "?type=".concat(finalTypes[0].id) : '') : '#',
     size: "lg",
@@ -762,7 +800,7 @@ var ResourceCreateButtom = function ResourceCreateButtom(_ref) {
 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$1.arrayOf(PropTypes$1.shape({
     id: PropTypes$1.string.isRequired,
@@ -827,7 +865,7 @@ var ResourceFilters = function ResourceFilters(_ref) {
     var component = _ref3.component,
       name = _ref3.name,
       groupLabel = _ref3.groupLabel,
-      filterProps = _objectWithoutProperties(_ref3, _excluded$3);
+      filterProps = _objectWithoutProperties(_ref3, _excluded$4);
     var FilterComponent = getComponentFromName(component, FilterComponents, null);
     var filterValue = value !== null && value[name] ? value[name] : null;
     var onFilterChange = useCallback(function (newFilterValue) {
@@ -862,8 +900,8 @@ var ResourceFilters = function ResourceFilters(_ref) {
 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: PropTypes.resource.isRequired,
   query: PropTypes$1.object,
@@ -900,7 +938,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     showPagination = _resource$index2$show === void 0 ? true : _resource$index2$show,
     _resource$index2$filt = _resource$index2.filters,
     filters = _resource$index2$filt === void 0 ? null : _resource$index2$filt,
-    listProps = _objectWithoutProperties(_resource$index2, _excluded$2);
+    listProps = _objectWithoutProperties(_resource$index2, _excluded$3);
   var _usePanneauColorSchem = usePanneauColorScheme(),
     _usePanneauColorSchem2 = _usePanneauColorSchem.background,
     theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
@@ -909,7 +947,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
       var _ref2 = query || {},
         _ref2$page = _ref2.page,
         currentPage = _ref2$page === void 0 ? 1 : _ref2$page,
-        rest = _objectWithoutProperties(_ref2, _excluded2);
+        rest = _objectWithoutProperties(_ref2, _excluded2$1);
       return [currentPage, rest];
     }, [query]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
@@ -953,7 +991,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
 ResourceItemsList.propTypes = propTypes$a;
 ResourceItemsList.defaultProps = defaultProps$a;
 
-var _excluded$1 = ["id", "component"];
+var _excluded$2 = ["id", "component"];
 var propTypes$9 = {
   resource: PropTypes.resource.isRequired,
   defaultActions: PropTypes$1.arrayOf(PropTypes$1.object) // eslint-disable-line react/forbid-prop-types
@@ -1024,8 +1062,10 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     navigate("".concat(url, "?").concat(queryString));
   }, [navigate, url, paginated]);
   var onClickCloseAlert = useCallback(function () {
-    history.replace(url);
-  }, [history, url]);
+    navigate(url, {
+      replace: true
+    });
+  }, [navigate, url]);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
@@ -1036,7 +1076,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var id = _ref5.id,
         _ref5$component = _ref5.component,
         component = _ref5$component === void 0 ? Button : _ref5$component,
-        actionProps = _objectWithoutProperties(_ref5, _excluded$1);
+        actionProps = _objectWithoutProperties(_ref5, _excluded$2);
       var ActionComponent = isString(component) ? componentsManager.getComponent(component) : component;
       return ActionComponent !== null ? /*#__PURE__*/React.createElement(ActionComponent, Object.assign({
         key: "action-".concat(id)
@@ -1413,7 +1453,7 @@ var ErrorPage = function ErrorPage(_ref) {
 ErrorPage.propTypes = propTypes$2;
 ErrorPage.defaultProps = defaultProps$2;
 
-var _excluded = ["path", "component", "exact"];
+var _excluded$1 = ["path", "component", "exact"];
 var createResourceRoutes = function createResourceRoutes(resource, _ref) {
   var route = _ref.route,
     componentsManager = _ref.componentsManager,
@@ -1501,7 +1541,7 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
       component = _ref4.component,
       _ref4$exact = _ref4.exact,
       exact = _ref4$exact === void 0 ? true : _ref4$exact,
-      pageProps = _objectWithoutProperties(_ref4, _excluded);
+      pageProps = _objectWithoutProperties(_ref4, _excluded$1);
     var RouteComponent = componentsManager.getComponent(component);
     return RouteComponent !== null ? /*#__PURE__*/React.createElement(Route, {
       key: "route-".concat(path),
@@ -1514,6 +1554,8 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
   })));
 };
 
+var _excluded = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete"],
+  _excluded2 = ["path", "route", "component", "exact"];
 var propTypes$1 = {
   statusCode: PropTypes.statusCode
 };
@@ -1550,7 +1592,8 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
   // Custom Pages
   var _usePanneau = usePanneau(),
     _usePanneau$pages = _usePanneau.pages,
-    pages = _usePanneau$pages === void 0 ? null : _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,
@@ -1560,6 +1603,30 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     accountPage = _ref2$account === void 0 ? null : _ref2$account,
     _ref2$error = _ref2.error,
     errorPage = _ref2$error === void 0 ? null : _ref2$error;
+    _ref2.index;
+    _ref2.show;
+    _ref2.create;
+    _ref2.edit;
+    _ref2["delete"];
+    var otherPages = _objectWithoutProperties(_ref2, _excluded);
+  var customRoutes = useMemo(function () {
+    return [].concat(_toConsumableArray(Object.keys(routesDefinition).filter(function (key) {
+      return key.match(/^(resources\.|auth\.)/) === null && key !== 'home' && key !== 'account';
+    }).filter(function (key) {
+      var routeDef = routesDefinition[key];
+      return isObject(routeDef) && typeof routeDef.component !== 'undefined' && typeof routeDef.path !== 'undefined';
+    }).map(function (key) {
+      return routesDefinition[key];
+    })), _toConsumableArray(Object.keys(otherPages).map(function (key) {
+      return otherPages[key];
+    }).filter(function (_ref3) {
+      var _ref3$path = _ref3.path,
+        path = _ref3$path === void 0 ? null : _ref3$path,
+        _ref3$route = _ref3.route,
+        pageRoute = _ref3$route === void 0 ? null : _ref3$route;
+      return path !== null || pageRoute !== null;
+    })));
+  }, [routesDefinition, otherPages]);
   var HomeComponent = componentsManager.getComponent(homePage === null || homePage === void 0 ? void 0 : homePage.component) || HomePage;
   var LoginComponent = componentsManager.getComponent(loginPage === null || loginPage === void 0 ? void 0 : loginPage.component) || LoginPage;
   var AccountComponent = componentsManager.getComponent(accountPage === null || accountPage === void 0 ? void 0 : accountPage.component) || AccountPage;
@@ -1593,8 +1660,8 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     exact: true,
     element: /*#__PURE__*/React.createElement(HomeComponent, null)
   }), resources.map(function (resource) {
-    var _ref3 = resource || {},
-      resourceId = _ref3.id;
+    var _ref4 = resource || {},
+      resourceId = _ref4.id;
     return /*#__PURE__*/React.createElement(Fragment, {
       key: "resource-".concat(resourceId)
     }, createResourceRoutes(resource, {
@@ -1606,6 +1673,21 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     path: routes.account,
     exact: true,
     element: /*#__PURE__*/React.createElement(AccountComponent, null)
+  }), customRoutes.map(function (_ref5) {
+    var _ref5$path = _ref5.path,
+      path = _ref5$path === void 0 ? null : _ref5$path,
+      _ref5$route = _ref5.route,
+      pageRoute = _ref5$route === void 0 ? null : _ref5$route,
+      component = _ref5.component,
+      _ref5$exact = _ref5.exact,
+      exact = _ref5$exact === void 0 ? true : _ref5$exact,
+      props = _objectWithoutProperties(_ref5, _excluded2);
+    var PageComponent = componentsManager.getComponent(component);
+    return PageComponent !== null ? /*#__PURE__*/React.createElement(Route, {
+      path: path || routes[pageRoute],
+      exact: exact,
+      element: /*#__PURE__*/React.createElement(PageComponent, props)
+    }) : null;
   }), /*#__PURE__*/React.createElement(Route, {
     path: "*",
     element: /*#__PURE__*/React.createElement(ErrorComponent, null)