@panneau/app 2.0.49 → 2.0.50

package/es/index.js

@@ -6,7 +6,7 @@ import { useLocation, useNavigate, useParams, Route, Routes, Navigate, MemoryRou
 import { Link, BrowserRouter } from 'react-router-dom';
 import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
 import { PropTypes } from '@panneau/core';
-import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, usePagesComponentsManager, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useRoutes, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
+import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useRoutes, usePagesComponentsManager, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
 import { useResourceStore, useResourceUpdate, useResourceDestroy, useResourceItem, useResourceItems, ApiProvider } from '@panneau/data';
 import DisplaysProvider from '@panneau/displays';
 import FieldsProvider from '@panneau/fields';
@@ -578,7 +578,6 @@ var propTypes$f = {
 var defaultProps$f = {};
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
-  var name = resource.name;
   var navigate = useNavigate();
   var _useLocation = useLocation(),
     search = _useLocation.search;
@@ -589,18 +588,12 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     _useMemo$type = _useMemo.type,
     type = _useMemo$type === void 0 ? null : _useMemo$type;
   var resourceValues = useResourceValues(resource);
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Create"));
   var onSuccess = useCallback(function () {
     navigate("".concat(resourceRoute('index'), "?created=true"));
   }, [navigate, resourceRoute]);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
-    resource: resource,
-    type: type,
-    onSuccess: onSuccess
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
+  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
     title: /*#__PURE__*/React.createElement(FormattedMessage, {
       values: resourceValues,
       id: "6viUpq",
@@ -623,7 +616,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     resource: resource,
     type: type,
     onSuccess: onSuccess
-  })))))));
+  }))))));
 };
 ResourceCreatePage.propTypes = propTypes$f;
 ResourceCreatePage.defaultProps = defaultProps$f;
@@ -635,7 +628,6 @@ var propTypes$e = {
 var defaultProps$e = {};
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resource = _ref.resource;
-  var name = resource.name;
   var _useParams = useParams(),
     itemId = _useParams.id;
   var navigate = useNavigate();
@@ -643,19 +635,12 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var _useResourceItem = useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var resourceValues = useResourceValues(resource);
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Delete"));
   var onSuccess = useCallback(function () {
     return navigate("".concat(resourceRoute('index'), "?deleted=true"));
   }, [navigate, resourceRoute]);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
-    resource: resource,
-    item: item,
-    onSuccess: onSuccess,
-    isDelete: true
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
+  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
     title: /*#__PURE__*/React.createElement(FormattedMessage, {
       values: resourceValues,
       id: "zN5N/Q",
@@ -679,20 +664,17 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
     item: item,
     onSuccess: onSuccess,
     isDelete: true
-  }) : null))))));
+  }) : null)))));
 };
 ResourceDeletePage.propTypes = propTypes$e;
 ResourceDeletePage.defaultProps = defaultProps$e;
 
-// import Button from '../buttons/Button';
-
 var propTypes$d = {
   resource: PropTypes.resource.isRequired
 };
 var defaultProps$d = {};
 var ResourceEditPage = function ResourceEditPage(_ref) {
   var resource = _ref.resource;
-  var name = resource.name;
   var _useParams = useParams(),
     itemId = _useParams.id;
   var _useResourceItem = useResourceItem(resource, itemId),
@@ -704,8 +686,6 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     editItem = _useState2[0],
     setEditItem = _useState2[1];
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Edit"));
   var onSuccess = useCallback(function (newItem) {
     return setEditItem(newItem);
   }, []);
@@ -715,12 +695,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
   var resourceValues = useResourceValues(resource);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
-    resource: resource,
-    item: editItem,
-    type: type,
-    onSuccess: onSuccess
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
+  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
     title: /*#__PURE__*/React.createElement(FormattedMessage, {
       values: resourceValues,
       id: "mCfzkJ",
@@ -744,7 +719,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     item: editItem,
     type: type,
     onSuccess: onSuccess
-  }) : null))))));
+  }) : null)))));
 };
 ResourceEditPage.propTypes = propTypes$d;
 ResourceEditPage.defaultProps = defaultProps$d;
@@ -1097,9 +1072,6 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     created = _ref4$created === void 0 ? false : _ref4$created,
     _ref4$deleted = _ref4.deleted,
     deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Index"));
-  var PageComponent = CustomPage !== null ? CustomPage : ResourceItemsList;
   var resourceRoute = useResourceUrlGenerator(resource);
   var url = resourceRoute('index');
   var onQueryChange = useCallback(function (submitQuery) {
@@ -1170,7 +1142,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       "type": 0,
       "value": " has been deleted."
     }]
-  })) : null, /*#__PURE__*/React.createElement(PageComponent, {
+  })) : null, /*#__PURE__*/React.createElement(ResourceItemsList, {
     resource: resource,
     baseUrl: url,
     query: listQuery,
@@ -1196,16 +1168,9 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
   var _ref2 = item || {},
     _ref2$type = _ref2.type,
     type = _ref2$type === void 0 ? null : _ref2$type;
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Show"));
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage ? /*#__PURE__*/React.createElement(CustomPage, {
-    resource: resource,
-    item: item,
-    type: type,
-    disabled: true
-  }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
+  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
     title: "".concat(name, " #").concat(itemId),
     small: true
   }), /*#__PURE__*/React.createElement("div", {
@@ -1219,7 +1184,7 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
     item: item,
     type: type,
     disabled: true
-  })))))));
+  }))))));
 };
 ResourceShowPage.propTypes = propTypes$8;
 ResourceShowPage.defaultProps = defaultProps$8;
@@ -1230,8 +1195,6 @@ var defaultProps$7 = {};
 var HomePage = function HomePage() {
   var route = useUrlGenerator();
   var resources = usePanneauResources();
-  var pagesComponentsManager = usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent('Home');
   var visibleResources = resources.filter(function (_ref) {
     var _ref$settings = _ref.settings,
       _ref$settings2 = _ref$settings === void 0 ? {} : _ref$settings,
@@ -1239,9 +1202,7 @@ var HomePage = function HomePage() {
       hideInNavbar = _ref$settings2$hideIn === void 0 ? false : _ref$settings2$hideIn;
     return !hideInNavbar;
   });
-  return /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
-    resources: visibleResources
-  }) : /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement("div", {
     className: "container-sm py-4"
   }, visibleResources.map(function (resource) {
     var _ref2 = resource || {},
@@ -1363,15 +1324,11 @@ var propTypes$3 = {};
 var defaultProps$3 = {};
 var LoginPage = function LoginPage() {
   var route = useUrlGenerator();
-
   // Sadly necessary to update cookies and routes correctly from the backend,
   // make it post directly instead of api call
   var onSuccess = useCallback(function () {
     window.location.href = route('home');
   }, [route]);
-
-  // TODO: add overrides
-
   return /*#__PURE__*/React.createElement(GuestLayout, {
     fullscreen: true
   }, /*#__PURE__*/React.createElement("div", {

package/lib/index.js

@@ -612,7 +612,6 @@ var propTypes$f = {
 var defaultProps$f = {};
 var ResourceCreatePage = function ResourceCreatePage(_ref) {
   var resource = _ref.resource;
-  var name = resource.name;
   var navigate = reactRouter.useNavigate();
   var _useLocation = reactRouter.useLocation(),
     search = _useLocation.search;
@@ -623,18 +622,12 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     _useMemo$type = _useMemo.type,
     type = _useMemo$type === void 0 ? null : _useMemo$type;
   var resourceValues = intl.useResourceValues(resource);
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Create"));
   var onSuccess = React.useCallback(function () {
     navigate("".concat(resourceRoute('index'), "?created=true"));
   }, [navigate, resourceRoute]);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
-    resource: resource,
-    type: type,
-    onSuccess: onSuccess
-  }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
+  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
     title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
       values: resourceValues,
       id: "6viUpq",
@@ -657,7 +650,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     resource: resource,
     type: type,
     onSuccess: onSuccess
-  })))))));
+  }))))));
 };
 ResourceCreatePage.propTypes = propTypes$f;
 ResourceCreatePage.defaultProps = defaultProps$f;
@@ -669,7 +662,6 @@ var propTypes$e = {
 var defaultProps$e = {};
 var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resource = _ref.resource;
-  var name = resource.name;
   var _useParams = reactRouter.useParams(),
     itemId = _useParams.id;
   var navigate = reactRouter.useNavigate();
@@ -677,19 +669,12 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var _useResourceItem = data.useResourceItem(resource, itemId),
     item = _useResourceItem.item;
   var resourceValues = intl.useResourceValues(resource);
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Delete"));
   var onSuccess = React.useCallback(function () {
     return navigate("".concat(resourceRoute('index'), "?deleted=true"));
   }, [navigate, resourceRoute]);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
-    resource: resource,
-    item: item,
-    onSuccess: onSuccess,
-    isDelete: true
-  }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
+  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
     title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
       values: resourceValues,
       id: "zN5N/Q",
@@ -713,20 +698,17 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
     item: item,
     onSuccess: onSuccess,
     isDelete: true
-  }) : null))))));
+  }) : 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 name = resource.name;
   var _useParams = reactRouter.useParams(),
     itemId = _useParams.id;
   var _useResourceItem = data.useResourceItem(resource, itemId),
@@ -738,8 +720,6 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     _useState2 = _slicedToArray__default["default"](_useState, 2),
     editItem = _useState2[0],
     setEditItem = _useState2[1];
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Edit"));
   var onSuccess = React.useCallback(function (newItem) {
     return setEditItem(newItem);
   }, []);
@@ -749,12 +729,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
   var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
-    resource: resource,
-    item: editItem,
-    type: type,
-    onSuccess: onSuccess
-  }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
+  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
     title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
       values: resourceValues,
       id: "mCfzkJ",
@@ -778,7 +753,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
     item: editItem,
     type: type,
     onSuccess: onSuccess
-  }) : null))))));
+  }) : null)))));
 };
 ResourceEditPage.propTypes = propTypes$d;
 ResourceEditPage.defaultProps = defaultProps$d;
@@ -1131,9 +1106,6 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     created = _ref4$created === void 0 ? false : _ref4$created,
     _ref4$deleted = _ref4.deleted,
     deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Index"));
-  var PageComponent = CustomPage !== null ? CustomPage : ResourceItemsList;
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var url = resourceRoute('index');
   var onQueryChange = React.useCallback(function (submitQuery) {
@@ -1204,7 +1176,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       "type": 0,
       "value": " has been deleted."
     }]
-  })) : null, /*#__PURE__*/React__default["default"].createElement(PageComponent, {
+  })) : null, /*#__PURE__*/React__default["default"].createElement(ResourceItemsList, {
     resource: resource,
     baseUrl: url,
     query: listQuery,
@@ -1230,16 +1202,9 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
   var _ref2 = item || {},
     _ref2$type = _ref2.type,
     type = _ref2$type === void 0 ? null : _ref2$type;
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Show"));
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
-  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
-    resource: resource,
-    item: item,
-    type: type,
-    disabled: true
-  }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
+  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
     title: "".concat(name, " #").concat(itemId),
     small: true
   }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -1253,7 +1218,7 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
     item: item,
     type: type,
     disabled: true
-  })))))));
+  }))))));
 };
 ResourceShowPage.propTypes = propTypes$8;
 ResourceShowPage.defaultProps = defaultProps$8;
@@ -1264,8 +1229,6 @@ var defaultProps$7 = {};
 var HomePage = function HomePage() {
   var route = contexts.useUrlGenerator();
   var resources = contexts.usePanneauResources();
-  var pagesComponentsManager = contexts.usePagesComponentsManager();
-  var CustomPage = pagesComponentsManager.getComponent('Home');
   var visibleResources = resources.filter(function (_ref) {
     var _ref$settings = _ref.settings,
       _ref$settings2 = _ref$settings === void 0 ? {} : _ref$settings,
@@ -1273,9 +1236,7 @@ var HomePage = function HomePage() {
       hideInNavbar = _ref$settings2$hideIn === void 0 ? false : _ref$settings2$hideIn;
     return !hideInNavbar;
   });
-  return /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
-    resources: visibleResources
-  }) : /*#__PURE__*/React__default["default"].createElement("div", {
+  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 || {},
@@ -1397,15 +1358,11 @@ var propTypes$3 = {};
 var defaultProps$3 = {};
 var LoginPage = function LoginPage() {
   var route = contexts.useUrlGenerator();
-
   // Sadly necessary to update cookies and routes correctly from the backend,
   // make it post directly instead of api call
   var onSuccess = React.useCallback(function () {
     window.location.href = route('home');
   }, [route]);
-
-  // TODO: add overrides
-
   return /*#__PURE__*/React__default["default"].createElement(GuestLayout, {
     fullscreen: true
   }, /*#__PURE__*/React__default["default"].createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "2.0.49",
+    "version": "2.0.50",
     "description": "",
     "keywords": [
         "javascript"
@@ -98,5 +98,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "813f7f4608491613dc839a6507e6d3ac9c0da62d"
+    "gitHead": "e8c98628853c108b2ad29912be93763243573a99"
 }