@panneau/data 3.0.169 → 3.0.174

package/es/index.js

@@ -1,17 +1,20 @@
 import PropTypes from 'prop-types';
-import React, { useState, useCallback, useEffect, useRef, useMemo, useContext } from 'react';
+import React, { useState, useCallback, useEffect, useMemo, useRef, useContext } from 'react';
 import { useUrlGenerator } from '@panneau/core/contexts';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _callSuper from '@babel/runtime/helpers/callSuper';
 import _inherits from '@babel/runtime/helpers/inherits';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { getCSRFHeaders, getJSON, postJSON } from '@folklore/fetch';
+import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from '@folklore/routes';
 import queryString from 'query-string';
+import { useQuery, keepPreviousData, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
+import isEmpty from 'lodash/isEmpty';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 
 var useData = function useData(loadData) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -70,6 +73,231 @@ var useData = function useData(loadData) {
 };
 var useData$1 = useData;
 
+var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
+  _excluded2$1 = ["page", "count"],
+  _excluded3 = ["data", "refetch", "isLoading", "isFetched", "status", "error"];
+var useItems$2 = function useItems(_ref) {
+  var store = _ref.store,
+    url = _ref.url,
+    _ref$paginated = _ref.paginated,
+    initialPaginated = _ref$paginated === void 0 ? false : _ref$paginated,
+    _ref$query = _ref.query,
+    initialQuery = _ref$query === void 0 ? null : _ref$query,
+    onQueryChange = _ref.onQueryChange,
+    _ref$queryConfig = _ref.queryConfig,
+    queryConfig = _ref$queryConfig === void 0 ? null : _ref$queryConfig,
+    _ref$keepData = _ref.keepData,
+    keepData = _ref$keepData === void 0 ? true : _ref$keepData,
+    oldProps = _objectWithoutProperties(_ref, _excluded$3);
+  // Legacy
+  var _ref2 = oldProps || {},
+    _ref2$getPage = _ref2.getPage,
+    getPage = _ref2$getPage === void 0 ? null : _ref2$getPage,
+    _ref2$getItems = _ref2.getItems,
+    getItems = _ref2$getItems === void 0 ? null : _ref2$getItems,
+    _ref2$page = _ref2.page,
+    oldPage = _ref2$page === void 0 ? null : _ref2$page,
+    _ref2$count = _ref2.count,
+    oldCount = _ref2$count === void 0 ? null : _ref2$count,
+    _ref2$items = _ref2.items,
+    providedItems = _ref2$items === void 0 ? null : _ref2$items,
+    _ref2$pages = _ref2.pages,
+    initialPages = _ref2$pages === void 0 ? null : _ref2$pages,
+    _ref2$getPageFromResp = _ref2.getPageFromResponse,
+    getPageFromResponse = _ref2$getPageFromResp === void 0 ? function () {
+      var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref3$pagination = _ref3.pagination,
+        _ref3$pagination$page = _ref3$pagination.page,
+        currentPage = _ref3$pagination$page === void 0 ? null : _ref3$pagination$page,
+        _ref3$pagination$last = _ref3$pagination.last_page,
+        lastPage = _ref3$pagination$last === void 0 ? null : _ref3$pagination$last,
+        _ref3$pagination$tota = _ref3$pagination.total,
+        total = _ref3$pagination$tota === void 0 ? null : _ref3$pagination$tota,
+        _ref3$pagination$per_ = _ref3$pagination.per_page,
+        perPage = _ref3$pagination$per_ === void 0 ? null : _ref3$pagination$per_,
+        _ref3$data = _ref3.data,
+        items = _ref3$data === void 0 ? null : _ref3$data;
+      return {
+        page: parseInt(currentPage, 10),
+        lastPage: parseInt(lastPage, 10),
+        total: parseInt(total, 10),
+        count: parseInt(perPage, 10),
+        items: items
+      };
+    } : _ref2$getPageFromResp,
+    _ref2$getItemsFromRes = _ref2.getItemsFromResponse,
+    getItemsFromResponse = _ref2$getItemsFromRes === void 0 ? function (data) {
+      return data;
+    } : _ref2$getItemsFromRes,
+    _ref2$onItemsLoaded = _ref2.onItemsLoaded,
+    onItemsLoaded = _ref2$onItemsLoaded === void 0 ? null : _ref2$onItemsLoaded,
+    _ref2$onPageLoaded = _ref2.onPageLoaded,
+    onPageLoaded = _ref2$onPageLoaded === void 0 ? null : _ref2$onPageLoaded,
+    _ref2$onLoaded = _ref2.onLoaded,
+    onLoaded = _ref2$onLoaded === void 0 ? null : _ref2$onLoaded,
+    _ref2$onError = _ref2.onError,
+    onError = _ref2$onError === void 0 ? null : _ref2$onError;
+  var paginated = useMemo(function () {
+    return getPage !== null || initialPages !== null || initialPaginated;
+  }, [getPage, initialPages, initialPaginated]);
+  var query = useMemo(function () {
+    // Backwards compatible
+    if (oldPage !== null || oldCount !== null) {
+      return _objectSpread({
+        page: oldPage,
+        count: oldCount
+      }, initialQuery);
+    }
+    return initialQuery;
+  }, [initialQuery]);
+  var _ref4 = query || {},
+    _ref4$page = _ref4.page,
+    page = _ref4$page === void 0 ? null : _ref4$page,
+    _ref4$count = _ref4.count,
+    count = _ref4$count === void 0 ? null : _ref4$count,
+    queryWithoutPageAndCount = _objectWithoutProperties(_ref4, _excluded2$1);
+  var queryKey = useMemo(function () {
+    return paginated && getPage !== null ? [store, page, count || 10, queryWithoutPageAndCount] : [store, query];
+  }, [paginated, page, count, queryWithoutPageAndCount]);
+  var _useQuery = useQuery(_objectSpread(_objectSpread(_objectSpread({
+      queryKey: queryKey,
+      queryFn: function queryFn(_ref5) {
+        var key = _ref5.queryKey;
+        if (paginated && getPage !== null) {
+          var _key = _slicedToArray(key, 4),
+            _key$ = _key[1],
+            p = _key$ === void 0 ? null : _key$,
+            _key$2 = _key[2],
+            c = _key$2 === void 0 ? null : _key$2,
+            _key$3 = _key[3],
+            _q = _key$3 === void 0 ? null : _key$3;
+          return getPage(p, c, _q);
+        }
+        if (!paginated && getItems !== null) {
+          var _key2 = _slicedToArray(key, 2),
+            _key2$ = _key2[1],
+            _q2 = _key2$ === void 0 ? null : _key2$;
+          return getItems(_q2);
+        }
+        var _key3 = _slicedToArray(key, 2),
+          _key3$ = _key3[1],
+          q = _key3$ === void 0 ? null : _key3$;
+        return getJSON("".concat(url).concat(!isEmpty(q) ? "?".concat(queryString.stringify(q, {
+          arrayFormat: 'bracket'
+        })) : ''));
+      }
+    }, keepData ? {
+      placeholderData: keepPreviousData
+    } : null), providedItems !== null ? {
+      initialData: providedItems
+    } : null), queryConfig)),
+    _useQuery$data = _useQuery.data,
+    data = _useQuery$data === void 0 ? null : _useQuery$data,
+    reload = _useQuery.refetch,
+    loading = _useQuery.isLoading,
+    loaded = _useQuery.isFetched,
+    _useQuery$status = _useQuery.status,
+    status = _useQuery$status === void 0 ? null : _useQuery$status,
+    _useQuery$error = _useQuery.error,
+    error = _useQuery$error === void 0 ? null : _useQuery$error,
+    otherProps = _objectWithoutProperties(_useQuery, _excluded3);
+  var _ref6 = data || {},
+    _ref6$data = _ref6.data,
+    items = _ref6$data === void 0 ? [] : _ref6$data,
+    _ref6$pagination = _ref6.pagination,
+    pagination = _ref6$pagination === void 0 ? null : _ref6$pagination;
+  var _ref7 = pagination || {},
+    _ref7$page = _ref7.page,
+    currentPage = _ref7$page === void 0 ? null : _ref7$page,
+    _ref7$last_page = _ref7.last_page,
+    lastPage = _ref7$last_page === void 0 ? null : _ref7$last_page,
+    _ref7$total = _ref7.total,
+    total = _ref7$total === void 0 ? null : _ref7$total;
+  var loadNextPage = useCallback(function () {
+    if (onQueryChange !== null && paginated && page !== null && page < lastPage) {
+      onQueryChange(_objectSpread(_objectSpread({}, query), {}, {
+        page: page + 1
+      }));
+    }
+  }, [paginated, pagination, page]);
+  var loadPage = useCallback(function (newPage) {
+    if (onQueryChange !== null && newPage !== null) {
+      onQueryChange(_objectSpread(_objectSpread({}, query), {}, {
+        page: newPage
+      }));
+    }
+  }, [query, onQueryChange]);
+  var pages = useRef(null);
+  useEffect(function () {
+    if (loaded && page !== null && data !== null) {
+      pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+    }
+  }, [loaded, page, data]);
+  var finalItems = useMemo(function () {
+    if (data === null) {
+      return data;
+    }
+    if (paginated) {
+      if (getPageFromResponse !== null) {
+        return items;
+      }
+      return items;
+    }
+    if (getItemsFromResponse !== null) {
+      return getItemsFromResponse(data);
+    }
+    return data;
+  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse]);
+
+  // Pseudo-events for compatibility
+  useEffect(function () {
+    if (status === 'success') {
+      if (onPageLoaded !== null && paginated) {
+        onItemsLoaded(data);
+      }
+      if (onItemsLoaded !== null && !paginated) {
+        onItemsLoaded(data);
+      }
+      if (onLoaded !== null) {
+        onLoaded(data);
+      }
+    }
+    if (status === 'error' && onError !== null) {
+      onError(error);
+    }
+  }, [status]);
+  var allItems = pages.current !== null ? Object.keys(pages.current).flatMap(function (k) {
+    var _pages$current$k;
+    return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
+  }) : null;
+  return _objectSpread(_objectSpread({}, otherProps), {}, {
+    items: finalItems,
+    allItems: allItems,
+    pages: pages.current,
+    pageItems: paginated ? finalItems : null,
+    pagination: paginated ? {
+      page: currentPage,
+      lastPage: lastPage,
+      total: total
+    } : null,
+    total: total,
+    lastPage: lastPage,
+    loaded: loaded,
+    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && loaded,
+    // very basic stuff, TODO
+    loading: loading,
+    loadNextPage: loadNextPage,
+    loadPage: loadPage,
+    reloadPage: reload,
+    reload: reload,
+    reset: reload,
+    updateItem: null,
+    status: status,
+    error: error
+  });
+};
+var useItems$3 = useItems$2;
+
 var useItems = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
     getPage = _ref$getPage === void 0 ? null : _ref$getPage,
@@ -342,6 +570,200 @@ var useItems = function useItems(_ref) {
 };
 var useItems$1 = useItems;
 
+var _excluded$2 = ["page", "count"],
+  _excluded2 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched"];
+var useItemsStore = function useItemsStore(store, _ref) {
+  var _ref$url = _ref.url,
+    url = _ref$url === void 0 ? null : _ref$url,
+    _ref$getPage = _ref.getPage,
+    getPage = _ref$getPage === void 0 ? null : _ref$getPage,
+    _ref$getItems = _ref.getItems,
+    getItems = _ref$getItems === void 0 ? null : _ref$getItems,
+    _ref$getPageFromRespo = _ref.getPageFromResponse,
+    getPageFromResponse = _ref$getPageFromRespo === void 0 ? null : _ref$getPageFromRespo,
+    _ref$getItemsFromResp = _ref.getItemsFromResponse,
+    getItemsFromResponse = _ref$getItemsFromResp === void 0 ? null : _ref$getItemsFromResp,
+    _ref$page = _ref.page,
+    initialPage = _ref$page === void 0 ? null : _ref$page,
+    _ref$count = _ref.count,
+    initialCount = _ref$count === void 0 ? null : _ref$count,
+    _ref$query = _ref.query,
+    query = _ref$query === void 0 ? null : _ref$query,
+    _ref$onQueryChange = _ref.onQueryChange,
+    onQueryChange = _ref$onQueryChange === void 0 ? null : _ref$onQueryChange,
+    _ref$queryConfig = _ref.queryConfig,
+    queryConfig = _ref$queryConfig === void 0 ? null : _ref$queryConfig,
+    _ref$keepData = _ref.keepData,
+    keepData = _ref$keepData === void 0 ? true : _ref$keepData;
+  var _ref2 = query || {},
+    _ref2$page = _ref2.page,
+    page = _ref2$page === void 0 ? initialPage : _ref2$page,
+    _ref2$count = _ref2.count,
+    count = _ref2$count === void 0 ? initialCount : _ref2$count,
+    queryWithoutPage = _objectWithoutProperties(_ref2, _excluded$2);
+  var paginated = page !== null;
+  var queryKey = useMemo(function () {
+    return paginated ? [store, page || 1, count || 12, queryWithoutPage] : [store, query];
+  }, [paginated, store, page, count, query, queryWithoutPage, getPage, getItems]);
+
+  // console.log('queryKey', queryKey, 'paginated', paginated);
+
+  var _useQuery = useQuery(_objectSpread(_objectSpread({
+      queryKey: queryKey,
+      queryFn: function queryFn(_ref3) {
+        var _ref3$queryKey = _ref3.queryKey,
+          key = _ref3$queryKey === void 0 ? null : _ref3$queryKey;
+        if (paginated && getPage !== null) {
+          var _key = _slicedToArray(key, 4),
+            _key$ = _key[1],
+            p = _key$ === void 0 ? null : _key$,
+            _key$2 = _key[2],
+            c = _key$2 === void 0 ? null : _key$2,
+            _key$3 = _key[3],
+            _q = _key$3 === void 0 ? null : _key$3;
+          return getPage(p, c, _q);
+        }
+        if (!paginated && getItems !== null) {
+          var _key2 = _slicedToArray(key, 2),
+            _key2$ = _key2[1],
+            _q2 = _key2$ === void 0 ? null : _key2$;
+          return getItems(_q2);
+        }
+        var _key3 = _slicedToArray(key, 2),
+          _key3$ = _key3[1],
+          q = _key3$ === void 0 ? null : _key3$;
+        return getJSON("".concat(url).concat(!isEmpty(q) ? "?".concat(queryString.stringify(q, {
+          arrayFormat: 'bracket'
+        })) : ''));
+      }
+    }, keepData ? {
+      placeholderData: keepPreviousData
+    } : null), queryConfig)),
+    _useQuery$data = _useQuery.data,
+    data = _useQuery$data === void 0 ? null : _useQuery$data,
+    reload = _useQuery.refetch,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
+    otherProps = _objectWithoutProperties(_useQuery, _excluded2);
+  var _ref4 = data || {},
+    _ref4$data = _ref4.data,
+    items = _ref4$data === void 0 ? [] : _ref4$data,
+    _ref4$pagination = _ref4.pagination,
+    pagination = _ref4$pagination === void 0 ? null : _ref4$pagination,
+    _ref4$metadata = _ref4.metadata,
+    metadata = _ref4$metadata === void 0 ? null : _ref4$metadata;
+  var _ref5 = pagination || metadata || {},
+    _ref5$page = _ref5.page,
+    currentPage = _ref5$page === void 0 ? null : _ref5$page,
+    _ref5$last_page = _ref5.last_page,
+    lastPage = _ref5$last_page === void 0 ? 0 : _ref5$last_page,
+    _ref5$total = _ref5.total,
+    total = _ref5$total === void 0 ? null : _ref5$total;
+  var loadNextPage = useCallback(function () {
+    if (onQueryChange !== null && paginated && page !== null && page < lastPage) {
+      onQueryChange(_objectSpread(_objectSpread({}, query), {}, {
+        page: page + 1
+      }));
+    }
+  }, [paginated, pagination, page]);
+  var loadPage = useCallback(function (newPage) {
+    if (onQueryChange !== null && newPage !== null) {
+      onQueryChange(_objectSpread(_objectSpread({}, query), {}, {
+        page: newPage
+      }));
+    }
+  }, [query, onQueryChange]);
+
+  // Keep a list of updated items
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    updatedItems = _useState2[0],
+    setUpdatedItems = _useState2[1];
+  var updateItem = useCallback(function (item) {
+    var _ref6 = item || {},
+      _ref6$id = _ref6.id,
+      itemId = _ref6$id === void 0 ? null : _ref6$id;
+    if (itemId !== null) {
+      setUpdatedItems([].concat(_toConsumableArray((items || []).filter(function () {
+        var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref7$id = _ref7.id,
+          id = _ref7$id === void 0 ? null : _ref7$id;
+        return id !== itemId;
+      })), [item]));
+    }
+  }, [items, updatedItems, setUpdatedItems]);
+  var replaceUpdatedItems = useCallback(function (currentItems) {
+    if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
+      return currentItems;
+    }
+    return (currentItems || []).map(function (item) {
+      var _ref8 = item || {},
+        _ref8$id = _ref8.id,
+        itemId = _ref8$id === void 0 ? null : _ref8$id;
+      var updated = (updatedItems || []).find(function () {
+        var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref9$id = _ref9.id,
+          id = _ref9$id === void 0 ? null : _ref9$id;
+        return id === itemId;
+      }) || null;
+      if (updated !== null) {
+        return updated;
+      }
+      return item;
+    }, []);
+  }, [updatedItems]);
+  var partialItems = useMemo(function () {
+    if (data === null) {
+      return data;
+    }
+    if (paginated) {
+      if (getPageFromResponse !== null) {
+        return getPageFromResponse(items);
+      }
+      return items;
+    }
+    if (getItemsFromResponse !== null) {
+      return getItemsFromResponse(data);
+    }
+    return data;
+  }, [items, data, paginated, getPageFromResponse, getItemsFromResponse, updatedItems]);
+  var finalItems = replaceUpdatedItems(partialItems);
+
+  // Keep a list of pages, useEffect wont work here because delayed
+  var pages = useRef(null);
+  if (isFetched && page !== null && data !== null) {
+    pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
+  }
+  var allItems = pages.current !== null ? replaceUpdatedItems(Object.keys(pages.current).flatMap(function (k) {
+    var _pages$current$k;
+    return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
+  })) : finalItems;
+  var finalLoading = isLoading || isFetching || isRefetching;
+  return _objectSpread(_objectSpread({}, otherProps), {}, {
+    isLoading: isLoading,
+    isFetching: isFetching,
+    isRefetching: isRefetching,
+    isFetched: isFetched,
+    items: finalItems,
+    pages: pages.current,
+    allItems: allItems,
+    loading: finalLoading,
+    loaded: isFetched,
+    reload: reload,
+    loadPage: loadPage,
+    loadNextPage: loadNextPage,
+    updateItem: updateItem,
+    pagination: paginated ? {
+      page: currentPage,
+      lastPage: lastPage,
+      total: total
+    } : null
+  });
+};
+var useItemsStore$1 = useItemsStore;
+
 var AccountApi = /*#__PURE__*/function () {
   function AccountApi(api, opts) {
     _classCallCheck(this, AccountApi);
@@ -587,10 +1009,12 @@ var MediasApi = /*#__PURE__*/function (_Base) {
       baseUrl: opts.baseUrl ? opts.baseUrl : null,
       routes: _objectSpread({
         index: 'medias',
+        trashed: 'medias/trash',
         tags: 'medias/tags',
         show: 'medias/:media',
         store: 'medias',
         update: 'medias/:media',
+        trash: 'medias/trash/:media',
         "delete": 'medias/:media'
       }, opts.routes || null)
     }]);
@@ -618,6 +1042,21 @@ var MediasApi = /*#__PURE__*/function (_Base) {
       }
       return this.requestGet(this.route('index'), finalQuery);
     }
+  }, {
+    key: "getTrashed",
+    value: function getTrashed() {
+      var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var page = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+      var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10;
+      var finalQuery = _objectSpread({}, query);
+      if (page !== null) {
+        finalQuery.page = page;
+      }
+      if (count !== null) {
+        finalQuery.count = count;
+      }
+      return this.requestGet(this.route('trashed'), finalQuery);
+    }
   }, {
     key: "getTags",
     value: function getTags() {
@@ -641,6 +1080,13 @@ var MediasApi = /*#__PURE__*/function (_Base) {
         media: id
       }), data);
     }
+  }, {
+    key: "trash",
+    value: function trash(id) {
+      return this.requestDelete(this.route('trash', {
+        media: id
+      }));
+    }
   }, {
     key: "delete",
     value: function _delete(id) {
@@ -681,7 +1127,7 @@ var ResourcesApi = /*#__PURE__*/function () {
     value: function get(resource) {
       var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
-      var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 10;
+      var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 12;
       var finalQuery = _objectSpread({}, query);
       if (page !== null) {
         finalQuery.page = page;
@@ -747,13 +1193,13 @@ var ApiContext = /*#__PURE__*/React.createContext(null);
 var useApi = function useApi() {
   return useContext(ApiContext);
 };
-var propTypes$1 = {
+var propTypes$2 = {
   api: PropTypes.instanceOf(Api$1),
   baseUrl: PropTypes.string,
   onUnauthorized: PropTypes.func,
   children: PropTypes.node.isRequired
 };
-var defaultProps$1 = {
+var defaultProps$2 = {
   api: null,
   onUnauthorized: null,
   baseUrl: undefined
@@ -776,8 +1222,8 @@ var ApiProvider = function ApiProvider(_ref) {
     value: api
   }, children);
 };
-ApiProvider.propTypes = propTypes$1;
-ApiProvider.defaultProps = defaultProps$1;
+ApiProvider.propTypes = propTypes$2;
+ApiProvider.defaultProps = defaultProps$2;
 
 var useResourceDestroy = function useResourceDestroy(resource) {
   var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
@@ -818,7 +1264,7 @@ var useResourceItem = function useResourceItem(resource, id, opts) {
 };
 var useResourceItem$1 = useResourceItem;
 
-var _excluded = ["items", "pageItems"];
+var _excluded = ["items"];
 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;
@@ -830,7 +1276,7 @@ var useResourceItems = function useResourceItems(resource) {
     id = _ref$id === void 0 ? null : _ref$id;
   var lastResourceRef = useRef(id);
   var resourceChanging = lastResourceRef.current !== id;
-  var getItems = useCallback(function () {
+  var getPage = useCallback(function () {
     var requestedPage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     return api.resources.get(resource, query, requestedPage, count).then(function (response) {
       var _ref2 = resource || {},
@@ -844,18 +1290,30 @@ var useResourceItems = function useResourceItems(resource) {
       throw err;
     });
   }, [api, resource, query, count]);
-  var _useItems = useItems$1(_objectSpread({
-      getPage: page !== null ? getItems : null,
+  var getItems = useCallback(function () {
+    return api.resources.get(resource, query, null, null).then(function (response) {
+      var _ref4 = resource || {},
+        resourceId = _ref4.id;
+      lastResourceRef.current = resourceId;
+      return response;
+    })["catch"](function (err) {
+      var _ref5 = resource || {},
+        resourceId = _ref5.id;
+      lastResourceRef.current = resourceId;
+      throw err;
+    });
+  }, [api, resource, query, count]);
+  var _useItemsStore = useItemsStore$1(id, _objectSpread({
+      getPage: page !== null ? getPage : null,
       getItems: page === null ? getItems : null,
-      page: page
+      query: query,
+      page: page,
+      count: count
     }, opts)),
-    items = _useItems.items,
-    pageItems = _useItems.pageItems,
-    request = _objectWithoutProperties(_useItems, _excluded);
-  var finalItems = page !== null ? pageItems : items;
+    items = _useItemsStore.items,
+    request = _objectWithoutProperties(_useItemsStore, _excluded);
   return _objectSpread({
-    items: resourceChanging ? null : finalItems,
-    allItems: items
+    items: resourceChanging ? null : items
   }, request);
 };
 var useResourceItems$1 = useResourceItems;
@@ -906,6 +1364,46 @@ var useResourceUpdate = function useResourceUpdate(resource, id) {
 };
 var useResourceUpdate$1 = useResourceUpdate;
 
+var QueryContext = /*#__PURE__*/React.createContext(null);
+var useQueryContext = function useQueryContext() {
+  return useContext(QueryContext);
+};
+var propTypes$1 = {
+  config: PropTypes.shape({}),
+  initialKey: PropTypes.arrayOf(PropTypes.string),
+  initialData: PropTypes.oneOfType([PropTypes.shape({}), PropTypes.arrayOf(PropTypes.shape({}))]),
+  children: PropTypes.node.isRequired
+};
+var defaultProps$1 = {
+  config: null,
+  initialKey: null,
+  initialData: null
+};
+var QueryProvider = function QueryProvider(_ref) {
+  var initialConfig = _ref.config,
+    initialKey = _ref.initialKey,
+    initialData = _ref.initialData,
+    children = _ref.children;
+  var queryClient = useMemo(function () {
+    var client = new QueryClient(_objectSpread({
+      defaultOptions: {
+        queries: {
+          staleTime: Infinity
+        }
+      }
+    }, initialConfig));
+    if (initialKey !== null && initialData !== null) {
+      client.setQueryData(initialKey, initialData);
+    }
+    return client;
+  }, [initialConfig]);
+  return /*#__PURE__*/React.createElement(QueryClientProvider, {
+    client: queryClient
+  }, children);
+};
+QueryProvider.propTypes = propTypes$1;
+QueryProvider.defaultProps = defaultProps$1;
+
 /* eslint-disable react/jsx-props-no-spreading */
 var propTypes = {
   api: PropTypes.instanceOf(Api$1),
@@ -930,4 +1428,4 @@ DataProvider.propTypes = propTypes;
 DataProvider.defaultProps = defaultProps;
 var DataProvider$1 = DataProvider;
 
-export { Api$1 as Api, ApiProvider, Base$1 as BaseApi, DataProvider$1 as DataProvider, useApi, useData$1 as useData, useItems$1 as useItems, useResourceDestroy$1 as useResourceDestroy, useResourceItem$1 as useResourceItem, useResourceItems$1 as useResourceItems, useResourceCreate$1 as useResourceStore, useResourceUpdate$1 as useResourceUpdate };
+export { Api$1 as Api, ApiProvider, Base$1 as BaseApi, DataProvider$1 as DataProvider, QueryProvider, useApi, useData$1 as useData, useItems$3 as useItems, useItems$1 as useItemsLegacy, useItemsStore$1 as useItemsStore, useQueryContext, useResourceDestroy$1 as useResourceDestroy, useResourceItem$1 as useResourceItem, useResourceItems$1 as useResourceItems, useResourceCreate$1 as useResourceStore, useResourceUpdate$1 as useResourceUpdate };