@panneau/core 0.6.70-alpha.0 → 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 (77) 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 -11
  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 +102 -64
  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 +25 -14
  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 -13
  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 +110 -67
  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 +25 -14
  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
  71. package/src/components/Panneau.jsx +0 -1
  72. package/src/components/pages/ResourceIndex.jsx +62 -13
  73. package/src/lib/react-container/UrlGeneratorContainer.jsx +17 -10
  74. package/src/styles/pages/resource-index.scss +16 -1
  75. package/es/components/pages/_ResourceIndexOld.js +0 -459
  76. package/lib/components/pages/_ResourceIndexOld.js +0 -488
  77. package/src/components/pages/_ResourceIndexOld.jsx +0 -428
@@ -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
  });
@@ -29,13 +29,17 @@ var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-stat
29
29
 
30
30
  var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
31
31
 
32
- 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); }; }
32
+ 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); }
33
+
34
+ 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; }
35
+
36
+ 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); }; }
33
37
 
34
- 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; } }
38
+ 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; } }
35
39
 
36
- 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; }
40
+ 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; }
37
41
 
38
- 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; }
42
+ 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; }
39
43
 
40
44
  function getDisplayName(WrappedComponent) {
41
45
  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
@@ -77,7 +81,7 @@ function withComponentsCollection(mapDefinitionToProps, opts) {
77
81
 
78
82
  var definition = this.context.definition;
79
83
 
80
- var props = _objectSpread({}, this.props, {}, finalMapDefinitionToProps(definition || null, this.props, this.context));
84
+ var props = _objectSpread(_objectSpread({}, this.props), finalMapDefinitionToProps(definition || null, this.props, this.context));
81
85
 
82
86
  if (withRef) {
83
87
  props.ref = function (c) {
@@ -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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -15,9 +15,13 @@ var PanneauPropTypes = _interopRequireWildcard(require("./PropTypes"));
15
15
 
16
16
  var _withComponentsCollection = _interopRequireDefault(require("./withComponentsCollection"));
17
17
 
18
- 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; }
18
+ 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); }
19
+
20
+ 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; }
21
+
22
+ 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; }
19
23
 
20
- 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; }
24
+ 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; }
21
25
 
22
26
  function getDisplayName(WrappedComponent) {
23
27
  return WrappedComponent.displayName || WrappedComponent.name || '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
  });
@@ -37,13 +37,17 @@ var _withDefinition = _interopRequireDefault(require("./withDefinition"));
37
37
 
38
38
  var _ResourceApi = _interopRequireDefault(require("./ResourceApi"));
39
39
 
40
- 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); }; }
40
+ 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); }
41
+
42
+ 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; }
43
+
44
+ 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); }; }
41
45
 
42
- 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; } }
46
+ 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; } }
43
47
 
44
- 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; }
48
+ 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; }
45
49
 
46
- 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; }
50
+ 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; }
47
51
 
48
52
  function getDisplayName(WrappedComponent) {
49
53
  return WrappedComponent.displayName || WrappedComponent.name || 'Component';
@@ -74,14 +78,6 @@ function withComponentsCollection(selectResourceFromProps, opts) {
74
78
 
75
79
  var _super = _createSuper(WithResourceApi);
76
80
 
77
- (0, _createClass2["default"])(WithResourceApi, null, [{
78
- key: "getWrappedInstance",
79
- value: function getWrappedInstance() {
80
- (0, _invariant["default"])(withRef, 'To access the wrapped instance, you need to specify `{ withRef: true }` as the second argument of the withDefinitionCollection() call.');
81
- return this.wrappedInstance;
82
- }
83
- }]);
84
-
85
81
  function WithResourceApi(props) {
86
82
  var _this;
87
83
 
@@ -108,7 +104,7 @@ function withComponentsCollection(selectResourceFromProps, opts) {
108
104
 
109
105
  var otherProps = (0, _extends2["default"])({}, this.props);
110
106
 
111
- var props = _objectSpread({}, otherProps, {
107
+ var props = _objectSpread(_objectSpread({}, otherProps), {}, {
112
108
  resourceApi: this.api
113
109
  });
114
110
 
@@ -120,6 +116,12 @@ function withComponentsCollection(selectResourceFromProps, opts) {
120
116
 
121
117
  return /*#__PURE__*/_react["default"].createElement(WrappedComponent, props);
122
118
  }
119
+ }], [{
120
+ key: "getWrappedInstance",
121
+ value: function getWrappedInstance() {
122
+ (0, _invariant["default"])(withRef, 'To access the wrapped instance, you need to specify `{ withRef: true }` as the second argument of the withDefinitionCollection() call.');
123
+ return this.wrappedInstance;
124
+ }
123
125
  }]);
124
126
  return WithResourceApi;
125
127
  }(_react.Component);
@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
11
11
 
12
12
  var _AuthActions = require("../actions/AuthActions");
13
13
 
14
- 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; }
14
+ 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; }
15
15
 
16
- 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; }
16
+ 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; }
17
17
 
18
18
  var initialState = {
19
19
  user: null
@@ -27,7 +27,7 @@ var AuthReducer = function AuthReducer() {
27
27
  switch (action.type) {
28
28
  case _AuthActions.SET_USER:
29
29
  {
30
- return _objectSpread({}, state, {
30
+ return _objectSpread(_objectSpread({}, state), {}, {
31
31
  user: action.payload
32
32
  });
33
33
  }
@@ -13,9 +13,9 @@ var _PanneauActions = require("../actions/PanneauActions");
13
13
 
14
14
  var _parseDefinition = _interopRequireDefault(require("../lib/parseDefinition"));
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 initialState = {
21
21
  definition: null,
@@ -30,14 +30,14 @@ var PanneauReducer = function PanneauReducer() {
30
30
  switch (action.type) {
31
31
  case _PanneauActions.SET_DEFINITION:
32
32
  {
33
- return _objectSpread({}, state, {
33
+ return _objectSpread(_objectSpread({}, state), {}, {
34
34
  definition: (0, _parseDefinition["default"])(action.payload)
35
35
  });
36
36
  }
37
37
 
38
38
  case _PanneauActions.SET_COMPONENTS_COLLECTION:
39
39
  {
40
- return _objectSpread({}, state, {
40
+ return _objectSpread(_objectSpread({}, state), {}, {
41
41
  componentsCollection: action.payload
42
42
  });
43
43
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/core",
3
- "version": "0.6.70-alpha.0",
3
+ "version": "0.6.73",
4
4
  "description": "Core utilities of the Panneau package",
5
5
  "keywords": [
6
6
  "react",
@@ -52,7 +52,7 @@
52
52
  "dependencies": {
53
53
  "@babel/runtime": "^7.0.0",
54
54
  "@fortawesome/fontawesome-free": "^5.7.1",
55
- "bootstrap": "~4.4.1",
55
+ "bootstrap": "~4.6.1",
56
56
  "classnames": "^2.2.5",
57
57
  "connected-react-router": "^6.0.0",
58
58
  "history": "^4.9.0",
@@ -87,5 +87,5 @@
87
87
  "react": ">=15.0.0 || ^16.0.0",
88
88
  "react-dom": ">=15.0.0 || ^16.0.0"
89
89
  },
90
- "gitHead": "ed9b5fba13b38edd866410963009acb2e1a023d5"
90
+ "gitHead": "9563b8edb8b5fc1802609fa1a429cc5b4338d8fa"
91
91
  }
@@ -50,7 +50,6 @@ class Panneau extends Component {
50
50
 
51
51
  getIntlProps() {
52
52
  const { locale, messages } = this.props;
53
- console.log('Panneau props', locale, messages); // eslint-disable-line
54
53
  return {
55
54
  locale,
56
55
  messages,
@@ -81,16 +81,40 @@ const defaultProps = {
81
81
  };
82
82
 
83
83
  class ResourceIndex extends Component {
84
- static getDerivedStateFromProps({ query: nextQuery, errors: nextErrors }, { query, errors }) {
84
+ static getDerivedStateFromProps(
85
+ { query: nextQuery, errors: nextErrors, resource: nextResource },
86
+ { query, errors, resource },
87
+ ) {
85
88
  const queryChanged = nextQuery !== query;
86
89
  const errorsChanged = nextErrors !== errors;
90
+
91
+ const currentId = resource ? resource.id : null;
92
+ const nextId = nextResource ? nextResource.id : null;
93
+ const resourceChanged = currentId && nextId && currentId !== nextId;
94
+
87
95
  if (queryChanged || errorsChanged) {
96
+ if (resourceChanged) {
97
+ return {
98
+ search: '',
99
+ query: queryChanged ? nextQuery : query,
100
+ errors: errorsChanged ? nextErrors : errors,
101
+ isLoading: queryChanged,
102
+ };
103
+ }
104
+
88
105
  return {
89
106
  query: queryChanged ? nextQuery : query,
90
107
  errors: errorsChanged ? nextErrors : errors,
91
108
  isLoading: queryChanged,
92
109
  };
93
110
  }
111
+
112
+ if (resourceChanged) {
113
+ return {
114
+ search: '',
115
+ };
116
+ }
117
+
94
118
  return null;
95
119
  }
96
120
 
@@ -106,6 +130,7 @@ class ResourceIndex extends Component {
106
130
  this.onClickAction = this.onClickAction.bind(this);
107
131
  this.onItemDeleted = this.onItemDeleted.bind(this);
108
132
  this.onSearchChange = this.onSearchChange.bind(this);
133
+ this.onSearchClear = this.onSearchClear.bind(this);
109
134
  this.onSearch = this.onSearch.bind(this);
110
135
 
111
136
  const query = ResourceIndex.getQueryFromLocation();
@@ -115,7 +140,7 @@ class ResourceIndex extends Component {
115
140
  query: null, // eslint-disable-line react/no-unused-state
116
141
  items: props.items,
117
142
  pagination: null,
118
- search: query.q || null,
143
+ search: query.q || '',
119
144
  errors: props.errors,
120
145
  };
121
146
  }
@@ -202,6 +227,12 @@ class ResourceIndex extends Component {
202
227
  });
203
228
  }
204
229
 
230
+ onSearchClear() {
231
+ const { getResourceActionUrl } = this.props;
232
+ const location = getResourceActionUrl('index');
233
+ window.location.href = location;
234
+ }
235
+
205
236
  onSearch(e) {
206
237
  if (e.key === 'Enter') {
207
238
  const { getResourceActionUrl } = this.props;
@@ -401,6 +432,7 @@ class ResourceIndex extends Component {
401
432
  <div
402
433
  className={classNames({
403
434
  [styles.filters]: true,
435
+ 'mb-3': true,
404
436
  'd-flex': true,
405
437
  'flex-row ': true,
406
438
  'justify-content-between': true,
@@ -443,20 +475,37 @@ class ResourceIndex extends Component {
443
475
  {withSearch ? (
444
476
  <div
445
477
  className={classNames({
478
+ [styles.search]: true,
446
479
  'btn-group': true,
447
480
  })}
448
481
  >
449
- <input
450
- className={classNames({
451
- input: true,
452
- 'form-control': true,
453
- })}
454
- type="text"
455
- value={search || ''}
456
- placeholder={intl.formatMessage(searchLabel)}
457
- onChange={this.onSearchChange}
458
- onKeyPress={this.onSearch}
459
- />
482
+ <div className="input-group">
483
+ <input
484
+ className={classNames({
485
+ input: true,
486
+ [styles.searchInput]: true,
487
+ 'form-control': true,
488
+ })}
489
+ type="text"
490
+ value={search || ''}
491
+ placeholder={intl.formatMessage(searchLabel)}
492
+ onChange={this.onSearchChange}
493
+ onKeyPress={this.onSearch}
494
+ />
495
+ {search ? (
496
+ <button
497
+ type="button"
498
+ className={classNames({
499
+ btn: true,
500
+ [styles.searchClose]: true,
501
+ 'bg-transparent': true,
502
+ })}
503
+ onClick={this.onSearchClear}
504
+ >
505
+ <i className="fa fa-times" />
506
+ </button>
507
+ ) : null}
508
+ </div>
460
509
  </div>
461
510
  ) : null}
462
511
  </div>
@@ -22,6 +22,23 @@ const childContextTypes = {
22
22
  };
23
23
 
24
24
  class UrlGeneratorContainer extends Component {
25
+ static getDerivedStateFromProps(nextProps, props) {
26
+ const nextRoutes = UrlGeneratorContainer.getRoutesFromProps(nextProps);
27
+ const routes = UrlGeneratorContainer.getRoutesFromProps(props);
28
+ if (!isEqual(nextRoutes, routes)) {
29
+ return {
30
+ urlGenerator: new UrlGenerator(nextRoutes),
31
+ };
32
+ }
33
+
34
+ return null;
35
+ }
36
+
37
+ static getRoutesFromProps(props) {
38
+ const { getRoutes, routes } = props || {};
39
+ return getRoutes ? getRoutes() : routes;
40
+ }
41
+
25
42
  constructor(props) {
26
43
  super(props);
27
44
 
@@ -37,16 +54,6 @@ class UrlGeneratorContainer extends Component {
37
54
  };
38
55
  }
39
56
 
40
- componentWillReceiveProps(nextProps) {
41
- const nextRoutes = this.getRoutes(nextProps);
42
- const routes = this.getRoutes();
43
- if (!isEqual(nextRoutes, routes)) {
44
- this.setState({
45
- urlGenerator: new UrlGenerator(nextRoutes),
46
- });
47
- }
48
- }
49
-
50
57
  getRoutes(props) {
51
58
  const { getRoutes, routes } = props || this.props;
52
59
  return getRoutes !== null ? getRoutes() : routes;
@@ -27,7 +27,22 @@
27
27
  flex-direction: row;
28
28
  align-items: center;
29
29
  justify-content: space-between;
30
- margin-bottom: 10px;
30
+ }
31
+
32
+ .search {
33
+ position: relative;
34
+ }
35
+
36
+ .searchInput {
37
+ padding-right: 35px;
38
+ border-radius: 0.25rem !important;
39
+ }
40
+
41
+ .searchClose {
42
+ position: absolute;
43
+ z-index: 10;
44
+ right: 0;
45
+ margin-left: -40px;
31
46
  }
32
47
 
33
48
  .loading {