@panneau/data 2.0.2 → 2.0.6

package/es/index.js

@@ -11,8 +11,8 @@ import _assertThisInitialized from '@babel/runtime/helpers/assertThisInitialized
 import _inherits from '@babel/runtime/helpers/inherits';
 import _createSuper from '@babel/runtime/helpers/createSuper';
 import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
+import queryString from 'query-string';
 import { generatePath } from 'react-router';
-import { stringify } from 'query-string';
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -301,10 +301,10 @@ var Base = /*#__PURE__*/function () {
     value: function requestGet(path) {
       var _this = this;
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      var queryString = query !== null ? stringify(query, {
+      var finalQuery = query !== null ? queryString.stringify(query, {
         arrayFormat: 'bracket'
       }) : null;
-      return getJSON("".concat(this.getFullUrl(path)).concat(queryString !== null && queryString.length > 0 ? "?".concat(queryString) : ''), {
+      return getJSON("".concat(this.getFullUrl(path)).concat(finalQuery !== null && finalQuery.length > 0 ? "?".concat(finalQuery) : ''), {
         credentials: 'include',
         headers: getCSRFHeaders()
       })["catch"](function (error) {
@@ -887,11 +887,26 @@ var useResourceItems = function useResourceItems(resource) {
   var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  var opts = arguments.length > 4 ? arguments[4] : undefined;
+  var opts = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   var api = useApi();
+  var _ref = resource || {},
+    _ref$id = _ref.id,
+    id = _ref$id === void 0 ? null : _ref$id;
+  var lastResourceRef = useRef(id);
+  var resourceChanging = lastResourceRef.current !== id;
   var getItems = useCallback(function () {
     var requestedPage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    return api.resources.get(resource, query, requestedPage, count);
+    return api.resources.get(resource, query, requestedPage, count).then(function (response) {
+      var _ref2 = resource || {},
+        resourceId = _ref2.id;
+      lastResourceRef.current = resourceId;
+      return response;
+    })["catch"](function (err) {
+      var _ref3 = resource || {},
+        resourceId = _ref3.id;
+      lastResourceRef.current = resourceId;
+      throw err;
+    });
   }, [api, resource, query, count]);
   var _useItems = useItems(_objectSpread({
       getPage: page !== null ? getItems : null,
@@ -901,8 +916,9 @@ var useResourceItems = function useResourceItems(resource) {
     items = _useItems.items,
     pageItems = _useItems.pageItems,
     request = _objectWithoutProperties(_useItems, _excluded);
+  var finalItems = page !== null ? pageItems : items;
   return _objectSpread({
-    items: page !== null ? pageItems : items,
+    items: resourceChanging ? null : finalItems,
     allItems: items
   }, request);
 };

package/lib/index.js

@@ -15,8 +15,8 @@ var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitializ
 var _inherits = require('@babel/runtime/helpers/inherits');
 var _createSuper = require('@babel/runtime/helpers/createSuper');
 var fetch$1 = require('@folklore/fetch');
-var reactRouter = require('react-router');
 var queryString = require('query-string');
+var reactRouter = require('react-router');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -31,6 +31,7 @@ var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallChec
 var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
 var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _createSuper__default = /*#__PURE__*/_interopDefaultLegacy(_createSuper);
+var queryString__default = /*#__PURE__*/_interopDefaultLegacy(queryString);
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -319,10 +320,10 @@ var Base = /*#__PURE__*/function () {
     value: function requestGet(path) {
       var _this = this;
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-      var queryString$1 = query !== null ? queryString.stringify(query, {
+      var finalQuery = query !== null ? queryString__default["default"].stringify(query, {
         arrayFormat: 'bracket'
       }) : null;
-      return fetch$1.getJSON("".concat(this.getFullUrl(path)).concat(queryString$1 !== null && queryString$1.length > 0 ? "?".concat(queryString$1) : ''), {
+      return fetch$1.getJSON("".concat(this.getFullUrl(path)).concat(finalQuery !== null && finalQuery.length > 0 ? "?".concat(finalQuery) : ''), {
         credentials: 'include',
         headers: fetch$1.getCSRFHeaders()
       })["catch"](function (error) {
@@ -905,11 +906,26 @@ var useResourceItems = function useResourceItems(resource) {
   var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  var opts = arguments.length > 4 ? arguments[4] : undefined;
+  var opts = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
   var api = useApi();
+  var _ref = resource || {},
+    _ref$id = _ref.id,
+    id = _ref$id === void 0 ? null : _ref$id;
+  var lastResourceRef = React.useRef(id);
+  var resourceChanging = lastResourceRef.current !== id;
   var getItems = React.useCallback(function () {
     var requestedPage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    return api.resources.get(resource, query, requestedPage, count);
+    return api.resources.get(resource, query, requestedPage, count).then(function (response) {
+      var _ref2 = resource || {},
+        resourceId = _ref2.id;
+      lastResourceRef.current = resourceId;
+      return response;
+    })["catch"](function (err) {
+      var _ref3 = resource || {},
+        resourceId = _ref3.id;
+      lastResourceRef.current = resourceId;
+      throw err;
+    });
   }, [api, resource, query, count]);
   var _useItems = useItems(_objectSpread__default["default"]({
       getPage: page !== null ? getItems : null,
@@ -919,8 +935,9 @@ var useResourceItems = function useResourceItems(resource) {
     items = _useItems.items,
     pageItems = _useItems.pageItems,
     request = _objectWithoutProperties__default["default"](_useItems, _excluded);
+  var finalItems = page !== null ? pageItems : items;
   return _objectSpread__default["default"]({
-    items: page !== null ? pageItems : items,
+    items: resourceChanging ? null : finalItems,
     allItems: items
   }, request);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "2.0.2",
+    "version": "2.0.6",
     "description": "",
     "keywords": [
         "javascript"
@@ -56,11 +56,11 @@
         "@folklore/fetch": "^0.1.15",
         "@panneau/core": "^2.0.2",
         "prop-types": "^15.7.2",
-        "query-string": "^7.0.0",
+        "query-string": "^7.0.0||^8.1.0",
         "react-router": "^6.2.1"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0b4b72766d40815f8da33b2c658e20d00f162f34"
+    "gitHead": "64251067bc232d1606b89dde8d63a865bdd0bf04"
 }