@panneau/app 2.0.49 → 2.0.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/index.js +17 -59
  2. package/lib/index.js +16 -58
  3. package/package.json +26 -26
package/es/index.js CHANGED
@@ -6,7 +6,7 @@ import { useLocation, useNavigate, useParams, Route, Routes, Navigate, MemoryRou
6
6
  import { Link, BrowserRouter } from 'react-router-dom';
7
7
  import { useUser, useLogout, useAuth, AuthProvider } from '@panneau/auth';
8
8
  import { PropTypes } from '@panneau/core';
9
- import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, usePagesComponentsManager, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useRoutes, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
9
+ import { useLocales, useFormsComponents, FormProvider, useUrlGenerator, usePanneauResources, usePanneau, usePanneauColorScheme, ResourceProvider, useFiltersComponents, useListsComponents, useComponentsManager, useRoutes, usePagesComponentsManager, PanneauProvider, UppyProvider, RoutesProvider, ComponentsProvider } from '@panneau/core/contexts';
10
10
  import { useResourceStore, useResourceUpdate, useResourceDestroy, useResourceItem, useResourceItems, ApiProvider } from '@panneau/data';
11
11
  import DisplaysProvider from '@panneau/displays';
12
12
  import FieldsProvider from '@panneau/fields';
@@ -578,7 +578,6 @@ var propTypes$f = {
578
578
  var defaultProps$f = {};
579
579
  var ResourceCreatePage = function ResourceCreatePage(_ref) {
580
580
  var resource = _ref.resource;
581
- var name = resource.name;
582
581
  var navigate = useNavigate();
583
582
  var _useLocation = useLocation(),
584
583
  search = _useLocation.search;
@@ -589,18 +588,12 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
589
588
  _useMemo$type = _useMemo.type,
590
589
  type = _useMemo$type === void 0 ? null : _useMemo$type;
591
590
  var resourceValues = useResourceValues(resource);
592
- var pagesComponentsManager = usePagesComponentsManager();
593
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Create"));
594
591
  var onSuccess = useCallback(function () {
595
592
  navigate("".concat(resourceRoute('index'), "?created=true"));
596
593
  }, [navigate, resourceRoute]);
597
594
  return /*#__PURE__*/React.createElement(ResourceProvider, {
598
595
  resource: resource
599
- }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
600
- resource: resource,
601
- type: type,
602
- onSuccess: onSuccess
603
- }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
596
+ }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
604
597
  title: /*#__PURE__*/React.createElement(FormattedMessage, {
605
598
  values: resourceValues,
606
599
  id: "6viUpq",
@@ -623,7 +616,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
623
616
  resource: resource,
624
617
  type: type,
625
618
  onSuccess: onSuccess
626
- })))))));
619
+ }))))));
627
620
  };
628
621
  ResourceCreatePage.propTypes = propTypes$f;
629
622
  ResourceCreatePage.defaultProps = defaultProps$f;
@@ -635,7 +628,6 @@ var propTypes$e = {
635
628
  var defaultProps$e = {};
636
629
  var ResourceDeletePage = function ResourceDeletePage(_ref) {
637
630
  var resource = _ref.resource;
638
- var name = resource.name;
639
631
  var _useParams = useParams(),
640
632
  itemId = _useParams.id;
641
633
  var navigate = useNavigate();
@@ -643,19 +635,12 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
643
635
  var _useResourceItem = useResourceItem(resource, itemId),
644
636
  item = _useResourceItem.item;
645
637
  var resourceValues = useResourceValues(resource);
646
- var pagesComponentsManager = usePagesComponentsManager();
647
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Delete"));
648
638
  var onSuccess = useCallback(function () {
649
639
  return navigate("".concat(resourceRoute('index'), "?deleted=true"));
650
640
  }, [navigate, resourceRoute]);
651
641
  return /*#__PURE__*/React.createElement(ResourceProvider, {
652
642
  resource: resource
653
- }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
654
- resource: resource,
655
- item: item,
656
- onSuccess: onSuccess,
657
- isDelete: true
658
- }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
643
+ }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
659
644
  title: /*#__PURE__*/React.createElement(FormattedMessage, {
660
645
  values: resourceValues,
661
646
  id: "zN5N/Q",
@@ -679,20 +664,17 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
679
664
  item: item,
680
665
  onSuccess: onSuccess,
681
666
  isDelete: true
682
- }) : null))))));
667
+ }) : null)))));
683
668
  };
684
669
  ResourceDeletePage.propTypes = propTypes$e;
685
670
  ResourceDeletePage.defaultProps = defaultProps$e;
686
671
 
687
- // import Button from '../buttons/Button';
688
-
689
672
  var propTypes$d = {
690
673
  resource: PropTypes.resource.isRequired
691
674
  };
692
675
  var defaultProps$d = {};
693
676
  var ResourceEditPage = function ResourceEditPage(_ref) {
694
677
  var resource = _ref.resource;
695
- var name = resource.name;
696
678
  var _useParams = useParams(),
697
679
  itemId = _useParams.id;
698
680
  var _useResourceItem = useResourceItem(resource, itemId),
@@ -704,8 +686,6 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
704
686
  _useState2 = _slicedToArray(_useState, 2),
705
687
  editItem = _useState2[0],
706
688
  setEditItem = _useState2[1];
707
- var pagesComponentsManager = usePagesComponentsManager();
708
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Edit"));
709
689
  var onSuccess = useCallback(function (newItem) {
710
690
  return setEditItem(newItem);
711
691
  }, []);
@@ -715,12 +695,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
715
695
  var resourceValues = useResourceValues(resource);
716
696
  return /*#__PURE__*/React.createElement(ResourceProvider, {
717
697
  resource: resource
718
- }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
719
- resource: resource,
720
- item: editItem,
721
- type: type,
722
- onSuccess: onSuccess
723
- }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
698
+ }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
724
699
  title: /*#__PURE__*/React.createElement(FormattedMessage, {
725
700
  values: resourceValues,
726
701
  id: "mCfzkJ",
@@ -744,7 +719,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
744
719
  item: editItem,
745
720
  type: type,
746
721
  onSuccess: onSuccess
747
- }) : null))))));
722
+ }) : null)))));
748
723
  };
749
724
  ResourceEditPage.propTypes = propTypes$d;
750
725
  ResourceEditPage.defaultProps = defaultProps$d;
@@ -975,6 +950,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
975
950
  filters = _resource$index2$filt === void 0 ? null : _resource$index2$filt;
976
951
  _resource$index2.actions;
977
952
  var listProps = _objectWithoutProperties(_resource$index2, _excluded$3);
953
+ console.log('resource', resource);
978
954
  var _usePanneauColorSchem = usePanneauColorScheme(),
979
955
  _usePanneauColorSchem2 = _usePanneauColorSchem.background,
980
956
  theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
@@ -1097,9 +1073,6 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
1097
1073
  created = _ref4$created === void 0 ? false : _ref4$created,
1098
1074
  _ref4$deleted = _ref4.deleted,
1099
1075
  deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
1100
- var pagesComponentsManager = usePagesComponentsManager();
1101
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Index"));
1102
- var PageComponent = CustomPage !== null ? CustomPage : ResourceItemsList;
1103
1076
  var resourceRoute = useResourceUrlGenerator(resource);
1104
1077
  var url = resourceRoute('index');
1105
1078
  var onQueryChange = useCallback(function (submitQuery) {
@@ -1170,7 +1143,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
1170
1143
  "type": 0,
1171
1144
  "value": " has been deleted."
1172
1145
  }]
1173
- })) : null, /*#__PURE__*/React.createElement(PageComponent, {
1146
+ })) : null, /*#__PURE__*/React.createElement(ResourceItemsList, {
1174
1147
  resource: resource,
1175
1148
  baseUrl: url,
1176
1149
  query: listQuery,
@@ -1196,16 +1169,9 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
1196
1169
  var _ref2 = item || {},
1197
1170
  _ref2$type = _ref2.type,
1198
1171
  type = _ref2$type === void 0 ? null : _ref2$type;
1199
- var pagesComponentsManager = usePagesComponentsManager();
1200
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Show"));
1201
1172
  return /*#__PURE__*/React.createElement(ResourceProvider, {
1202
1173
  resource: resource
1203
- }, /*#__PURE__*/React.createElement(MainLayout, null, CustomPage ? /*#__PURE__*/React.createElement(CustomPage, {
1204
- resource: resource,
1205
- item: item,
1206
- type: type,
1207
- disabled: true
1208
- }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PageHeader, {
1174
+ }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
1209
1175
  title: "".concat(name, " #").concat(itemId),
1210
1176
  small: true
1211
1177
  }), /*#__PURE__*/React.createElement("div", {
@@ -1219,7 +1185,7 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
1219
1185
  item: item,
1220
1186
  type: type,
1221
1187
  disabled: true
1222
- })))))));
1188
+ }))))));
1223
1189
  };
1224
1190
  ResourceShowPage.propTypes = propTypes$8;
1225
1191
  ResourceShowPage.defaultProps = defaultProps$8;
@@ -1230,8 +1196,6 @@ var defaultProps$7 = {};
1230
1196
  var HomePage = function HomePage() {
1231
1197
  var route = useUrlGenerator();
1232
1198
  var resources = usePanneauResources();
1233
- var pagesComponentsManager = usePagesComponentsManager();
1234
- var CustomPage = pagesComponentsManager.getComponent('Home');
1235
1199
  var visibleResources = resources.filter(function (_ref) {
1236
1200
  var _ref$settings = _ref.settings,
1237
1201
  _ref$settings2 = _ref$settings === void 0 ? {} : _ref$settings,
@@ -1239,9 +1203,7 @@ var HomePage = function HomePage() {
1239
1203
  hideInNavbar = _ref$settings2$hideIn === void 0 ? false : _ref$settings2$hideIn;
1240
1204
  return !hideInNavbar;
1241
1205
  });
1242
- return /*#__PURE__*/React.createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React.createElement(CustomPage, {
1243
- resources: visibleResources
1244
- }) : /*#__PURE__*/React.createElement("div", {
1206
+ return /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement("div", {
1245
1207
  className: "container-sm py-4"
1246
1208
  }, visibleResources.map(function (resource) {
1247
1209
  var _ref2 = resource || {},
@@ -1363,15 +1325,11 @@ var propTypes$3 = {};
1363
1325
  var defaultProps$3 = {};
1364
1326
  var LoginPage = function LoginPage() {
1365
1327
  var route = useUrlGenerator();
1366
-
1367
1328
  // Sadly necessary to update cookies and routes correctly from the backend,
1368
1329
  // make it post directly instead of api call
1369
1330
  var onSuccess = useCallback(function () {
1370
1331
  window.location.href = route('home');
1371
1332
  }, [route]);
1372
-
1373
- // TODO: add overrides
1374
-
1375
1333
  return /*#__PURE__*/React.createElement(GuestLayout, {
1376
1334
  fullscreen: true
1377
1335
  }, /*#__PURE__*/React.createElement("div", {
@@ -1695,9 +1653,9 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1695
1653
 
1696
1654
  // If there is an error status code
1697
1655
  if (statusCode !== null) {
1698
- return /*#__PURE__*/React.createElement(ErrorComponent, {
1656
+ return /*#__PURE__*/React.createElement(ErrorComponent, Object.assign({
1699
1657
  statusCode: statusCode
1700
- });
1658
+ }, errorPage));
1701
1659
  }
1702
1660
 
1703
1661
  // If user is unauthenticated
@@ -1705,7 +1663,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1705
1663
  return /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
1706
1664
  path: routes['auth.login'],
1707
1665
  exact: true,
1708
- element: /*#__PURE__*/React.createElement(LoginComponent, null)
1666
+ element: /*#__PURE__*/React.createElement(LoginComponent, loginPage)
1709
1667
  }), /*#__PURE__*/React.createElement(Route, {
1710
1668
  path: "*",
1711
1669
  element: /*#__PURE__*/React.createElement(Navigate, {
@@ -1719,7 +1677,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1719
1677
  return /*#__PURE__*/React.createElement(Routes, null, /*#__PURE__*/React.createElement(Route, {
1720
1678
  path: routes.home,
1721
1679
  exact: true,
1722
- element: /*#__PURE__*/React.createElement(HomeComponent, null)
1680
+ element: /*#__PURE__*/React.createElement(HomeComponent, homePage)
1723
1681
  }), user !== null ? /*#__PURE__*/React.createElement(Route, {
1724
1682
  path: routes['auth.login'],
1725
1683
  exact: true,
@@ -1740,7 +1698,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1740
1698
  }), /*#__PURE__*/React.createElement(Route, {
1741
1699
  path: routes.account,
1742
1700
  exact: true,
1743
- element: /*#__PURE__*/React.createElement(AccountComponent, null)
1701
+ element: /*#__PURE__*/React.createElement(AccountComponent, accountPage)
1744
1702
  }), customRoutes.map(function (_ref5) {
1745
1703
  var _ref5$path = _ref5.path,
1746
1704
  path = _ref5$path === void 0 ? null : _ref5$path,
package/lib/index.js CHANGED
@@ -612,7 +612,6 @@ var propTypes$f = {
612
612
  var defaultProps$f = {};
613
613
  var ResourceCreatePage = function ResourceCreatePage(_ref) {
614
614
  var resource = _ref.resource;
615
- var name = resource.name;
616
615
  var navigate = reactRouter.useNavigate();
617
616
  var _useLocation = reactRouter.useLocation(),
618
617
  search = _useLocation.search;
@@ -623,18 +622,12 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
623
622
  _useMemo$type = _useMemo.type,
624
623
  type = _useMemo$type === void 0 ? null : _useMemo$type;
625
624
  var resourceValues = intl.useResourceValues(resource);
626
- var pagesComponentsManager = contexts.usePagesComponentsManager();
627
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Create"));
628
625
  var onSuccess = React.useCallback(function () {
629
626
  navigate("".concat(resourceRoute('index'), "?created=true"));
630
627
  }, [navigate, resourceRoute]);
631
628
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
632
629
  resource: resource
633
- }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
634
- resource: resource,
635
- type: type,
636
- onSuccess: onSuccess
637
- }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
630
+ }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
638
631
  title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
639
632
  values: resourceValues,
640
633
  id: "6viUpq",
@@ -657,7 +650,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
657
650
  resource: resource,
658
651
  type: type,
659
652
  onSuccess: onSuccess
660
- })))))));
653
+ }))))));
661
654
  };
662
655
  ResourceCreatePage.propTypes = propTypes$f;
663
656
  ResourceCreatePage.defaultProps = defaultProps$f;
@@ -669,7 +662,6 @@ var propTypes$e = {
669
662
  var defaultProps$e = {};
670
663
  var ResourceDeletePage = function ResourceDeletePage(_ref) {
671
664
  var resource = _ref.resource;
672
- var name = resource.name;
673
665
  var _useParams = reactRouter.useParams(),
674
666
  itemId = _useParams.id;
675
667
  var navigate = reactRouter.useNavigate();
@@ -677,19 +669,12 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
677
669
  var _useResourceItem = data.useResourceItem(resource, itemId),
678
670
  item = _useResourceItem.item;
679
671
  var resourceValues = intl.useResourceValues(resource);
680
- var pagesComponentsManager = contexts.usePagesComponentsManager();
681
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Delete"));
682
672
  var onSuccess = React.useCallback(function () {
683
673
  return navigate("".concat(resourceRoute('index'), "?deleted=true"));
684
674
  }, [navigate, resourceRoute]);
685
675
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
686
676
  resource: resource
687
- }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
688
- resource: resource,
689
- item: item,
690
- onSuccess: onSuccess,
691
- isDelete: true
692
- }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
677
+ }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
693
678
  title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
694
679
  values: resourceValues,
695
680
  id: "zN5N/Q",
@@ -713,20 +698,17 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
713
698
  item: item,
714
699
  onSuccess: onSuccess,
715
700
  isDelete: true
716
- }) : null))))));
701
+ }) : null)))));
717
702
  };
718
703
  ResourceDeletePage.propTypes = propTypes$e;
719
704
  ResourceDeletePage.defaultProps = defaultProps$e;
720
705
 
721
- // import Button from '../buttons/Button';
722
-
723
706
  var propTypes$d = {
724
707
  resource: core.PropTypes.resource.isRequired
725
708
  };
726
709
  var defaultProps$d = {};
727
710
  var ResourceEditPage = function ResourceEditPage(_ref) {
728
711
  var resource = _ref.resource;
729
- var name = resource.name;
730
712
  var _useParams = reactRouter.useParams(),
731
713
  itemId = _useParams.id;
732
714
  var _useResourceItem = data.useResourceItem(resource, itemId),
@@ -738,8 +720,6 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
738
720
  _useState2 = _slicedToArray__default["default"](_useState, 2),
739
721
  editItem = _useState2[0],
740
722
  setEditItem = _useState2[1];
741
- var pagesComponentsManager = contexts.usePagesComponentsManager();
742
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Edit"));
743
723
  var onSuccess = React.useCallback(function (newItem) {
744
724
  return setEditItem(newItem);
745
725
  }, []);
@@ -749,12 +729,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
749
729
  var resourceValues = intl.useResourceValues(resource);
750
730
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
751
731
  resource: resource
752
- }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
753
- resource: resource,
754
- item: editItem,
755
- type: type,
756
- onSuccess: onSuccess
757
- }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
732
+ }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
758
733
  title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
759
734
  values: resourceValues,
760
735
  id: "mCfzkJ",
@@ -778,7 +753,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
778
753
  item: editItem,
779
754
  type: type,
780
755
  onSuccess: onSuccess
781
- }) : null))))));
756
+ }) : null)))));
782
757
  };
783
758
  ResourceEditPage.propTypes = propTypes$d;
784
759
  ResourceEditPage.defaultProps = defaultProps$d;
@@ -1009,6 +984,7 @@ var ResourceItemsList = function ResourceItemsList(_ref) {
1009
984
  filters = _resource$index2$filt === void 0 ? null : _resource$index2$filt;
1010
985
  _resource$index2.actions;
1011
986
  var listProps = _objectWithoutProperties__default["default"](_resource$index2, _excluded$3);
987
+ console.log('resource', resource);
1012
988
  var _usePanneauColorSchem = contexts.usePanneauColorScheme(),
1013
989
  _usePanneauColorSchem2 = _usePanneauColorSchem.background,
1014
990
  theme = _usePanneauColorSchem2 === void 0 ? null : _usePanneauColorSchem2;
@@ -1131,9 +1107,6 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
1131
1107
  created = _ref4$created === void 0 ? false : _ref4$created,
1132
1108
  _ref4$deleted = _ref4.deleted,
1133
1109
  deleted = _ref4$deleted === void 0 ? false : _ref4$deleted;
1134
- var pagesComponentsManager = contexts.usePagesComponentsManager();
1135
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Index"));
1136
- var PageComponent = CustomPage !== null ? CustomPage : ResourceItemsList;
1137
1110
  var resourceRoute = hooks.useResourceUrlGenerator(resource);
1138
1111
  var url = resourceRoute('index');
1139
1112
  var onQueryChange = React.useCallback(function (submitQuery) {
@@ -1204,7 +1177,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
1204
1177
  "type": 0,
1205
1178
  "value": " has been deleted."
1206
1179
  }]
1207
- })) : null, /*#__PURE__*/React__default["default"].createElement(PageComponent, {
1180
+ })) : null, /*#__PURE__*/React__default["default"].createElement(ResourceItemsList, {
1208
1181
  resource: resource,
1209
1182
  baseUrl: url,
1210
1183
  query: listQuery,
@@ -1230,16 +1203,9 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
1230
1203
  var _ref2 = item || {},
1231
1204
  _ref2$type = _ref2.type,
1232
1205
  type = _ref2$type === void 0 ? null : _ref2$type;
1233
- var pagesComponentsManager = contexts.usePagesComponentsManager();
1234
- var CustomPage = pagesComponentsManager.getComponent("".concat(name, "Show"));
1235
1206
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
1236
1207
  resource: resource
1237
- }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
1238
- resource: resource,
1239
- item: item,
1240
- type: type,
1241
- disabled: true
1242
- }) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
1208
+ }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
1243
1209
  title: "".concat(name, " #").concat(itemId),
1244
1210
  small: true
1245
1211
  }), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -1253,7 +1219,7 @@ var ResourceShowPage = function ResourceShowPage(_ref) {
1253
1219
  item: item,
1254
1220
  type: type,
1255
1221
  disabled: true
1256
- })))))));
1222
+ }))))));
1257
1223
  };
1258
1224
  ResourceShowPage.propTypes = propTypes$8;
1259
1225
  ResourceShowPage.defaultProps = defaultProps$8;
@@ -1264,8 +1230,6 @@ var defaultProps$7 = {};
1264
1230
  var HomePage = function HomePage() {
1265
1231
  var route = contexts.useUrlGenerator();
1266
1232
  var resources = contexts.usePanneauResources();
1267
- var pagesComponentsManager = contexts.usePagesComponentsManager();
1268
- var CustomPage = pagesComponentsManager.getComponent('Home');
1269
1233
  var visibleResources = resources.filter(function (_ref) {
1270
1234
  var _ref$settings = _ref.settings,
1271
1235
  _ref$settings2 = _ref$settings === void 0 ? {} : _ref$settings,
@@ -1273,9 +1237,7 @@ var HomePage = function HomePage() {
1273
1237
  hideInNavbar = _ref$settings2$hideIn === void 0 ? false : _ref$settings2$hideIn;
1274
1238
  return !hideInNavbar;
1275
1239
  });
1276
- return /*#__PURE__*/React__default["default"].createElement(MainLayout, null, CustomPage !== null ? /*#__PURE__*/React__default["default"].createElement(CustomPage, {
1277
- resources: visibleResources
1278
- }) : /*#__PURE__*/React__default["default"].createElement("div", {
1240
+ return /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement("div", {
1279
1241
  className: "container-sm py-4"
1280
1242
  }, visibleResources.map(function (resource) {
1281
1243
  var _ref2 = resource || {},
@@ -1397,15 +1359,11 @@ var propTypes$3 = {};
1397
1359
  var defaultProps$3 = {};
1398
1360
  var LoginPage = function LoginPage() {
1399
1361
  var route = contexts.useUrlGenerator();
1400
-
1401
1362
  // Sadly necessary to update cookies and routes correctly from the backend,
1402
1363
  // make it post directly instead of api call
1403
1364
  var onSuccess = React.useCallback(function () {
1404
1365
  window.location.href = route('home');
1405
1366
  }, [route]);
1406
-
1407
- // TODO: add overrides
1408
-
1409
1367
  return /*#__PURE__*/React__default["default"].createElement(GuestLayout, {
1410
1368
  fullscreen: true
1411
1369
  }, /*#__PURE__*/React__default["default"].createElement("div", {
@@ -1729,9 +1687,9 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1729
1687
 
1730
1688
  // If there is an error status code
1731
1689
  if (statusCode !== null) {
1732
- return /*#__PURE__*/React__default["default"].createElement(ErrorComponent, {
1690
+ return /*#__PURE__*/React__default["default"].createElement(ErrorComponent, Object.assign({
1733
1691
  statusCode: statusCode
1734
- });
1692
+ }, errorPage));
1735
1693
  }
1736
1694
 
1737
1695
  // If user is unauthenticated
@@ -1739,7 +1697,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1739
1697
  return /*#__PURE__*/React__default["default"].createElement(reactRouter.Routes, null, /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
1740
1698
  path: routes['auth.login'],
1741
1699
  exact: true,
1742
- element: /*#__PURE__*/React__default["default"].createElement(LoginComponent, null)
1700
+ element: /*#__PURE__*/React__default["default"].createElement(LoginComponent, loginPage)
1743
1701
  }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
1744
1702
  path: "*",
1745
1703
  element: /*#__PURE__*/React__default["default"].createElement(reactRouter.Navigate, {
@@ -1753,7 +1711,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1753
1711
  return /*#__PURE__*/React__default["default"].createElement(reactRouter.Routes, null, /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
1754
1712
  path: routes.home,
1755
1713
  exact: true,
1756
- element: /*#__PURE__*/React__default["default"].createElement(HomeComponent, null)
1714
+ element: /*#__PURE__*/React__default["default"].createElement(HomeComponent, homePage)
1757
1715
  }), user !== null ? /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
1758
1716
  path: routes['auth.login'],
1759
1717
  exact: true,
@@ -1774,7 +1732,7 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
1774
1732
  }), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
1775
1733
  path: routes.account,
1776
1734
  exact: true,
1777
- element: /*#__PURE__*/React__default["default"].createElement(AccountComponent, null)
1735
+ element: /*#__PURE__*/React__default["default"].createElement(AccountComponent, accountPage)
1778
1736
  }), customRoutes.map(function (_ref5) {
1779
1737
  var _ref5$path = _ref5.path,
1780
1738
  path = _ref5$path === void 0 ? null : _ref5$path,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/app",
3
- "version": "2.0.49",
3
+ "version": "2.0.51",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -63,30 +63,30 @@
63
63
  "@fortawesome/fontawesome-svg-core": "^1.2.35",
64
64
  "@fortawesome/free-solid-svg-icons": "^5.15.3",
65
65
  "@fortawesome/react-fontawesome": "^0.1.14",
66
- "@panneau/auth": "^2.0.46",
67
- "@panneau/core": "^2.0.46",
68
- "@panneau/data": "^2.0.46",
69
- "@panneau/displays": "^2.0.46",
70
- "@panneau/element-alert": "^2.0.46",
71
- "@panneau/element-button": "^2.0.46",
72
- "@panneau/element-buttons": "^2.0.46",
73
- "@panneau/element-dropdown": "^2.0.46",
74
- "@panneau/element-form": "^2.0.46",
75
- "@panneau/element-form-group": "^2.0.46",
76
- "@panneau/element-label": "^2.0.46",
77
- "@panneau/element-link": "^2.0.46",
78
- "@panneau/element-loading": "^2.0.46",
79
- "@panneau/element-menu": "^2.0.46",
80
- "@panneau/element-navbar": "^2.0.46",
81
- "@panneau/element-pagination": "^2.0.46",
82
- "@panneau/element-radios": "^2.0.46",
83
- "@panneau/fields": "^2.0.49",
84
- "@panneau/filters": "^2.0.46",
85
- "@panneau/forms": "^2.0.46",
86
- "@panneau/intl": "^2.0.46",
87
- "@panneau/lists": "^2.0.46",
88
- "@panneau/modals": "^2.0.46",
89
- "@panneau/themes": "^2.0.46",
66
+ "@panneau/auth": "^2.0.51",
67
+ "@panneau/core": "^2.0.51",
68
+ "@panneau/data": "^2.0.51",
69
+ "@panneau/displays": "^2.0.51",
70
+ "@panneau/element-alert": "^2.0.51",
71
+ "@panneau/element-button": "^2.0.51",
72
+ "@panneau/element-buttons": "^2.0.51",
73
+ "@panneau/element-dropdown": "^2.0.51",
74
+ "@panneau/element-form": "^2.0.51",
75
+ "@panneau/element-form-group": "^2.0.51",
76
+ "@panneau/element-label": "^2.0.51",
77
+ "@panneau/element-link": "^2.0.51",
78
+ "@panneau/element-loading": "^2.0.51",
79
+ "@panneau/element-menu": "^2.0.51",
80
+ "@panneau/element-navbar": "^2.0.51",
81
+ "@panneau/element-pagination": "^2.0.51",
82
+ "@panneau/element-radios": "^2.0.51",
83
+ "@panneau/fields": "^2.0.51",
84
+ "@panneau/filters": "^2.0.51",
85
+ "@panneau/forms": "^2.0.51",
86
+ "@panneau/intl": "^2.0.51",
87
+ "@panneau/lists": "^2.0.51",
88
+ "@panneau/modals": "^2.0.51",
89
+ "@panneau/themes": "^2.0.51",
90
90
  "classnames": "^2.2.6",
91
91
  "lodash": "^4.17.21",
92
92
  "prop-types": "^15.7.2",
@@ -98,5 +98,5 @@
98
98
  "publishConfig": {
99
99
  "access": "public"
100
100
  },
101
- "gitHead": "813f7f4608491613dc839a6507e6d3ac9c0da62d"
101
+ "gitHead": "dcdf30dd8429d6022ae69fff1ea7a101fc6d4e71"
102
102
  }