@micromag/data 0.3.329 → 0.3.332

package/es/index.js

@@ -8,9 +8,10 @@ import _inherits from '@babel/runtime/helpers/inherits';
 import _createSuper from '@babel/runtime/helpers/createSuper';
 import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from 'react-router';
-import { stringify } from 'query-string';
+import { stringify, parse } from 'query-string';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import isString from 'lodash/isString';
 import { useVisitor, useStory } from '@micromag/core/contexts';
 
 var Base = /*#__PURE__*/function () {
@@ -193,10 +194,10 @@ var MediasApi = /*#__PURE__*/function (_Base) {
     }
   }, {
     key: "delete",
-    value: function _delete(id) {
+    value: function _delete(id, data) {
       return this.requestDelete(this.route('delete', {
         media: id
-      }));
+      }), data);
     }
   }]);
   return MediasApi;
@@ -368,7 +369,7 @@ var useData = function useData(loadData) {
   };
 };
 
-var _excluded$4 = ["data"];
+var _excluded$3 = ["data"];
 var useContributions = function useContributions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     screenId = _ref.screenId,
@@ -390,13 +391,13 @@ var useContributions = function useContributions() {
       data: null
     },
     data = _ref2.data,
-    request = _objectWithoutProperties(_ref2, _excluded$4);
+    request = _objectWithoutProperties(_ref2, _excluded$3);
   return _objectSpread({
     contributions: data || defaultContributions
   }, request);
 };
 
-var useItems = function useItems(_ref) {
+var useItems$1 = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
     getPage = _ref$getPage === void 0 ? null : _ref$getPage,
     _ref$getItems = _ref.getItems,
@@ -608,7 +609,7 @@ var useItems = function useItems(_ref) {
   };
 };
 
-var _excluded$3 = ["data"];
+var _excluded$2 = ["data"];
 var useMedia = function useMedia(id, opts) {
   var api = useApi();
   var loader = useCallback(function () {
@@ -616,7 +617,7 @@ var useMedia = function useMedia(id, opts) {
   }, [api, id]);
   var _useData = useData(loader, opts),
     data = _useData.data,
-    request = _objectWithoutProperties(_useData, _excluded$3);
+    request = _objectWithoutProperties(_useData, _excluded$2);
   return _objectSpread({
     story: data
   }, request);
@@ -660,30 +661,205 @@ var useMediaCreate = function useMediaCreate() {
   };
 };
 
-var _excluded$2 = ["items", "pageItems"];
+var useItems = function useItems(_ref) {
+  var _ref$getPage = _ref.getPage,
+    getPage = _ref$getPage === void 0 ? null : _ref$getPage,
+    _ref$page = _ref.page,
+    page = _ref$page === void 0 ? 1 : _ref$page,
+    _ref$count = _ref.count,
+    count = _ref$count === void 0 ? 10 : _ref$count,
+    _ref$query = _ref.query,
+    pageQuery = _ref$query === void 0 ? null : _ref$query,
+    _ref$pages = _ref.pages,
+    startingPages = _ref$pages === void 0 ? null : _ref$pages,
+    _ref$getPageFromRespo = _ref.getPageFromResponse,
+    getPageFromResponse = _ref$getPageFromRespo === void 0 ? function (newPage) {
+      return newPage;
+    } : _ref$getPageFromRespo,
+    _ref$getPagination = _ref.getPagination,
+    getPagination = _ref$getPagination === void 0 ? function () {
+      var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        cp = _ref2.current_page,
+        pp = _ref2.per_page,
+        lp = _ref2.last_page,
+        total = _ref2.total;
+      return {
+        pageNumber: cp,
+        pageCount: pp,
+        lastPage: lp,
+        total: total
+      };
+    } : _ref$getPagination,
+    _ref$onLoaded = _ref.onLoaded,
+    onLoaded = _ref$onLoaded === void 0 ? null : _ref$onLoaded,
+    _ref$onError = _ref.onError,
+    onError = _ref$onError === void 0 ? null : _ref$onError;
+  // Pagination
+  var _useState = useState(page !== null),
+    _useState2 = _slicedToArray(_useState, 2),
+    paginated = _useState2[0],
+    setPaginated = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    pagination = _useState4[0],
+    setPagination = _useState4[1];
+  var _getPagination = getPagination(pagination || {}),
+    _getPagination$pageNu = _getPagination.pageNumber,
+    pageNumber = _getPagination$pageNu === void 0 ? page : _getPagination$pageNu,
+    _getPagination$pageCo = _getPagination.pageCount,
+    pageCount = _getPagination$pageCo === void 0 ? count : _getPagination$pageCo,
+    _getPagination$lastPa = _getPagination.lastPage,
+    lastPage = _getPagination$lastPa === void 0 ? null : _getPagination$lastPa,
+    _getPagination$total = _getPagination.total,
+    total = _getPagination$total === void 0 ? null : _getPagination$total;
+  var _useMemo = useMemo(function () {
+      return (startingPages || []).reduce(function (paginatedData, it) {
+        var _ref3 = it || {},
+          items = _ref3.data,
+          currentPagination = _ref3.pagination;
+        // eslint-disable-next-line no-param-reassign
+        paginatedData.data = paginatedData.data.concat(items);
+        // eslint-disable-next-line no-param-reassign
+        paginatedData.pagination = currentPagination;
+        return paginatedData;
+      }, {
+        data: [],
+        pagination: {}
+      });
+    }, [startingPages]),
+    initialPages = _useMemo.data,
+    initialPagination = _useMemo.pagination;
+  var _useState5 = useState(startingPages === null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    canLoad = _useState6[0],
+    setCanLoad = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
+
+  // Query
+  var query = useMemo(function () {
+    return _objectSpread({}, isString(pageQuery) ? parse(pageQuery || null, {
+      arrayFormat: 'bracket'
+    }) : pageQuery);
+  }, [pageQuery]);
+
+  // Items
+  var _useState9 = useState(null),
+    _useState10 = _slicedToArray(_useState9, 2),
+    items = _useState10[0],
+    setItems = _useState10[1];
+  var getPages = useCallback(function (newQuery, newPageNumber, newPageCount) {
+    return getPage(newQuery, newPageNumber, newPageCount);
+  }, [getPage]);
+
+  // Api has changed, reset to beginning
+  useEffect(function () {
+    setItems(initialPages);
+    setPagination(initialPagination);
+  }, [getPages, setItems, setPagination]);
+  useEffect(function () {
+    // console.log('try to load');
+    if (!canLoad || loading || lastPage !== null && pageNumber > lastPage) {
+      // console.log('skips loading');
+      return;
+    }
+    // console.log('actually load', query, pageNumber, pageCount);
+    setLoading(true);
+    setCanLoad(false);
+    // TODO: make this a cancellable promise
+    getPages(query, pageNumber, pageCount).then(function (response) {
+      return getPageFromResponse(response);
+    }).then(function (response) {
+      var _ref4 = response || {},
+        _ref4$data = _ref4.data,
+        data = _ref4$data === void 0 ? null : _ref4$data,
+        _ref4$meta = _ref4.meta,
+        meta = _ref4$meta === void 0 ? null : _ref4$meta;
+      // console.log('response --- ', response);
+      //  This is not a paginated list so we dont care anymore
+      if (data === null && meta === null) {
+        setItems(response);
+        setPaginated(false);
+      } else {
+        setItems(function (old) {
+          return [].concat(_toConsumableArray(old || null), _toConsumableArray(data));
+        });
+        setPagination(meta);
+        setPaginated(true);
+      }
+      return response;
+    }).then(function (response) {
+      setLoading(false);
+      if (onLoaded !== null) {
+        onLoaded(response);
+      }
+    })["catch"](function (e) {
+      // Error is real
+      setLoading(false);
+      if (onError !== null) {
+        onError(e);
+      }
+    });
+  }, [query, pageNumber, canLoad, getPages, setLoading, setItems, setPagination, onLoaded, onError]);
+  var reset = useCallback(function () {
+    setItems([]);
+    setPagination(null);
+    setCanLoad(true);
+  }, [setItems, setPagination, setCanLoad]);
+
+  // Resets the game, "natural" refresh
+  var onQueryChange = useEffect(function () {
+    reset();
+  }, [query, page, count, reset]);
+
+  // Handle to Load next
+  var loadNextPage = useCallback(function () {
+    if (!loading && pageNumber < lastPage) {
+      var params = _objectSpread(_objectSpread({}, pagination), {}, {
+        current_page: pageNumber + 1,
+        per_page: pageCount
+      });
+      setPagination(params);
+      setCanLoad(true);
+    }
+  }, [query, pagination, pageNumber, pageCount, loading, lastPage, onQueryChange, setCanLoad]);
+  var disabled = (items || []).length === 0 || loading || pageNumber >= lastPage || lastPage === null || lastPage === 1;
+  var regularLoaded = !paginated && items !== null;
+  var paginatedLoaded = !loading && items !== null && (items.length === total || pageNumber >= lastPage);
+  return {
+    items: items,
+    total: total,
+    page: pageNumber,
+    count: pageCount,
+    lastPage: lastPage,
+    loading: loading,
+    loaded: !loading,
+    allLoaded: regularLoaded || paginatedLoaded,
+    disabled: disabled,
+    loadNextPage: loadNextPage,
+    reset: reset
+  };
+};
+
 var useMedias = function useMedias() {
   var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var page = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var page = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10;
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var api = useApi();
-  var getItems = useCallback(function () {
-    var requestedPage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    return api.medias.get(query, requestedPage, count);
-  }, [api, query, count]);
-  var _useItems = useItems(_objectSpread({
-      getPage: page !== null ? getItems : null,
-      getItems: page === null ? getItems : null,
-      page: page
-    }, opts)),
-    items = _useItems.items,
-    pageItems = _useItems.pageItems,
-    request = _objectWithoutProperties(_useItems, _excluded$2);
-  // console.log('medias', items);
-  return _objectSpread({
-    medias: page !== null ? pageItems : items,
-    allMedias: items
-  }, request);
+  var getPage = useCallback(function (newQuery) {
+    var requestedPage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var requestedCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    return api.medias.get(newQuery, requestedPage, requestedCount);
+  }, [api]);
+  return useItems(_objectSpread({
+    getPage: getPage,
+    query: query,
+    page: page,
+    count: count
+  }, opts));
 };
 
 var useMediasRecent = function useMediasRecent(opts) {
@@ -722,7 +898,7 @@ var useMediaTags = function useMediaTags() {
   var getItems = useCallback(function () {
     return api.medias.getTags(query, count);
   }, [api, query, count]);
-  var _useItems = useItems(_objectSpread({
+  var _useItems = useItems$1(_objectSpread({
       getItems: getItems
     }, opts)),
     items = _useItems.items;
@@ -758,9 +934,12 @@ var useMediaDelete = function useMediaDelete() {
     deleting = _useState2[0],
     setDeleting = _useState2[1];
   var api = useApi();
-  var deleteMedia = useCallback(function (id, data) {
+  var deleteMedia = useCallback(function (id) {
+    var confirm = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     setDeleting(true);
-    return api.medias["delete"](id, data).then(function (response) {
+    return api.medias["delete"](id, {
+      confirm: confirm
+    }).then(function (response) {
       setDeleting(false);
       return response;
     });
@@ -855,4 +1034,4 @@ var DataProvider = function DataProvider(_ref) {
 DataProvider.propTypes = propTypes;
 DataProvider.defaultProps = defaultProps;
 
-export { Api, ApiProvider, Base as BaseApi, DataProvider, useApi, useContributionCreate, useContributions, useData, useItems, useMedia, useMediaAuthors, useMediaCreate, useMediaDelete, useMediaTags, useMediaUpdate, useMedias, useMediasRecent as useMediasRecentSearches, useQuiz, useQuizCreate };
+export { Api, ApiProvider, Base as BaseApi, DataProvider, useApi, useContributionCreate, useContributions, useData, useItems$1 as useItems, useMedia, useMediaAuthors, useMediaCreate, useMediaDelete, useMediaTags, useMediaUpdate, useMedias, useMediasRecent as useMediasRecentSearches, useQuiz, useQuizCreate };

package/lib/index.js

@@ -15,6 +15,7 @@ var reactRouter = require('react-router');
 var queryString = require('query-string');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
+var isString = require('lodash/isString');
 var contexts = require('@micromag/core/contexts');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -29,6 +30,7 @@ var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
 var _createSuper__default = /*#__PURE__*/_interopDefaultLegacy(_createSuper);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
+var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 
 var Base = /*#__PURE__*/function () {
   function Base() {
@@ -210,10 +212,10 @@ var MediasApi = /*#__PURE__*/function (_Base) {
     }
   }, {
     key: "delete",
-    value: function _delete(id) {
+    value: function _delete(id, data) {
       return this.requestDelete(this.route('delete', {
         media: id
-      }));
+      }), data);
     }
   }]);
   return MediasApi;
@@ -385,7 +387,7 @@ var useData = function useData(loadData) {
   };
 };
 
-var _excluded$4 = ["data"];
+var _excluded$3 = ["data"];
 var useContributions = function useContributions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     screenId = _ref.screenId,
@@ -407,13 +409,13 @@ var useContributions = function useContributions() {
       data: null
     },
     data = _ref2.data,
-    request = _objectWithoutProperties__default["default"](_ref2, _excluded$4);
+    request = _objectWithoutProperties__default["default"](_ref2, _excluded$3);
   return _objectSpread__default["default"]({
     contributions: data || defaultContributions
   }, request);
 };
 
-var useItems = function useItems(_ref) {
+var useItems$1 = function useItems(_ref) {
   var _ref$getPage = _ref.getPage,
     getPage = _ref$getPage === void 0 ? null : _ref$getPage,
     _ref$getItems = _ref.getItems,
@@ -625,7 +627,7 @@ var useItems = function useItems(_ref) {
   };
 };
 
-var _excluded$3 = ["data"];
+var _excluded$2 = ["data"];
 var useMedia = function useMedia(id, opts) {
   var api = useApi();
   var loader = React.useCallback(function () {
@@ -633,7 +635,7 @@ var useMedia = function useMedia(id, opts) {
   }, [api, id]);
   var _useData = useData(loader, opts),
     data = _useData.data,
-    request = _objectWithoutProperties__default["default"](_useData, _excluded$3);
+    request = _objectWithoutProperties__default["default"](_useData, _excluded$2);
   return _objectSpread__default["default"]({
     story: data
   }, request);
@@ -677,30 +679,205 @@ var useMediaCreate = function useMediaCreate() {
   };
 };
 
-var _excluded$2 = ["items", "pageItems"];
+var useItems = function useItems(_ref) {
+  var _ref$getPage = _ref.getPage,
+    getPage = _ref$getPage === void 0 ? null : _ref$getPage,
+    _ref$page = _ref.page,
+    page = _ref$page === void 0 ? 1 : _ref$page,
+    _ref$count = _ref.count,
+    count = _ref$count === void 0 ? 10 : _ref$count,
+    _ref$query = _ref.query,
+    pageQuery = _ref$query === void 0 ? null : _ref$query,
+    _ref$pages = _ref.pages,
+    startingPages = _ref$pages === void 0 ? null : _ref$pages,
+    _ref$getPageFromRespo = _ref.getPageFromResponse,
+    getPageFromResponse = _ref$getPageFromRespo === void 0 ? function (newPage) {
+      return newPage;
+    } : _ref$getPageFromRespo,
+    _ref$getPagination = _ref.getPagination,
+    getPagination = _ref$getPagination === void 0 ? function () {
+      var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        cp = _ref2.current_page,
+        pp = _ref2.per_page,
+        lp = _ref2.last_page,
+        total = _ref2.total;
+      return {
+        pageNumber: cp,
+        pageCount: pp,
+        lastPage: lp,
+        total: total
+      };
+    } : _ref$getPagination,
+    _ref$onLoaded = _ref.onLoaded,
+    onLoaded = _ref$onLoaded === void 0 ? null : _ref$onLoaded,
+    _ref$onError = _ref.onError,
+    onError = _ref$onError === void 0 ? null : _ref$onError;
+  // Pagination
+  var _useState = React.useState(page !== null),
+    _useState2 = _slicedToArray__default["default"](_useState, 2),
+    paginated = _useState2[0],
+    setPaginated = _useState2[1];
+  var _useState3 = React.useState(null),
+    _useState4 = _slicedToArray__default["default"](_useState3, 2),
+    pagination = _useState4[0],
+    setPagination = _useState4[1];
+  var _getPagination = getPagination(pagination || {}),
+    _getPagination$pageNu = _getPagination.pageNumber,
+    pageNumber = _getPagination$pageNu === void 0 ? page : _getPagination$pageNu,
+    _getPagination$pageCo = _getPagination.pageCount,
+    pageCount = _getPagination$pageCo === void 0 ? count : _getPagination$pageCo,
+    _getPagination$lastPa = _getPagination.lastPage,
+    lastPage = _getPagination$lastPa === void 0 ? null : _getPagination$lastPa,
+    _getPagination$total = _getPagination.total,
+    total = _getPagination$total === void 0 ? null : _getPagination$total;
+  var _useMemo = React.useMemo(function () {
+      return (startingPages || []).reduce(function (paginatedData, it) {
+        var _ref3 = it || {},
+          items = _ref3.data,
+          currentPagination = _ref3.pagination;
+        // eslint-disable-next-line no-param-reassign
+        paginatedData.data = paginatedData.data.concat(items);
+        // eslint-disable-next-line no-param-reassign
+        paginatedData.pagination = currentPagination;
+        return paginatedData;
+      }, {
+        data: [],
+        pagination: {}
+      });
+    }, [startingPages]),
+    initialPages = _useMemo.data,
+    initialPagination = _useMemo.pagination;
+  var _useState5 = React.useState(startingPages === null),
+    _useState6 = _slicedToArray__default["default"](_useState5, 2),
+    canLoad = _useState6[0],
+    setCanLoad = _useState6[1];
+  var _useState7 = React.useState(false),
+    _useState8 = _slicedToArray__default["default"](_useState7, 2),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
+
+  // Query
+  var query = React.useMemo(function () {
+    return _objectSpread__default["default"]({}, isString__default["default"](pageQuery) ? queryString.parse(pageQuery || null, {
+      arrayFormat: 'bracket'
+    }) : pageQuery);
+  }, [pageQuery]);
+
+  // Items
+  var _useState9 = React.useState(null),
+    _useState10 = _slicedToArray__default["default"](_useState9, 2),
+    items = _useState10[0],
+    setItems = _useState10[1];
+  var getPages = React.useCallback(function (newQuery, newPageNumber, newPageCount) {
+    return getPage(newQuery, newPageNumber, newPageCount);
+  }, [getPage]);
+
+  // Api has changed, reset to beginning
+  React.useEffect(function () {
+    setItems(initialPages);
+    setPagination(initialPagination);
+  }, [getPages, setItems, setPagination]);
+  React.useEffect(function () {
+    // console.log('try to load');
+    if (!canLoad || loading || lastPage !== null && pageNumber > lastPage) {
+      // console.log('skips loading');
+      return;
+    }
+    // console.log('actually load', query, pageNumber, pageCount);
+    setLoading(true);
+    setCanLoad(false);
+    // TODO: make this a cancellable promise
+    getPages(query, pageNumber, pageCount).then(function (response) {
+      return getPageFromResponse(response);
+    }).then(function (response) {
+      var _ref4 = response || {},
+        _ref4$data = _ref4.data,
+        data = _ref4$data === void 0 ? null : _ref4$data,
+        _ref4$meta = _ref4.meta,
+        meta = _ref4$meta === void 0 ? null : _ref4$meta;
+      // console.log('response --- ', response);
+      //  This is not a paginated list so we dont care anymore
+      if (data === null && meta === null) {
+        setItems(response);
+        setPaginated(false);
+      } else {
+        setItems(function (old) {
+          return [].concat(_toConsumableArray__default["default"](old || null), _toConsumableArray__default["default"](data));
+        });
+        setPagination(meta);
+        setPaginated(true);
+      }
+      return response;
+    }).then(function (response) {
+      setLoading(false);
+      if (onLoaded !== null) {
+        onLoaded(response);
+      }
+    })["catch"](function (e) {
+      // Error is real
+      setLoading(false);
+      if (onError !== null) {
+        onError(e);
+      }
+    });
+  }, [query, pageNumber, canLoad, getPages, setLoading, setItems, setPagination, onLoaded, onError]);
+  var reset = React.useCallback(function () {
+    setItems([]);
+    setPagination(null);
+    setCanLoad(true);
+  }, [setItems, setPagination, setCanLoad]);
+
+  // Resets the game, "natural" refresh
+  var onQueryChange = React.useEffect(function () {
+    reset();
+  }, [query, page, count, reset]);
+
+  // Handle to Load next
+  var loadNextPage = React.useCallback(function () {
+    if (!loading && pageNumber < lastPage) {
+      var params = _objectSpread__default["default"](_objectSpread__default["default"]({}, pagination), {}, {
+        current_page: pageNumber + 1,
+        per_page: pageCount
+      });
+      setPagination(params);
+      setCanLoad(true);
+    }
+  }, [query, pagination, pageNumber, pageCount, loading, lastPage, onQueryChange, setCanLoad]);
+  var disabled = (items || []).length === 0 || loading || pageNumber >= lastPage || lastPage === null || lastPage === 1;
+  var regularLoaded = !paginated && items !== null;
+  var paginatedLoaded = !loading && items !== null && (items.length === total || pageNumber >= lastPage);
+  return {
+    items: items,
+    total: total,
+    page: pageNumber,
+    count: pageCount,
+    lastPage: lastPage,
+    loading: loading,
+    loaded: !loading,
+    allLoaded: regularLoaded || paginatedLoaded,
+    disabled: disabled,
+    loadNextPage: loadNextPage,
+    reset: reset
+  };
+};
+
 var useMedias = function useMedias() {
   var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var page = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-  var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  var page = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  var count = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 10;
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   var api = useApi();
-  var getItems = React.useCallback(function () {
-    var requestedPage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    return api.medias.get(query, requestedPage, count);
-  }, [api, query, count]);
-  var _useItems = useItems(_objectSpread__default["default"]({
-      getPage: page !== null ? getItems : null,
-      getItems: page === null ? getItems : null,
-      page: page
-    }, opts)),
-    items = _useItems.items,
-    pageItems = _useItems.pageItems,
-    request = _objectWithoutProperties__default["default"](_useItems, _excluded$2);
-  // console.log('medias', items);
-  return _objectSpread__default["default"]({
-    medias: page !== null ? pageItems : items,
-    allMedias: items
-  }, request);
+  var getPage = React.useCallback(function (newQuery) {
+    var requestedPage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var requestedCount = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+    return api.medias.get(newQuery, requestedPage, requestedCount);
+  }, [api]);
+  return useItems(_objectSpread__default["default"]({
+    getPage: getPage,
+    query: query,
+    page: page,
+    count: count
+  }, opts));
 };
 
 var useMediasRecent = function useMediasRecent(opts) {
@@ -739,7 +916,7 @@ var useMediaTags = function useMediaTags() {
   var getItems = React.useCallback(function () {
     return api.medias.getTags(query, count);
   }, [api, query, count]);
-  var _useItems = useItems(_objectSpread__default["default"]({
+  var _useItems = useItems$1(_objectSpread__default["default"]({
       getItems: getItems
     }, opts)),
     items = _useItems.items;
@@ -775,9 +952,12 @@ var useMediaDelete = function useMediaDelete() {
     deleting = _useState2[0],
     setDeleting = _useState2[1];
   var api = useApi();
-  var deleteMedia = React.useCallback(function (id, data) {
+  var deleteMedia = React.useCallback(function (id) {
+    var confirm = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     setDeleting(true);
-    return api.medias["delete"](id, data).then(function (response) {
+    return api.medias["delete"](id, {
+      confirm: confirm
+    }).then(function (response) {
       setDeleting(false);
       return response;
     });
@@ -880,7 +1060,7 @@ exports.useApi = useApi;
 exports.useContributionCreate = useContributionCreate;
 exports.useContributions = useContributions;
 exports.useData = useData;
-exports.useItems = useItems;
+exports.useItems = useItems$1;
 exports.useMedia = useMedia;
 exports.useMediaAuthors = useMediaAuthors;
 exports.useMediaCreate = useMediaCreate;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/data",
-    "version": "0.3.329",
+    "version": "0.3.332",
     "description": "",
     "keywords": [
         "javascript"
@@ -50,7 +50,8 @@
     "dependencies": {
         "@babel/runtime": "^7.13.10",
         "@folklore/fetch": "^0.1.15",
-        "@micromag/core": "^0.3.329",
+        "@micromag/core": "^0.3.332",
+        "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
         "query-string": "^6.13.7",
         "react-router": "^5.2.0"
@@ -58,5 +59,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "2bfbc2ca564fd104e1df42dfa9314668fe48a000"
+    "gitHead": "61fe137d589629d05127be69b667fc62f8ca1d18"
 }