@panneau/field-resource-item 3.0.171 → 3.0.173

package/es/index.js

@@ -5,6 +5,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import classNames from 'classnames';
 import isArray from 'lodash/isArray';
 import isEmpty from 'lodash/isEmpty';
+import uniqBy from 'lodash/uniqBy';
 import PropTypes from 'prop-types';
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
 import { useIntl, FormattedMessage } from 'react-intl';
@@ -130,7 +131,7 @@ var ResourceItemField = function ResourceItemField(_ref) {
     return initialPage || (paginated ? 1 : null);
   }, [initialPage, paginated]);
   var defaultCount = useMemo(function () {
-    return initialCount || (paginated ? 10 : null);
+    return initialCount || (paginated ? 8 : null);
   }, [initialCount, paginated]);
   var hasValue = value !== null && !isEmpty(value);
 
@@ -194,24 +195,22 @@ var ResourceItemField = function ResourceItemField(_ref) {
       paginated: paginated
     });
   }, [queryTextValue, paginated]);
-  var resourceItems = useResourceItems(queryResource, finalQuery, paginated ? page : null, paginated ? count : null, resourceOptions);
-  var _ref3 = resourceItems || {},
-    _ref3$allItems = _ref3.allItems,
-    partialItems = _ref3$allItems === void 0 ? null : _ref3$allItems,
-    _ref3$reload = _ref3.reload,
-    reload = _ref3$reload === void 0 ? null : _ref3$reload,
-    _ref3$reloadPage = _ref3.reloadPage,
-    reloadPage = _ref3$reloadPage === void 0 ? null : _ref3$reloadPage,
-    _ref3$reset = _ref3.reset,
-    reset = _ref3$reset === void 0 ? null : _ref3$reset,
+  var _useResourceItems = useResourceItems(queryResource, finalQuery, paginated ? page : null, paginated ? count : null, resourceOptions),
+    _useResourceItems$all = _useResourceItems.allItems,
+    partialItems = _useResourceItems$all === void 0 ? null : _useResourceItems$all,
+    _useResourceItems$rel = _useResourceItems.reload,
+    reload = _useResourceItems$rel === void 0 ? null : _useResourceItems$rel,
+    _useResourceItems$pag = _useResourceItems.pagination,
+    pagination = _useResourceItems$pag === void 0 ? null : _useResourceItems$pag;
+  var _ref3 = pagination || {},
     _ref3$lastPage = _ref3.lastPage,
     lastPage = _ref3$lastPage === void 0 ? null : _ref3$lastPage;
-  var items = (partialItems || []).concat(multiple && isArray(value) ? value : [value]).filter(function (it) {
+  var items = uniqBy((partialItems || []).concat(multiple && isArray(value) ? value : [value]).filter(function (it) {
     return it !== null;
-  }).filter(function (v, i, a) {
-    return a.findIndex(function (v2) {
-      return v2.id === v.id;
-    }) === i;
+  }), function (_ref4) {
+    var _ref4$id = _ref4.id,
+      id = _ref4$id === void 0 ? null : _ref4$id;
+    return id;
   });
   var onScrollEnd = useCallback(function () {
     if (page !== null && page >= lastPage) {
@@ -222,18 +221,15 @@ var ResourceItemField = function ResourceItemField(_ref) {
     }
   }, [paginated, page, setPage, lastPage]);
   var getItemLabel = useCallback(function (it, path) {
-    var _ref4 = it || {},
-      _ref4$id = _ref4.id,
-      id = _ref4$id === void 0 ? null : _ref4$id;
+    var _ref5 = it || {},
+      _ref5$id = _ref5.id,
+      id = _ref5$id === void 0 ? null : _ref5$id;
     if (itemLabelWithId) {
       var label = initialGetItemLabel(it, path);
       return label ? "".concat(label, " (#").concat(id, ")") : "#".concat(id);
     }
     return path !== null ? initialGetItemLabel(it, path) : "#".concat(id);
   }, [initialGetItemLabel, itemLabelWithId]);
-
-  // const getItemLabel = getItemLabelFunction(initialGetItemLabel, itemLabelWithId);
-
   var parseItem = useCallback(function (it) {
     var label = getItemLabel(it, itemLabelPath);
     var description = getItemDescription(it, itemDescriptionPath);
@@ -243,32 +239,32 @@ var ResourceItemField = function ResourceItemField(_ref) {
       label: finalLabel
     };
   }, [getItemLabel, getItemDescription, itemLabelPath, itemDescriptionPath]);
-  var finalValue = multiple && isArray(value) ? value.map(function (_ref5) {
-    var _ref5$id = _ref5.id,
-      id = _ref5$id === void 0 ? null : _ref5$id;
+  var finalValue = multiple && isArray(value) ? value.map(function (_ref6) {
+    var _ref6$id = _ref6.id,
+      id = _ref6$id === void 0 ? null : _ref6$id;
     return id;
   }) : (value === null || value === void 0 ? void 0 : value.id) || null;
-  var _ref6 = !multiple && hasValue ? value : {
+  var _ref7 = !multiple && hasValue ? value : {
       type: resourceType
     },
-    _ref6$type = _ref6.type,
-    finalType = _ref6$type === void 0 ? null : _ref6$type;
+    _ref7$type = _ref7.type,
+    finalType = _ref7$type === void 0 ? null : _ref7$type;
   var options = (items || []).map(function (it) {
     return parseItem(it);
   });
   var onValueChange = useCallback(function (newId) {
     if (onChange === null) return;
     if (multiple) {
-      var newValue = items.filter(function (_ref7) {
-        var _ref7$id = _ref7.id,
-          id = _ref7$id === void 0 ? null : _ref7$id;
+      var newValue = items.filter(function (_ref8) {
+        var _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
         return newId.indexOf(id) !== -1;
       }) || [];
       onChange(newValue);
     } else {
-      var _newValue = items.filter(function (_ref8) {
-        var _ref8$id = _ref8.id,
-          id = _ref8$id === void 0 ? null : _ref8$id;
+      var _newValue = items.filter(function (_ref9) {
+        var _ref9$id = _ref9.id,
+          id = _ref9$id === void 0 ? null : _ref9$id;
         return id === newId;
       }) || [];
       if (_newValue !== null && _newValue.length > 0) {
@@ -310,27 +306,25 @@ var ResourceItemField = function ResourceItemField(_ref) {
   }, [onChange, setListOpen]);
 
   // If empty try to fetch
-  var onFocus = useCallback(function () {
-    if ((partialItems || []).length === 0) {
-      if (paginated) {
-        reloadPage();
-      } else {
-        reload();
-      }
-    }
-  }, [paginated, partialItems]);
+  // const onFocus = useCallback(() => {
+  //     if ((partialItems || []).length === 0) {
+  //         reloadall();
+  //     }
+  // }, [paginated, reloadall]);
+
   var onClickRemove = useCallback(function () {
     if (onChange !== null) {
       onChange(null);
     }
+
     // Clear the page and be good
     if (paginated) {
       setPage(defaultPage);
-      reset();
+      reload();
     } else {
-      reset();
+      reload();
     }
-  }, [onChange, paginated, defaultPage, reload, reloadPage, reset]);
+  }, [onChange, paginated, defaultPage, reload]);
   var form = formOpen ? /*#__PURE__*/React.createElement(ResourceForm, {
     resource: resource,
     type: finalType,
@@ -377,8 +371,9 @@ var ResourceItemField = function ResourceItemField(_ref) {
       }]
     }),
     onChange: onValueChange,
-    onInputChange: onInputChange,
-    onFocus: onFocus,
+    onInputChange: onInputChange
+    // onFocus={onFocus}
+    ,
     onMenuScrollToBottom: onScrollEnd,
     multiple: multiple
   })), canFind ? /*#__PURE__*/React.createElement("div", {

package/lib/index.js

@@ -9,6 +9,7 @@ var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var classNames = require('classnames');
 var isArray = require('lodash/isArray');
 var isEmpty = require('lodash/isEmpty');
+var uniqBy = require('lodash/uniqBy');
 var PropTypes = require('prop-types');
 var React = require('react');
 var reactIntl = require('react-intl');
@@ -134,7 +135,7 @@ var ResourceItemField = function ResourceItemField(_ref) {
     return initialPage || (paginated ? 1 : null);
   }, [initialPage, paginated]);
   var defaultCount = React.useMemo(function () {
-    return initialCount || (paginated ? 10 : null);
+    return initialCount || (paginated ? 8 : null);
   }, [initialCount, paginated]);
   var hasValue = value !== null && !isEmpty(value);
 
@@ -198,24 +199,22 @@ var ResourceItemField = function ResourceItemField(_ref) {
       paginated: paginated
     });
   }, [queryTextValue, paginated]);
-  var resourceItems = data.useResourceItems(queryResource, finalQuery, paginated ? page : null, paginated ? count : null, resourceOptions);
-  var _ref3 = resourceItems || {},
-    _ref3$allItems = _ref3.allItems,
-    partialItems = _ref3$allItems === void 0 ? null : _ref3$allItems,
-    _ref3$reload = _ref3.reload,
-    reload = _ref3$reload === void 0 ? null : _ref3$reload,
-    _ref3$reloadPage = _ref3.reloadPage,
-    reloadPage = _ref3$reloadPage === void 0 ? null : _ref3$reloadPage,
-    _ref3$reset = _ref3.reset,
-    reset = _ref3$reset === void 0 ? null : _ref3$reset,
+  var _useResourceItems = data.useResourceItems(queryResource, finalQuery, paginated ? page : null, paginated ? count : null, resourceOptions),
+    _useResourceItems$all = _useResourceItems.allItems,
+    partialItems = _useResourceItems$all === void 0 ? null : _useResourceItems$all,
+    _useResourceItems$rel = _useResourceItems.reload,
+    reload = _useResourceItems$rel === void 0 ? null : _useResourceItems$rel,
+    _useResourceItems$pag = _useResourceItems.pagination,
+    pagination = _useResourceItems$pag === void 0 ? null : _useResourceItems$pag;
+  var _ref3 = pagination || {},
     _ref3$lastPage = _ref3.lastPage,
     lastPage = _ref3$lastPage === void 0 ? null : _ref3$lastPage;
-  var items = (partialItems || []).concat(multiple && isArray(value) ? value : [value]).filter(function (it) {
+  var items = uniqBy((partialItems || []).concat(multiple && isArray(value) ? value : [value]).filter(function (it) {
     return it !== null;
-  }).filter(function (v, i, a) {
-    return a.findIndex(function (v2) {
-      return v2.id === v.id;
-    }) === i;
+  }), function (_ref4) {
+    var _ref4$id = _ref4.id,
+      id = _ref4$id === void 0 ? null : _ref4$id;
+    return id;
   });
   var onScrollEnd = React.useCallback(function () {
     if (page !== null && page >= lastPage) {
@@ -226,18 +225,15 @@ var ResourceItemField = function ResourceItemField(_ref) {
     }
   }, [paginated, page, setPage, lastPage]);
   var getItemLabel = React.useCallback(function (it, path) {
-    var _ref4 = it || {},
-      _ref4$id = _ref4.id,
-      id = _ref4$id === void 0 ? null : _ref4$id;
+    var _ref5 = it || {},
+      _ref5$id = _ref5.id,
+      id = _ref5$id === void 0 ? null : _ref5$id;
     if (itemLabelWithId) {
       var label = initialGetItemLabel(it, path);
       return label ? "".concat(label, " (#").concat(id, ")") : "#".concat(id);
     }
     return path !== null ? initialGetItemLabel(it, path) : "#".concat(id);
   }, [initialGetItemLabel, itemLabelWithId]);
-
-  // const getItemLabel = getItemLabelFunction(initialGetItemLabel, itemLabelWithId);
-
   var parseItem = React.useCallback(function (it) {
     var label = getItemLabel(it, itemLabelPath);
     var description = getItemDescription(it, itemDescriptionPath);
@@ -247,32 +243,32 @@ var ResourceItemField = function ResourceItemField(_ref) {
       label: finalLabel
     };
   }, [getItemLabel, getItemDescription, itemLabelPath, itemDescriptionPath]);
-  var finalValue = multiple && isArray(value) ? value.map(function (_ref5) {
-    var _ref5$id = _ref5.id,
-      id = _ref5$id === void 0 ? null : _ref5$id;
+  var finalValue = multiple && isArray(value) ? value.map(function (_ref6) {
+    var _ref6$id = _ref6.id,
+      id = _ref6$id === void 0 ? null : _ref6$id;
     return id;
   }) : (value === null || value === void 0 ? void 0 : value.id) || null;
-  var _ref6 = !multiple && hasValue ? value : {
+  var _ref7 = !multiple && hasValue ? value : {
       type: resourceType
     },
-    _ref6$type = _ref6.type,
-    finalType = _ref6$type === void 0 ? null : _ref6$type;
+    _ref7$type = _ref7.type,
+    finalType = _ref7$type === void 0 ? null : _ref7$type;
   var options = (items || []).map(function (it) {
     return parseItem(it);
   });
   var onValueChange = React.useCallback(function (newId) {
     if (onChange === null) return;
     if (multiple) {
-      var newValue = items.filter(function (_ref7) {
-        var _ref7$id = _ref7.id,
-          id = _ref7$id === void 0 ? null : _ref7$id;
+      var newValue = items.filter(function (_ref8) {
+        var _ref8$id = _ref8.id,
+          id = _ref8$id === void 0 ? null : _ref8$id;
         return newId.indexOf(id) !== -1;
       }) || [];
       onChange(newValue);
     } else {
-      var _newValue = items.filter(function (_ref8) {
-        var _ref8$id = _ref8.id,
-          id = _ref8$id === void 0 ? null : _ref8$id;
+      var _newValue = items.filter(function (_ref9) {
+        var _ref9$id = _ref9.id,
+          id = _ref9$id === void 0 ? null : _ref9$id;
         return id === newId;
       }) || [];
       if (_newValue !== null && _newValue.length > 0) {
@@ -314,27 +310,25 @@ var ResourceItemField = function ResourceItemField(_ref) {
   }, [onChange, setListOpen]);
 
   // If empty try to fetch
-  var onFocus = React.useCallback(function () {
-    if ((partialItems || []).length === 0) {
-      if (paginated) {
-        reloadPage();
-      } else {
-        reload();
-      }
-    }
-  }, [paginated, partialItems]);
+  // const onFocus = useCallback(() => {
+  //     if ((partialItems || []).length === 0) {
+  //         reloadall();
+  //     }
+  // }, [paginated, reloadall]);
+
   var onClickRemove = React.useCallback(function () {
     if (onChange !== null) {
       onChange(null);
     }
+
     // Clear the page and be good
     if (paginated) {
       setPage(defaultPage);
-      reset();
+      reload();
     } else {
-      reset();
+      reload();
     }
-  }, [onChange, paginated, defaultPage, reload, reloadPage, reset]);
+  }, [onChange, paginated, defaultPage, reload]);
   var form = formOpen ? /*#__PURE__*/React.createElement(ResourceForm, {
     resource: resource,
     type: finalType,
@@ -381,8 +375,9 @@ var ResourceItemField = function ResourceItemField(_ref) {
       }]
     }),
     onChange: onValueChange,
-    onInputChange: onInputChange,
-    onFocus: onFocus,
+    onInputChange: onInputChange
+    // onFocus={onFocus}
+    ,
     onMenuScrollToBottom: onScrollEnd,
     multiple: multiple
   })), canFind ? /*#__PURE__*/React.createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/field-resource-item",
-    "version": "3.0.171",
+    "version": "3.0.173",
     "description": "An item mapping a resource",
     "keywords": [
         "javascript"
@@ -47,15 +47,15 @@
     "dependencies": {
         "@babel/runtime": "^7.12.5",
         "@panneau/core": "^3.0.169",
-        "@panneau/data": "^3.0.169",
+        "@panneau/data": "^3.0.173",
         "@panneau/element-button": "^3.0.169",
         "@panneau/element-resource-card": "^3.0.169",
-        "@panneau/element-select": "^3.0.169",
-        "@panneau/form-resource": "^3.0.171",
-        "@panneau/intl": "^3.0.169",
+        "@panneau/element-select": "^3.0.172",
+        "@panneau/form-resource": "^3.0.173",
+        "@panneau/intl": "^3.0.172",
         "@panneau/modal-dialog": "^3.0.169",
-        "@panneau/modal-resource-form": "^3.0.171",
-        "@panneau/modal-resource-items": "^3.0.171",
+        "@panneau/modal-resource-form": "^3.0.173",
+        "@panneau/modal-resource-items": "^3.0.173",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "38e041e7659ef78ddbec9da1232c1456366c2040"
+    "gitHead": "29037e4f0ed74d81586442a76daffcfb6d062200"
 }