@zengenti/contensis-react-base 3.1.1-beta.8 → 3.2.0

package/README.md

@@ -126,6 +126,42 @@ https://www.conventionalcommits.org/en/v1.0.0/#summary
 
 # Changelog
 
+#### 3.2.0 (2024-04-26)
+
+##### New Features
+
+*  add support for new delivery api search parameter `fieldLinkDepths` (3f6d1def)
+*  introduce `SSRContext` allowing us to hold and access request-scope references throughout the component tree and use these refs in backing code reliably scoped to the current request (915e9f97)
+
+##### Bug Fixes
+
+*  cache invalidation - surrogate key count inconsistencies in high concurrent load scenario (915e9f97)
+*  Routing sagas - childrenOptions object undefined if nodeOptions.children not specified, meaning children saga would error with global children customNavigation setting (55b389b5)
+*  restore delivery api response handler to handle 200 responses only due to inconsistent behaviour in non-ok fetch responses (5f69d2db)
+*  add `any_update` header in SSR for any page request with any delivery api errors (3d404e4f)
+*  correct syntax for last immutable fix (f415a487)
+*  add server startup option `enableSsrCookies` as processing cookies in ssr can cause authentication information to become cached (67b0d011)
+*  undefined error in ssr when using immutable state type (afd2f147)
+*  undefined error on Redux in server features (e1e4842a)
+*  need to provide path attribute when using `universal-cookie` package (95fe9f12)
+*  Reset user state to prevent user details from being cached in SSR response (f8fb5bfe)
+*  allow CookieHelper  fallback to browser cookies when cookies args not provided (457c4f56)
+*  prevent mutation of DELIVERY_API_CONFIG when building client config (cafbe5e1)
+
+##### Performance Improvements
+
+*  remove surrogateKeys routing key from serialised redux state in ssr (749782bc)
+
+##### Refactors
+
+*  remove redundant types files (dac4cf52)
+*  consolidate typescript types in models folder (de959949)
+*  convert user login JS code to TypeScript (75ef4e0c)
+
+##### Code Style Changes
+
+*  fix return types in store creation (f611e88c)
+
 #### 3.1.0 (2024-01-18)
 
 ##### New Features

package/cjs/{App-4c9e6d1b.js → App-8a2f85d5.js}

@@ -3,22 +3,21 @@
 var history$1 = require('history');
 var effects = require('@redux-saga/core/effects');
 var log = require('loglevel');
-var ContensisDeliveryApi = require('./ContensisDeliveryApi-d63b3d39.js');
-var version = require('./version-bb4a3418.js');
-var version$1 = require('./version-c2a37225.js');
-var selectors = require('./selectors-8e56cc34.js');
+var store = require('./store-665c229b.js');
+var version = require('./version-3b05d6c8.js');
 var to = require('await-to-js');
-var ChangePassword_container = require('./ChangePassword.container-15acbce2.js');
+var selectors = require('./selectors-e3f1fd85.js');
+var version$1 = require('./version-7b43af3e.js');
+var ChangePassword_container = require('./ChangePassword.container-efcb1fcd.js');
 var React = require('react');
 require('react-cookie');
 require('react-redux');
 require('jsonpath-mapper');
-var reducers = require('./reducers-ea1b2dc0.js');
 var contensisDeliveryApi = require('contensis-delivery-api');
-var ToJs = require('./ToJs-374a7fbd.js');
+var ToJs = require('./ToJs-7f965106.js');
 require('react-hot-loader');
 require('query-string');
-var RouteLoader = require('./RouteLoader-190ac009.js');
+var RouteLoader = require('./RouteLoader-4fb33db9.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -49,32 +48,37 @@ const selectedHistory = typeof window !== 'undefined' ? history$1.createBrowserH
 const history = (options = {}) => selectedHistory(options);
 const browserHistory = selectedHistory();
 
-const navigationSagas = [effects.takeEvery(version.GET_NODE_TREE, ensureNodeTreeSaga)];
+const navigationSagas = [effects.takeEvery(store.GET_NODE_TREE, ensureNodeTreeSaga)];
 function* ensureNodeTreeSaga(action) {
+  const {
+    api,
+    language,
+    project,
+    versionStatus,
+    treeDepth
+  } = action;
   const state = yield effects.select();
   try {
-    if (!version$1.hasNavigationTree(state)) {
-      const deliveryApiVersionStatus = yield effects.select(version.selectVersionStatus);
-      const project = yield effects.select(selectors.selectCurrentProject);
-      const nodes = yield ContensisDeliveryApi.deliveryApi.getClient(deliveryApiVersionStatus, project).nodes.getRoot({
-        depth: action.treeDepth || 0,
-        language: action.language
-      });
+    if (!version.hasNavigationTree(state)) {
+      const nodes = yield api.getRootNode({
+        depth: treeDepth || 0,
+        language
+      }, versionStatus, project);
       if (nodes) {
         yield effects.put({
-          type: version.SET_NODE_TREE,
+          type: store.SET_NODE_TREE,
           nodes
         });
       } else {
         yield effects.put({
-          type: version.GET_NODE_TREE_ERROR
+          type: store.GET_NODE_TREE_ERROR
         });
       }
     }
   } catch (ex) {
     log__namespace.error(...['Error running ensureNodeTreeSaga:', ex]);
     yield effects.put({
-      type: version.GET_NODE_TREE_ERROR,
+      type: store.GET_NODE_TREE_ERROR,
       error: ex.toString()
     });
   }
@@ -108,9 +112,10 @@ const defaultExpressions = versionStatus => {
 };
 const equalToOrIn = (field, arr, operator = 'equalTo') => arr.length === 0 ? [] : arr.length === 1 ? [contensisDeliveryApi.Op[operator](field, arr[0])] : [contensisDeliveryApi.Op.in(field, ...arr)];
 
-const routeEntryByFieldsQuery = (id, language = 'en-GB', fields = [], versionStatus = 'published') => {
+const routeEntryByFieldsQuery = (id, language = 'en-GB', fields = [], fieldLinkDepths, versionStatus = 'published') => {
   const query = new contensisDeliveryApi.Query(...[...fieldExpression('sys.id', id), ...fieldExpression('sys.language', language), ...defaultExpressions(versionStatus)]);
   query.fields = fields;
+  query.fieldLinkDepths = fieldLinkDepths;
   return query;
 };
 
@@ -132,16 +137,18 @@ function* setRouteSaga(action) {
 function* getRouteSaga(action) {
   let entry = null;
   try {
-    var _staticRoute$route, _staticRoute$route$pa, _staticRoute$route2, _staticRoute$route2$p, _pathNode2, _pathNode2$entry, _pathNode2$entry$sys, _pathNode3, _pathNode3$entry, _pathNode3$entry$sys;
+    var _staticRoute$route, _staticRoute$route$pa, _staticRoute$route2, _staticRoute$route2$p, _staticRoute$route3, _staticRoute$route3$p, _appsays, _appsays2, _appsays3, _pathNode2, _pathNode2$entry, _pathNode2$entry$sys, _pathNode3, _pathNode3$entry, _pathNode3$entry$sys;
     const {
       withEvents,
       routes: {
         ContentTypeMappings = {}
       } = {},
       staticRoute,
-      cookies
+      // get api instance from ssr context that is connected to the specific request in ssr
+      ssr: {
+        api
+      }
     } = action;
-    const api = ContensisDeliveryApi.cachedSearchWithCookies(cookies.raw);
 
     // Inject redux { key, reducer, saga } provided by staticRoute
     if (staticRoute && staticRoute.route.injectRedux) yield effects.call(reduxInjectorSaga, staticRoute.route.injectRedux);
@@ -162,23 +169,26 @@ function* getRouteSaga(action) {
     }
     const staticRouteLinkDepth = staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$route = staticRoute.route) === null || _staticRoute$route === void 0 ? void 0 : (_staticRoute$route$pa = _staticRoute$route.params) === null || _staticRoute$route$pa === void 0 ? void 0 : _staticRoute$route$pa.linkDepth;
     const staticRouteFields = staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$route2 = staticRoute.route) === null || _staticRoute$route2 === void 0 ? void 0 : (_staticRoute$route2$p = _staticRoute$route2.params) === null || _staticRoute$route2$p === void 0 ? void 0 : _staticRoute$route2$p.fields;
+    const staticRouteFieldLinkDepths = staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$route3 = staticRoute.route) === null || _staticRoute$route3 === void 0 ? void 0 : (_staticRoute$route3$p = _staticRoute$route3.params) === null || _staticRoute$route3$p === void 0 ? void 0 : _staticRoute$route3$p.fieldLinkDepths;
     const entryLinkDepth = appsays && appsays.entryLinkDepth !== undefined ? appsays.entryLinkDepth : 2;
-    const setContentTypeLimits = (typeof staticRouteLinkDepth === 'undefined' || !staticRouteFields) && !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions);
+    const entryFieldLinkDepths = (_appsays = appsays) === null || _appsays === void 0 ? void 0 : _appsays.entryFieldLinkDepths;
+    const setContentTypeLimits = (typeof staticRouteLinkDepth === 'undefined' || !staticRouteFields) && !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions || ct.fieldLinkDepths);
     const state = yield effects.select();
     const routeEntry = selectors.selectRouteEntry(state, 'js');
     const routeNode = selectors.selectCurrentNode(state, 'js');
     const currentPath = action.path; //selectCurrentPath(state);
-    const deliveryApiStatus = version.selectVersionStatus(state);
+    const deliveryApiStatus = version$1.selectVersionStatus(state);
     const project = selectors.selectCurrentProject(state);
     // const isHome = currentPath === '/';
     const isPreview = currentPath && currentPath.startsWith('/preview/');
     const defaultLang = appsays && appsays.defaultLang || 'en-GB';
-    if (!isPreview && (appsays && appsays.customRouting || staticRoute && !staticRoute.route.fetchNode || routeEntry && action.statePath === action.path && (appsays && appsays.refetchNode) !== true)) {
+    if (!isPreview && ((_appsays2 = appsays) !== null && _appsays2 !== void 0 && _appsays2.customRouting || staticRoute && !staticRoute.route.fetchNode || routeEntry && action.statePath === action.path && ((_appsays3 = appsays) === null || _appsays3 === void 0 ? void 0 : _appsays3.refetchNode) !== true)) {
+      var _staticRoute$route4;
       // To prevent erroneous 404s and wasted network calls, this covers
       // - appsays customRouting and does SET_ENTRY etc. via the consuming app
       // - all staticRoutes (where custom 'route.fetchNode' attribute is falsey)
       // - standard Contensis SiteView Routing where we already have that entry in state
-      if (routeEntry && (!staticRoute || staticRoute.route && staticRoute.route.fetchNode)) {
+      if (routeEntry && (!staticRoute || staticRoute !== null && staticRoute !== void 0 && (_staticRoute$route4 = staticRoute.route) !== null && _staticRoute$route4 !== void 0 && _staticRoute$route4.fetchNode)) {
         pathNode = {
           ...routeNode,
           entry: null
@@ -232,8 +242,9 @@ function* getRouteSaga(action) {
         [nodeError, pathNode] = yield to__default["default"](api.getNode({
           depth: 0,
           path: currentPath,
-          entryFields: setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : staticRouteFields || '*',
-          entryLinkDepth: setContentTypeLimits ? 0 : typeof staticRouteLinkDepth !== 'undefined' ? staticRouteLinkDepth : entryLinkDepth,
+          entryFields: staticRouteFields || (setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : '*'),
+          entryLinkDepth: typeof staticRouteLinkDepth !== 'undefined' ? staticRouteLinkDepth : entryLinkDepth || 0,
+          entryFieldLinkDepths: staticRouteFieldLinkDepths || (!setContentTypeLimits ? entryFieldLinkDepths : undefined),
           language: defaultLang,
           versionStatus: deliveryApiStatus
         }, project));
@@ -270,10 +281,11 @@ function* getRouteSaga(action) {
           // and current node's ordinates at a specified depth with specified fields
           contentTypeMapping = ChangePassword_container.findContentTypeMapping(ContentTypeMappings, pathNode.entry.sys.contentTypeId) || {};
           const {
+            fieldLinkDepths,
             fields,
             linkDepth
           } = contentTypeMapping;
-          const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, fields, deliveryApiStatus);
+          const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, fields, fieldLinkDepths, deliveryApiStatus);
           const payload = yield api.search(query, typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth || 0, project);
           if ((payload === null || payload === void 0 ? void 0 : (_payload$items = payload.items) === null || _payload$items === void 0 ? void 0 : _payload$items.length) > 0) {
             pathNode.entry = entry = payload.items[0];
@@ -322,9 +334,9 @@ function* getRouteSaga(action) {
       if (typeof window !== 'undefined') window.scrollTo(0, 0);
     }
     if ((_pathNode3 = pathNode) !== null && _pathNode3 !== void 0 && (_pathNode3$entry = _pathNode3.entry) !== null && _pathNode3$entry !== void 0 && (_pathNode3$entry$sys = _pathNode3$entry.sys) !== null && _pathNode3$entry$sys !== void 0 && _pathNode3$entry$sys.id) {
-      var _staticRoute$route3, _staticRoute$route3$f, _appsays;
+      var _staticRoute$route5, _staticRoute$route5$f, _appsays4;
       entry = pathNode.entry;
-      yield effects.call(setRouteEntry, currentPath, entry, pathNode, ancestors, siblings, (staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$route3 = staticRoute.route) === null || _staticRoute$route3 === void 0 ? void 0 : (_staticRoute$route3$f = _staticRoute$route3.fetchNode) === null || _staticRoute$route3$f === void 0 ? void 0 : _staticRoute$route3$f.entryMapper) || resolvedContentTypeMapping.entryMapper, false, (_appsays = appsays) === null || _appsays === void 0 ? void 0 : _appsays.refetchNode);
+      yield effects.call(setRouteEntry, currentPath, entry, pathNode, ancestors, siblings, (staticRoute === null || staticRoute === void 0 ? void 0 : (_staticRoute$route5 = staticRoute.route) === null || _staticRoute$route5 === void 0 ? void 0 : (_staticRoute$route5$f = _staticRoute$route5.fetchNode) === null || _staticRoute$route5$f === void 0 ? void 0 : _staticRoute$route5$f.entryMapper) || resolvedContentTypeMapping.entryMapper, false, (_appsays4 = appsays) === null || _appsays4 === void 0 ? void 0 : _appsays4.refetchNode);
     } else {
       if (staticRoute) yield effects.call(setRouteEntry, currentPath, null, pathNode, ancestors, siblings);else yield effects.call(do404);
     }
@@ -333,16 +345,17 @@ function* getRouteSaga(action) {
     yield effects.call(do500, e);
   }
 }
-function* resolveCurrentNodeOrdinates({
-  api,
-  appsays,
-  contentTypeMapping,
-  language,
-  path,
-  pathNode,
-  project,
-  versionStatus
-}) {
+function* resolveCurrentNodeOrdinates(action) {
+  const {
+    api,
+    appsays,
+    contentTypeMapping,
+    language,
+    path,
+    pathNode,
+    project,
+    versionStatus
+  } = action;
   const apiCall = [() => null, () => null, () => null, () => null];
 
   // if appsays customNavigation: true, we will set doNavigation to false
@@ -351,6 +364,7 @@ function* resolveCurrentNodeOrdinates({
   const doNavigation = !appsays || ((appsays === null || appsays === void 0 ? void 0 : appsays.customNavigation) === true ? false : (appsays === null || appsays === void 0 ? void 0 : appsays.customNavigation) || true);
   const {
     entryLinkDepth = 0,
+    fieldLinkDepths,
     fields,
     linkDepth,
     nodeOptions = {}
@@ -372,12 +386,13 @@ function* resolveCurrentNodeOrdinates({
     }
     const childrenDepth = doNavigation === true || doNavigation.children === true ? 1 : doNavigation && doNavigation.children || 0;
     if (typeof (nodeOptions === null || nodeOptions === void 0 ? void 0 : nodeOptions.children) === 'undefined' && childrenDepth > 0 || nodeOptions.children) {
-      const childrenOptions = typeof nodeOptions.children === 'boolean' ? {} : nodeOptions.children;
+      const childrenOptions = !nodeOptions.children || typeof nodeOptions.children === 'boolean' ? {} : nodeOptions.children;
       apiCall[1] = function* getChildren() {
         try {
           return yield api.getNode({
             depth: childrenOptions.depth !== undefined ? childrenOptions.depth : childrenDepth,
             path,
+            entryFieldLinkDepths: childrenOptions.fieldLinkDepths || fieldLinkDepths,
             entryFields: childrenOptions.fields || fields || undefined,
             entryLinkDepth: typeof childrenOptions.linkDepth !== 'undefined' ? childrenOptions.linkDepth : typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth,
             language,
@@ -392,11 +407,12 @@ function* resolveCurrentNodeOrdinates({
     if (typeof (nodeOptions === null || nodeOptions === void 0 ? void 0 : nodeOptions.siblings) === 'undefined' && doNavigation.siblings || nodeOptions.siblings) {
       apiCall[2] = function* getSiblings() {
         try {
-          var _nodeOptions$siblings, _nodeOptions$siblings2;
+          var _nodeOptions$siblings, _nodeOptions$siblings2, _nodeOptions$siblings3;
           return yield api.getSiblings({
             id: pathNode.id,
-            entryFields: (nodeOptions === null || nodeOptions === void 0 ? void 0 : (_nodeOptions$siblings = nodeOptions.siblings) === null || _nodeOptions$siblings === void 0 ? void 0 : _nodeOptions$siblings.fields) || fields || undefined,
-            entryLinkDepth: typeof (nodeOptions === null || nodeOptions === void 0 ? void 0 : (_nodeOptions$siblings2 = nodeOptions.siblings) === null || _nodeOptions$siblings2 === void 0 ? void 0 : _nodeOptions$siblings2.linkDepth) !== 'undefined' ? nodeOptions.siblings.linkDepth : typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth,
+            entryFieldLinkDepths: (nodeOptions === null || nodeOptions === void 0 ? void 0 : (_nodeOptions$siblings = nodeOptions.siblings) === null || _nodeOptions$siblings === void 0 ? void 0 : _nodeOptions$siblings.fieldLinkDepths) || fieldLinkDepths,
+            entryFields: (nodeOptions === null || nodeOptions === void 0 ? void 0 : (_nodeOptions$siblings2 = nodeOptions.siblings) === null || _nodeOptions$siblings2 === void 0 ? void 0 : _nodeOptions$siblings2.fields) || fields || undefined,
+            entryLinkDepth: typeof (nodeOptions === null || nodeOptions === void 0 ? void 0 : (_nodeOptions$siblings3 = nodeOptions.siblings) === null || _nodeOptions$siblings3 === void 0 ? void 0 : _nodeOptions$siblings3.linkDepth) !== 'undefined' ? nodeOptions.siblings.linkDepth : typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth,
             includeInMenu: true,
             language,
             versionStatus
@@ -408,18 +424,18 @@ function* resolveCurrentNodeOrdinates({
       };
     }
   }
-  const isTreeLoaded = yield effects.select(version$1.hasNavigationTree);
+  const isTreeLoaded = yield effects.select(version.hasNavigationTree);
   if (!isTreeLoaded && (doNavigation === true || doNavigation.tree)) apiCall[3] = function* getNodeTree() {
     const treeDepth = doNavigation === true || !doNavigation.tree || doNavigation.tree === true ? 2 : doNavigation.tree;
     if (typeof window !== 'undefined') {
       return yield effects.put({
-        type: version.GET_NODE_TREE,
-        language,
+        type: store.GET_NODE_TREE,
+        ...action,
         treeDepth
       });
     } else {
       return yield effects.call(ensureNodeTreeSaga, {
-        language,
+        ...action,
         treeDepth
       });
     }
@@ -507,7 +523,7 @@ function* reduxInjectorSaga(injectorFn) {
       reducer,
       saga
     } = yield injectorFn();
-    version$1.injectRedux({
+    version.injectRedux({
       key,
       reducer,
       saga
@@ -515,7 +531,7 @@ function* reduxInjectorSaga(injectorFn) {
   }
 }
 
-const registerSagas = [effects.takeEvery(reducers.REGISTER_USER, registerSaga), effects.takeEvery(reducers.REGISTER_USER_SUCCESS, redirectSaga)];
+const registerSagas = [effects.takeEvery(selectors.REGISTER_USER, registerSaga), effects.takeEvery(selectors.REGISTER_USER_SUCCESS, redirectSaga)];
 function* registerSaga({
   user,
   mappers
@@ -547,13 +563,13 @@ function* registerSaga({
       }
       // Update user object with mappedResponse or responseBody
       yield effects.put({
-        type: reducers.REGISTER_USER_SUCCESS,
+        type: selectors.REGISTER_USER_SUCCESS,
         user: mappedResponse || responseBody
       });
     } else {
       // OK response but unable to parse the response body
       yield effects.put({
-        type: reducers.REGISTER_USER_FAILED,
+        type: selectors.REGISTER_USER_FAILED,
         error: {
           message: 'Unable to parse the created user from the register service response'
         }
@@ -571,7 +587,7 @@ function* registerSaga({
       error.status = response.status;
     }
     yield effects.put({
-      type: reducers.REGISTER_USER_FAILED,
+      type: selectors.REGISTER_USER_FAILED,
       error
     });
   }
@@ -650,11 +666,11 @@ async function api(url, options) {
   });
 }
 
-const resetPasswordSagas = [effects.takeEvery(reducers.REQUEST_USER_PASSWORD_RESET, requestPasswordResetSaga), effects.takeEvery(reducers.RESET_USER_PASSWORD, resetPasswordSaga), effects.takeEvery(reducers.CHANGE_USER_PASSWORD, changePasswordSaga)];
+const resetPasswordSagas = [effects.takeEvery(selectors.REQUEST_USER_PASSWORD_RESET, requestPasswordResetSaga), effects.takeEvery(selectors.RESET_USER_PASSWORD, resetPasswordSaga), effects.takeEvery(selectors.CHANGE_USER_PASSWORD, changePasswordSaga)];
 function* requestPasswordResetSaga(action) {
   const userEmailObject = action.userEmailObject;
   yield effects.put({
-    type: reducers.REQUEST_USER_PASSWORD_RESET_SENDING
+    type: selectors.REQUEST_USER_PASSWORD_RESET_SENDING
   });
   if (userEmailObject && userEmailObject.userEmail) {
     try {
@@ -662,29 +678,29 @@ function* requestPasswordResetSaga(action) {
       if (passwordResetRequestResponse) {
         if (!passwordResetRequestResponse.error) {
           yield effects.put({
-            type: reducers.REQUEST_USER_PASSWORD_RESET_SUCCESS
+            type: selectors.REQUEST_USER_PASSWORD_RESET_SUCCESS
           });
         } else {
           yield effects.put({
-            type: reducers.REQUEST_USER_PASSWORD_RESET_ERROR,
+            type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
             error: passwordResetRequestResponse.error.message
           });
         }
       } else {
         yield effects.put({
-          type: reducers.REQUEST_USER_PASSWORD_RESET_ERROR,
+          type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
           error: 'No response from server'
         });
       }
     } catch (error) {
       yield effects.put({
-        type: reducers.REQUEST_USER_PASSWORD_RESET_ERROR,
+        type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
         error: error && error.toString()
       });
     }
   } else {
     yield effects.put({
-      type: reducers.REQUEST_USER_PASSWORD_RESET_ERROR,
+      type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
       error: 'Invalid object'
     });
   }
@@ -692,7 +708,7 @@ function* requestPasswordResetSaga(action) {
 function* resetPasswordSaga(action) {
   const resetPasswordObject = action.resetPasswordObject;
   yield effects.put({
-    type: reducers.RESET_USER_PASSWORD_SENDING
+    type: selectors.RESET_USER_PASSWORD_SENDING
   });
   if (resetPasswordObject.token && resetPasswordObject.password) {
     try {
@@ -700,30 +716,30 @@ function* resetPasswordSaga(action) {
       if (resetPasswordResponse) {
         if (!resetPasswordResponse.error) {
           yield effects.put({
-            type: reducers.RESET_USER_PASSWORD_SUCCESS
+            type: selectors.RESET_USER_PASSWORD_SUCCESS
           });
         } else {
           const error = resetPasswordResponse.error.data && resetPasswordResponse.error.data.length > 0 && resetPasswordResponse.error.data[0].message || resetPasswordResponse.error.message;
           yield effects.put({
-            type: reducers.RESET_USER_PASSWORD_ERROR,
+            type: selectors.RESET_USER_PASSWORD_ERROR,
             error
           });
         }
       } else {
         yield effects.put({
-          type: reducers.RESET_USER_PASSWORD_ERROR,
+          type: selectors.RESET_USER_PASSWORD_ERROR,
           error: 'No response from server'
         });
       }
     } catch (error) {
       yield effects.put({
-        type: reducers.RESET_USER_PASSWORD_ERROR,
+        type: selectors.RESET_USER_PASSWORD_ERROR,
         error: error && error.toString()
       });
     }
   } else {
     yield effects.put({
-      type: reducers.RESET_USER_PASSWORD_ERROR,
+      type: selectors.RESET_USER_PASSWORD_ERROR,
       error: 'Invalid object'
     });
   }
@@ -735,7 +751,7 @@ function* resetPasswordSaga(action) {
 function* changePasswordSaga(action) {
   if (!action || !action.userId || !action.currentPassword || !action.newPassword) {
     yield effects.put({
-      type: reducers.CHANGE_USER_PASSWORD_ERROR,
+      type: selectors.CHANGE_USER_PASSWORD_ERROR,
       error: 'Invalid action object sent to changePassword saga'
     });
     return;
@@ -747,7 +763,7 @@ function* changePasswordSaga(action) {
       new: action.newPassword
     };
     yield effects.put({
-      type: reducers.CHANGE_USER_PASSWORD_SENDING
+      type: selectors.CHANGE_USER_PASSWORD_SENDING
     });
     const clientCredentials = yield effects.select(ToJs.selectClientCredentials, 'js');
     const client = yield ChangePassword_container.getManagementApiClient({
@@ -758,7 +774,7 @@ function* changePasswordSaga(action) {
       var _err$data, _err$data$data, _err$data2;
       const error = (err === null || err === void 0 ? void 0 : (_err$data = err.data) === null || _err$data === void 0 ? void 0 : (_err$data$data = _err$data.data) === null || _err$data$data === void 0 ? void 0 : _err$data$data.length) > 0 && err.data.data[0].message || (err === null || err === void 0 ? void 0 : (_err$data2 = err.data) === null || _err$data2 === void 0 ? void 0 : _err$data2.message);
       yield effects.put({
-        type: reducers.CHANGE_USER_PASSWORD_ERROR,
+        type: selectors.CHANGE_USER_PASSWORD_ERROR,
         error
       });
       return;
@@ -769,11 +785,11 @@ function* changePasswordSaga(action) {
     // // eslint-disable-next-line no-console
     // console.log(userCredentialsObject);
     yield effects.put({
-      type: reducers.CHANGE_USER_PASSWORD_SUCCESS
+      type: selectors.CHANGE_USER_PASSWORD_SUCCESS
     });
   } catch (error) {
     yield effects.put({
-      type: reducers.CHANGE_USER_PASSWORD_ERROR,
+      type: selectors.CHANGE_USER_PASSWORD_ERROR,
       error: error && error.toString()
     });
   }
@@ -837,4 +853,4 @@ exports.browserHistory = browserHistory;
 exports.history = history;
 exports.pickProject = pickProject;
 exports.rootSaga = rootSaga;
-//# sourceMappingURL=App-4c9e6d1b.js.map
+//# sourceMappingURL=App-8a2f85d5.js.map