@panneau/app 2.0.3 → 2.0.5

package/es/index.js

@@ -18,7 +18,7 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import isObject from 'lodash/isObject';
-import { parse, stringify } from 'query-string';
+import queryString from 'query-string';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { useResourceUrlGenerator, useForm } from '@panneau/core/hooks';
 import { getComponentFromName } from '@panneau/core/utils';
@@ -574,7 +574,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     navigate("".concat(resourceRoute('index'), "?created=true"));
   }, [navigate, resourceRoute]);
   var _useMemo = useMemo(function () {
-      return parse(search);
+      return queryString.parse(search);
     }, [search]),
     _useMemo$type = _useMemo.type,
     type = _useMemo$type === void 0 ? null : _useMemo$type;
@@ -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",
@@ -1034,7 +1025,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     search = _useLocation.search;
   var navigate = useNavigate();
   var query = useMemo(function () {
-    return parse(search);
+    return queryString.parse(search);
   }, [search]);
   var listQuery = useMemo(function () {
     return query;
@@ -1051,15 +1042,15 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var value = submitQuery[key];
       return value !== null ? _objectSpread(_objectSpread({}, currentQuery), {}, _defineProperty({}, key, value)) : currentQuery;
     }, null) : null;
-    navigate("".concat(url).concat(newQuery !== null ? "?".concat(stringify(newQuery, {
+    navigate("".concat(url).concat(newQuery !== null ? "?".concat(queryString.stringify(newQuery, {
       arrayFormat: 'bracket'
     })) : ''));
   }, [navigate, url, query, paginated]);
   var onQueryReset = useCallback(function () {
-    var queryString = stringify(null, {
+    var resetQuery = queryString.stringify(null, {
       arrayFormat: 'bracket'
     });
-    navigate("".concat(url, "?").concat(queryString));
+    navigate("".concat(url, "?").concat(resetQuery));
   }, [navigate, url, paginated]);
   var onClickCloseAlert = useCallback(function () {
     navigate(url, {

package/lib/index.js

@@ -57,6 +57,7 @@ var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumab
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
+var queryString__default = /*#__PURE__*/_interopDefaultLegacy(queryString);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var Form__default = /*#__PURE__*/_interopDefaultLegacy(Form);
@@ -607,7 +608,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
     navigate("".concat(resourceRoute('index'), "?created=true"));
   }, [navigate, resourceRoute]);
   var _useMemo = React.useMemo(function () {
-      return queryString.parse(search);
+      return queryString__default["default"].parse(search);
     }, [search]),
     _useMemo$type = _useMemo.type,
     type = _useMemo$type === void 0 ? null : _useMemo$type;
@@ -642,8 +643,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 +656,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 +682,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 +876,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",
@@ -1067,7 +1059,7 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
     search = _useLocation.search;
   var navigate = reactRouter.useNavigate();
   var query = React.useMemo(function () {
-    return queryString.parse(search);
+    return queryString__default["default"].parse(search);
   }, [search]);
   var listQuery = React.useMemo(function () {
     return query;
@@ -1084,15 +1076,15 @@ var ResourceIndexPage = function ResourceIndexPage(_ref) {
       var value = submitQuery[key];
       return value !== null ? _objectSpread__default["default"](_objectSpread__default["default"]({}, currentQuery), {}, _defineProperty__default["default"]({}, key, value)) : currentQuery;
     }, null) : null;
-    navigate("".concat(url).concat(newQuery !== null ? "?".concat(queryString.stringify(newQuery, {
+    navigate("".concat(url).concat(newQuery !== null ? "?".concat(queryString__default["default"].stringify(newQuery, {
       arrayFormat: 'bracket'
     })) : ''));
   }, [navigate, url, query, paginated]);
   var onQueryReset = React.useCallback(function () {
-    var queryString$1 = queryString.stringify(null, {
+    var resetQuery = queryString__default["default"].stringify(null, {
       arrayFormat: 'bracket'
     });
-    navigate("".concat(url, "?").concat(queryString$1));
+    navigate("".concat(url, "?").concat(resetQuery));
   }, [navigate, url, paginated]);
   var onClickCloseAlert = React.useCallback(function () {
     navigate(url, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/app",
-    "version": "2.0.3",
+    "version": "2.0.5",
     "description": "",
     "keywords": [
         "javascript"
@@ -63,9 +63,9 @@
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "@panneau/auth": "^2.0.2",
+        "@panneau/auth": "^2.0.5",
         "@panneau/core": "^2.0.2",
-        "@panneau/data": "^2.0.2",
+        "@panneau/data": "^2.0.5",
         "@panneau/displays": "^2.0.2",
         "@panneau/element-alert": "^2.0.2",
         "@panneau/element-button": "^2.0.2",
@@ -78,19 +78,19 @@
         "@panneau/element-loading": "^2.0.2",
         "@panneau/element-menu": "^2.0.2",
         "@panneau/element-navbar": "^2.0.2",
-        "@panneau/element-pagination": "^2.0.2",
+        "@panneau/element-pagination": "^2.0.5",
         "@panneau/element-radios": "^2.0.2",
-        "@panneau/fields": "^2.0.3",
-        "@panneau/filters": "^2.0.2",
-        "@panneau/forms": "^2.0.3",
+        "@panneau/fields": "^2.0.5",
+        "@panneau/filters": "^2.0.5",
+        "@panneau/forms": "^2.0.5",
         "@panneau/intl": "^2.0.2",
-        "@panneau/lists": "^2.0.2",
+        "@panneau/lists": "^2.0.5",
         "@panneau/modals": "^2.0.2",
         "@panneau/themes": "^2.0.2",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
-        "query-string": "^7.0.0",
+        "query-string": "^7.0.0||^8.1.0",
         "react-intl": "^5.15.8||^6.0.0",
         "react-router": "^6.2.1",
         "react-router-dom": "^6.2.1"
@@ -98,5 +98,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "acc0691040062ca37b3eca65a31198ad20356903"
+    "gitHead": "eb99739fb81a02464eccb6a131b3e36a436de294"
 }