@panneau/app 2.0.92 → 3.0.0
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.
- package/assets/css/styles.css +1 -1
- package/es/index.js +85 -93
- package/lib/index.js +104 -111
- package/package.json +33 -32
package/lib/index.js
CHANGED
@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
6
6
|
var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
|
7
|
+
var routes = require('@folklore/routes');
|
7
8
|
var PropTypes = require('prop-types');
|
8
9
|
var React = require('react');
|
9
|
-
var
|
10
|
-
var reactRouterDom = require('react-router-dom');
|
10
|
+
var wouter = require('wouter');
|
11
11
|
var auth = require('@panneau/auth');
|
12
12
|
var core = require('@panneau/core');
|
13
13
|
var contexts = require('@panneau/core/contexts');
|
@@ -30,6 +30,7 @@ var ResourceForm = require('@panneau/form-resource');
|
|
30
30
|
var classNames = require('classnames');
|
31
31
|
var elementModal = require('@panneau/element-modal');
|
32
32
|
var isArray = require('lodash/isArray');
|
33
|
+
var Link = require('@panneau/element-link');
|
33
34
|
var Menu = require('@panneau/element-menu');
|
34
35
|
var Navbar = require('@panneau/element-navbar');
|
35
36
|
var Label = require('@panneau/element-label');
|
@@ -61,6 +62,7 @@ var queryString__default = /*#__PURE__*/_interopDefaultLegacy(queryString);
|
|
61
62
|
var ResourceForm__default = /*#__PURE__*/_interopDefaultLegacy(ResourceForm);
|
62
63
|
var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
|
63
64
|
var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
|
65
|
+
var Link__default = /*#__PURE__*/_interopDefaultLegacy(Link);
|
64
66
|
var Menu__default = /*#__PURE__*/_interopDefaultLegacy(Menu);
|
65
67
|
var Navbar__default = /*#__PURE__*/_interopDefaultLegacy(Navbar);
|
66
68
|
var Label__default = /*#__PURE__*/_interopDefaultLegacy(Label);
|
@@ -169,8 +171,9 @@ var ResourcesMenu = function ResourcesMenu(_ref) {
|
|
169
171
|
var className = _ref.className,
|
170
172
|
itemClassName = _ref.itemClassName,
|
171
173
|
linkClassName = _ref.linkClassName;
|
172
|
-
var _useLocation =
|
173
|
-
|
174
|
+
var _useLocation = routes.useLocation(),
|
175
|
+
_useLocation2 = _slicedToArray__default["default"](_useLocation, 1),
|
176
|
+
pathname = _useLocation2[0].pathname;
|
174
177
|
var resources = contexts.usePanneauResources();
|
175
178
|
var resourceRoute = hooks.useResourceUrlGenerator();
|
176
179
|
var items = React.useMemo(function () {
|
@@ -259,8 +262,8 @@ var MainNavbar = function MainNavbar(props) {
|
|
259
262
|
}, [main]);
|
260
263
|
return /*#__PURE__*/React__default["default"].createElement(Navbar__default["default"], Object.assign({
|
261
264
|
theme: background
|
262
|
-
}, props), name !== null ? /*#__PURE__*/React__default["default"].createElement(
|
263
|
-
|
265
|
+
}, props), name !== null ? /*#__PURE__*/React__default["default"].createElement(Link__default["default"], {
|
266
|
+
href: route('home'),
|
264
267
|
className: "navbar-brand"
|
265
268
|
}, name) : null, items);
|
266
269
|
};
|
@@ -356,9 +359,10 @@ var propTypes$e = {
|
|
356
359
|
var defaultProps$d = {};
|
357
360
|
var ResourceCreatePage = function ResourceCreatePage(_ref) {
|
358
361
|
var resource = _ref.resource;
|
359
|
-
var
|
360
|
-
|
361
|
-
search =
|
362
|
+
var _useLocation = routes.useLocation(),
|
363
|
+
_useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
|
364
|
+
search = _useLocation2[0].search,
|
365
|
+
navigate = _useLocation2[1];
|
362
366
|
var resourceRoute = hooks.useResourceUrlGenerator(resource);
|
363
367
|
var _useMemo = React.useMemo(function () {
|
364
368
|
return queryString__default["default"].parse(search);
|
@@ -402,16 +406,17 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
|
|
402
406
|
ResourceCreatePage.propTypes = propTypes$e;
|
403
407
|
ResourceCreatePage.defaultProps = defaultProps$d;
|
404
408
|
|
405
|
-
// import PropTypes from 'prop-types';
|
406
409
|
var propTypes$d = {
|
410
|
+
itemId: PropTypes__default["default"].string.isRequired,
|
407
411
|
resource: core.PropTypes.resource.isRequired
|
408
412
|
};
|
409
413
|
var defaultProps$c = {};
|
410
414
|
var ResourceDeletePage = function ResourceDeletePage(_ref) {
|
411
|
-
var
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
+
var itemId = _ref.itemId,
|
416
|
+
resource = _ref.resource;
|
417
|
+
var _useLocation = routes.useLocation(),
|
418
|
+
_useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
|
419
|
+
navigate = _useLocation2[1];
|
415
420
|
var resourceRoute = hooks.useResourceUrlGenerator(resource);
|
416
421
|
var _useResourceItem = data.useResourceItem(resource, itemId),
|
417
422
|
item = _useResourceItem.item;
|
@@ -457,13 +462,13 @@ ResourceDeletePage.propTypes = propTypes$d;
|
|
457
462
|
ResourceDeletePage.defaultProps = defaultProps$c;
|
458
463
|
|
459
464
|
var propTypes$c = {
|
465
|
+
itemId: PropTypes__default["default"].string.isRequired,
|
460
466
|
resource: core.PropTypes.resource.isRequired
|
461
467
|
};
|
462
468
|
var defaultProps$b = {};
|
463
469
|
var ResourceEditPage = function ResourceEditPage(_ref) {
|
464
|
-
var
|
465
|
-
|
466
|
-
itemId = _useParams.id;
|
470
|
+
var itemId = _ref.itemId,
|
471
|
+
resource = _ref.resource;
|
467
472
|
var _useResourceItem = data.useResourceItem(resource, itemId),
|
468
473
|
item = _useResourceItem.item;
|
469
474
|
var _ref2 = item || {},
|
@@ -654,9 +659,10 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
|
|
654
659
|
}, [canCreate, actions]);
|
655
660
|
var resourceValues = intl.useResourceValues(resource);
|
656
661
|
var componentsManager = contexts.useComponentsManager();
|
657
|
-
var _useLocation =
|
658
|
-
|
659
|
-
|
662
|
+
var _useLocation = routes.useLocation(),
|
663
|
+
_useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
|
664
|
+
search = _useLocation2[0].search,
|
665
|
+
navigate = _useLocation2[1];
|
660
666
|
var query = React.useMemo(function () {
|
661
667
|
return queryString__default["default"].parse(search);
|
662
668
|
}, [search]);
|
@@ -752,14 +758,14 @@ ResourceIndexPage.propTypes = propTypes$9;
|
|
752
758
|
ResourceIndexPage.defaultProps = defaultProps$9;
|
753
759
|
|
754
760
|
var propTypes$8 = {
|
755
|
-
resource: core.PropTypes.resource.isRequired
|
761
|
+
resource: core.PropTypes.resource.isRequired,
|
762
|
+
itemId: PropTypes__default["default"].string.isRequired
|
756
763
|
};
|
757
764
|
var defaultProps$8 = {};
|
758
765
|
var ResourceShowPage = function ResourceShowPage(_ref) {
|
759
|
-
var resource = _ref.resource
|
766
|
+
var resource = _ref.resource,
|
767
|
+
itemId = _ref.itemId;
|
760
768
|
var name = resource.name;
|
761
|
-
var _useParams = reactRouter.useParams(),
|
762
|
-
itemId = _useParams.id;
|
763
769
|
var _useResourceItem = data.useResourceItem(resource, itemId),
|
764
770
|
item = _useResourceItem.item;
|
765
771
|
var _ref2 = item || {},
|
@@ -805,10 +811,10 @@ var HomePage = function HomePage() {
|
|
805
811
|
var _ref2 = resource || {},
|
806
812
|
resourceId = _ref2.id;
|
807
813
|
var resourceValues = intl.useResourceValues(resource);
|
808
|
-
return /*#__PURE__*/React__default["default"].createElement(
|
814
|
+
return /*#__PURE__*/React__default["default"].createElement(Link__default["default"], {
|
809
815
|
className: "d-block my-2",
|
810
816
|
key: "resource-link-".concat(resourceId),
|
811
|
-
|
817
|
+
href: route('resources.index', {
|
812
818
|
resource: resourceId
|
813
819
|
})
|
814
820
|
}, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
|
@@ -1063,7 +1069,7 @@ var ErrorPage = function ErrorPage(_ref) {
|
|
1063
1069
|
ErrorPage.propTypes = propTypes$2;
|
1064
1070
|
ErrorPage.defaultProps = defaultProps$2;
|
1065
1071
|
|
1066
|
-
var _excluded$1 = ["path", "component"
|
1072
|
+
var _excluded$1 = ["path", "component"];
|
1067
1073
|
var createResourceRoutes = function createResourceRoutes(resource, _ref) {
|
1068
1074
|
var route = _ref.route,
|
1069
1075
|
componentsManager = _ref.componentsManager,
|
@@ -1103,74 +1109,73 @@ var createResourceRoutes = function createResourceRoutes(resource, _ref) {
|
|
1103
1109
|
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;
|
1104
1110
|
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;
|
1105
1111
|
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;
|
1106
|
-
return [/*#__PURE__*/React__default["default"].createElement(
|
1107
|
-
key: "".concat(resourceId, "-index"),
|
1108
|
-
path: route('resources.index', {
|
1109
|
-
resource: resourceId
|
1110
|
-
}),
|
1111
|
-
exact: true,
|
1112
|
-
element: /*#__PURE__*/React__default["default"].createElement(ResourceIndexComponent, {
|
1113
|
-
resource: resource
|
1114
|
-
})
|
1115
|
-
}), /*#__PURE__*/React__default["default"].createElement(reactRouter.Route, {
|
1112
|
+
return [/*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1116
1113
|
key: "".concat(resourceId, "-create"),
|
1117
1114
|
path: route('resources.create', {
|
1118
1115
|
resource: resourceId
|
1119
1116
|
}),
|
1120
|
-
exact: true
|
1121
|
-
|
1117
|
+
exact: true
|
1118
|
+
}, function () {
|
1119
|
+
return /*#__PURE__*/React__default["default"].createElement(ResourceCreateComponent, {
|
1122
1120
|
resource: resource
|
1123
|
-
})
|
1124
|
-
}), /*#__PURE__*/React__default["default"].createElement(
|
1121
|
+
});
|
1122
|
+
}), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1125
1123
|
key: "".concat(resourceId, "-show"),
|
1126
1124
|
path: route('resources.show', {
|
1127
1125
|
resource: resourceId,
|
1128
1126
|
id: ':id'
|
1129
|
-
}),
|
1130
|
-
exact: true,
|
1131
|
-
element: /*#__PURE__*/React__default["default"].createElement(ResourceShowComponent, {
|
1132
|
-
resource: resource
|
1133
1127
|
})
|
1134
|
-
}
|
1128
|
+
}, function () {
|
1129
|
+
return /*#__PURE__*/React__default["default"].createElement(ResourceShowComponent, {
|
1130
|
+
resource: resource
|
1131
|
+
});
|
1132
|
+
}), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1135
1133
|
key: "".concat(resourceId, "-edit"),
|
1136
1134
|
path: route('resources.edit', {
|
1137
1135
|
resource: resourceId,
|
1138
1136
|
id: ':id'
|
1139
|
-
}),
|
1140
|
-
exact: true,
|
1141
|
-
element: /*#__PURE__*/React__default["default"].createElement(ResourceEditComponent, {
|
1142
|
-
resource: resource
|
1143
1137
|
})
|
1144
|
-
}
|
1138
|
+
}, function () {
|
1139
|
+
return /*#__PURE__*/React__default["default"].createElement(ResourceEditComponent, {
|
1140
|
+
resource: resource
|
1141
|
+
});
|
1142
|
+
}), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1145
1143
|
key: "".concat(resourceId, "-delete"),
|
1146
1144
|
path: route('resources.delete', {
|
1147
1145
|
resource: resourceId,
|
1148
1146
|
id: ':id'
|
1149
|
-
}),
|
1150
|
-
exact: true,
|
1151
|
-
element: /*#__PURE__*/React__default["default"].createElement(ResourceDeleteComponent, {
|
1152
|
-
resource: resource
|
1153
1147
|
})
|
1148
|
+
}, function () {
|
1149
|
+
return /*#__PURE__*/React__default["default"].createElement(ResourceDeleteComponent, {
|
1150
|
+
resource: resource
|
1151
|
+
});
|
1154
1152
|
})].concat(_toConsumableArray__default["default"](extraRoutes.map(function (_ref4) {
|
1155
1153
|
var path = _ref4.path,
|
1156
1154
|
component = _ref4.component,
|
1157
|
-
_ref4$exact = _ref4.exact,
|
1158
|
-
exact = _ref4$exact === void 0 ? true : _ref4$exact,
|
1159
1155
|
pageProps = _objectWithoutProperties__default["default"](_ref4, _excluded$1);
|
1160
1156
|
var RouteComponent = componentsManager.getComponent(component);
|
1161
|
-
return RouteComponent !== null ? /*#__PURE__*/React__default["default"].createElement(
|
1157
|
+
return RouteComponent !== null ? /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1162
1158
|
key: "route-".concat(path),
|
1163
|
-
path: path
|
1164
|
-
|
1165
|
-
|
1159
|
+
path: path
|
1160
|
+
}, function () {
|
1161
|
+
return /*#__PURE__*/React__default["default"].createElement(RouteComponent, Object.assign({
|
1166
1162
|
resource: resource
|
1167
|
-
}, pageProps))
|
1163
|
+
}, pageProps));
|
1168
1164
|
}) : null;
|
1169
|
-
}))
|
1165
|
+
})), [/*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1166
|
+
key: "".concat(resourceId, "-index"),
|
1167
|
+
path: route('resources.index', {
|
1168
|
+
resource: resourceId
|
1169
|
+
})
|
1170
|
+
}, function () {
|
1171
|
+
return /*#__PURE__*/React__default["default"].createElement(ResourceIndexComponent, {
|
1172
|
+
resource: resource
|
1173
|
+
});
|
1174
|
+
})]);
|
1170
1175
|
};
|
1171
1176
|
|
1172
1177
|
var _excluded = ["home", "login", "account", "error", "index", "show", "create", "edit", "delete"],
|
1173
|
-
_excluded2 = ["path", "route", "component"
|
1178
|
+
_excluded2 = ["path", "route", "component"];
|
1174
1179
|
var propTypes$1 = {
|
1175
1180
|
statusCode: core.PropTypes.statusCode
|
1176
1181
|
};
|
@@ -1179,9 +1184,10 @@ var defaultProps$1 = {
|
|
1179
1184
|
};
|
1180
1185
|
var PanneauRoutes = function PanneauRoutes(_ref) {
|
1181
1186
|
var initialStatusCode = _ref.statusCode;
|
1182
|
-
var routes = contexts.useRoutes();
|
1183
|
-
var _useLocation =
|
1184
|
-
|
1187
|
+
var routes$1 = contexts.useRoutes();
|
1188
|
+
var _useLocation = routes.useLocation(),
|
1189
|
+
_useLocation2 = _slicedToArray__default["default"](_useLocation, 1),
|
1190
|
+
pathname = _useLocation2[0].pathname;
|
1185
1191
|
var _useState = React.useState({
|
1186
1192
|
statusCode: initialStatusCode,
|
1187
1193
|
pathname: pathname
|
@@ -1256,32 +1262,21 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
|
|
1256
1262
|
|
1257
1263
|
// If user is unauthenticated
|
1258
1264
|
if (user === null) {
|
1259
|
-
return /*#__PURE__*/React__default["default"].createElement(
|
1260
|
-
path: routes['auth.login']
|
1261
|
-
|
1262
|
-
|
1263
|
-
|
1264
|
-
|
1265
|
-
element: /*#__PURE__*/React__default["default"].createElement(reactRouter.Navigate, {
|
1266
|
-
to: "".concat(route('auth.login'), "?next=").concat(encodeURIComponent(pathname)),
|
1267
|
-
replace: true
|
1268
|
-
})
|
1269
|
-
}));
|
1265
|
+
return /*#__PURE__*/React__default["default"].createElement(wouter.Switch, null, /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1266
|
+
path: routes$1['auth.login']
|
1267
|
+
}, /*#__PURE__*/React__default["default"].createElement(LoginComponent, loginPage)), /*#__PURE__*/React__default["default"].createElement(wouter.Route, null, /*#__PURE__*/React__default["default"].createElement(wouter.Redirect, {
|
1268
|
+
to: "".concat(route('auth.login'), "?next=").concat(encodeURIComponent(pathname)),
|
1269
|
+
replace: true
|
1270
|
+
})));
|
1270
1271
|
}
|
1271
1272
|
|
1272
1273
|
// Normal routes
|
1273
|
-
return /*#__PURE__*/React__default["default"].createElement(
|
1274
|
-
path: routes.
|
1275
|
-
|
1276
|
-
|
1277
|
-
|
1278
|
-
|
1279
|
-
exact: true,
|
1280
|
-
element: /*#__PURE__*/React__default["default"].createElement(reactRouter.Navigate, {
|
1281
|
-
to: routes.home,
|
1282
|
-
replace: true
|
1283
|
-
})
|
1284
|
-
}) : null, resources.map(function (resource) {
|
1274
|
+
return /*#__PURE__*/React__default["default"].createElement(wouter.Switch, null, user !== null ? /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1275
|
+
path: routes$1['auth.login']
|
1276
|
+
}, /*#__PURE__*/React__default["default"].createElement(wouter.Redirect, {
|
1277
|
+
to: routes$1.home,
|
1278
|
+
replace: true
|
1279
|
+
})) : null, resources.map(function (resource) {
|
1285
1280
|
var _ref4 = resource || {},
|
1286
1281
|
resourceId = _ref4.id;
|
1287
1282
|
return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
|
@@ -1291,35 +1286,29 @@ var PanneauRoutes = function PanneauRoutes(_ref) {
|
|
1291
1286
|
componentsManager: componentsManager,
|
1292
1287
|
pages: pages
|
1293
1288
|
}));
|
1294
|
-
}), /*#__PURE__*/React__default["default"].createElement(
|
1295
|
-
path: routes.account
|
1296
|
-
|
1297
|
-
element: /*#__PURE__*/React__default["default"].createElement(AccountComponent, accountPage)
|
1298
|
-
}), customRoutes.map(function (_ref5) {
|
1289
|
+
}), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1290
|
+
path: routes$1.account
|
1291
|
+
}, /*#__PURE__*/React__default["default"].createElement(AccountComponent, accountPage)), customRoutes.map(function (_ref5) {
|
1299
1292
|
var _ref5$path = _ref5.path,
|
1300
1293
|
path = _ref5$path === void 0 ? null : _ref5$path,
|
1301
1294
|
_ref5$route = _ref5.route,
|
1302
1295
|
pageRoute = _ref5$route === void 0 ? null : _ref5$route,
|
1303
1296
|
component = _ref5.component,
|
1304
|
-
_ref5$exact = _ref5.exact,
|
1305
|
-
exact = _ref5$exact === void 0 ? true : _ref5$exact,
|
1306
1297
|
props = _objectWithoutProperties__default["default"](_ref5, _excluded2);
|
1307
1298
|
var PageComponent = componentsManager.getComponent(component);
|
1308
|
-
var finalPath = path || routes[pageRoute];
|
1309
|
-
return PageComponent !== null ? /*#__PURE__*/React__default["default"].createElement(
|
1299
|
+
var finalPath = path || routes$1[pageRoute];
|
1300
|
+
return PageComponent !== null ? /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1310
1301
|
key: "custom-route-".concat(finalPath),
|
1311
|
-
path: path || routes[pageRoute]
|
1312
|
-
|
1313
|
-
|
1314
|
-
|
1315
|
-
}), /*#__PURE__*/React__default["default"].createElement(
|
1316
|
-
path: "*",
|
1317
|
-
element: /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)
|
1318
|
-
}));
|
1302
|
+
path: path || routes$1[pageRoute]
|
1303
|
+
}, /*#__PURE__*/React__default["default"].createElement(PageComponent, props)) : null;
|
1304
|
+
}), /*#__PURE__*/React__default["default"].createElement(wouter.Route, {
|
1305
|
+
path: routes$1.home
|
1306
|
+
}, /*#__PURE__*/React__default["default"].createElement(HomeComponent, homePage)), /*#__PURE__*/React__default["default"].createElement(wouter.Route, null, /*#__PURE__*/React__default["default"].createElement(ErrorComponent, null)));
|
1319
1307
|
};
|
1320
1308
|
PanneauRoutes.propTypes = propTypes$1;
|
1321
1309
|
PanneauRoutes.defaultProps = defaultProps$1;
|
1322
1310
|
|
1311
|
+
var pathToRegexpMatcher = routes.createPathToRegexpMatcher();
|
1323
1312
|
var propTypes = {
|
1324
1313
|
definition: core.PropTypes.panneauDefinition.isRequired,
|
1325
1314
|
components: PropTypes__default["default"].oneOfType([PropTypes__default["default"].objectOf(PropTypes__default["default"].elementType), PropTypes__default["default"].objectOf(PropTypes__default["default"].objectOf(PropTypes__default["default"].elementType))]),
|
@@ -1352,12 +1341,12 @@ var Container = function Container(_ref) {
|
|
1352
1341
|
_definition$intl2$loc2 = _definition$intl2.locales,
|
1353
1342
|
locales = _definition$intl2$loc2 === void 0 ? [] : _definition$intl2$loc2,
|
1354
1343
|
_definition$routes = definition.routes,
|
1355
|
-
routes = _definition$routes === void 0 ? {} : _definition$routes,
|
1344
|
+
routes$1 = _definition$routes === void 0 ? {} : _definition$routes,
|
1356
1345
|
_definition$settings = definition.settings,
|
1357
1346
|
_definition$settings2 = _definition$settings === void 0 ? {} : _definition$settings,
|
1358
1347
|
_definition$settings3 = _definition$settings2.memoryRouter,
|
1359
1348
|
usesMemoryRouter = _definition$settings3 === void 0 ? false : _definition$settings3;
|
1360
|
-
var
|
1349
|
+
var isMemoryRouter = memoryRouter || usesMemoryRouter || false;
|
1361
1350
|
var extraMessages = React.useMemo(function () {
|
1362
1351
|
var _definition$intl3 = definition.intl,
|
1363
1352
|
_definition$intl4 = _definition$intl3 === void 0 ? {} : _definition$intl3,
|
@@ -1382,14 +1371,18 @@ var Container = function Container(_ref) {
|
|
1382
1371
|
var onLogout = React.useCallback(function () {
|
1383
1372
|
window.location.reload();
|
1384
1373
|
}, [baseUrl]);
|
1385
|
-
|
1374
|
+
var memoryLocationHook = routes.useMemoryLocationHook();
|
1375
|
+
return /*#__PURE__*/React__default["default"].createElement(wouter.Router, {
|
1376
|
+
hook: isMemoryRouter ? memoryLocationHook : null,
|
1377
|
+
matcher: pathToRegexpMatcher
|
1378
|
+
}, /*#__PURE__*/React__default["default"].createElement(intl.IntlProvider, {
|
1386
1379
|
locale: locale,
|
1387
1380
|
locales: locales,
|
1388
1381
|
extraMessages: extraMessages
|
1389
1382
|
}, /*#__PURE__*/React__default["default"].createElement(contexts.PanneauProvider, {
|
1390
1383
|
definition: definition
|
1391
1384
|
}, /*#__PURE__*/React__default["default"].createElement(contexts.UppyProvider, uppy, /*#__PURE__*/React__default["default"].createElement(contexts.RoutesProvider, {
|
1392
|
-
routes: routes
|
1385
|
+
routes: routes$1
|
1393
1386
|
}, /*#__PURE__*/React__default["default"].createElement(FieldsProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(FormsProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(ListsProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(DisplaysProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(FiltersProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(contexts.ModalProvider, null, /*#__PURE__*/React__default["default"].createElement(ModalsProvider__default["default"], null, /*#__PURE__*/React__default["default"].createElement(data.ApiProvider, {
|
1394
1387
|
baseUrl: baseUrl,
|
1395
1388
|
onUnauthorized: onUnauthorized
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@panneau/app",
|
3
|
-
"version": "
|
3
|
+
"version": "3.0.0",
|
4
4
|
"description": "",
|
5
5
|
"keywords": [
|
6
6
|
"javascript"
|
@@ -60,47 +60,48 @@
|
|
60
60
|
},
|
61
61
|
"dependencies": {
|
62
62
|
"@babel/runtime": "^7.12.5",
|
63
|
+
"@folklore/routes": "^0.2.6",
|
63
64
|
"@fortawesome/fontawesome-svg-core": "^1.2.35",
|
64
65
|
"@fortawesome/free-solid-svg-icons": "^5.15.3",
|
65
66
|
"@fortawesome/react-fontawesome": "^0.1.14",
|
66
|
-
"@panneau/auth": "^
|
67
|
-
"@panneau/core": "^
|
68
|
-
"@panneau/data": "^
|
69
|
-
"@panneau/displays": "^
|
70
|
-
"@panneau/element-alert": "^
|
71
|
-
"@panneau/element-button": "^
|
72
|
-
"@panneau/element-buttons": "^
|
73
|
-
"@panneau/element-dropdown": "^
|
74
|
-
"@panneau/element-form": "^
|
75
|
-
"@panneau/element-form-group": "^
|
76
|
-
"@panneau/element-label": "^
|
77
|
-
"@panneau/element-link": "^
|
78
|
-
"@panneau/element-loading": "^
|
79
|
-
"@panneau/element-menu": "^
|
80
|
-
"@panneau/element-modal": "^
|
81
|
-
"@panneau/element-navbar": "^
|
82
|
-
"@panneau/element-pagination": "^
|
83
|
-
"@panneau/element-radios": "^
|
84
|
-
"@panneau/fields": "^
|
85
|
-
"@panneau/filter-filters": "^
|
86
|
-
"@panneau/filters": "^
|
87
|
-
"@panneau/form-resource": "^
|
88
|
-
"@panneau/forms": "^
|
89
|
-
"@panneau/intl": "^
|
90
|
-
"@panneau/list-resource-items": "^
|
91
|
-
"@panneau/lists": "^
|
92
|
-
"@panneau/modals": "^
|
93
|
-
"@panneau/themes": "^
|
67
|
+
"@panneau/auth": "^3.0.0",
|
68
|
+
"@panneau/core": "^3.0.0",
|
69
|
+
"@panneau/data": "^3.0.0",
|
70
|
+
"@panneau/displays": "^3.0.0",
|
71
|
+
"@panneau/element-alert": "^3.0.0",
|
72
|
+
"@panneau/element-button": "^3.0.0",
|
73
|
+
"@panneau/element-buttons": "^3.0.0",
|
74
|
+
"@panneau/element-dropdown": "^3.0.0",
|
75
|
+
"@panneau/element-form": "^3.0.0",
|
76
|
+
"@panneau/element-form-group": "^3.0.0",
|
77
|
+
"@panneau/element-label": "^3.0.0",
|
78
|
+
"@panneau/element-link": "^3.0.0",
|
79
|
+
"@panneau/element-loading": "^3.0.0",
|
80
|
+
"@panneau/element-menu": "^3.0.0",
|
81
|
+
"@panneau/element-modal": "^3.0.0",
|
82
|
+
"@panneau/element-navbar": "^3.0.0",
|
83
|
+
"@panneau/element-pagination": "^3.0.0",
|
84
|
+
"@panneau/element-radios": "^3.0.0",
|
85
|
+
"@panneau/fields": "^3.0.0",
|
86
|
+
"@panneau/filter-filters": "^3.0.0",
|
87
|
+
"@panneau/filters": "^3.0.0",
|
88
|
+
"@panneau/form-resource": "^3.0.0",
|
89
|
+
"@panneau/forms": "^3.0.0",
|
90
|
+
"@panneau/intl": "^3.0.0",
|
91
|
+
"@panneau/list-resource-items": "^3.0.0",
|
92
|
+
"@panneau/lists": "^3.0.0",
|
93
|
+
"@panneau/modals": "^3.0.0",
|
94
|
+
"@panneau/themes": "^3.0.0",
|
94
95
|
"classnames": "^2.2.6",
|
95
96
|
"lodash": "^4.17.21",
|
97
|
+
"path-to-regexp": "^6.2.1",
|
96
98
|
"prop-types": "^15.7.2",
|
97
99
|
"query-string": "^8.1.0",
|
98
100
|
"react-intl": "^5.15.8||^6.0.0",
|
99
|
-
"
|
100
|
-
"react-router-dom": "^6.2.1"
|
101
|
+
"wouter": "^2.0.0"
|
101
102
|
},
|
102
103
|
"publishConfig": {
|
103
104
|
"access": "public"
|
104
105
|
},
|
105
|
-
"gitHead": "
|
106
|
+
"gitHead": "b72d6fe6309ac3be6e2bef67e187f9aaa77b774e"
|
106
107
|
}
|