@zengenti/contensis-react-base 3.0.0-beta.7 → 3.0.0-beta.72

package/README.md

@@ -14,7 +14,7 @@ Many projects upgrading to v3.0 of `contensis-react-base` are likely to be using
 
 You will need to upgrade your version of Storybook to be >= 6.1 which has support for React 17. [Further reading](https://storybook.js.org/blog/storybook-6-1/)
 
-TLDR: Storybook have provided a simple way to upgrade. Run `npx sb upgrade` when upgrading to v2.6 of `contensis-react-base`. You should also ensure you are running the latest version of webpack or webpack@4 to prevent futher errors when loading Storybook.
+TLDR: Storybook have provided a simple way to upgrade. Run `npx sb upgrade` when upgrading to v3.0 of `contensis-react-base`. You should also ensure you are running the latest version of webpack or webpack@4 to prevent futher errors when loading Storybook.
 
 If you are still getting react errors after this, check your project for other dependencies to remove/update that rely on older versions of react
 

package/cjs/{App-3324f784.js → App-80a696bc.js}

@@ -2,21 +2,21 @@
 
 var history$1 = require('history');
 var effects = require('@redux-saga/core/effects');
-var contensisDeliveryApi = require('contensis-delivery-api');
-var actions = require('./actions-a24bf46e.js');
-var version = require('./version-4f0f5fa6.js');
-var version$1 = require('./version-085d203d.js');
-var selectors = require('./selectors-0ec95076.js');
 var log = require('loglevel');
-var login = require('./login-c810cc4c.js');
+var contensisDeliveryApi = require('contensis-delivery-api');
+var actions = require('./actions-8dc9e8de.js');
+var version = require('./version-330551f5.js');
+var version$1 = require('./version-eba6d09b.js');
+var selectors = require('./selectors-656da4b7.js');
+var login = require('./login-6b9de6a1.js');
 var awaitToJs = require('await-to-js');
-var reducers = require('./reducers-fde41d6b.js');
-var ToJs = require('./ToJs-a38fa20e.js');
+var reducers = require('./reducers-3a4f8971.js');
+var ToJs = require('./ToJs-a9a8522b.js');
 var React = require('react');
 require('react-hot-loader');
 require('jsonpath-mapper');
 require('query-string');
-var RouteLoader = require('./RouteLoader-c7957b14.js');
+var RouteLoader = require('./RouteLoader-2675e1c9.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -41,13 +41,9 @@ function _interopNamespace(e) {
 var log__namespace = /*#__PURE__*/_interopNamespace(log);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const selectedHistory = typeof window !== 'undefined' ? history$1.createBrowserHistory : history$1.createMemoryHistory;
-const history = (options = {}) => selectedHistory(options);
-const browserHistory = selectedHistory();
-
 const storeSurrogateKeys = response => {
   const keys = response.headers.get ? response.headers.get('surrogate-key') : response.headers.map['surrogate-key'];
-  if (keys) version.reduxStore.dispatch(actions.setSurrogateKeys(keys));
+  if (keys) version.reduxStore === null || version.reduxStore === void 0 ? void 0 : version.reduxStore.dispatch(actions.setSurrogateKeys(keys, response.url));
 };
 
 const getClientConfig = project => {
@@ -58,7 +54,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') {
@@ -236,6 +232,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 = contensisDeliveryApi.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 = contensisDeliveryApi.Client.create(getClientConfig(project));
     client.clientConfig.versionStatus = versionStatus;
@@ -292,32 +293,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' ? history$1.createBrowserHistory : history$1.createMemoryHistory;
+const history = (options = {}) => selectedHistory(options);
+const browserHistory = selectedHistory();
+
 const navigationSagas = [effects.takeEvery(version.GET_NODE_TREE, ensureNodeTreeSaga)];
 function* ensureNodeTreeSaga(action) {
   const state = yield effects.select();
@@ -342,6 +325,7 @@ function* ensureNodeTreeSaga(action) {
       }
     }
   } catch (ex) {
+    log__namespace.error(...['Error running ensureNodeTreeSaga:', ex]);
     yield effects.put({
       type: version.GET_NODE_TREE_ERROR,
       error: ex.toString()
@@ -404,7 +388,7 @@ function* getRouteSaga(action) {
   let entry = null;
 
   try {
-    var _pathNode, _pathNode$entry, _pathNode$entry$sys;
+    var _pathNode2, _pathNode2$entry, _pathNode2$entry$sys, _pathNode3, _pathNode3$entry, _pathNode3$entry$sys;
 
     const {
       withEvents,
@@ -418,7 +402,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,
@@ -426,13 +412,9 @@ 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 entryLinkDepth = appsays && appsays.entryLinkDepth !== undefined ? appsays.entryLinkDepth : 2;
     const setContentTypeLimits = !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions);
     const state = yield effects.select();
     const routeEntry = selectors.selectRouteEntry(state, 'js');
@@ -440,8 +422,8 @@ function* getRouteSaga(action) {
     const currentPath = action.path; //selectCurrentPath(state);
 
     const deliveryApiStatus = version$1.selectVersionStatus(state);
-    const project = selectors.selectCurrentProject(state);
-    const isHome = currentPath === '/';
+    const project = selectors.selectCurrentProject(state); // const isHome = currentPath === '/';
+
     const isPreview = currentPath && currentPath.startsWith('/preview/');
     const defaultLang = appsays && appsays.defaultLang || 'en-GB';
 
@@ -466,130 +448,92 @@ function* getRouteSaga(action) {
           type: actions.UPDATE_LOADING_STATE,
           isLoading: false
         });
-      } else yield effects.call(setRouteEntry, routeEntry, yield effects.select(selectors.selectCurrentNode), yield effects.select(selectors.selectCurrentAncestors));
+      } else yield effects.call(setRouteEntry, routeEntry, yield effects.select(selectors.selectCurrentNode), yield effects.select(selectors.selectCurrentAncestors), yield effects.select(selectors.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'] : '*',
+          entryLinkDepth: setContentTypeLimits ? 0 : 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 = {}
-            } = login.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__namespace.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__namespace.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 = login.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 effects.call(resolveCurrentNodeOrdinates, {
+        appsays,
+        contentTypeMapping,
+        language: defaultLang,
+        path: currentPath,
+        pathNode,
+        project,
+        versionStatus: deliveryApiStatus
+      });
+      if (children) pathNode.children = children;
     }
 
-    const contentTypeMapping = login.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 {
+      entryMapper,
+      injectRedux
+    } = login.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 effects.call(reduxInjectorSaga, contentTypeMapping.injectRedux);
+    if (injectRedux) yield effects.call(reduxInjectorSaga, injectRedux);
 
     if (withEvents && withEvents.onRouteLoaded) {
       // Check if the app has provided a requireLogin boolean flag or groups array
@@ -609,37 +553,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 _appsays;
+
       entry = pathNode.entry;
-      const {
-        entryMapper
-      } = contentTypeMapping;
-      yield effects.call(setRouteEntry, entry, pathNode, ancestors, siblings, entryMapper, false, appsays && appsays.refetchNode);
+      yield effects.call(setRouteEntry, entry, pathNode, ancestors, siblings, entryMapper, false, (_appsays = appsays) === null || _appsays === void 0 ? void 0 : _appsays.refetchNode);
     } else {
       if (staticRoute) yield effects.call(setRouteEntry, null, pathNode, ancestors, siblings);else yield effects.call(do404);
     }
+  } catch (e) {
+    log__namespace.error(...['Error running route saga:', e, e.stack]);
+    yield effects.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__namespace.info('Problem fetching ancestors', ex);
+          return [];
+        }
+      };
     }
 
-    if (!version.hasNavigationTree(state) && (doNavigation === true || doNavigation.tree)) if (typeof window !== 'undefined') {
-      yield effects.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__namespace.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__namespace.info('Problem fetching siblings', ex);
+          return [];
+        }
+      };
+    }
+  }
+
+  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,
-        treeDepth: doNavigation === true || !doNavigation.tree || doNavigation.tree === true ? 2 : doNavigation.tree
+        treeDepth
       });
     } else {
-      yield effects.call(ensureNodeTreeSaga);
+      return yield effects.call(ensureNodeTreeSaga, {
+        treeDepth
+      });
     }
-  } catch (e) {
-    log__namespace.error(...['Error running route saga:', e, e.stack]);
-    yield effects.call(do500, e);
-  }
+  };
+  const [loadAncestors, loadChildren, loadSiblings, loadTree] = apiCall;
+  const [ancestors, nodeWithChildren, siblings] = yield effects.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) {
@@ -976,7 +1006,7 @@ function* changePasswordSaga(action) {
     yield effects.put({
       type: reducers.CHANGE_USER_PASSWORD_SENDING
     });
-    const clientCredentials = yield effects.select(ToJs.selectClientCredentials);
+    const clientCredentials = yield effects.select(ToJs.selectClientCredentials, 'js');
     const client = yield login.getManagementApiClient({ ...clientCredentials
     });
     const [err, res] = yield awaitToJs.to(client.security.users.updatePassword(changePasswordObject));
@@ -1066,8 +1096,9 @@ const AppRoot = props => {
 
 exports.AppRoot = AppRoot;
 exports.browserHistory = browserHistory;
+exports.cachedSearch = cachedSearch;
 exports.deliveryApi = deliveryApi;
 exports.history = history;
 exports.pickProject = pickProject;
 exports.rootSaga = rootSaga;
-//# sourceMappingURL=App-3324f784.js.map
+//# sourceMappingURL=App-80a696bc.js.map