@twreporter/redux 7.6.0 → 7.7.0-rc.0

package/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.7.0-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.6.1-rc.0...@twreporter/redux@7.7.0-rc.0) (2023-07-03)
+
+
+### Bug Fixes
+
+* remove unused code ([8f5f72c](https://github.com/twreporter/twreporter-npm-packages/commit/8f5f72c6e48a478b9cc8bbbf458aab51fa94c7b8))
+
+
+### Features
+
+* add test for getUserData ([f6e8854](https://github.com/twreporter/twreporter-npm-packages/commit/f6e8854b953d49217b2785c1dd2d7195fb0e1ef8))
+* getUserData from api ([bff225b](https://github.com/twreporter/twreporter-npm-packages/commit/bff225bfeb16460b35851ca47712cd488e059414))
+
+
+
+
+
+## [7.6.1-rc.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.6.0...@twreporter/redux@7.6.1-rc.0) (2023-06-28)
+
+**Note:** Version bump only for package @twreporter/redux
+
+
+
+
+
 # [7.6.0](https://github.com/twreporter/twreporter-npm-packages/compare/@twreporter/redux@7.6.0-rc.2...@twreporter/redux@7.6.0) (2023-06-21)
 
 **Note:** Version bump only for package @twreporter/redux

package/lib/actions/user.js

@@ -85,7 +85,6 @@ function buildSuccessActionFromRes(axiosResponse, actionType) {
  * @param {number} userID - id of user
  * @return {Function} - function will be executed in Redux Thunk middleware
  */
-// TODO: wait till api ready
 
 
 function getUserData(jwt, userID) {
@@ -94,42 +93,33 @@ function getUserData(jwt, userID) {
    * @param {Function} getState - Redux store getState function
    * @return {Promise} resolve with success action or reject with fail action
    */
-  // return function(dispatch, getState) {
-  //   const state = getState()
-  //   const apiOrigin = _.get(state, [stateFieldNames.origins, 'api'])
-  //   const url = formURL(
-  //     apiOrigin,
-  //     `/v2/${apiEndpoints.users}/${userID}`,
-  //   )
-  //   dispatch({
-  //     type: types.user.read.request,
-  //     url
-  //   })
-  //   const axiosConfig = {
-  //     timeout: apiTimeout,
-  //     headers: {
-  //       Authorization: `Bearer ${jwt}`,
-  //     },
-  //   }
-  //   return axios
-  //     .get(url, axiosConfig)
-  //     .then(res => {
-  //       const successAction = buildSuccessActionFromRes(
-  //         res,
-  //         types.user.read.success
-  //       )
-  //       dispatch(successAction)
-  //       return successAction
-  //     })
-  //     .catch(error => {
-  //       const failAction = failActionCreators.axios(
-  //         error,
-  //         types.user.read.failure
-  //       )
-  //       dispatch(failAction)
-  //       return Promise.reject(failAction)
-  //     })
-  // }
+  return function (dispatch, getState) {
+    var state = getState();
+
+    var apiOrigin = _.get(state, [_reduxStateFieldNames["default"].origins, 'api']);
+
+    var url = (0, _url.formURL)(apiOrigin, "/v2/".concat(_apiEndpoints["default"].users, "/").concat(userID));
+    dispatch({
+      type: _actionTypes["default"].user.read.request,
+      url: url
+    });
+    var axiosConfig = {
+      timeout: apiTimeout,
+      headers: {
+        Authorization: "Bearer ".concat(jwt)
+      }
+    };
+    return _axios["default"].get(url, axiosConfig).then(function (res) {
+      var successAction = buildSuccessActionFromRes(res, _actionTypes["default"].user.read.success);
+      dispatch(successAction);
+      return successAction;
+    })["catch"](function (error) {
+      var failAction = _errorActionCreators["default"].axios(error, _actionTypes["default"].user.read.failure);
+
+      dispatch(failAction);
+      return Promise.reject(failAction);
+    });
+  };
 }
 /**
  *

package/lib/constants/redux-state-field-names.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _featureFlag = require("@twreporter/core/lib/constants/feature-flag");
-
 var _categorySet = require("@twreporter/core/lib/constants/category-set");
 
 var entities = 'entities';
@@ -33,14 +31,7 @@ var photosSection = 'photos_section';
 var reviewsSection = 'reviews_section';
 var topicsSection = 'topics_section'; // categories in index_page
 
-var humanRightsAndSociety = 'human_rights_and_society';
-var environmentAndEducation = 'environment_and_education';
-var politicsAndEconomy = 'politics_and_economy';
-var cultureAndArt = 'culture_and_art';
-var international = 'international';
-var livingAndMedicalCare = 'living_and_medical_care'; // feature toggle
-
-var categories = _featureFlag.ENABLE_NEW_INFO_ARCH ? {
+var categories = {
   world: _categorySet.CATEGORY_PATH.world,
   humanrights: _categorySet.CATEGORY_PATH.humanrights,
   politicsAndSociety: _categorySet.CATEGORY_PATH.politicsAndSociety,
@@ -49,13 +40,6 @@ var categories = _featureFlag.ENABLE_NEW_INFO_ARCH ? {
   econ: _categorySet.CATEGORY_PATH.econ,
   culture: _categorySet.CATEGORY_PATH.culture,
   education: _categorySet.CATEGORY_PATH.education
-} : {
-  humanRightsAndSociety: humanRightsAndSociety,
-  environmentAndEducation: environmentAndEducation,
-  politicsAndEconomy: politicsAndEconomy,
-  cultureAndArt: cultureAndArt,
-  international: international,
-  livingAndMedicalCare: livingAndMedicalCare
 }; // time stamp for next popup
 
 var nextNotifyPopupTS = 'nextNotifyPopupTS';

package/lib/reducers/user.js

@@ -27,13 +27,13 @@ var initState = {
   error: null,
   isFetching: false,
   isReady: false,
-  // TODO: need add other user state after connect to getUser api
-  // userID: -1,
-  // firstName: '',
-  // lastName: '',
-  // role: MEMBER_ROLE.explorer,
-  // email: '',
-  // activated: false,
+  userID: -1,
+  email: '',
+  firstName: '',
+  lastName: '',
+  roles: [],
+  registrationDate: '',
+  activated: false,
   readPreference: [],
   maillist: []
 };
@@ -44,6 +44,59 @@ function user() {
   var payload = action.payload;
 
   switch (action.type) {
+    case _actionTypes["default"].user.read.request:
+      {
+        return _.merge({}, state, {
+          isFetching: true,
+          isReady: false
+        });
+      }
+
+    case _actionTypes["default"].user.read.success:
+      {
+        var userID = _.get(payload, 'data.data.user_id');
+
+        var email = _.get(payload, 'data.data.email');
+
+        var firstName = _.get(payload, 'data.data.first_name');
+
+        var lastName = _.get(payload, 'data.data.last_name');
+
+        var roles = _.get(payload, 'data.data.roles');
+
+        var registrationDate = _.get(payload, 'data.data.registration_date');
+
+        var activated = _.get(payload, 'data.data.activated');
+
+        var readPreference = _.get(payload, 'data.data.read_preference');
+
+        var maillist = _.get(payload, 'data.data.maillist');
+
+        return _objectSpread(_objectSpread({}, state), {}, {
+          error: null,
+          isFetching: false,
+          isReady: true,
+          userID: userID,
+          email: email,
+          firstName: firstName,
+          lastName: lastName,
+          roles: roles,
+          registrationDate: registrationDate,
+          activated: activated,
+          readPreference: readPreference,
+          maillist: maillist
+        });
+      }
+
+    case _actionTypes["default"].user.read.failure:
+      {
+        return _objectSpread(_objectSpread({}, state), {}, {
+          error: payload.error,
+          isFetching: false,
+          isReady: false
+        });
+      }
+
     case _actionTypes["default"].user.update.request:
       {
         return _.merge({}, state, {
@@ -54,18 +107,16 @@ function user() {
 
     case _actionTypes["default"].user.update.success:
       {
-        var readPreference = _.get(payload, 'data.record.read_preference', []);
+        var _readPreference = _.get(payload, 'data.record.read_preference', []);
 
-        var maillist = _.get(payload, 'data.record.maillist', []);
+        var _maillist = _.get(payload, 'data.record.maillist', []);
 
-        state.readPreference = readPreference;
-        state.maillist = maillist;
         return _objectSpread(_objectSpread({}, state), {}, {
           error: null,
           isFetching: false,
           isReady: true,
-          maillist: maillist,
-          readPreference: readPreference
+          maillist: _maillist,
+          readPreference: _readPreference
         });
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/redux",
-  "version": "7.6.0",
+  "version": "7.7.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>",
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/twreporter/twreporter-redux/#readme",
   "dependencies": {
-    "@twreporter/core": "^1.10.0",
+    "@twreporter/core": "^1.11.0-rc.0",
     "axios": "^0.19.0",
     "es6-error": "^4.0.2",
     "humps": "^0.6.0",
@@ -44,5 +44,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "8bb552690874aabe203b3c8205f725eef6285282"
+  "gitHead": "fb910ec11c88214b24e87ef0e4a011a896554471"
 }