@panneau/core 0.6.72 → 0.6.73

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 (70) hide show
  1. package/es/Panneau.js +33 -35
  2. package/es/components/App.js +5 -5
  3. package/es/components/Layout.js +4 -3
  4. package/es/components/Panneau.js +9 -9
  5. package/es/components/pages/Account.js +2 -1
  6. package/es/components/pages/ResourceCreate.js +2 -2
  7. package/es/components/pages/ResourceForm.js +39 -39
  8. package/es/components/pages/ResourceIndex.js +71 -71
  9. package/es/lib/ComponentsCollection.js +9 -11
  10. package/es/lib/ResourceApi.js +4 -4
  11. package/es/lib/messageWithValues.js +3 -3
  12. package/es/lib/parseDefinition.js +11 -10
  13. package/es/lib/react-container/Container.js +7 -6
  14. package/es/lib/react-container/IntlContainer.js +7 -6
  15. package/es/lib/react-container/RouterContainer.js +2 -1
  16. package/es/lib/react-container/StoreContainer.js +5 -5
  17. package/es/lib/react-container/UrlGenerator.js +6 -5
  18. package/es/lib/react-container/UrlGeneratorContainer.js +28 -30
  19. package/es/lib/react-container/configureStore.dev.js +2 -2
  20. package/es/lib/react-container/withUrlGenerator.js +5 -5
  21. package/es/lib/requests.js +8 -6
  22. package/es/lib/withComponentsCollection.js +6 -6
  23. package/es/lib/withDefinition.js +5 -5
  24. package/es/lib/withFieldsCollection.js +2 -2
  25. package/es/lib/withFormsCollection.js +2 -2
  26. package/es/lib/withLayoutsCollection.js +2 -2
  27. package/es/lib/withListsCollection.js +2 -2
  28. package/es/lib/withModalsCollection.js +2 -2
  29. package/es/lib/withPreviewsCollection.js +2 -2
  30. package/es/lib/withResourceApi.js +11 -13
  31. package/es/reducers/AuthReducer.js +3 -3
  32. package/es/reducers/PanneauReducer.js +4 -4
  33. package/lib/Panneau.js +35 -36
  34. package/lib/actions/PanneauActions.js +1 -1
  35. package/lib/components/App.js +11 -7
  36. package/lib/components/Layout.js +11 -5
  37. package/lib/components/Panneau.js +15 -11
  38. package/lib/components/index.js +4 -4
  39. package/lib/components/pages/Account.js +9 -4
  40. package/lib/components/pages/ResourceCreate.js +8 -4
  41. package/lib/components/pages/ResourceForm.js +47 -42
  42. package/lib/components/pages/ResourceIndex.js +79 -74
  43. package/lib/index.js +47 -47
  44. package/lib/lib/ComponentsCollection.js +9 -11
  45. package/lib/lib/PropTypes.js +1 -1
  46. package/lib/lib/ResourceApi.js +4 -4
  47. package/lib/lib/messageWithValues.js +3 -3
  48. package/lib/lib/parseDefinition.js +12 -10
  49. package/lib/lib/react-container/Container.js +14 -8
  50. package/lib/lib/react-container/IntlContainer.js +14 -8
  51. package/lib/lib/react-container/RouterContainer.js +2 -1
  52. package/lib/lib/react-container/StoreContainer.js +11 -7
  53. package/lib/lib/react-container/UrlGenerator.js +7 -5
  54. package/lib/lib/react-container/UrlGeneratorContainer.js +28 -30
  55. package/lib/lib/react-container/configureStore.dev.js +2 -2
  56. package/lib/lib/react-container/index.js +5 -5
  57. package/lib/lib/react-container/withUrlGenerator.js +11 -7
  58. package/lib/lib/requests.js +10 -7
  59. package/lib/lib/withComponentsCollection.js +12 -8
  60. package/lib/lib/withDefinition.js +11 -7
  61. package/lib/lib/withFieldsCollection.js +8 -4
  62. package/lib/lib/withFormsCollection.js +8 -4
  63. package/lib/lib/withLayoutsCollection.js +8 -4
  64. package/lib/lib/withListsCollection.js +8 -4
  65. package/lib/lib/withModalsCollection.js +8 -4
  66. package/lib/lib/withPreviewsCollection.js +8 -4
  67. package/lib/lib/withResourceApi.js +17 -15
  68. package/lib/reducers/AuthReducer.js +3 -3
  69. package/lib/reducers/PanneauReducer.js +4 -4
  70. package/package.json +3 -3
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
-
5
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
6
4
 
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
@@ -17,10 +17,10 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
17
17
 
18
18
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
19
19
 
20
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
21
-
22
20
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
23
21
 
22
+ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
23
+
24
24
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
25
25
 
26
26
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -55,13 +55,20 @@ var _Errors = _interopRequireDefault(require("../partials/Errors"));
55
55
 
56
56
  var _Loading = _interopRequireDefault(require("../partials/Loading"));
57
57
 
58
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
58
+ var _excluded = ["type", "fields", "fullscreen"],
59
+ _excluded2 = ["type", "className"];
60
+
61
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
62
+
63
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
64
+
65
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
59
66
 
60
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
67
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
61
68
 
62
- function _createSuper(Derived) { return function () { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
69
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
63
70
 
64
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
71
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
65
72
 
66
73
  var styles = {
67
74
  "container": "panneau-core-resource-form-container",
@@ -177,23 +184,6 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
177
184
 
178
185
  var _super = _createSuper(ResourceForm);
179
186
 
180
- (0, _createClass2["default"])(ResourceForm, null, [{
181
- key: "getDerivedStateFromProps",
182
- value: function getDerivedStateFromProps(_ref, _ref2) {
183
- var nextErrors = _ref.errors;
184
- var errors = _ref2.errors;
185
- var errorsChanged = nextErrors !== errors;
186
-
187
- if (errorsChanged) {
188
- return {
189
- errors: errorsChanged ? nextErrors : errors
190
- };
191
- }
192
-
193
- return null;
194
- }
195
- }]);
196
-
197
187
  function ResourceForm(props) {
198
188
  var _this;
199
189
 
@@ -335,9 +325,9 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
335
325
  key: "getDefaultType",
336
326
  value: function getDefaultType() {
337
327
  var types = this.getTypes();
338
- return types.length > 0 ? types.find(function (_ref3) {
339
- var _ref3$default = _ref3["default"],
340
- isDefault = _ref3$default === void 0 ? false : _ref3$default;
328
+ return types.length > 0 ? types.find(function (_ref) {
329
+ var _ref$default = _ref["default"],
330
+ isDefault = _ref$default === void 0 ? false : _ref$default;
341
331
  return isDefault;
342
332
  }) || types[0] || null : null;
343
333
  }
@@ -358,14 +348,14 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
358
348
  action = _this$props2.action;
359
349
  var forms = resource.forms || {};
360
350
 
361
- var _ref4 = forms[action] || forms || {},
362
- _ref4$type = _ref4.type,
363
- type = _ref4$type === void 0 ? 'normal' : _ref4$type,
364
- _ref4$fields = _ref4.fields,
365
- fields = _ref4$fields === void 0 ? [] : _ref4$fields,
366
- _ref4$fullscreen = _ref4.fullscreen,
367
- fullscreen = _ref4$fullscreen === void 0 ? false : _ref4$fullscreen,
368
- form = (0, _objectWithoutProperties2["default"])(_ref4, ["type", "fields", "fullscreen"]);
351
+ var _ref2 = forms[action] || forms || {},
352
+ _ref2$type = _ref2.type,
353
+ type = _ref2$type === void 0 ? 'normal' : _ref2$type,
354
+ _ref2$fields = _ref2.fields,
355
+ fields = _ref2$fields === void 0 ? [] : _ref2$fields,
356
+ _ref2$fullscreen = _ref2.fullscreen,
357
+ fullscreen = _ref2$fullscreen === void 0 ? false : _ref2$fullscreen,
358
+ form = (0, _objectWithoutProperties2["default"])(_ref2, _excluded);
369
359
 
370
360
  var currentType = this.getCurrentType();
371
361
  return _objectSpread({
@@ -385,13 +375,13 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
385
375
  saveButtonLabel = _this$props3.saveButtonLabel;
386
376
  return readOnly ? [] : buttons.map(function (button) {
387
377
  if (button.id === 'save' && saveButtonLabel !== null) {
388
- return _objectSpread({}, button, {
378
+ return _objectSpread(_objectSpread({}, button), {}, {
389
379
  label: saveButtonLabel
390
380
  });
391
381
  }
392
382
 
393
383
  if (button.id === 'cancel' && typeof button.onClick === 'undefined') {
394
- return _objectSpread({}, button, {
384
+ return _objectSpread(_objectSpread({}, button), {}, {
395
385
  onClick: _this2.onClickCancel
396
386
  });
397
387
  }
@@ -514,9 +504,9 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
514
504
  className: "caret"
515
505
  })), /*#__PURE__*/_react["default"].createElement("div", {
516
506
  className: "dropdown-menu"
517
- }, types.map(function (_ref5) {
518
- var id = _ref5.id,
519
- label = _ref5.label;
507
+ }, types.map(function (_ref3) {
508
+ var id = _ref3.id,
509
+ label = _ref3.label;
520
510
  return /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
521
511
  key: "add-button-".concat(id),
522
512
  to: "".concat(urlGenerator.route('resource.create', {
@@ -553,7 +543,7 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
553
543
  type = _this$getForm2.type,
554
544
  _this$getForm2$classN = _this$getForm2.className,
555
545
  className = _this$getForm2$classN === void 0 ? null : _this$getForm2$classN,
556
- formProps = (0, _objectWithoutProperties2["default"])(_this$getForm2, ["type", "className"]);
546
+ formProps = (0, _objectWithoutProperties2["default"])(_this$getForm2, _excluded2);
557
547
 
558
548
  var FormComponent = formsCollection.getComponent(type);
559
549
  var buttons = this.getButtons();
@@ -605,6 +595,21 @@ var ResourceForm = /*#__PURE__*/function (_Component) {
605
595
  className: "col-lg-9"
606
596
  }, this.renderHeader(), this.renderErrors(), isLoading ? this.renderLoading() : this.renderForm()))));
607
597
  }
598
+ }], [{
599
+ key: "getDerivedStateFromProps",
600
+ value: function getDerivedStateFromProps(_ref6, _ref7) {
601
+ var nextErrors = _ref6.errors;
602
+ var errors = _ref7.errors;
603
+ var errorsChanged = nextErrors !== errors;
604
+
605
+ if (errorsChanged) {
606
+ return {
607
+ errors: errorsChanged ? nextErrors : errors
608
+ };
609
+ }
610
+
611
+ return null;
612
+ }
608
613
  }]);
609
614
  return ResourceForm;
610
615
  }(_react.Component);
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
4
-
5
3
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
6
4
 
5
+ var _typeof = require("@babel/runtime/helpers/typeof");
6
+
7
7
  Object.defineProperty(exports, "__esModule", {
8
8
  value: true
9
9
  });
@@ -17,10 +17,10 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
17
17
 
18
18
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
19
19
 
20
- var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
21
-
22
20
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
23
21
 
22
+ var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
23
+
24
24
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
25
25
 
26
26
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -53,9 +53,16 @@ var _withResourceApi = _interopRequireDefault(require("../../lib/withResourceApi
53
53
 
54
54
  var _withListsCollection = _interopRequireDefault(require("../../lib/withListsCollection"));
55
55
 
56
- function _createSuper(Derived) { return function () { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
56
+ var _excluded = ["data"],
57
+ _excluded2 = ["type"];
58
+
59
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
57
60
 
58
- function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
61
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
62
+
63
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
64
+
65
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
59
66
 
60
67
  var styles = {
61
68
  "container": "panneau-core-resource-index-container",
@@ -140,54 +147,6 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
140
147
 
141
148
  var _super = _createSuper(ResourceIndex);
142
149
 
143
- (0, _createClass2["default"])(ResourceIndex, null, [{
144
- key: "getDerivedStateFromProps",
145
- value: function getDerivedStateFromProps(_ref, _ref2) {
146
- var nextQuery = _ref.query,
147
- nextErrors = _ref.errors,
148
- nextResource = _ref.resource;
149
- var query = _ref2.query,
150
- errors = _ref2.errors,
151
- resource = _ref2.resource;
152
- var queryChanged = nextQuery !== query;
153
- var errorsChanged = nextErrors !== errors;
154
- var currentId = resource ? resource.id : null;
155
- var nextId = nextResource ? nextResource.id : null;
156
- var resourceChanged = currentId && nextId && currentId !== nextId;
157
-
158
- if (queryChanged || errorsChanged) {
159
- if (resourceChanged) {
160
- return {
161
- search: '',
162
- query: queryChanged ? nextQuery : query,
163
- errors: errorsChanged ? nextErrors : errors,
164
- isLoading: queryChanged
165
- };
166
- }
167
-
168
- return {
169
- query: queryChanged ? nextQuery : query,
170
- errors: errorsChanged ? nextErrors : errors,
171
- isLoading: queryChanged
172
- };
173
- }
174
-
175
- if (resourceChanged) {
176
- return {
177
- search: ''
178
- };
179
- }
180
-
181
- return null;
182
- }
183
- }, {
184
- key: "getQueryFromLocation",
185
- value: function getQueryFromLocation() {
186
- var location = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
187
- return _queryString["default"].parse(location ? location.search : window.location.search) || {};
188
- }
189
- }]);
190
-
191
150
  function ResourceIndex(props) {
192
151
  var _this;
193
152
 
@@ -224,9 +183,9 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
224
183
  }
225
184
  }, {
226
185
  key: "componentDidUpdate",
227
- value: function componentDidUpdate(_ref3, _ref4) {
228
- var prevQuery = _ref3.query;
229
- var prevItems = _ref4.items;
186
+ value: function componentDidUpdate(_ref, _ref2) {
187
+ var prevQuery = _ref.query;
188
+ var prevItems = _ref2.items;
230
189
  var query = this.props.query;
231
190
  var items = this.state.items;
232
191
  var itemsChanged = prevItems !== items;
@@ -241,7 +200,7 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
241
200
  value: function onItemsLoaded(data) {
242
201
  if (this.isPaginated()) {
243
202
  var items = data.data,
244
- pagination = (0, _objectWithoutProperties2["default"])(data, ["data"]);
203
+ pagination = (0, _objectWithoutProperties2["default"])(data, _excluded);
245
204
  this.setState({
246
205
  items: items,
247
206
  pagination: pagination,
@@ -303,10 +262,10 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
303
262
  }
304
263
  }, {
305
264
  key: "onItemDeleted",
306
- value: function onItemDeleted(_ref5) {
307
- var id = _ref5.id;
308
- this.setState(function (_ref6) {
309
- var items = _ref6.items;
265
+ value: function onItemDeleted(_ref3) {
266
+ var id = _ref3.id;
267
+ this.setState(function (_ref4) {
268
+ var items = _ref4.items;
310
269
  return {
311
270
  items: items.filter(function (it) {
312
271
  return it.id !== id;
@@ -357,9 +316,9 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
357
316
  resourceApi = _this$props2.resourceApi,
358
317
  query = _this$props2.query;
359
318
 
360
- var _ref7 = ResourceIndex.getQueryFromLocation() || {},
361
- q = _ref7.q,
362
- type = _ref7.type;
319
+ var _ref5 = ResourceIndex.getQueryFromLocation() || {},
320
+ q = _ref5.q,
321
+ type = _ref5.type;
363
322
 
364
323
  var params = {};
365
324
 
@@ -441,9 +400,9 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
441
400
  })
442
401
  }, buttonMessage !== null ? buttonMessage : buttonLabel), isTyped ? /*#__PURE__*/_react["default"].createElement("div", {
443
402
  className: "dropdown-menu"
444
- }, types.map(function (_ref8) {
445
- var id = _ref8.id,
446
- label = _ref8.label;
403
+ }, types.map(function (_ref6) {
404
+ var id = _ref6.id,
405
+ label = _ref6.label;
447
406
  return /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
448
407
  key: "add-button-".concat(id),
449
408
  to: "".concat(getResourceActionUrl('create'), "?type=").concat(id),
@@ -502,8 +461,8 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
502
461
  var withSearch = lists.withSearch || showSearch;
503
462
  if (!withTypeFilters && !withSearch) return null;
504
463
 
505
- var _ref9 = ResourceIndex.getQueryFromLocation() || {},
506
- type = _ref9.type;
464
+ var _ref7 = ResourceIndex.getQueryFromLocation() || {},
465
+ type = _ref7.type;
507
466
 
508
467
  var currentType = types.find(function (t) {
509
468
  return t.id === type;
@@ -530,9 +489,9 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
530
489
  className: "caret"
531
490
  })), /*#__PURE__*/_react["default"].createElement("div", {
532
491
  className: "dropdown-menu"
533
- }, types.map(function (_ref10) {
534
- var id = _ref10.id,
535
- label = _ref10.label;
492
+ }, types.map(function (_ref8) {
493
+ var id = _ref8.id,
494
+ label = _ref8.label;
536
495
  return /*#__PURE__*/_react["default"].createElement(_reactRouterDom.Link, {
537
496
  key: "add-button-".concat(id),
538
497
  to: "".concat(getResourceActionUrl('index'), "?type=").concat(id),
@@ -586,7 +545,7 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
586
545
  var items = this.state.items;
587
546
  var list = (0, _get["default"])(resource, 'lists.index', (0, _get["default"])(resource, 'lists', {}));
588
547
  var type = list.type,
589
- listProps = (0, _objectWithoutProperties2["default"])(list, ["type"]);
548
+ listProps = (0, _objectWithoutProperties2["default"])(list, _excluded2);
590
549
  var ListComponent = listsCollection.getComponent(type || 'table');
591
550
  var listClassNames = (0, _classnames["default"])((0, _defineProperty2["default"])({}, styles.list, true));
592
551
  return ListComponent !== null ? /*#__PURE__*/_react["default"].createElement("div", {
@@ -652,6 +611,52 @@ var ResourceIndex = /*#__PURE__*/function (_Component) {
652
611
  className: styles.list
653
612
  }, items !== null ? this.renderList() : null), isLoading ? this.renderLoading() : null), pagination !== null && pagination.last_page > 1 ? this.renderPagination() : null))));
654
613
  }
614
+ }], [{
615
+ key: "getDerivedStateFromProps",
616
+ value: function getDerivedStateFromProps(_ref9, _ref10) {
617
+ var nextQuery = _ref9.query,
618
+ nextErrors = _ref9.errors,
619
+ nextResource = _ref9.resource;
620
+ var query = _ref10.query,
621
+ errors = _ref10.errors,
622
+ resource = _ref10.resource;
623
+ var queryChanged = nextQuery !== query;
624
+ var errorsChanged = nextErrors !== errors;
625
+ var currentId = resource ? resource.id : null;
626
+ var nextId = nextResource ? nextResource.id : null;
627
+ var resourceChanged = currentId && nextId && currentId !== nextId;
628
+
629
+ if (queryChanged || errorsChanged) {
630
+ if (resourceChanged) {
631
+ return {
632
+ search: '',
633
+ query: queryChanged ? nextQuery : query,
634
+ errors: errorsChanged ? nextErrors : errors,
635
+ isLoading: queryChanged
636
+ };
637
+ }
638
+
639
+ return {
640
+ query: queryChanged ? nextQuery : query,
641
+ errors: errorsChanged ? nextErrors : errors,
642
+ isLoading: queryChanged
643
+ };
644
+ }
645
+
646
+ if (resourceChanged) {
647
+ return {
648
+ search: ''
649
+ };
650
+ }
651
+
652
+ return null;
653
+ }
654
+ }, {
655
+ key: "getQueryFromLocation",
656
+ value: function getQueryFromLocation() {
657
+ var location = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
658
+ return _queryString["default"].parse(location ? location.search : window.location.search) || {};
659
+ }
655
660
  }]);
656
661
  return ResourceIndex;
657
662
  }(_react.Component);
package/lib/index.js CHANGED
@@ -5,145 +5,145 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- Object.defineProperty(exports, "PanneauComponent", {
8
+ Object.defineProperty(exports, "ComponentsCollection", {
9
9
  enumerable: true,
10
10
  get: function get() {
11
- return _index.Panneau;
11
+ return _ComponentsCollection["default"];
12
12
  }
13
13
  });
14
- Object.defineProperty(exports, "LoadingComponent", {
14
+ Object.defineProperty(exports, "ErrorsComponent", {
15
15
  enumerable: true,
16
16
  get: function get() {
17
- return _index.Loading;
17
+ return _index.Errors;
18
18
  }
19
19
  });
20
- Object.defineProperty(exports, "ErrorsComponent", {
20
+ Object.defineProperty(exports, "LoadingComponent", {
21
21
  enumerable: true,
22
22
  get: function get() {
23
- return _index.Errors;
23
+ return _index.Loading;
24
24
  }
25
25
  });
26
- Object.defineProperty(exports, "PropTypes", {
26
+ Object.defineProperty(exports, "PanneauComponent", {
27
27
  enumerable: true,
28
28
  get: function get() {
29
- return _PropTypes["default"];
29
+ return _index.Panneau;
30
30
  }
31
31
  });
32
- Object.defineProperty(exports, "ComponentsCollection", {
32
+ Object.defineProperty(exports, "PropTypes", {
33
33
  enumerable: true,
34
34
  get: function get() {
35
- return _ComponentsCollection["default"];
35
+ return _PropTypes["default"];
36
36
  }
37
37
  });
38
- Object.defineProperty(exports, "withUrlGenerator", {
38
+ Object.defineProperty(exports, "ResponseError", {
39
39
  enumerable: true,
40
40
  get: function get() {
41
- return _withUrlGenerator["default"];
41
+ return _requests.ResponseError;
42
42
  }
43
43
  });
44
- Object.defineProperty(exports, "withDefinition", {
44
+ Object.defineProperty(exports, "ValidationError", {
45
45
  enumerable: true,
46
46
  get: function get() {
47
- return _withDefinition["default"];
47
+ return _requests.ValidationError;
48
48
  }
49
49
  });
50
- Object.defineProperty(exports, "withResourceApi", {
50
+ exports["default"] = void 0;
51
+ Object.defineProperty(exports, "getJSON", {
51
52
  enumerable: true,
52
53
  get: function get() {
53
- return _withResourceApi["default"];
54
+ return _requests.getJSON;
54
55
  }
55
56
  });
56
- Object.defineProperty(exports, "withComponentsCollection", {
57
+ Object.defineProperty(exports, "getResponseAndDataObject", {
57
58
  enumerable: true,
58
59
  get: function get() {
59
- return _withComponentsCollection["default"];
60
+ return _requests.getResponseAndDataObject;
60
61
  }
61
62
  });
62
- Object.defineProperty(exports, "withFormsCollection", {
63
+ Object.defineProperty(exports, "isMessage", {
63
64
  enumerable: true,
64
65
  get: function get() {
65
- return _withFormsCollection["default"];
66
+ return _utils.isMessage;
66
67
  }
67
68
  });
68
- Object.defineProperty(exports, "withFieldsCollection", {
69
+ Object.defineProperty(exports, "postJSON", {
69
70
  enumerable: true,
70
71
  get: function get() {
71
- return _withFieldsCollection["default"];
72
+ return _requests.postJSON;
72
73
  }
73
74
  });
74
- Object.defineProperty(exports, "withListsCollection", {
75
+ Object.defineProperty(exports, "throwResponseError", {
75
76
  enumerable: true,
76
77
  get: function get() {
77
- return _withListsCollection["default"];
78
+ return _requests.throwResponseError;
78
79
  }
79
80
  });
80
- Object.defineProperty(exports, "withLayoutsCollection", {
81
+ Object.defineProperty(exports, "throwValidationError", {
81
82
  enumerable: true,
82
83
  get: function get() {
83
- return _withLayoutsCollection["default"];
84
+ return _requests.throwValidationError;
84
85
  }
85
86
  });
86
- Object.defineProperty(exports, "withModalsCollection", {
87
+ Object.defineProperty(exports, "withComponentsCollection", {
87
88
  enumerable: true,
88
89
  get: function get() {
89
- return _withModalsCollection["default"];
90
+ return _withComponentsCollection["default"];
90
91
  }
91
92
  });
92
- Object.defineProperty(exports, "withPreviewsCollection", {
93
+ Object.defineProperty(exports, "withDefinition", {
93
94
  enumerable: true,
94
95
  get: function get() {
95
- return _withPreviewsCollection["default"];
96
+ return _withDefinition["default"];
96
97
  }
97
98
  });
98
- Object.defineProperty(exports, "ResponseError", {
99
+ Object.defineProperty(exports, "withFieldsCollection", {
99
100
  enumerable: true,
100
101
  get: function get() {
101
- return _requests.ResponseError;
102
+ return _withFieldsCollection["default"];
102
103
  }
103
104
  });
104
- Object.defineProperty(exports, "ValidationError", {
105
+ Object.defineProperty(exports, "withFormsCollection", {
105
106
  enumerable: true,
106
107
  get: function get() {
107
- return _requests.ValidationError;
108
+ return _withFormsCollection["default"];
108
109
  }
109
110
  });
110
- Object.defineProperty(exports, "getResponseAndDataObject", {
111
+ Object.defineProperty(exports, "withLayoutsCollection", {
111
112
  enumerable: true,
112
113
  get: function get() {
113
- return _requests.getResponseAndDataObject;
114
+ return _withLayoutsCollection["default"];
114
115
  }
115
116
  });
116
- Object.defineProperty(exports, "throwResponseError", {
117
+ Object.defineProperty(exports, "withListsCollection", {
117
118
  enumerable: true,
118
119
  get: function get() {
119
- return _requests.throwResponseError;
120
+ return _withListsCollection["default"];
120
121
  }
121
122
  });
122
- Object.defineProperty(exports, "throwValidationError", {
123
+ Object.defineProperty(exports, "withModalsCollection", {
123
124
  enumerable: true,
124
125
  get: function get() {
125
- return _requests.throwValidationError;
126
+ return _withModalsCollection["default"];
126
127
  }
127
128
  });
128
- Object.defineProperty(exports, "postJSON", {
129
+ Object.defineProperty(exports, "withPreviewsCollection", {
129
130
  enumerable: true,
130
131
  get: function get() {
131
- return _requests.postJSON;
132
+ return _withPreviewsCollection["default"];
132
133
  }
133
134
  });
134
- Object.defineProperty(exports, "getJSON", {
135
+ Object.defineProperty(exports, "withResourceApi", {
135
136
  enumerable: true,
136
137
  get: function get() {
137
- return _requests.getJSON;
138
+ return _withResourceApi["default"];
138
139
  }
139
140
  });
140
- Object.defineProperty(exports, "isMessage", {
141
+ Object.defineProperty(exports, "withUrlGenerator", {
141
142
  enumerable: true,
142
143
  get: function get() {
143
- return _utils.isMessage;
144
+ return _withUrlGenerator["default"];
144
145
  }
145
146
  });
146
- exports["default"] = void 0;
147
147
 
148
148
  var _Panneau = _interopRequireDefault(require("./Panneau"));
149
149
 
@@ -13,18 +13,11 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
13
13
 
14
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
15
15
 
16
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
16
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
17
17
 
18
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
18
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
19
 
20
20
  var ComponentsCollection = /*#__PURE__*/function () {
21
- (0, _createClass2["default"])(ComponentsCollection, null, [{
22
- key: "normalizeKey",
23
- value: function normalizeKey(key) {
24
- return key.replace(/[^A-Za-z0-9.]/gi, '').toLowerCase();
25
- }
26
- }]);
27
-
28
21
  function ComponentsCollection(components) {
29
22
  (0, _classCallCheck2["default"])(this, ComponentsCollection);
30
23
  this.components = {};
@@ -64,10 +57,10 @@ var ComponentsCollection = /*#__PURE__*/function () {
64
57
  var namespaceKey = ComponentsCollection.normalizeKey(namespace); // eslint-disable-next-line no-useless-escape
65
58
 
66
59
  var matches = key.match(new RegExp("^".concat(namespaceKey, ".(.*)$"), 'i'));
67
- return matches ? _objectSpread({}, components, (0, _defineProperty2["default"])({}, matches[1], _this2.components[key])) : components;
60
+ return matches ? _objectSpread(_objectSpread({}, components), {}, (0, _defineProperty2["default"])({}, matches[1], _this2.components[key])) : components;
68
61
  }
69
62
 
70
- return _objectSpread({}, components, (0, _defineProperty2["default"])({}, key, _this2.components[key]));
63
+ return _objectSpread(_objectSpread({}, components), {}, (0, _defineProperty2["default"])({}, key, _this2.components[key]));
71
64
  }, {});
72
65
  }
73
66
  }, {
@@ -96,6 +89,11 @@ var ComponentsCollection = /*#__PURE__*/function () {
96
89
  });
97
90
  return typeof foundKey !== 'undefined' && foundKey !== null ? this.components[foundKey] : null;
98
91
  }
92
+ }], [{
93
+ key: "normalizeKey",
94
+ value: function normalizeKey(key) {
95
+ return key.replace(/[^A-Za-z0-9.]/gi, '').toLowerCase();
96
+ }
99
97
  }]);
100
98
  return ComponentsCollection;
101
99
  }();