@panneau/data 3.0.173 → 3.0.175

package/es/index.js

@@ -75,7 +75,7 @@ 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"];
+  _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -194,8 +194,10 @@ var useItems$2 = function useItems(_ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     _useQuery$status = _useQuery.status,
     status = _useQuery$status === void 0 ? null : _useQuery$status,
     _useQuery$error = _useQuery.error,
@@ -229,10 +231,10 @@ var useItems$2 = function useItems(_ref) {
   }, [query, onQueryChange]);
   var pages = useRef(null);
   useEffect(function () {
-    if (loaded && page !== null && data !== null) {
+    if (isFetched && page !== null && data !== null) {
       pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
     }
-  }, [loaded, page, data]);
+  }, [isFetched, page, data]);
   var finalItems = useMemo(function () {
     if (data === null) {
       return data;
@@ -270,6 +272,7 @@ var useItems$2 = function useItems(_ref) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   }) : null;
+  var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
     allItems: allItems,
@@ -282,10 +285,10 @@ var useItems$2 = function useItems(_ref) {
     } : null,
     total: total,
     lastPage: lastPage,
-    loaded: loaded,
-    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && loaded,
+    loaded: isFetched,
+    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && isFetched,
     // very basic stuff, TODO
-    loading: loading,
+    loading: finalLoading,
     loadNextPage: loadNextPage,
     loadPage: loadPage,
     reloadPage: reload,
@@ -571,7 +574,7 @@ var useItems = function useItems(_ref) {
 var useItems$1 = useItems;
 
 var _excluded$2 = ["page", "count"],
-  _excluded2 = ["data", "refetch", "isLoading", "isFetched"];
+  _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,
@@ -605,9 +608,6 @@ var useItemsStore = function useItemsStore(store, _ref) {
   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) {
@@ -642,8 +642,10 @@ var useItemsStore = function useItemsStore(store, _ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     otherProps = _objectWithoutProperties(_useQuery, _excluded2);
   var _ref4 = data || {},
     _ref4$data = _ref4.data,
@@ -731,19 +733,25 @@ var useItemsStore = function useItemsStore(store, _ref) {
 
   // Keep a list of pages, useEffect wont work here because delayed
   var pages = useRef(null);
-  if (loaded && page !== null && data !== 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;
+  console.log(isLoading, isFetching, isRefetching, otherProps);
   return _objectSpread(_objectSpread({}, otherProps), {}, {
+    isLoading: isLoading,
+    isFetching: isFetching,
+    isRefetching: isRefetching,
+    isFetched: isFetched,
     items: finalItems,
     pages: pages.current,
     allItems: allItems,
-    loading: loading,
-    loaded: loaded,
+    loading: finalLoading,
+    loaded: isFetched,
     reload: reload,
     loadPage: loadPage,
     loadNextPage: loadNextPage,
@@ -1002,10 +1010,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)
     }]);
@@ -1033,6 +1043,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() {
@@ -1056,6 +1081,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) {
@@ -1339,13 +1371,19 @@ var useQueryContext = function useQueryContext() {
 };
 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
+  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({
@@ -1355,15 +1393,9 @@ var QueryProvider = function QueryProvider(_ref) {
         }
       }
     }, initialConfig));
-    // if (page !== null) {
-    //     const query =
-    //         window && !isEmpty(window.location.search)
-    //             ? queryString.parse(window.location.search, {
-    //                   arrayFormat: 'bracket',
-    //               })
-    //             : null;
-    //     client.setQueryData(['pages', page.url, query], page);
-    // }
+    if (initialKey !== null && initialData !== null) {
+      client.setQueryData(initialKey, initialData);
+    }
     return client;
   }, [initialConfig]);
   return /*#__PURE__*/React.createElement(QueryClientProvider, {

package/lib/index.js

@@ -739,7 +739,7 @@ var queryString = /*#__PURE__*/Object.freeze({
 
 var _excluded$3 = ["store", "url", "paginated", "query", "onQueryChange", "queryConfig", "keepData"],
   _excluded2$1 = ["page", "count"],
-  _excluded3 = ["data", "refetch", "isLoading", "isFetched", "status", "error"];
+  _excluded3 = ["data", "refetch", "isLoading", "isFetching", "isRefetching", "isFetched", "status", "error"];
 var useItems$2 = function useItems(_ref) {
   var store = _ref.store,
     url = _ref.url,
@@ -858,8 +858,10 @@ var useItems$2 = function useItems(_ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     _useQuery$status = _useQuery.status,
     status = _useQuery$status === void 0 ? null : _useQuery$status,
     _useQuery$error = _useQuery.error,
@@ -893,10 +895,10 @@ var useItems$2 = function useItems(_ref) {
   }, [query, onQueryChange]);
   var pages = React.useRef(null);
   React.useEffect(function () {
-    if (loaded && page !== null && data !== null) {
+    if (isFetched && page !== null && data !== null) {
       pages.current = _objectSpread(_objectSpread({}, pages.current), {}, _defineProperty({}, page, data));
     }
-  }, [loaded, page, data]);
+  }, [isFetched, page, data]);
   var finalItems = React.useMemo(function () {
     if (data === null) {
       return data;
@@ -934,6 +936,7 @@ var useItems$2 = function useItems(_ref) {
     var _pages$current$k;
     return (_pages$current$k = pages.current[k]) === null || _pages$current$k === void 0 ? void 0 : _pages$current$k.data;
   }) : null;
+  var finalLoading = isLoading || isFetching || isRefetching;
   return _objectSpread(_objectSpread({}, otherProps), {}, {
     items: finalItems,
     allItems: allItems,
@@ -946,10 +949,10 @@ var useItems$2 = function useItems(_ref) {
     } : null,
     total: total,
     lastPage: lastPage,
-    loaded: loaded,
-    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && loaded,
+    loaded: isFetched,
+    allLoaded: paginated && pages.current !== null && Object.keys(pages.current).length === lastPage || !paginated && isFetched,
     // very basic stuff, TODO
-    loading: loading,
+    loading: finalLoading,
     loadNextPage: loadNextPage,
     loadPage: loadPage,
     reloadPage: reload,
@@ -1235,7 +1238,7 @@ var useItems = function useItems(_ref) {
 var useItems$1 = useItems;
 
 var _excluded$2 = ["page", "count"],
-  _excluded2 = ["data", "refetch", "isLoading", "isFetched"];
+  _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,
@@ -1269,9 +1272,6 @@ var useItemsStore = function useItemsStore(store, _ref) {
   var queryKey = React.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 = reactQuery.useQuery(_objectSpread(_objectSpread({
       queryKey: queryKey,
       queryFn: function queryFn(_ref3) {
@@ -1306,8 +1306,10 @@ var useItemsStore = function useItemsStore(store, _ref) {
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? null : _useQuery$data,
     reload = _useQuery.refetch,
-    loading = _useQuery.isLoading,
-    loaded = _useQuery.isFetched,
+    isLoading = _useQuery.isLoading,
+    isFetching = _useQuery.isFetching,
+    isRefetching = _useQuery.isRefetching,
+    isFetched = _useQuery.isFetched,
     otherProps = _objectWithoutProperties(_useQuery, _excluded2);
   var _ref4 = data || {},
     _ref4$data = _ref4.data,
@@ -1395,19 +1397,25 @@ var useItemsStore = function useItemsStore(store, _ref) {
 
   // Keep a list of pages, useEffect wont work here because delayed
   var pages = React.useRef(null);
-  if (loaded && page !== null && data !== 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;
+  console.log(isLoading, isFetching, isRefetching, otherProps);
   return _objectSpread(_objectSpread({}, otherProps), {}, {
+    isLoading: isLoading,
+    isFetching: isFetching,
+    isRefetching: isRefetching,
+    isFetched: isFetched,
     items: finalItems,
     pages: pages.current,
     allItems: allItems,
-    loading: loading,
-    loaded: loaded,
+    loading: finalLoading,
+    loaded: isFetched,
     reload: reload,
     loadPage: loadPage,
     loadNextPage: loadNextPage,
@@ -1682,10 +1690,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)
     }]);
@@ -1713,6 +1723,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() {
@@ -1736,6 +1761,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) {
@@ -2019,13 +2051,19 @@ var useQueryContext = function useQueryContext() {
 };
 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
+  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 = React.useMemo(function () {
     var client = new reactQuery.QueryClient(_objectSpread({
@@ -2035,15 +2073,9 @@ var QueryProvider = function QueryProvider(_ref) {
         }
       }
     }, initialConfig));
-    // if (page !== null) {
-    //     const query =
-    //         window && !isEmpty(window.location.search)
-    //             ? queryString.parse(window.location.search, {
-    //                   arrayFormat: 'bracket',
-    //               })
-    //             : null;
-    //     client.setQueryData(['pages', page.url, query], page);
-    // }
+    if (initialKey !== null && initialData !== null) {
+      client.setQueryData(initialKey, initialData);
+    }
     return client;
   }, [initialConfig]);
   return /*#__PURE__*/React.createElement(reactQuery.QueryClientProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/data",
-    "version": "3.0.173",
+    "version": "3.0.175",
     "description": "",
     "keywords": [
         "javascript"
@@ -56,7 +56,7 @@
         "@babel/runtime": "^7.12.5",
         "@folklore/fetch": "^0.1.17",
         "@folklore/routes": "^0.2.26",
-        "@panneau/core": "^3.0.169",
+        "@panneau/core": "^3.0.175",
         "@tanstack/react-query": "^5.29.2",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "29037e4f0ed74d81586442a76daffcfb6d062200"
+    "gitHead": "cb8320f1041e7ced6bcf77dd6d32661950215a92"
 }