@twreporter/redux 7.2.1 → 7.3.0-rc.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.3.0-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.2.2...@twreporter/redux@7.3.0-rc.0) (2022-08-22)
+
+
+### Bug Fixes
+
+* fix redux test ([11b4c5f](https://github.com/twreporter/twreporter-npm-packages/commit/11b4c5f56e86eb4a3943317ad1485fe16cef64d6))
+
+
+### Features
+
+* add `fetchPostsByCategorySetListId` action ([5980ebb](https://github.com/twreporter/twreporter-npm-packages/commit/5980ebb6eb8bc81f294b260b65421cad04e44050))
+
+
+
+
+
+## [7.2.2](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.2.2-rc.0...@twreporter/redux@7.2.2) (2022-07-06)
+
+**Note:** Version bump only for package @twreporter/redux
+
+
+
+
+
+## [7.2.2-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.2.1...@twreporter/redux@7.2.2-rc.0) (2022-06-30)
+
+
+### Bug Fixes
+
+* new bookmark should be fetched when mount ([9bb438f](https://github.com/twreporter/twreporter-npm-packages/commit/9bb438f81bd321fee47f55c872589091d8db8be6))
+
+
+
+
+
 ## [7.2.1](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.2.1-rc.0...@twreporter/redux@7.2.1) (2022-04-29)
 
 **Note:** Version bump only for package @twreporter/redux

package/lib/actions/index.js

@@ -32,6 +32,7 @@ var _default = {
   fetchIndexPageContent: _indexPage.fetchIndexPageContent,
   fetchPostsByCategoryListId: _posts.fetchPostsByCategoryListId,
   fetchPostsByTagListId: _posts.fetchPostsByTagListId,
+  fetchPostsByCategorySetListId: _posts.fetchPostsByCategorySetListId,
   fetchRelatedPostsOfAnEntity: _posts.fetchRelatedPostsOfAnEntity,
   fetchTopics: _topics.fetchTopics,
   getAccessToken: _auth.getAccessToken,

package/lib/actions/posts.js

@@ -7,6 +7,7 @@ exports.fetchAFullPost = fetchAFullPost;
 exports.fetchRelatedPostsOfAnEntity = fetchRelatedPostsOfAnEntity;
 exports.fetchPostsByCategoryListId = fetchPostsByCategoryListId;
 exports.fetchPostsByTagListId = fetchPostsByTagListId;
+exports.fetchPostsByCategorySetListId = fetchPostsByCategorySetListId;
 
 var _url = require("../utils/url");
 
@@ -28,14 +29,27 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _merge = _interopRequireDefault(require("lodash/merge"));
 
+var _split = _interopRequireDefault(require("lodash/split"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var _ = {
   filter: _filter["default"],
   get: _get["default"],
-  merge: _merge["default"]
+  merge: _merge["default"],
+  split: _split["default"]
 };
 var entities = _reduxStateFieldNames["default"].entities,
     postsInEntities = _reduxStateFieldNames["default"].postsInEntities;
@@ -234,8 +248,9 @@ var startPage = 1;
 /**
  * Fetch a listed posts(only containing meta properties),
  * such as the posts belonging to the same tag/category/topic.
- * @param {string} listId - id of tag or category
- * @param {string} listType - tag_id or category_id
+ * @param {string} listId - id of tag, category or category_set
+ * @param {string} listType - tag_id, category_id or category_set_id
+ *   category_set_id: `${category_id}_${subcateogry_id}`
  * @param {number} [limit=10] - the number of posts you want to get in one request
  * @param {number} [page=1] - page is used to calculate `offset`, which indicates how many posts we should skip
  * @param {number} timeout - request api timeout
@@ -247,30 +262,24 @@ function fetchPostsByListId(listId, listType) {
   var page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : startPage;
   var timeout = arguments.length > 4 ? arguments[4] : undefined;
   return function (dispatch, getState) {
-    var _params;
-
-    if (typeof listId !== 'string' || !listId) {
+    var fail = function fail(reason) {
       var action = {
         type: _actionTypes["default"].postsByListId.read.failure,
         payload: {
-          listId: '',
-          error: new Error('listId should be a string and not empty, but got ' + listId)
+          listId: typeof listId === 'string' ? listId : '',
+          error: new Error(reason)
         }
       };
       dispatch(action);
       return Promise.reject(action);
-    }
+    };
 
     if (typeof page !== 'number' || isNaN(page) || page < startPage) {
-      var _action2 = {
-        type: _actionTypes["default"].postsByListId.read.failure,
-        payload: {
-          listId: listId,
-          error: new Error('page should be > 0')
-        }
-      };
-      dispatch(_action2);
-      return Promise.reject(_action2);
+      return fail('page should be > 0');
+    }
+
+    if (typeof listId !== 'string' || !listId) {
+      return fail("listId should be a string and not empty, but got ".concat(listId));
     }
 
     var state = getState();
@@ -279,7 +288,7 @@ function fetchPostsByListId(listId, listType) {
 
 
     if (Array.isArray(_.get(list, ['pages', page]))) {
-      var _action3 = {
+      var action = {
         type: _actionTypes["default"].postsByListId.read.alreadyExists,
         payload: {
           listId: listId,
@@ -287,8 +296,8 @@ function fetchPostsByListId(listId, listType) {
           page: page
         }
       };
-      dispatch(_action3);
-      return Promise.resolve(_action3);
+      dispatch(action);
+      return Promise.resolve(action);
     }
 
     var offset = (page - 1) * limit;
@@ -296,7 +305,23 @@ function fetchPostsByListId(listId, listType) {
     var apiOrigin = _.get(state, [_reduxStateFieldNames["default"].origins, 'api']);
 
     var path = "/v2/".concat(_apiEndpoints["default"].posts);
-    var params = (_params = {}, _defineProperty(_params, listType, listId), _defineProperty(_params, "limit", limit), _defineProperty(_params, "offset", offset), _params);
+    var params = {
+      limit: limit,
+      offset: offset
+    };
+
+    if (listType === 'category_set_id') {
+      var _$split = _.split(listId, '_'),
+          _$split2 = _slicedToArray(_$split, 2),
+          categoryId = _$split2[0],
+          subcategoryId = _$split2[1];
+
+      params.category_id = categoryId;
+      params.subcategory_id = subcategoryId;
+    } else {
+      params[listType] = listId;
+    }
+
     var url = (0, _url.formURL)(apiOrigin, path, params);
     dispatch({
       type: _actionTypes["default"].postsByListId.read.request,
@@ -346,4 +371,23 @@ function fetchPostsByTagListId(listId) {
   return function (dispatch, getState) {
     return fetchPostsByListId(listId, 'tag_id', limit, page, timeout)(dispatch, getState);
   };
+}
+/**
+ * Fetch posts(only containing meta properties) by category set id.
+ * @param {string} listId - id of category set
+ *   category set id: `${category_id}_${subcategory_id}`
+ * @param {number} [limit=10] - the number of posts you want to get in one request
+ * @param {number} [page=1] - page is used to calculate `offset`, which indicates how many posts we should skip
+ * @param {number} [timeout=apiConfig.timeout] - request api timeout
+ * @return {import('../typedef').Thunk} async action creator
+ */
+
+
+function fetchPostsByCategorySetListId(listId) {
+  var limit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+  var page = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _apiConfig["default"].timeout;
+  return function (dispatch, getState) {
+    return fetchPostsByListId(listId, 'category_set_id', limit, page, timeout)(dispatch, getState);
+  };
 }

package/lib/reducers/bookmarks.js

@@ -15,6 +15,10 @@ var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
 
 var _uniq = _interopRequireDefault(require("lodash/uniq"));
 
+var _orderBy = _interopRequireDefault(require("lodash/orderBy"));
+
+var _map = _interopRequireDefault(require("lodash/map"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -39,7 +43,9 @@ var _ = {
   assign: _assign["default"],
   findIndex: _findIndex["default"],
   get: _get["default"],
-  uniq: _uniq["default"]
+  uniq: _uniq["default"],
+  orderBy: _orderBy["default"],
+  map: _map["default"]
 };
 var defaultLimit = 10;
 var initState = {
@@ -77,25 +83,21 @@ function bookmarks() {
             total = meta.total,
             limit = meta.limit;
 
-        var bookmarkIDList = _toConsumableArray(state.bookmarkIDList);
-
         var entities = _objectSpread({}, state.entities); // Push new fetched records to stored ones and push ids to id list
 
 
         fetchedRecords.forEach(function (record) {
           var id = _.get(record, 'id');
 
-          if (id) {
-            if (!bookmarkIDList.some(function (idInList) {
-              return idInList === id;
-            })) {
-              bookmarkIDList.push(id);
-            } // prevent duplicate items in list
-
-
-            entities["".concat(id)] = record;
+          if (!id) {
+            return;
           }
+
+          entities["".concat(id)] = record;
         });
+
+        var bookmarkIDList = _.map(_.orderBy(entities, ['added_at'], ['desc']), 'id');
+
         return _objectSpread(_objectSpread({}, state), {}, {
           actionType: action.type,
           isRequesting: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/redux",
-  "version": "7.2.1",
+  "version": "7.3.0-rc.0",
   "description": "redux actions and reducers for twreporter website",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
   "author": "twreporter <developer@twreporter.org>",
@@ -43,5 +43,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "d558a91e42cdf3a177e5d0d3471e834bc75f1cd0"
+  "gitHead": "c39b265ecd77107f0e1aeb6d3d147efb969c6226"
 }