@panneau/app 2.0.3 → 2.0.4

package/es/index.js

@@ -609,8 +609,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
 ResourceCreatePage.propTypes = propTypes$f;
 ResourceCreatePage.defaultProps = defaultProps$f;
 
-// import Button from '../buttons/Button';
-
+// import PropTypes from 'prop-types';
 var propTypes$e = {
   resource: PropTypes.resource.isRequired
 };
@@ -623,17 +622,10 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resourceRoute = useResourceUrlGenerator(resource);
   var _useResourceItem = useResourceItem(resource, itemId),
     item = _useResourceItem.item;
+  var resourceValues = useResourceValues(resource);
   var onSuccess = useCallback(function () {
     return navigate("".concat(resourceRoute('index'), "?deleted=true"));
   }, [navigate, resourceRoute]);
-
-  // Navigate back
-  var _ref2 = history || {},
-    _ref2$entries = _ref2.entries,
-    entries = _ref2$entries === void 0 ? [] : _ref2$entries;
-  var previousEntry = entries !== null && entries.length > 1 ? entries[entries.length - 2] : null;
-  var previous = (previousEntry === null || previousEntry === void 0 ? void 0 : previousEntry.pathname) || null;
-  var resourceValues = useResourceValues(resource);
   return /*#__PURE__*/React.createElement(ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
@@ -656,11 +648,9 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
   }, item !== null ? /*#__PURE__*/React.createElement(ResourceForm, {
-    component: "",
     resource: resource,
     item: item,
     onSuccess: onSuccess,
-    previous: previous,
     isDelete: true
   }) : null)))));
 };
@@ -852,43 +842,44 @@ var ResourceFilters = function ResourceFilters(_ref) {
     }
     return isActive;
   }, false);
-
-  // console.log('value', value);
-
+  var onFilterChange = useCallback(function (name, newFilterValue) {
+    if (name !== null && onChange !== null) {
+      onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, name, newFilterValue), defaultValue));
+    }
+  }, [onChange, value, defaultValue]);
+  var onFilterClear = useCallback(function (name) {
+    if (name !== null && onChange !== null) {
+      var _ref2 = value || {};
+        _ref2[name];
+        var newValue = _objectWithoutProperties(_ref2, [name].map(_toPropertyKey));
+      onChange(_objectSpread(_objectSpread({}, newValue), defaultValue));
+    }
+  }, [onChange, value, defaultValue]);
   return /*#__PURE__*/React.createElement(Navbar, {
     className: classNames([_defineProperty({
       'navbar-expand-md': withContainer
     }, className, className !== null), 'justify-content-start', 'align-items-start', 'flex-column', 'flex-md-row']),
     theme: background,
     withoutCollapse: true
-  }, currentFilters.map(function (_ref3, index) {
-    var component = _ref3.component,
-      name = _ref3.name,
-      groupLabel = _ref3.groupLabel,
-      filterProps = _objectWithoutProperties(_ref3, _excluded$4);
+  }, currentFilters.map(function (_ref4, index) {
+    var component = _ref4.component,
+      name = _ref4.name,
+      groupLabel = _ref4.groupLabel,
+      filterProps = _objectWithoutProperties(_ref4, _excluded$4);
     var FilterComponent = getComponentFromName(component, FilterComponents, null);
     var filterValue = value !== null && value[name] ? value[name] : null;
-    var onFilterChange = useCallback(function (newFilterValue) {
-      if (name !== null && onChange !== null) {
-        onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, name, newFilterValue), defaultValue));
-      }
-    }, [onChange, name, value, defaultValue]);
-    var onFilterClear = useCallback(function () {
-      if (name !== null && onChange !== null) {
-        var _ref4 = value || {};
-          _ref4[name];
-          var newValue = _objectWithoutProperties(_ref4, [name].map(_toPropertyKey));
-        onChange(_objectSpread(_objectSpread({}, newValue), defaultValue));
-      }
-    }, [onChange, name, value, defaultValue]);
     return FilterComponent !== null ? /*#__PURE__*/React.createElement(FormGroup, {
       key: "filter-".concat(name, "-").concat(index + 1),
       label: groupLabel,
       className: "me-4"
     }, /*#__PURE__*/React.createElement(FilterComponent, Object.assign({}, filterProps, {
       value: filterValue,
-      onChange: onFilterChange,
-      onClear: onFilterClear
+      onChange: function onChange(newValue) {
+        return onFilterChange(name, newValue);
+      },
+      onClear: function onClear() {
+        return onFilterClear(name);
+      }
     }))) : null;
   }), withReset && hasActiveFilter && currentFilters.length > 0 ? /*#__PURE__*/React.createElement(Button, {
     theme: "primary",

package/lib/index.js

@@ -642,8 +642,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
 ResourceCreatePage.propTypes = propTypes$f;
 ResourceCreatePage.defaultProps = defaultProps$f;
 
-// import Button from '../buttons/Button';
-
+// import PropTypes from 'prop-types';
 var propTypes$e = {
   resource: core.PropTypes.resource.isRequired
 };
@@ -656,17 +655,10 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   var resourceRoute = hooks.useResourceUrlGenerator(resource);
   var _useResourceItem = data.useResourceItem(resource, itemId),
     item = _useResourceItem.item;
+  var resourceValues = intl.useResourceValues(resource);
   var onSuccess = React.useCallback(function () {
     return navigate("".concat(resourceRoute('index'), "?deleted=true"));
   }, [navigate, resourceRoute]);
-
-  // Navigate back
-  var _ref2 = history || {},
-    _ref2$entries = _ref2.entries,
-    entries = _ref2$entries === void 0 ? [] : _ref2$entries;
-  var previousEntry = entries !== null && entries.length > 1 ? entries[entries.length - 2] : null;
-  var previous = (previousEntry === null || previousEntry === void 0 ? void 0 : previousEntry.pathname) || null;
-  var resourceValues = intl.useResourceValues(resource);
   return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
     resource: resource
   }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
@@ -689,11 +681,9 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "col-12 col-md-8 col-lg-7"
   }, item !== null ? /*#__PURE__*/React__default["default"].createElement(ResourceForm, {
-    component: "",
     resource: resource,
     item: item,
     onSuccess: onSuccess,
-    previous: previous,
     isDelete: true
   }) : null)))));
 };
@@ -885,43 +875,44 @@ var ResourceFilters = function ResourceFilters(_ref) {
     }
     return isActive;
   }, false);
-
-  // console.log('value', value);
-
+  var onFilterChange = React.useCallback(function (name, newFilterValue) {
+    if (name !== null && onChange !== null) {
+      onChange(_objectSpread__default["default"](_objectSpread__default["default"]({}, value), {}, _defineProperty__default["default"]({}, name, newFilterValue), defaultValue));
+    }
+  }, [onChange, value, defaultValue]);
+  var onFilterClear = React.useCallback(function (name) {
+    if (name !== null && onChange !== null) {
+      var _ref2 = value || {};
+        _ref2[name];
+        var newValue = _objectWithoutProperties__default["default"](_ref2, [name].map(_toPropertyKey__default["default"]));
+      onChange(_objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), defaultValue));
+    }
+  }, [onChange, value, defaultValue]);
   return /*#__PURE__*/React__default["default"].createElement(Navbar__default["default"], {
     className: classNames__default["default"]([_defineProperty__default["default"]({
       'navbar-expand-md': withContainer
     }, className, className !== null), 'justify-content-start', 'align-items-start', 'flex-column', 'flex-md-row']),
     theme: background,
     withoutCollapse: true
-  }, currentFilters.map(function (_ref3, index) {
-    var component = _ref3.component,
-      name = _ref3.name,
-      groupLabel = _ref3.groupLabel,
-      filterProps = _objectWithoutProperties__default["default"](_ref3, _excluded$4);
+  }, currentFilters.map(function (_ref4, index) {
+    var component = _ref4.component,
+      name = _ref4.name,
+      groupLabel = _ref4.groupLabel,
+      filterProps = _objectWithoutProperties__default["default"](_ref4, _excluded$4);
     var FilterComponent = utils.getComponentFromName(component, FilterComponents, null);
     var filterValue = value !== null && value[name] ? value[name] : null;
-    var onFilterChange = React.useCallback(function (newFilterValue) {
-      if (name !== null && onChange !== null) {
-        onChange(_objectSpread__default["default"](_objectSpread__default["default"]({}, value), {}, _defineProperty__default["default"]({}, name, newFilterValue), defaultValue));
-      }
-    }, [onChange, name, value, defaultValue]);
-    var onFilterClear = React.useCallback(function () {
-      if (name !== null && onChange !== null) {
-        var _ref4 = value || {};
-          _ref4[name];
-          var newValue = _objectWithoutProperties__default["default"](_ref4, [name].map(_toPropertyKey__default["default"]));
-        onChange(_objectSpread__default["default"](_objectSpread__default["default"]({}, newValue), defaultValue));
-      }
-    }, [onChange, name, value, defaultValue]);
     return FilterComponent !== null ? /*#__PURE__*/React__default["default"].createElement(FormGroup__default["default"], {
       key: "filter-".concat(name, "-").concat(index + 1),
       label: groupLabel,
       className: "me-4"
     }, /*#__PURE__*/React__default["default"].createElement(FilterComponent, Object.assign({}, filterProps, {
       value: filterValue,
-      onChange: onFilterChange,
-      onClear: onFilterClear
+      onChange: function onChange(newValue) {
+        return onFilterChange(name, newValue);
+      },
+      onClear: function onClear() {
+        return onFilterClear(name);
+      }
     }))) : null;
   }), withReset && hasActiveFilter && currentFilters.length > 0 ? /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
     theme: "primary",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "description": "",
     "keywords": [
         "javascript"
@@ -84,7 +84,7 @@
         "@panneau/filters": "^2.0.2",
         "@panneau/forms": "^2.0.3",
         "@panneau/intl": "^2.0.2",
-        "@panneau/lists": "^2.0.2",
+        "@panneau/lists": "^2.0.4",
         "@panneau/modals": "^2.0.2",
         "@panneau/themes": "^2.0.2",
         "classnames": "^2.2.6",
@@ -98,5 +98,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "acc0691040062ca37b3eca65a31198ad20356903"
+    "gitHead": "d7ec869f7f55a84f613d66db9c0068f76890e648"
 }