@micromag/data 0.2.391 → 0.2.396

package/es/index.js

@@ -79,6 +79,57 @@ var Base = /*#__PURE__*/function () {
   return Base;
 }();
 
+var ContributionsApi = /*#__PURE__*/function (_Base) {
+  _inherits(ContributionsApi, _Base);
+
+  var _super = _createSuper(ContributionsApi);
+
+  function ContributionsApi() {
+    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck(this, ContributionsApi);
+
+    return _super.call(this, _objectSpread(_objectSpread({}, opts), {}, {
+      routes: _objectSpread({
+        index: '/contributions/:screen',
+        store: '/contributions',
+        update: '/contributions/:contribution',
+        "delete": '/contributions/:contribution'
+      }, opts.routes || null)
+    }));
+  }
+
+  _createClass(ContributionsApi, [{
+    key: "get",
+    value: function get(id) {
+      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 finalQuery = _objectSpread({}, query);
+
+      if (page !== null) {
+        finalQuery.page = page;
+      }
+
+      if (count !== null) {
+        finalQuery.count = count;
+      }
+
+      return this.requestGet(this.route('index', {
+        screen: id
+      }), finalQuery);
+    }
+  }, {
+    key: "create",
+    value: function create(data) {
+      return this.requestPost(this.route('store'), data);
+    }
+  }]);
+
+  return ContributionsApi;
+}(Base);
+
 var MediasApi = /*#__PURE__*/function (_Base) {
   _inherits(MediasApi, _Base);
 
@@ -180,57 +231,6 @@ var MediasApi = /*#__PURE__*/function (_Base) {
   return MediasApi;
 }(Base);
 
-var ContributionsApi = /*#__PURE__*/function (_Base) {
-  _inherits(ContributionsApi, _Base);
-
-  var _super = _createSuper(ContributionsApi);
-
-  function ContributionsApi() {
-    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    _classCallCheck(this, ContributionsApi);
-
-    return _super.call(this, _objectSpread(_objectSpread({}, opts), {}, {
-      routes: _objectSpread({
-        index: '/contributions/:screen',
-        store: '/contributions',
-        update: '/contributions/:contribution',
-        "delete": '/contributions/:contribution'
-      }, opts.routes || null)
-    }));
-  }
-
-  _createClass(ContributionsApi, [{
-    key: "get",
-    value: function get(id) {
-      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 finalQuery = _objectSpread({}, query);
-
-      if (page !== null) {
-        finalQuery.page = page;
-      }
-
-      if (count !== null) {
-        finalQuery.count = count;
-      }
-
-      return this.requestGet(this.route('index', {
-        screen: id
-      }), finalQuery);
-    }
-  }, {
-    key: "create",
-    value: function create(data) {
-      return this.requestPost(this.route('store'), data);
-    }
-  }]);
-
-  return ContributionsApi;
-}(Base);
-
 var QuizApi = /*#__PURE__*/function (_Base) {
   _inherits(QuizApi, _Base);
 
@@ -311,7 +311,7 @@ var ApiProvider = function ApiProvider(_ref) {
   var previousApi = useApi();
   var api = useMemo(function () {
     return initialApi || previousApi || new Api({
-      baseUrl: baseUrl // baseUrl: 'https://micromag.studio.homestead.flklr.ca/api',
+      baseUrl: baseUrl // baseUrl: 'https://micromag.studio.test/api',
 
     });
   }, [previousApi, initialApi, baseUrl]);
@@ -424,7 +424,7 @@ var useData = function useData(loadData) {
   };
 };
 
-var _excluded$5 = ["data"];
+var _excluded$4 = ["data"];
 var useContributions = function useContributions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       screenId = _ref.screenId,
@@ -450,7 +450,7 @@ var useContributions = function useContributions() {
     data: null
   },
       data = _ref2.data,
-      request = _objectWithoutProperties(_ref2, _excluded$5);
+      request = _objectWithoutProperties(_ref2, _excluded$4);
 
   return _objectSpread({
     contributions: data || defaultContributions
@@ -694,7 +694,7 @@ var useItems = function useItems(_ref) {
   };
 };
 
-var _excluded$4 = ["data"];
+var _excluded$3 = ["data"];
 
 var useMedia = function useMedia(id, opts) {
   var api = useApi();
@@ -704,34 +704,29 @@ var useMedia = function useMedia(id, opts) {
 
   var _useData = useData(loader, opts),
       data = _useData.data,
-      request = _objectWithoutProperties(_useData, _excluded$4);
+      request = _objectWithoutProperties(_useData, _excluded$3);
 
   return _objectSpread({
     story: data
   }, request);
 };
 
-var _excluded$3 = ["items", "pageItems"];
+// import { useCallback } from 'react';
+// eslint-disable-next-line
 
 var useMediaAuthors = function useMediaAuthors() {
-  var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
-  var opts = arguments.length > 2 ? arguments[2] : undefined;
   var api = useApi();
-  var getItems = useCallback(function () {
-    return api.medias.getAuthors(query, count);
-  }, [api, query, count]);
+  console.log('api', api); // eslint-disable-line
+  // const getItems = useCallback(() => api.medias.getAuthors(query, count), [api, query, count]);
+  // const { items, pageItems, ...request } = useItems({
+  //     getItems,
+  //     ...opts,
+  // });
 
-  var _useItems = useItems(_objectSpread({
-    getItems: getItems
-  }, opts)),
-      items = _useItems.items;
-      _useItems.pageItems;
-      var request = _objectWithoutProperties(_useItems, _excluded$3);
+  return {
+    authors: [] // ...request,
 
-  return _objectSpread({
-    authors: items
-  }, request);
+  };
 };
 
 var useMediaCreate = function useMediaCreate() {

package/lib/index.js

@@ -96,6 +96,57 @@ var Base = /*#__PURE__*/function () {
   return Base;
 }();
 
+var ContributionsApi = /*#__PURE__*/function (_Base) {
+  _inherits__default["default"](ContributionsApi, _Base);
+
+  var _super = _createSuper__default["default"](ContributionsApi);
+
+  function ContributionsApi() {
+    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    _classCallCheck__default["default"](this, ContributionsApi);
+
+    return _super.call(this, _objectSpread__default["default"](_objectSpread__default["default"]({}, opts), {}, {
+      routes: _objectSpread__default["default"]({
+        index: '/contributions/:screen',
+        store: '/contributions',
+        update: '/contributions/:contribution',
+        "delete": '/contributions/:contribution'
+      }, opts.routes || null)
+    }));
+  }
+
+  _createClass__default["default"](ContributionsApi, [{
+    key: "get",
+    value: function get(id) {
+      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 finalQuery = _objectSpread__default["default"]({}, query);
+
+      if (page !== null) {
+        finalQuery.page = page;
+      }
+
+      if (count !== null) {
+        finalQuery.count = count;
+      }
+
+      return this.requestGet(this.route('index', {
+        screen: id
+      }), finalQuery);
+    }
+  }, {
+    key: "create",
+    value: function create(data) {
+      return this.requestPost(this.route('store'), data);
+    }
+  }]);
+
+  return ContributionsApi;
+}(Base);
+
 var MediasApi = /*#__PURE__*/function (_Base) {
   _inherits__default["default"](MediasApi, _Base);
 
@@ -197,57 +248,6 @@ var MediasApi = /*#__PURE__*/function (_Base) {
   return MediasApi;
 }(Base);
 
-var ContributionsApi = /*#__PURE__*/function (_Base) {
-  _inherits__default["default"](ContributionsApi, _Base);
-
-  var _super = _createSuper__default["default"](ContributionsApi);
-
-  function ContributionsApi() {
-    var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    _classCallCheck__default["default"](this, ContributionsApi);
-
-    return _super.call(this, _objectSpread__default["default"](_objectSpread__default["default"]({}, opts), {}, {
-      routes: _objectSpread__default["default"]({
-        index: '/contributions/:screen',
-        store: '/contributions',
-        update: '/contributions/:contribution',
-        "delete": '/contributions/:contribution'
-      }, opts.routes || null)
-    }));
-  }
-
-  _createClass__default["default"](ContributionsApi, [{
-    key: "get",
-    value: function get(id) {
-      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 finalQuery = _objectSpread__default["default"]({}, query);
-
-      if (page !== null) {
-        finalQuery.page = page;
-      }
-
-      if (count !== null) {
-        finalQuery.count = count;
-      }
-
-      return this.requestGet(this.route('index', {
-        screen: id
-      }), finalQuery);
-    }
-  }, {
-    key: "create",
-    value: function create(data) {
-      return this.requestPost(this.route('store'), data);
-    }
-  }]);
-
-  return ContributionsApi;
-}(Base);
-
 var QuizApi = /*#__PURE__*/function (_Base) {
   _inherits__default["default"](QuizApi, _Base);
 
@@ -328,7 +328,7 @@ var ApiProvider = function ApiProvider(_ref) {
   var previousApi = useApi();
   var api = React.useMemo(function () {
     return initialApi || previousApi || new Api({
-      baseUrl: baseUrl // baseUrl: 'https://micromag.studio.homestead.flklr.ca/api',
+      baseUrl: baseUrl // baseUrl: 'https://micromag.studio.test/api',
 
     });
   }, [previousApi, initialApi, baseUrl]);
@@ -441,7 +441,7 @@ var useData = function useData(loadData) {
   };
 };
 
-var _excluded$5 = ["data"];
+var _excluded$4 = ["data"];
 var useContributions = function useContributions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       screenId = _ref.screenId,
@@ -467,7 +467,7 @@ var useContributions = function useContributions() {
     data: null
   },
       data = _ref2.data,
-      request = _objectWithoutProperties__default["default"](_ref2, _excluded$5);
+      request = _objectWithoutProperties__default["default"](_ref2, _excluded$4);
 
   return _objectSpread__default["default"]({
     contributions: data || defaultContributions
@@ -711,7 +711,7 @@ var useItems = function useItems(_ref) {
   };
 };
 
-var _excluded$4 = ["data"];
+var _excluded$3 = ["data"];
 
 var useMedia = function useMedia(id, opts) {
   var api = useApi();
@@ -721,34 +721,29 @@ var useMedia = function useMedia(id, opts) {
 
   var _useData = useData(loader, opts),
       data = _useData.data,
-      request = _objectWithoutProperties__default["default"](_useData, _excluded$4);
+      request = _objectWithoutProperties__default["default"](_useData, _excluded$3);
 
   return _objectSpread__default["default"]({
     story: data
   }, request);
 };
 
-var _excluded$3 = ["items", "pageItems"];
+// import { useCallback } from 'react';
+// eslint-disable-next-line
 
 var useMediaAuthors = function useMediaAuthors() {
-  var query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-  var count = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5;
-  var opts = arguments.length > 2 ? arguments[2] : undefined;
   var api = useApi();
-  var getItems = React.useCallback(function () {
-    return api.medias.getAuthors(query, count);
-  }, [api, query, count]);
+  console.log('api', api); // eslint-disable-line
+  // const getItems = useCallback(() => api.medias.getAuthors(query, count), [api, query, count]);
+  // const { items, pageItems, ...request } = useItems({
+  //     getItems,
+  //     ...opts,
+  // });
 
-  var _useItems = useItems(_objectSpread__default["default"]({
-    getItems: getItems
-  }, opts)),
-      items = _useItems.items;
-      _useItems.pageItems;
-      var request = _objectWithoutProperties__default["default"](_useItems, _excluded$3);
+  return {
+    authors: [] // ...request,
 
-  return _objectSpread__default["default"]({
-    authors: items
-  }, request);
+  };
 };
 
 var useMediaCreate = function useMediaCreate() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/data",
-    "version": "0.2.391",
+    "version": "0.2.396",
     "description": "",
     "keywords": [
         "javascript"
@@ -50,7 +50,7 @@
     "dependencies": {
         "@babel/runtime": "^7.13.10",
         "@folklore/fetch": "^0.1.10",
-        "@micromag/core": "^0.2.391",
+        "@micromag/core": "^0.2.396",
         "prop-types": "^15.7.2",
         "query-string": "^6.13.7",
         "react-router": "^5.2.0"
@@ -58,5 +58,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "8136754d570e4fc8c1bb9c89f8635279f252e89f"
+    "gitHead": "480deb93475c6eefcd4c5997b4ce7c9f32e6ff7d"
 }