@zengenti/contensis-react-base 3.0.0-beta.9 → 3.0.1-beta.1

package/esm/{App-4224ba21.js → App-069378e0.js}

@@ -1,28 +1,24 @@
 import { createBrowserHistory, createMemoryHistory } from 'history';
 import { takeEvery, select, put, call, all } from '@redux-saga/core/effects';
-import { Client, Op, Query } from 'contensis-delivery-api';
-import { a as setSurrogateKeys, S as SET_NAVIGATION_PATH, b as SET_ROUTE, U as UPDATE_LOADING_STATE, c as SET_ENTRY, d as SET_ANCESTORS, e as SET_SIBLINGS, f as setRoute } from './actions-b949ef5c.js';
-import { r as reduxStore, G as GET_NODE_TREE, h as hasNavigationTree, S as SET_NODE_TREE, b as GET_NODE_TREE_ERROR, i as injectRedux } from './version-3b4fe08d.js';
-import { s as selectVersionStatus } from './version-ad2ec52c.js';
-import { a as selectCurrentProject, s as selectRouteEntry, b as selectCurrentNode, c as selectCurrentAncestors, d as selectRouteEntryEntryId, e as selectRouteEntryLanguage, f as selectMappedEntry, q as queryParams, h as selectCurrentSearch } from './selectors-8fca7fb2.js';
 import * as log from 'loglevel';
-import { f as findContentTypeMapping, h as handleRequiresLoginSaga, g as getManagementApiClient, l as loginSagas } from './login-6eab4c94.js';
+import { Client, Op, Query } from 'contensis-delivery-api';
+import { parse } from 'query-string';
+import { a as setSurrogateKeys, S as SET_NAVIGATION_PATH, b as SET_ROUTE, U as UPDATE_LOADING_STATE, c as SET_ENTRY, d as SET_ANCESTORS, e as SET_SIBLINGS, f as setRoute } from './actions-180948dd.js';
+import { r as reduxStore, G as GET_NODE_TREE, h as hasNavigationTree, S as SET_NODE_TREE, b as GET_NODE_TREE_ERROR, i as injectRedux } from './version-e3a5ec66.js';
+import { s as selectVersionStatus } from './version-2485e2fb.js';
+import { b as selectCurrentProject, a as selectRouteEntry, c as selectCurrentNode, d as selectCurrentAncestors, e as selectCurrentSiblings, f as selectRouteEntryEntryId, h as selectRouteEntryLanguage, i as selectMappedEntry, q as queryParams, j as selectCurrentSearch } from './selectors-a5e5835b.js';
+import { f as findContentTypeMapping, h as handleRequiresLoginSaga, g as getManagementApiClient, l as loginSagas } from './login-508cac0f.js';
 import { to } from 'await-to-js';
-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-d6c0edb1.js';
-import { s as selectClientCredentials } from './ToJs-46761960.js';
+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-8e5d6232.js';
+import { s as selectClientCredentials } from './ToJs-4e02a04d.js';
 import React from 'react';
 import 'react-hot-loader';
 import 'jsonpath-mapper';
-import 'query-string';
-import { R as RouteLoader } from './RouteLoader-027215f2.js';
-
-const selectedHistory = typeof window !== 'undefined' ? createBrowserHistory : createMemoryHistory;
-const history = (options = {}) => selectedHistory(options);
-const browserHistory = selectedHistory();
+import { R as RouteLoader } from './RouteLoader-5171c63f.js';
 
 const storeSurrogateKeys = response => {
   const keys = response.headers.get ? response.headers.get('surrogate-key') : response.headers.map['surrogate-key'];
-  if (keys) reduxStore.dispatch(setSurrogateKeys(keys));
+  if (keys) reduxStore === null || reduxStore === void 0 ? void 0 : reduxStore.dispatch(setSurrogateKeys(keys, response.url));
 };
 
 const getClientConfig = project => {
@@ -33,7 +29,7 @@ const getClientConfig = project => {
 
   if (project) {
     config.projectId = project;
-  } // // we only want the surrogate key header in a server context
+  } // we only want the surrogate key header in a server context
 
 
   if (typeof window === 'undefined') {
@@ -58,7 +54,15 @@ const getClientConfig = project => {
 class DeliveryApi {
   constructor() {
     this.getClientSideVersionStatus = () => {
-      if (typeof window != 'undefined') {
+      if (typeof window !== 'undefined') {
+        // Allow overriding versionStatus with the querystring
+        const {
+          versionStatus
+        } = parse(window.location.search);
+        if (versionStatus) return versionStatus; // Client-side we will have a global variable set if rendered by SSR in production
+
+        if (typeof window.versionStatus !== 'undefined') return window.versionStatus; // For localhost development we can only work out versionStatus from the current hostname
+
         const currentHostname = window.location.hostname;
         return this.getVersionStatusFromHostname(currentHostname);
       }
@@ -66,6 +70,14 @@ class DeliveryApi {
       return null;
     };
 
+    this.getServerSideVersionStatus = request => request.query.versionStatus || deliveryApi.getVersionStatusFromHeaders(request.headers) || deliveryApi.getVersionStatusFromHostname(request.hostname);
+
+    this.getVersionStatusFromHeaders = headers => {
+      const versionStatusHeader = headers['x-entry-versionstatus'];
+      if (typeof versionStatusHeader !== 'undefined') return versionStatusHeader;
+      return null;
+    };
+
     this.getVersionStatusFromHostname = currentHostname => {
       if (currentHostname.indexOf('localhost') > -1) return 'latest';
 
@@ -181,6 +193,7 @@ class LruCache {
 
   remove(key) {
     let node = this.map[key];
+    if (!node) return; // This is sometimes null and crashes the container without this check
 
     if (node.prev) {
       node.prev.next = node.next;
@@ -211,6 +224,11 @@ class CachedSearch {
     return this.request(project + JSON.stringify(query) + linkDepth.toString(), () => client.entries.search(query, linkDepth));
   }
 
+  searchUsingPost(query, linkDepth = 0, project = '', env) {
+    const client = Client.create(getClientConfig(project));
+    return this.request(project + JSON.stringify(query) + linkDepth.toString(), () => client.entries.searchUsingPost(query, linkDepth));
+  }
+
   get(id, linkDepth, versionStatus, project, env) {
     const client = Client.create(getClientConfig(project));
     client.clientConfig.versionStatus = versionStatus;
@@ -267,32 +285,14 @@ class CachedSearch {
     return this.cache.get(key);
   }
 
-  extendTaxonomyNode(node) {
-    let id = this.getTaxonomyId(node);
-    this.taxonomyLookup[id] = node.key;
-    return { ...node,
-      id,
-      children: node.children ? node.children.map(n => this.extendTaxonomyNode(n)) : null
-    };
-  }
-
-  getTaxonomyId(node) {
-    if (node.key) {
-      let parts = node.key.split('/');
-      return parts[parts.length - 1];
-    }
-
-    return '';
-  }
-
-  getTaxonomyKey(id) {
-    return this.taxonomyLookup[id];
-  }
-
 }
 
 const cachedSearch = new CachedSearch();
 
+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 state = yield select();
@@ -317,6 +317,7 @@ function* ensureNodeTreeSaga(action) {
       }
     }
   } catch (ex) {
+    log.error(...['Error running ensureNodeTreeSaga:', ex]);
     yield put({
       type: GET_NODE_TREE_ERROR,
       error: ex.toString()
@@ -379,7 +380,7 @@ function* getRouteSaga(action) {
   let entry = null;
 
   try {
-    var _pathNode, _pathNode$entry, _pathNode$entry$sys;
+    var _staticRoute$route, _staticRoute$route$pa, _staticRoute$route2, _staticRoute$route2$p, _pathNode2, _pathNode2$entry, _pathNode2$entry$sys, _pathNode3, _pathNode3$entry, _pathNode3$entry$sys;
 
     const {
       withEvents,
@@ -393,7 +394,9 @@ function* getRouteSaga(action) {
 
     let pathNode = null,
         ancestors = null,
-        siblings = null; // These variables are the return values from
+        children = [],
+        siblings = null;
+    let contentTypeMapping = {}; // These variables are the return values from
     // calls to withEvents.onRouteLoad and onRouteLoaded
 
     let appsays,
@@ -401,22 +404,20 @@ function* getRouteSaga(action) {
 
     if (withEvents && withEvents.onRouteLoad) {
       appsays = yield withEvents.onRouteLoad(action);
-    } // 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 && appsays.customNavigation === true ? false : appsays && appsays.customNavigation || true);
-    const entryLinkDepth = appsays && appsays.entryLinkDepth || 3;
-    const setContentTypeLimits = !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions);
+    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 entryLinkDepth = appsays && appsays.entryLinkDepth !== undefined ? appsays.entryLinkDepth : 2;
+    const setContentTypeLimits = (typeof staticRouteLinkDepth === 'undefined' || !staticRouteFields) && !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions);
     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';
 
@@ -441,130 +442,89 @@ function* getRouteSaga(action) {
           type: UPDATE_LOADING_STATE,
           isLoading: false
         });
-      } else yield call(setRouteEntry, routeEntry, yield select(selectCurrentNode), yield select(selectCurrentAncestors));
+      } else yield call(setRouteEntry, routeEntry, yield select(selectCurrentNode), yield select(selectCurrentAncestors), yield select(selectCurrentSiblings));
     } else {
-      // Handle homepage
-      if (isHome) {
-        pathNode = yield cachedSearch.getRootNode({
+      // 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
+          // for previewing entries as it gives a response of []
+          // -- apparently it is not correct to request latest content
+          // with Node API
+
+          let previewEntry = yield deliveryApi.getClient(deliveryApiStatus, project).entries.get({
+            id: entryGuid,
+            language,
+            linkDepth: entryLinkDepth
+          });
+
+          if (previewEntry) {
+            pathNode = {
+              entry: previewEntry
+            };
+            ({
+              entry
+            } = pathNode || {});
+          }
+        }
+      } else {
+        var _pathNode, _pathNode$entry, _pathNode$entry$sys;
+
+        // Handle all other routes
+        pathNode = yield cachedSearch.getNode({
           depth: 0,
-          entryFields: '*',
-          entryLinkDepth,
+          path: currentPath,
+          entryFields: setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : staticRouteFields || '*',
+          entryLinkDepth: setContentTypeLimits ? 0 : typeof staticRouteLinkDepth !== 'undefined' ? staticRouteLinkDepth : entryLinkDepth,
           language: defaultLang,
           versionStatus: deliveryApiStatus
         }, project);
         ({
           entry
         } = pathNode || {});
-      } else {
-        // 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
-            // for previewing entries as it gives a response of []
-            // -- apparently it is not correct to request latest content
-            // with Node API
-
-            let previewEntry = yield deliveryApi.getClient(deliveryApiStatus, project).entries.get({
-              id: entryGuid,
-              language,
-              linkDepth: entryLinkDepth
-            });
-
-            if (previewEntry) {
-              pathNode = {
-                entry: previewEntry
-              };
-              ({
-                entry
-              } = pathNode || {});
-            }
-          }
-        } else {
-          // Handle all other routes
-          const childrenDepth = doNavigation === true || doNavigation.children === true ? 1 : doNavigation && doNavigation.children || 0;
-          pathNode = yield cachedSearch.getNode({
-            depth: childrenDepth,
-            path: currentPath,
-            entryFields: setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : '*',
-            entryLinkDepth: setContentTypeLimits ? 0 : entryLinkDepth,
-            language: defaultLang,
-            versionStatus: deliveryApiStatus
-          }, project);
-          ({
-            entry
-          } = pathNode || {});
-
-          if (setContentTypeLimits && pathNode && pathNode.entry && pathNode.entry.sys && pathNode.entry.sys.id) {
-            // Get fields[] and linkDepth from ContentTypeMapping to get the entry data
-            // at a specified depth with specified fields
-            const {
-              fields,
-              linkDepth,
-              nodeOptions = {}
-            } = findContentTypeMapping(ContentTypeMappings, pathNode.entry.sys.contentTypeId) || {};
-            const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, fields, deliveryApiStatus);
-            const payload = yield cachedSearch.search(query, linkDepth || entryLinkDepth || 0, project);
-
-            if (payload && payload.items && payload.items.length > 0) {
-              pathNode.entry = entry = payload.items[0];
-            }
-
-            if (childrenDepth > 0 || nodeOptions.children) {
-              const childrenOptions = nodeOptions.children || {}; // We need to make a separate call for child nodes if the first node query has been
-              // limited by linkDepth or fields[]
-
-              const childNodes = yield cachedSearch.getChildren({
-                id: pathNode.id,
-                entryFields: childrenOptions.fields || fields || '*',
-                entryLinkDepth: childrenOptions.linkDepth || linkDepth || entryLinkDepth || 0,
-                language: defaultLang,
-                versionStatus: deliveryApiStatus
-              });
-
-              if (childNodes) {
-                pathNode.children = childNodes;
-              }
-            }
-          }
-        }
 
-        if (pathNode && pathNode.id) {
-          if (doNavigation === true || doNavigation.ancestors) {
-            try {
-              ancestors = yield cachedSearch.getAncestors({
-                id: pathNode.id,
-                language: defaultLang,
-                versionStatus: deliveryApiStatus
-              }, project);
-            } catch (ex) {
-              log.info('Problem fetching ancestors', ex);
-            }
-          }
-
-          if (doNavigation === true || doNavigation.siblings) {
-            try {
-              siblings = yield cachedSearch.getSiblings({
-                id: pathNode.id,
-                language: defaultLang,
-                versionStatus: deliveryApiStatus
-              }, project);
-            } catch (ex) {
-              log.info('Problem fetching siblings', ex);
-            }
+        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;
+
+          // 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 {
+            fields,
+            linkDepth
+          } = contentTypeMapping;
+          const query = routeEntryByFieldsQuery(pathNode.entry.sys.id, pathNode.entry.sys.language, fields, deliveryApiStatus);
+          const payload = yield cachedSearch.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];
           }
         }
-      }
+      } // make calls to fetch node ancestors, children,
+      // siblings or entire node tree
+
+
+      [ancestors, children, siblings] = yield call(resolveCurrentNodeOrdinates, {
+        appsays,
+        contentTypeMapping,
+        language: defaultLang,
+        path: currentPath,
+        pathNode,
+        project,
+        versionStatus: deliveryApiStatus
+      });
+      if (children) pathNode.children = children;
     }
 
-    const contentTypeMapping = findContentTypeMapping(ContentTypeMappings, (_pathNode = pathNode) === null || _pathNode === void 0 ? void 0 : (_pathNode$entry = _pathNode.entry) === null || _pathNode$entry === void 0 ? void 0 : (_pathNode$entry$sys = _pathNode$entry.sys) === null || _pathNode$entry$sys === void 0 ? void 0 : _pathNode$entry$sys.contentTypeId) || {}; // Inject redux { key, reducer, saga } provided by ContentTypeMapping
+    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
 
-    if (contentTypeMapping.injectRedux) yield call(reduxInjectorSaga, contentTypeMapping.injectRedux);
+    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
@@ -584,37 +544,123 @@ function* getRouteSaga(action) {
       });
     }
 
-    if (pathNode && pathNode.entry && pathNode.entry.sys && pathNode.entry.sys.id) {
+    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;
+
       entry = pathNode.entry;
-      const {
-        entryMapper
-      } = contentTypeMapping;
-      yield call(setRouteEntry, entry, pathNode, ancestors, siblings, entryMapper, false, appsays && appsays.refetchNode);
+      yield call(setRouteEntry, 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);
     } else {
       if (staticRoute) yield call(setRouteEntry, null, pathNode, ancestors, siblings);else yield call(do404);
     }
+  } catch (e) {
+    log.error(...['Error running route saga:', e, e.stack]);
+    yield call(do500, e);
+  }
+}
 
-    if (!appsays || !appsays.preventScrollTop) {
-      // Scroll into View
-      if (typeof window !== 'undefined') {
-        window.scroll({
-          top: 0
-        });
-      }
+function* resolveCurrentNodeOrdinates({
+  appsays,
+  contentTypeMapping,
+  language,
+  path,
+  pathNode,
+  project,
+  versionStatus
+}) {
+  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,
+    fields,
+    linkDepth,
+    nodeOptions = {}
+  } = contentTypeMapping;
+
+  if (pathNode && pathNode.id) {
+    if (doNavigation === true || doNavigation.ancestors) {
+      apiCall[0] = function* getAncestors() {
+        try {
+          return yield cachedSearch.getAncestors({
+            id: pathNode.id,
+            language,
+            versionStatus
+          }, project);
+        } catch (ex) {
+          log.info('Problem fetching ancestors', ex);
+          return [];
+        }
+      };
     }
 
-    if (!hasNavigationTree(state) && (doNavigation === true || doNavigation.tree)) if (typeof window !== 'undefined') {
-      yield put({
+    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;
+
+      apiCall[1] = function* getChildren() {
+        try {
+          return yield cachedSearch.getNode({
+            depth: childrenOptions.depth !== undefined ? childrenOptions.depth : childrenDepth,
+            path,
+            entryFields: childrenOptions.fields || fields || undefined,
+            entryLinkDepth: typeof childrenOptions.linkDepth !== 'undefined' ? childrenOptions.linkDepth : typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth,
+            language,
+            versionStatus
+          }, project);
+        } catch (ex) {
+          log.info('Problem fetching children', ex);
+          return [];
+        }
+      };
+    }
+
+    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;
+
+          return yield cachedSearch.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,
+            includeInMenu: true,
+            language,
+            versionStatus
+          }, project);
+        } catch (ex) {
+          log.info('Problem fetching siblings', ex);
+          return [];
+        }
+      };
+    }
+  }
+
+  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,
-        treeDepth: doNavigation === true || !doNavigation.tree || doNavigation.tree === true ? 2 : doNavigation.tree
+        treeDepth
       });
     } else {
-      yield call(ensureNodeTreeSaga);
+      return yield call(ensureNodeTreeSaga, {
+        treeDepth
+      });
     }
-  } catch (e) {
-    log.error(...['Error running route saga:', e, e.stack]);
-    yield call(do500, e);
-  }
+  };
+  const [loadAncestors, loadChildren, loadSiblings, loadTree] = apiCall;
+  const [ancestors, nodeWithChildren, siblings] = yield all([loadAncestors(), loadChildren(), loadSiblings(), loadTree()]);
+  return [ancestors, nodeWithChildren === null || nodeWithChildren === void 0 ? void 0 : nodeWithChildren.children, siblings];
 }
 
 function* setRouteEntry(entry, node, ancestors, siblings, entryMapper, notFound = false, remapEntry = false) {
@@ -951,7 +997,7 @@ function* changePasswordSaga(action) {
     yield put({
       type: CHANGE_USER_PASSWORD_SENDING
     });
-    const clientCredentials = yield select(selectClientCredentials);
+    const clientCredentials = yield select(selectClientCredentials, 'js');
     const client = yield getManagementApiClient({ ...clientCredentials
     });
     const [err, res] = yield to(client.security.users.updatePassword(changePasswordObject));
@@ -1039,5 +1085,5 @@ const AppRoot = props => {
   return /*#__PURE__*/React.createElement(RouteLoader, props);
 };
 
-export { AppRoot as A, browserHistory as b, deliveryApi as d, history as h, pickProject as p, rootSaga as r };
-//# sourceMappingURL=App-4224ba21.js.map
+export { AppRoot as A, browserHistory as b, cachedSearch as c, deliveryApi as d, history as h, pickProject as p, rootSaga as r };
+//# sourceMappingURL=App-069378e0.js.map