@panneau/app 2.0.17 → 2.0.19

package/es/index.js

@@ -913,7 +913,8 @@ var propTypes$a = {
   // eslint-disable-line react/forbid-prop-types
   onQueryChange: PropTypes$1.func,
   onQueryReset: PropTypes$1.func,
-  showFilters: PropTypes$1.bool
+  showFilters: PropTypes$1.bool,
+  listProps: PropTypes$1.shape({})
 };
 var defaultProps$a = {
   query: null,
@@ -923,7 +924,8 @@ var defaultProps$a = {
   componentProps: null,
   onQueryChange: null,
   onQueryReset: null,
-  showFilters: true
+  showFilters: true,
+  listProps: null
 };
 var ResourceItemsList = function ResourceItemsList(_ref) {
   var resource = _ref.resource,
@@ -932,7 +934,8 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     onQueryChange = _ref.onQueryChange,
     onQueryReset = _ref.onQueryReset,
     paginated = _ref.paginated,
-    showFilters = _ref.showFilters;
+    showFilters = _ref.showFilters,
+    customListProps = _ref.listProps;
   var _resource$index = resource.index,
     _resource$index2 = _resource$index === void 0 ? {} : _resource$index,
     _resource$index2$comp = _resource$index2.component,
@@ -959,10 +962,15 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     queryWithoutPage = _useMemo2[1];
   var itemsProps = useResourceItems(resource, queryWithoutPage, paginated ? parseInt(page, 10) : null);
   var _ref3 = itemsProps || {},
+    _ref3$loaded = _ref3.loaded,
+    loaded = _ref3$loaded === void 0 ? false : _ref3$loaded,
+    _ref3$loading = _ref3.loading,
+    loading = _ref3$loading === void 0 ? false : _ref3$loading,
     _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 finalEmpty = loaded && !loading && total === 0;
   var ListComponent = getComponentFromName(listComponent || 'table', ListComponents);
   return /*#__PURE__*/React.createElement(React.Fragment, null, showFilters && filters !== null ? /*#__PURE__*/React.createElement(ResourceFilters, {
     filters: filters,
@@ -982,8 +990,18 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     query: query,
     onQueryChange: onQueryChange,
     onQueryReset: onQueryReset,
-    theme: theme
-  })) : null, paginated && showPagination ? /*#__PURE__*/React.createElement(Pagination, {
+    theme: theme,
+    showEmptyLabel: finalEmpty,
+    emptyLabel: /*#__PURE__*/React.createElement("p", {
+      className: "my-2"
+    }, /*#__PURE__*/React.createElement(FormattedMessage, {
+      id: "WgIC2T",
+      defaultMessage: [{
+        "type": 0,
+        "value": "No results found"
+      }]
+    }))
+  }, customListProps)) : null, paginated && showPagination ? /*#__PURE__*/React.createElement(Pagination, {
     page: page,
     lastPage: lastPage,
     total: total,
@@ -1281,10 +1299,6 @@ GuestLayout.defaultProps = defaultProps$4;
 var propTypes$3 = {};
 var defaultProps$3 = {};
 var LoginPage = function LoginPage() {
-  var route = useUrlGenerator();
-  var onSuccess = useCallback(function () {
-    window.location.href = route('home');
-  }, [route]);
   return /*#__PURE__*/React.createElement(GuestLayout, {
     fullscreen: true
   }, /*#__PURE__*/React.createElement("div", {
@@ -1301,9 +1315,7 @@ var LoginPage = function LoginPage() {
       "type": 0,
       "value": "Login"
     }]
-  })), /*#__PURE__*/React.createElement(LoginForm, {
-    onSuccess: onSuccess
-  })))));
+  })), /*#__PURE__*/React.createElement(LoginForm, null)))));
 };
 LoginPage.propTypes = propTypes$3;
 LoginPage.defaultProps = defaultProps$3;
@@ -1628,7 +1640,14 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     path: routes.home,
     exact: true,
     element: /*#__PURE__*/React.createElement(HomeComponent, null)
-  }), resources.map(function (resource) {
+  }), user !== null ? /*#__PURE__*/React.createElement(Route, {
+    path: routes['auth.login'],
+    exact: true,
+    element: /*#__PURE__*/React.createElement(Navigate, {
+      to: routes.home,
+      replace: true
+    })
+  }) : null, resources.map(function (resource) {
     var _ref4 = resource || {},
       resourceId = _ref4.id;
     return /*#__PURE__*/React.createElement(Fragment, {
@@ -1724,9 +1743,6 @@ var Container = function Container(_ref) {
   var onUnauthorized = useCallback(function () {
     window.location.href = baseUrl;
   }, [baseUrl]);
-  var onLogout = useCallback(function () {
-    window.location.reload();
-  }, [baseUrl]);
   return /*#__PURE__*/React.createElement(Router, null, /*#__PURE__*/React.createElement(IntlProvider, {
     locale: locale,
     locales: locales,
@@ -1739,8 +1755,7 @@ var Container = function Container(_ref) {
     baseUrl: baseUrl,
     onUnauthorized: onUnauthorized
   }, /*#__PURE__*/React.createElement(AuthProvider, {
-    user: user,
-    onLogout: onLogout
+    user: user
   }, /*#__PURE__*/React.createElement(ComponentsProvider, {
     components: components
   }, /*#__PURE__*/React.createElement(PanneauRoutes, {

package/lib/index.js

@@ -947,7 +947,8 @@ var propTypes$a = {
   // eslint-disable-line react/forbid-prop-types
   onQueryChange: PropTypes__default["default"].func,
   onQueryReset: PropTypes__default["default"].func,
-  showFilters: PropTypes__default["default"].bool
+  showFilters: PropTypes__default["default"].bool,
+  listProps: PropTypes__default["default"].shape({})
 };
 var defaultProps$a = {
   query: null,
@@ -957,7 +958,8 @@ var defaultProps$a = {
   componentProps: null,
   onQueryChange: null,
   onQueryReset: null,
-  showFilters: true
+  showFilters: true,
+  listProps: null
 };
 var ResourceItemsList = function ResourceItemsList(_ref) {
   var resource = _ref.resource,
@@ -966,7 +968,8 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     onQueryChange = _ref.onQueryChange,
     onQueryReset = _ref.onQueryReset,
     paginated = _ref.paginated,
-    showFilters = _ref.showFilters;
+    showFilters = _ref.showFilters,
+    customListProps = _ref.listProps;
   var _resource$index = resource.index,
     _resource$index2 = _resource$index === void 0 ? {} : _resource$index,
     _resource$index2$comp = _resource$index2.component,
@@ -993,10 +996,15 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     queryWithoutPage = _useMemo2[1];
   var itemsProps = data.useResourceItems(resource, queryWithoutPage, paginated ? parseInt(page, 10) : null);
   var _ref3 = itemsProps || {},
+    _ref3$loaded = _ref3.loaded,
+    loaded = _ref3$loaded === void 0 ? false : _ref3$loaded,
+    _ref3$loading = _ref3.loading,
+    loading = _ref3$loading === void 0 ? false : _ref3$loading,
     _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 finalEmpty = loaded && !loading && total === 0;
   var ListComponent = utils.getComponentFromName(listComponent || 'table', ListComponents);
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, showFilters && filters !== null ? /*#__PURE__*/React__default["default"].createElement(ResourceFilters, {
     filters: filters,
@@ -1016,8 +1024,18 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
     query: query,
     onQueryChange: onQueryChange,
     onQueryReset: onQueryReset,
-    theme: theme
-  })) : null, paginated && showPagination ? /*#__PURE__*/React__default["default"].createElement(Pagination__default["default"], {
+    theme: theme,
+    showEmptyLabel: finalEmpty,
+    emptyLabel: /*#__PURE__*/React__default["default"].createElement("p", {
+      className: "my-2"
+    }, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+      id: "WgIC2T",
+      defaultMessage: [{
+        "type": 0,
+        "value": "No results found"
+      }]
+    }))
+  }, customListProps)) : null, paginated && showPagination ? /*#__PURE__*/React__default["default"].createElement(Pagination__default["default"], {
     page: page,
     lastPage: lastPage,
     total: total,
@@ -1315,10 +1333,6 @@ GuestLayout.defaultProps = defaultProps$4;
 var propTypes$3 = {};
 var defaultProps$3 = {};
 var LoginPage = function LoginPage() {
-  var route = contexts.useUrlGenerator();
-  var onSuccess = React.useCallback(function () {
-    window.location.href = route('home');
-  }, [route]);
   return /*#__PURE__*/React__default["default"].createElement(GuestLayout, {
     fullscreen: true
   }, /*#__PURE__*/React__default["default"].createElement("div", {
@@ -1335,9 +1349,7 @@ var LoginPage = function LoginPage() {
       "type": 0,
       "value": "Login"
     }]
-  })), /*#__PURE__*/React__default["default"].createElement(LoginForm, {
-    onSuccess: onSuccess
-  })))));
+  })), /*#__PURE__*/React__default["default"].createElement(LoginForm, null)))));
 };
 LoginPage.propTypes = propTypes$3;
 LoginPage.defaultProps = defaultProps$3;
@@ -1662,7 +1674,14 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
     path: routes.home,
     exact: true,
     element: /*#__PURE__*/React__default["default"].createElement(HomeComponent, null)
-  }), resources.map(function (resource) {
+  }), user !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
+    path: routes['auth.login'],
+    exact: true,
+    element: /*#__PURE__*/React__default["default"].createElement(reactRouter.Navigate, {
+      to: routes.home,
+      replace: true
+    })
+  }) : null, resources.map(function (resource) {
     var _ref4 = resource || {},
       resourceId = _ref4.id;
     return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
@@ -1758,9 +1777,6 @@ var Container = function Container(_ref) {
   var onUnauthorized = React.useCallback(function () {
     window.location.href = baseUrl;
   }, [baseUrl]);
-  var onLogout = React.useCallback(function () {
-    window.location.reload();
-  }, [baseUrl]);
   return /*#__PURE__*/React__default["default"].createElement(Router, null, /*#__PURE__*/React__default["default"].createElement(intl.IntlProvider, {
     locale: locale,
     locales: locales,
@@ -1773,8 +1789,7 @@ var Container = function Container(_ref) {
     baseUrl: baseUrl,
     onUnauthorized: onUnauthorized
   }, /*#__PURE__*/React__default["default"].createElement(auth.AuthProvider, {
-    user: user,
-    onLogout: onLogout
+    user: user
   }, /*#__PURE__*/React__default["default"].createElement(contexts.ComponentsProvider, {
     components: components
   }, /*#__PURE__*/React__default["default"].createElement(PanneauRoutes, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "2.0.17",
+    "version": "2.0.19",
     "description": "",
     "keywords": [
         "javascript"
@@ -80,11 +80,11 @@
         "@panneau/element-navbar": "^2.0.16",
         "@panneau/element-pagination": "^2.0.15",
         "@panneau/element-radios": "^2.0.17",
-        "@panneau/fields": "^2.0.17",
+        "@panneau/fields": "^2.0.18",
         "@panneau/filters": "^2.0.17",
         "@panneau/forms": "^2.0.16",
         "@panneau/intl": "^2.0.15",
-        "@panneau/lists": "^2.0.16",
+        "@panneau/lists": "^2.0.18",
         "@panneau/modals": "^2.0.16",
         "@panneau/themes": "^2.0.15",
         "classnames": "^2.2.6",
@@ -98,5 +98,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3c06458008eb0b0b12017ca43cae9baf1904d6dc"
+    "gitHead": "6a2deb28fe5dda0d611c92b1ace32cda18d3101b"
 }