@zengenti/contensis-react-base 4.0.0-beta.2 → 4.0.0-beta.4

package/esm/{App-83107d7e.js → App-CIlf4cl4.js}

@@ -1,40 +1,43 @@
 import { createBrowserHistory, createMemoryHistory } from 'history';
 import { takeEvery, select, put, call, all } from '@redux-saga/core/effects';
 import * as log from 'loglevel';
-import { d as deliveryApi, a as cachedSearchWithCookies } from './ContensisDeliveryApi-fe57a037.js';
-import { G as GET_NODE_TREE, s as selectVersionStatus, S as SET_NODE_TREE, a as GET_NODE_TREE_ERROR } from './version-3d9911e2.js';
-import { h as hasNavigationTree, i as injectRedux } from './version-9f29becb.js';
-import { b as selectCurrentProject, S as SET_NAVIGATION_PATH, d as SET_ROUTE, a as selectRouteEntry, e as selectCurrentNode, U as UPDATE_LOADING_STATE, f as selectCurrentAncestors, h as selectCurrentSiblings, i as selectRouteEntryEntryId, j as selectRouteEntryLanguage, k as selectMappedEntry, l as SET_ENTRY, m as SET_ANCESTORS, n as SET_SIBLINGS, q as queryParams, o as selectCurrentSearch, p as setRoute } from './selectors-691caf02.js';
+import { G as GET_NODE_TREE, b as SET_NODE_TREE, d as GET_NODE_TREE_ERROR } from './store-v2gyr6u2.js';
+import { h as hasNavigationTree, i as injectRedux } from './version-DvjTUbcA.js';
 import to, { to as to$1 } from 'await-to-js';
-import { h as handleRequiresLoginSaga, L as LoginHelper, f as findContentTypeMapping, g as getManagementApiClient, l as loginSagas } from './ChangePassword.container-76fd5e9b.js';
+import { y as SET_NAVIGATION_PATH, x as SET_ROUTE, j as selectRouteEntry, C as selectCurrentNode, f as selectCurrentProject, z as UPDATE_LOADING_STATE, D as selectCurrentAncestors, E as selectCurrentSiblings, F as selectRouteEntryEntryId, G as selectRouteEntryLanguage, n as selectMappedEntry, A as SET_ENTRY, B as SET_ANCESTORS, w as SET_SIBLINGS, R as REGISTER_USER, H as REGISTER_USER_SUCCESS, I as REGISTER_USER_FAILED, J as queryParams, K as selectCurrentSearch, L as setRoute, M as REQUEST_USER_PASSWORD_RESET, N as RESET_USER_PASSWORD, O as CHANGE_USER_PASSWORD, P as REQUEST_USER_PASSWORD_RESET_SENDING, Q as REQUEST_USER_PASSWORD_RESET_SUCCESS, T as REQUEST_USER_PASSWORD_RESET_ERROR, V as RESET_USER_PASSWORD_SENDING, W as RESET_USER_PASSWORD_SUCCESS, X as RESET_USER_PASSWORD_ERROR, Y as CHANGE_USER_PASSWORD_ERROR, Z as CHANGE_USER_PASSWORD_SENDING, _ as CHANGE_USER_PASSWORD_SUCCESS } from './selectors-CBdCY0u3.js';
+import { s as selectVersionStatus } from './version-D773TD9j.js';
+import { h as handleRequiresLoginSaga, L as LoginHelper, i as findContentTypeMapping, j as getManagementApiClient, k as loginSagas } from './ChangePassword.container-C0tFq0Tf.js';
 import React from 'react';
 import 'react-cookie';
 import 'react-redux';
 import 'jsonpath-mapper';
-import { R as REGISTER_USER, a as REGISTER_USER_SUCCESS, b as REGISTER_USER_FAILED, c as REQUEST_USER_PASSWORD_RESET, d as RESET_USER_PASSWORD, C as CHANGE_USER_PASSWORD, e as REQUEST_USER_PASSWORD_RESET_SENDING, f as REQUEST_USER_PASSWORD_RESET_SUCCESS, g as REQUEST_USER_PASSWORD_RESET_ERROR, h as RESET_USER_PASSWORD_SENDING, i as RESET_USER_PASSWORD_SUCCESS, j as RESET_USER_PASSWORD_ERROR, k as CHANGE_USER_PASSWORD_ERROR, l as CHANGE_USER_PASSWORD_SENDING, m as CHANGE_USER_PASSWORD_SUCCESS } from './reducers-aa8cef1e.js';
 import { Op, Query } from 'contensis-delivery-api';
-import { s as selectClientCredentials } from './ToJs-df57f31d.js';
+import { l as selectClientCredentials } from './ToJs-CpPNdcXS.js';
 import 'query-string';
 import 'react-router-dom';
-import { R as RouteLoader } from './RouteLoader-29fd689a.js';
+import { a as RouteLoader } from './RouteLoader-D7HmVx5l.js';
 
+// Create a history depending on the environment
 const selectedHistory = typeof window !== 'undefined' ? createBrowserHistory : createMemoryHistory;
 const history = (options = {}) => selectedHistory(options);
 const browserHistory = selectedHistory();
 
 const navigationSagas = [takeEvery(GET_NODE_TREE, ensureNodeTreeSaga)];
 function* ensureNodeTreeSaga(action) {
+  const {
+    api,
+    language,
+    project,
+    versionStatus,
+    treeDepth
+  } = action;
   const state = yield select();
-
   try {
     if (!hasNavigationTree(state)) {
-      const deliveryApiVersionStatus = yield select(selectVersionStatus);
-      const project = yield select(selectCurrentProject);
-      const nodes = yield deliveryApi.getClient(deliveryApiVersionStatus, project).nodes.getRoot({
-        depth: action.treeDepth || 0,
-        language: action.language
-      });
-
+      const nodes = yield api.getRootNode({
+        depth: treeDepth || 0,
+        language
+      }, versionStatus, project);
       if (nodes) {
         yield put({
           type: SET_NODE_TREE,
@@ -56,23 +59,10 @@ function* ensureNodeTreeSaga(action) {
 }
 
 const sys = {
-  contentTypeId: 'sys.contentTypeId',
-  dataFormat: 'sys.dataFormat',
-  filename: 'sys.properties.filename',
-  id: 'sys.id',
-  includeInSearch: 'sys.metadata.includeInSearch',
-  slug: 'sys.slug',
-  uri: 'sys.uri',
   versionStatus: 'sys.versionStatus'
 };
 const Fields = {
-  entryTitle: 'entryTitle',
-  entryDescription: 'entryDescription',
-  keywords: 'keywords',
-  sys,
-  contentTypeId: 'sys.contentTypeId',
-  wildcard: '*'
-};
+  sys};
 
 const fieldExpression = (field, value, operator = 'equalTo', weight = null) => {
   if (!field || !value) return [];
@@ -81,21 +71,21 @@ const fieldExpression = (field, value, operator = 'equalTo', weight = null) => {
 const defaultExpressions = versionStatus => {
   return [Op.equalTo(Fields.sys.versionStatus, versionStatus)];
 };
-
 const equalToOrIn = (field, arr, operator = 'equalTo') => arr.length === 0 ? [] : arr.length === 1 ? [Op[operator](field, arr[0])] : [Op.in(field, ...arr)];
 
-const routeEntryByFieldsQuery = (id, language = 'en-GB', fields = [], versionStatus = 'published') => {
-  const query = new Query(...[...fieldExpression('sys.id', id), ...fieldExpression('sys.language', language), ...defaultExpressions(versionStatus)]);
+const routeEntryByFieldsQuery = (id, language = 'en-GB', contentTypeId = '', fields = [], fieldLinkDepths, versionStatus = 'published') => {
+  const query = new Query(...[...fieldExpression('sys.id', id), ...fieldExpression('sys.language', language), ...(contentTypeId ? fieldExpression('sys.contentTypeId', contentTypeId) : fieldExpression('sys.dataFormat', 'entry')), ...defaultExpressions(versionStatus)]);
   query.fields = fields;
+  query.fieldLinkDepths = fieldLinkDepths;
   return query;
 };
 
 const routingSagas = [takeEvery(SET_NAVIGATION_PATH, getRouteSaga), takeEvery(SET_ROUTE, setRouteSaga)];
+
 /**
  * To navigate / push a specific route via redux middleware
  * @param {path, state} action
  */
-
 function* setRouteSaga(action) {
   yield put({
     type: 'CALL_HISTORY_METHOD',
@@ -105,87 +95,97 @@ 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$route2, _staticRoute$route3, _staticRoute$route4, _appsays, _appsays2, _appsays3, _pathNode3, _pathNode4;
     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 = cachedSearchWithCookies(cookies.raw); // Inject redux { key, reducer, saga } provided by staticRoute
 
-    if (staticRoute && staticRoute.route.injectRedux) yield call(reduxInjectorSaga, staticRoute.route.injectRedux); // Variables we will pass to setRouteEntry
+    // Inject redux { key, reducer, saga } provided by staticRoute
+    if (staticRoute && staticRoute.route.injectRedux) yield call(reduxInjectorSaga, staticRoute.route.injectRedux);
 
+    // Variables we will pass to setRouteEntry
     let pathNode = null,
-        ancestors = null,
-        children = [],
-        siblings = null;
-    let contentTypeMapping = {}; // These variables are the return values from
-    // calls to withEvents.onRouteLoad and onRouteLoaded
+      ancestors = null,
+      children = [],
+      siblings = null;
+    let contentTypeMapping = {};
 
+    // These variables are the return values from
+    // calls to withEvents.onRouteLoad and onRouteLoaded
     let appsays,
-        requireLogin = false;
-
+      requireLogin = false;
     if (withEvents && withEvents.onRouteLoad) {
       appsays = yield withEvents.onRouteLoad(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;
+    // We could improve this further with a reusable mapper
+    // function to return these params given a static route
+    // or matching a content type mapping we could call at various points
+    // enabling us to mix and match and prioritise inputs if there are multiple
+    let linkDepth = staticRoute === null || staticRoute === void 0 || (_staticRoute$route = staticRoute.route) === null || _staticRoute$route === void 0 || (_staticRoute$route = _staticRoute$route.fetchNode) === null || _staticRoute$route === void 0 ? void 0 : _staticRoute$route.linkDepth;
+    let fields = staticRoute === null || staticRoute === void 0 || (_staticRoute$route2 = staticRoute.route) === null || _staticRoute$route2 === void 0 || (_staticRoute$route2 = _staticRoute$route2.fetchNode) === null || _staticRoute$route2 === void 0 ? void 0 : _staticRoute$route2.fields;
+    let fieldLinkDepths = staticRoute === null || staticRoute === void 0 || (_staticRoute$route3 = staticRoute.route) === null || _staticRoute$route3 === void 0 || (_staticRoute$route3 = _staticRoute$route3.fetchNode) === null || _staticRoute$route3 === void 0 ? void 0 : _staticRoute$route3.fieldLinkDepths;
+    let entryMapper = staticRoute === null || staticRoute === void 0 || (_staticRoute$route4 = staticRoute.route) === null || _staticRoute$route4 === void 0 || (_staticRoute$route4 = _staticRoute$route4.fetchNode) === null || _staticRoute$route4 === void 0 ? void 0 : _staticRoute$route4.entryMapper;
     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 setStaticRouteLimits = typeof linkDepth !== 'undefined' || fields || fieldLinkDepths;
+    const setContentTypeLimits = !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions || ct.fieldLinkDepths);
     const state = yield select();
     const routeEntry = selectRouteEntry(state, 'js');
     const routeNode = selectCurrentNode(state, 'js');
     const currentPath = action.path; //selectCurrentPath(state);
-
     const deliveryApiStatus = selectVersionStatus(state);
-    const project = selectCurrentProject(state); // const isHome = currentPath === '/';
-
+    const project = 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$route5;
       // 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)) {
-        pathNode = { ...routeNode,
+      if (routeEntry && (!staticRoute || staticRoute !== null && staticRoute !== void 0 && (_staticRoute$route5 = staticRoute.route) !== null && _staticRoute$route5 !== void 0 && _staticRoute$route5.fetchNode)) {
+        pathNode = {
+          ...routeNode,
           entry: null
         };
-        pathNode.entry = entry = routeEntry; //Do nothing, the entry is allready the right one.
+        pathNode.entry = entry = routeEntry;
+        //Do nothing, the entry is allready the right one.
         // yield put({
         //   type: SET_ENTRY,
         //   entry,
         //   node: routeNode,
         //   isLoading: false,
         // });
-
         yield put({
           type: UPDATE_LOADING_STATE,
           isLoading: false
         });
       } else yield call(setRouteEntry, currentPath, routeEntry, yield select(selectCurrentNode), yield select(selectCurrentAncestors), yield select(selectCurrentSiblings));
     } else {
+      var _staticRoute$route6;
       // Handle preview routes
       if (isPreview) {
         let splitPath = currentPath.split('/');
         let entryGuid = splitPath[2];
         let language = defaultLang;
-
         if (splitPath.length >= 3) {
           //set lang key if available in the path, else use default lang
           //assumes preview url on content type is: http://preview.ALIAS.contensis.cloud/preview/{GUID}/{LANG}
-          if (splitPath.length == 4) language = splitPath[3]; // According to product dev we cannot use Node API
+          if (splitPath.length == 4) language = splitPath[3];
+          // According to product dev we cannot use Node API
           // for previewing entries as it gives a response of []
           // -- apparently it is not correct to request latest content
           // with Node API
@@ -195,7 +195,6 @@ function* getRouteSaga(action) {
             language,
             linkDepth: entryLinkDepth
           });
-
           if (previewEntry) {
             pathNode = {
               entry: previewEntry
@@ -206,29 +205,30 @@ function* getRouteSaga(action) {
           }
         }
       } else {
-        var _pathNode, _pathNode$entry, _pathNode$entry$sys;
-
+        var _pathNode, _pathNode2;
         // Handle all other routes
         let nodeError = undefined;
+        // Resolve a stub of route node if we are setting limits in content type mappings
+        // Resolve the complete entry with the node if we are setting limits in a static route
         [nodeError, pathNode] = yield to(api.getNode({
           depth: 0,
           path: currentPath,
-          entryFields: setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : staticRouteFields || '*',
-          entryLinkDepth: setContentTypeLimits ? 0 : typeof staticRouteLinkDepth !== 'undefined' ? staticRouteLinkDepth : entryLinkDepth,
+          entryFields: setStaticRouteLimits ? fields || '*' : setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : '*',
+          entryLinkDepth: setStaticRouteLimits && typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth || 0,
+          entryFieldLinkDepths: setStaticRouteLimits ? fieldLinkDepths : setContentTypeLimits ? undefined : entryFieldLinkDepths,
           language: defaultLang,
           versionStatus: deliveryApiStatus
         }, project));
-
         if (nodeError) {
           if ([401, 403].includes(nodeError.status)) {
             // Capture specific auth errors with the delivery api
             // and fire the user down the handleRequiresLoginSaga
             // If auth was successful via a refreshToken we need to reload the page
             // to run this getRouteSaga again with the security token cookie
-            const userLoggedIn = yield call(handleRequiresLoginSaga, { ...action,
+            const userLoggedIn = yield call(handleRequiresLoginSaga, {
+              ...action,
               requireLogin: true
             });
-
             if (userLoggedIn && nodeError.status === 401) {
               // Reload the route so we can re-run the routing request now the
               // authentication cookies are written
@@ -247,31 +247,41 @@ function* getRouteSaga(action) {
           entry
         } = pathNode || {});
 
-        if (setContentTypeLimits && (_pathNode = pathNode) !== null && _pathNode !== void 0 && (_pathNode$entry = _pathNode.entry) !== null && _pathNode$entry !== void 0 && (_pathNode$entry$sys = _pathNode$entry.sys) !== null && _pathNode$entry$sys !== void 0 && _pathNode$entry$sys.id) {
-          var _payload$items;
-
+        // Try resolve a content type mapping
+        if ((_pathNode = pathNode) !== null && _pathNode !== void 0 && (_pathNode = _pathNode.entry) !== null && _pathNode !== void 0 && (_pathNode = _pathNode.sys) !== null && _pathNode !== void 0 && _pathNode.id && pathNode.entry.sys.contentTypeId) {
           // Get fields[] and linkDepth from ContentTypeMapping to get the entry data
           // and current node's ordinates at a specified depth with specified fields
-          contentTypeMapping = findContentTypeMapping(ContentTypeMappings, pathNode.entry.sys.contentTypeId) || {};
-          const {
+          contentTypeMapping = findContentTypeMapping(ContentTypeMappings, pathNode.entry.sys.contentTypeId);
+        }
+
+        // Run a second search query if we aren't setting limits from a static route
+        // but we are setting limits from a content type mapping, now we have a handle
+        // on a contentTypeId from the resolve node, we can apply the right limits when
+        // fetching the entry
+        if (!setStaticRouteLimits && setContentTypeLimits && (_pathNode2 = pathNode) !== null && _pathNode2 !== void 0 && (_pathNode2 = _pathNode2.entry) !== null && _pathNode2 !== void 0 && (_pathNode2 = _pathNode2.sys) !== null && _pathNode2 !== void 0 && _pathNode2.id) {
+          var _payload$items;
+          // Now we have a handle on a content type mapping we can
+          // reassign the query limiting variables if we haven't
+          // already set them in a static route
+          if (!setStaticRouteLimits) ({
+            fieldLinkDepths,
             fields,
             linkDepth
-          } = contentTypeMapping;
-          const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, fields, deliveryApiStatus);
+          } = contentTypeMapping || {});
+          const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, pathNode.entry.sys.contentTypeId, 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) {
+          if ((payload === null || payload === void 0 || (_payload$items = payload.items) === null || _payload$items === void 0 ? void 0 : _payload$items.length) > 0) {
             pathNode.entry = entry = payload.items[0];
           }
         }
-      } // make calls to fetch node ancestors, children,
-      // siblings or entire node tree
-
+      }
 
+      // make calls to fetch node ancestors, children,
+      // siblings or entire node tree
       [ancestors, children, siblings] = yield call(resolveCurrentNodeOrdinates, {
         api,
         appsays,
-        contentTypeMapping,
+        contentTypeMapping: contentTypeMapping || (staticRoute === null || staticRoute === void 0 || (_staticRoute$route6 = staticRoute.route) === null || _staticRoute$route6 === void 0 ? void 0 : _staticRoute$route6.fetchNode) || {},
         language: defaultLang,
         path: currentPath,
         pathNode,
@@ -280,39 +290,36 @@ function* getRouteSaga(action) {
       });
       if (children) pathNode.children = children;
     }
+    const resolvedContentTypeMapping = findContentTypeMapping(ContentTypeMappings, (_pathNode3 = pathNode) === null || _pathNode3 === void 0 || (_pathNode3 = _pathNode3.entry) === null || _pathNode3 === void 0 || (_pathNode3 = _pathNode3.sys) === null || _pathNode3 === void 0 ? void 0 : _pathNode3.contentTypeId) || {};
 
-    const resolvedContentTypeMapping = findContentTypeMapping(ContentTypeMappings, (_pathNode2 = pathNode) === null || _pathNode2 === void 0 ? void 0 : (_pathNode2$entry = _pathNode2.entry) === null || _pathNode2$entry === void 0 ? void 0 : (_pathNode2$entry$sys = _pathNode2$entry.sys) === null || _pathNode2$entry$sys === void 0 ? void 0 : _pathNode2$entry$sys.contentTypeId) || {}; // Inject redux { key, reducer, saga } provided by ContentTypeMapping
-
+    // Inject redux { key, reducer, saga } provided by ContentTypeMapping
     if (resolvedContentTypeMapping.injectRedux) yield call(reduxInjectorSaga, resolvedContentTypeMapping.injectRedux);
-
     if (withEvents && withEvents.onRouteLoaded) {
       // Check if the app has provided a requireLogin boolean flag or groups array
       // in addition to checking if requireLogin is set in the route definition
       ({
         requireLogin
-      } = (yield withEvents.onRouteLoaded({ ...action,
+      } = (yield withEvents.onRouteLoaded({
+        ...action,
         entry
       })) || {});
     }
-
     if (requireLogin !== false) {
       // Do not call the login feature saga if requireLogin is false
-      yield call(handleRequiresLoginSaga, { ...action,
+      yield call(handleRequiresLoginSaga, {
+        ...action,
         entry,
         requireLogin
       });
     }
-
     if (!appsays || !appsays.preventScrollTop) {
       // Scroll into View
       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;
-
+    if ((_pathNode4 = pathNode) !== null && _pathNode4 !== void 0 && (_pathNode4 = _pathNode4.entry) !== null && _pathNode4 !== void 0 && (_pathNode4 = _pathNode4.sys) !== null && _pathNode4 !== void 0 && _pathNode4.id) {
+      var _appsays4;
       entry = pathNode.entry;
-      yield 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 call(setRouteEntry, currentPath, entry, pathNode, ancestors, siblings, entryMapper || resolvedContentTypeMapping.entryMapper, false, (_appsays4 = appsays) === null || _appsays4 === void 0 ? void 0 : _appsays4.refetchNode);
     } else {
       if (staticRoute) yield call(setRouteEntry, currentPath, null, pathNode, ancestors, siblings);else yield call(do404);
     }
@@ -321,29 +328,30 @@ function* getRouteSaga(action) {
     yield call(do500, e);
   }
 }
-
-function* resolveCurrentNodeOrdinates({
-  api,
-  appsays,
-  contentTypeMapping,
-  language,
-  path,
-  pathNode,
-  project,
-  versionStatus
-}) {
-  const apiCall = [() => null, () => null, () => null, () => null]; // if appsays customNavigation: true, we will set doNavigation to false
+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
   // if appsays customNavigation: { ... }, we will set doNavigation to the customNavigation object and check for child elements
   // if appsays nothing we will set doNavigation to true and continue to do navigation calls
-
   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 = {}
   } = contentTypeMapping;
-
   if (pathNode && pathNode.id) {
     if (doNavigation === true || doNavigation.ancestors) {
       apiCall[0] = function* getAncestors() {
@@ -359,17 +367,15 @@ 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,
@@ -381,16 +387,15 @@ 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 || (_nodeOptions$siblings = nodeOptions.siblings) === null || _nodeOptions$siblings === void 0 ? void 0 : _nodeOptions$siblings.fieldLinkDepths) || fieldLinkDepths,
+            entryFields: (nodeOptions === null || nodeOptions === 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 || (_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
@@ -402,20 +407,18 @@ function* resolveCurrentNodeOrdinates({
       };
     }
   }
-
   const isTreeLoaded = yield select(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 put({
         type: GET_NODE_TREE,
-        language,
+        ...action,
         treeDepth
       });
     } else {
       return yield call(ensureNodeTreeSaga, {
-        language,
+        ...action,
         treeDepth
       });
     }
@@ -424,15 +427,16 @@ function* resolveCurrentNodeOrdinates({
   const [ancestors, nodeWithChildren, siblings] = yield all([loadAncestors(), loadChildren(), loadSiblings(), loadTree()]);
   return [ancestors, nodeWithChildren === null || nodeWithChildren === void 0 ? void 0 : nodeWithChildren.children, siblings];
 }
-
 function* setRouteEntry(currentPath, entry, node, ancestors, siblings, entryMapper, notFound = false, remapEntry = false) {
-  const entrySys = entry && entry.sys || {}; // Update a window global to provide the preview toolbar
-  // an updated entry id in client-side navigation
+  const entrySys = entry && entry.sys || {};
 
+  // Update a window global to provide the preview toolbar
+  // an updated entry id in client-side navigation
   if (typeof window !== 'undefined') window.ContensisEntryId = entrySys.id;
   const currentEntryId = yield select(selectRouteEntryEntryId);
   const currentEntryLang = yield select(selectRouteEntryLanguage);
-  const mappedEntry = currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (yield select(selectMappedEntry, 'js')) || {} : yield mapRouteEntry(entryMapper, { ...node,
+  const mappedEntry = !entryMapper ? null : currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (yield select(selectMappedEntry, 'js')) || {} : yield mapRouteEntry(entryMapper, {
+    ...node,
     entry,
     ancestors,
     siblings
@@ -453,7 +457,6 @@ function* setRouteEntry(currentPath, entry, node, ancestors, siblings, entryMapp
     siblings
   })]);
 }
-
 function* mapRouteEntry(entryMapper, node) {
   try {
     if (typeof entryMapper === 'function') {
@@ -463,11 +466,10 @@ function* mapRouteEntry(entryMapper, node) {
     }
   } catch (e) {
     log.error(...['Error running entryMapper:', e, e.stack]);
+    throw e;
   }
-
   return;
 }
-
 function* do404() {
   yield call(clientReloadHitServer);
   yield put({
@@ -477,17 +479,16 @@ function* do404() {
     notFound: true
   });
 }
-
 function* clientReloadHitServer() {
-  const stateEntry = yield select(selectRouteEntry); // If in client and there is a stateEntry.sys field reload the page,
+  const stateEntry = yield select(selectRouteEntry);
+
+  // If in client and there is a stateEntry.sys field reload the page,
   // on the 2nd load stateEntry.sys should be null at this point,
   // we do not wish to reload again and get stuck in an infinite reloading loop
-
   if (typeof window !== 'undefined' && (stateEntry !== null && stateEntry !== void 0 && stateEntry.sys || null)) {
     window.location.reload();
   }
 }
-
 function* do500(error) {
   yield put({
     type: SET_ENTRY,
@@ -499,7 +500,6 @@ function* do500(error) {
     statusCode: error && error.status ? error.status : 500
   });
 }
-
 function* reduxInjectorSaga(injectorFn) {
   if (typeof injectorFn === 'function') {
     const {
@@ -516,19 +516,18 @@ function* reduxInjectorSaga(injectorFn) {
 }
 
 const registerSagas = [takeEvery(REGISTER_USER, registerSaga), takeEvery(REGISTER_USER_SUCCESS, redirectSaga)];
-
 function* registerSaga({
   user,
   mappers
 }) {
-  let requestBody = user; // Allow use of request mapper to take a user object
+  let requestBody = user;
+  // Allow use of request mapper to take a user object
   // of any format and return the payload for the api request
-
   if (mappers && mappers.request && typeof mappers.request === 'function') {
     requestBody = yield mappers.request(user);
-  } // Make POST call to register API
-
+  }
 
+  // Make POST call to register API
   const response = yield fetch('/account/register', {
     method: 'POST',
     headers: {
@@ -537,19 +536,16 @@ function* registerSaga({
     },
     body: JSON.stringify(requestBody)
   });
-
   if (response.ok) {
     let mappedResponse;
     const [, responseBody] = yield to$1(response.json());
-
     if (responseBody) {
       // Allow use of response mapper to convert the successful user object
       // from the api response body into a user object of any format
       if (mappers && mappers.response && typeof mappers.response === 'function') {
         mappedResponse = yield mappers.response(responseBody);
-      } // Update user object with mappedResponse or responseBody
-
-
+      }
+      // Update user object with mappedResponse or responseBody
       yield put({
         type: REGISTER_USER_SUCCESS,
         user: mappedResponse || responseBody
@@ -568,25 +564,24 @@ function* registerSaga({
     // or status codes echoed from the responses received from
     // management api when registering the user
     const [, errorResponse] = yield to$1(response.json());
-    const error = errorResponse && errorResponse.error || errorResponse || {}; // Get something meaningful from the response if there is no message in the body
-
+    const error = errorResponse && errorResponse.error || errorResponse || {};
+    // Get something meaningful from the response if there is no message in the body
     if (!error.message) {
       error.message = `Registration service: ${response.statusText}`;
       error.status = response.status;
     }
-
     yield put({
       type: REGISTER_USER_FAILED,
       error
     });
   }
 }
-
 function* redirectSaga() {
   // Check if querystring contains a redirect_uri
   const currentQs = queryParams(yield select(selectCurrentSearch));
-  const redirectUri = currentQs.redirect_uri || currentQs.redirect; // We must use redux based navigation to preserve the registration state
+  const redirectUri = currentQs.redirect_uri || currentQs.redirect;
 
+  // We must use redux based navigation to preserve the registration state
   if (redirectUri) yield put(setRoute(redirectUri));
 }
 
@@ -604,36 +599,36 @@ const BASE_OPTIONS = {
 };
 class UserHelper {
   static async GetUsersEnvironments(securityToken) {
-    const options = { ...BASE_OPTIONS,
+    const options = {
+      ...BASE_OPTIONS,
       headers: {
         'x-security-token': securityToken
       }
     };
     return await UserHelper.get(USER_ENVS_URL, options);
   }
-
   static async ResendUserVerification(userEmail) {
-    const options = { ...BASE_OPTIONS
+    const options = {
+      ...BASE_OPTIONS
     };
     return await UserHelper.get(`/${USER_RESEND_VERIFICATION_URI}?user=${userEmail}`, options);
   }
-
   static async RequestPasswordReset(userEmailObject) {
-    const options = { ...BASE_OPTIONS,
+    const options = {
+      ...BASE_OPTIONS,
       body: JSON.stringify(userEmailObject)
     };
     options.method = 'POST';
     return await UserHelper.get(`/${USER_REQUEST_PASSWORD_RESET_URI}`, options);
   }
-
   static async ResetPassword(resetPasswordObject) {
-    const options = { ...BASE_OPTIONS,
+    const options = {
+      ...BASE_OPTIONS,
       body: JSON.stringify(resetPasswordObject)
     };
     options.method = 'POST';
     return await UserHelper.get(`/${USER_RESET_PASSWORD_URI}`, options);
   }
-
   static async get(url, options = BASE_OPTIONS) {
     try {
       const responseBody = await api(url, options);
@@ -646,9 +641,7 @@ class UserHelper {
       };
     }
   }
-
 }
-
 async function api(url, options) {
   return fetch(url, options).then(async response => {
     return response.json().then(data => data);
@@ -658,17 +651,14 @@ async function api(url, options) {
 }
 
 const resetPasswordSagas = [takeEvery(REQUEST_USER_PASSWORD_RESET, requestPasswordResetSaga), takeEvery(RESET_USER_PASSWORD, resetPasswordSaga), takeEvery(CHANGE_USER_PASSWORD, changePasswordSaga)];
-
 function* requestPasswordResetSaga(action) {
   const userEmailObject = action.userEmailObject;
   yield put({
     type: REQUEST_USER_PASSWORD_RESET_SENDING
   });
-
   if (userEmailObject && userEmailObject.userEmail) {
     try {
       const passwordResetRequestResponse = yield UserHelper.RequestPasswordReset(userEmailObject);
-
       if (passwordResetRequestResponse) {
         if (!passwordResetRequestResponse.error) {
           yield put({
@@ -699,17 +689,14 @@ function* requestPasswordResetSaga(action) {
     });
   }
 }
-
 function* resetPasswordSaga(action) {
   const resetPasswordObject = action.resetPasswordObject;
   yield put({
     type: RESET_USER_PASSWORD_SENDING
   });
-
   if (resetPasswordObject.token && resetPasswordObject.password) {
     try {
       const resetPasswordResponse = yield UserHelper.ResetPassword(resetPasswordObject);
-
       if (resetPasswordResponse) {
         if (!resetPasswordResponse.error) {
           yield put({
@@ -740,11 +727,11 @@ function* resetPasswordSaga(action) {
       error: 'Invalid object'
     });
   }
-} // userId
+}
+
+// userId
 // existingPassword
 // newPassword
-
-
 function* changePasswordSaga(action) {
   if (!action || !action.userId || !action.currentPassword || !action.newPassword) {
     yield put({
@@ -753,7 +740,6 @@ function* changePasswordSaga(action) {
     });
     return;
   }
-
   try {
     const changePasswordObject = {
       userId: action.userId,
@@ -764,25 +750,24 @@ function* changePasswordSaga(action) {
       type: CHANGE_USER_PASSWORD_SENDING
     });
     const clientCredentials = yield select(selectClientCredentials, 'js');
-    const client = yield getManagementApiClient({ ...clientCredentials
+    const client = yield getManagementApiClient({
+      ...clientCredentials
     });
     const [err, res] = yield to$1(client.security.users.updatePassword(changePasswordObject));
-
     if (err) {
-      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);
+      var _err$data, _err$data2;
+      const error = (err === null || err === void 0 || (_err$data = err.data) === null || _err$data === void 0 || (_err$data = _err$data.data) === null || _err$data === void 0 ? void 0 : _err$data.length) > 0 && err.data.data[0].message || (err === null || err === void 0 || (_err$data2 = err.data) === null || _err$data2 === void 0 ? void 0 : _err$data2.message);
       yield put({
         type: CHANGE_USER_PASSWORD_ERROR,
         error
       });
       return;
-    } // // eslint-disable-next-line no-console
+    }
+
+    // // eslint-disable-next-line no-console
     // console.log(changePasswordObject);
     // // eslint-disable-next-line no-console
     // console.log(userCredentialsObject);
-
-
     yield put({
       type: CHANGE_USER_PASSWORD_SUCCESS
     });
@@ -804,35 +789,32 @@ function rootSaga (featureSagas = []) {
   };
 }
 
-const servers = SERVERS;
-/* global SERVERS */
-
+const servers = SERVERS; /* global SERVERS */
 const alias = servers.alias.toLowerCase();
-const publicUri = PUBLIC_URI;
-/* global PUBLIC_URI */
+const publicUri = PUBLIC_URI; /* global PUBLIC_URI */
+const projects = PROJECTS; /* global PROJECTS */
 
-const projects = PROJECTS;
-/* global PROJECTS */
 // return a projectId via the request hostname
-
 const pickProject = (hostname, query) => {
   // if localhost we can only infer via a querystring, and take your word for it
   if (hostname == 'localhost') {
     return query && query.p || projects[0].id;
-  } // if hostname is the actual public uri we can return the first project from the list
-
+  }
 
+  // if hostname is the actual public uri we can return the first project from the list
   if (hostname == publicUri) {
     return projects[0].id;
   }
+  let project = 'unknown';
 
-  let project = 'unknown'; // // go through all the defined projects
+  // // go through all the defined projects
   // Object.entries(projects).map(([, p]) => {
+  const p = projects[0];
 
-  const p = projects[0]; // check if we're accessing via the project's public uri
-
-  if (hostname.includes(p.publicUri)) project = p.id; // the url structure is different for website (we don't prefix)
+  // check if we're accessing via the project's public uri
+  if (hostname.includes(p.publicUri)) project = p.id;
 
+  // the url structure is different for website (we don't prefix)
   if (p.id.startsWith('website')) {
     // check for internal and external hostnames
     // we check live and preview distinctly so our rule does not clash with
@@ -841,9 +823,8 @@ const pickProject = (hostname, query) => {
   } else {
     // check for internal and external hostnames, prefixed with the projectId
     if (hostname.includes(`${p.id.toLowerCase()}-${alias}.cloud.contensis.com`) || hostname.includes(`${p.id.toLowerCase()}.${alias}.contensis.cloud`)) project = p.id;
-  } // });
-
-
+  }
+  // });
   return project === 'unknown' ? p.id : project;
 };
 
@@ -852,4 +833,4 @@ const AppRoot = props => {
 };
 
 export { AppRoot as A, browserHistory as b, history as h, pickProject as p, rootSaga as r };
-//# sourceMappingURL=App-83107d7e.js.map
+//# sourceMappingURL=App-CIlf4cl4.js.map