@zengenti/contensis-react-base 4.0.0-beta.6 → 4.0.0-beta.60

package/cjs/{App-vZrUfVgQ.js → App-Dr56ZsQj.js}

@@ -3,21 +3,33 @@
 var history$1 = require('history');
 var effects = require('@redux-saga/core/effects');
 var log = require('loglevel');
-var store = require('./store-D07FOXvM.js');
-var version = require('./version-B7XFkBhY.js');
+var store = require('./store-Dn7vP6G0.js');
+var version = require('./version-2FamXHhj.js');
 var to = require('await-to-js');
-var selectors = require('./selectors-wCs5fHD4.js');
-var version$1 = require('./version-CM-bJ62L.js');
-var ChangePassword_container = require('./ChangePassword.container-ECjEXixF.js');
+var contensisDeliveryApi = require('contensis-delivery-api');
+var slice = require('./slice-5xJMH24n.js');
+var selectors$1 = require('./selectors-BrxJ8-F8.js');
+var version$1 = require('./version-rFG9Y6_B.js');
+var ContensisDeliveryApi = require('./ContensisDeliveryApi-gN3_MHEl.js');
 var React = require('react');
 require('react-cookie');
 require('react-redux');
+require('./VersionInfo-zFPsvS8q.js');
+require('react-helmet-async');
 require('jsonpath-mapper');
-var contensisDeliveryApi = require('contensis-delivery-api');
-var ToJs = require('./ToJs-C9jwV7YB.js');
-require('query-string');
 require('react-router-dom');
-var RouteLoader = require('./RouteLoader-D5Yg7EB5.js');
+var selectors = require('./selectors-DAQR0uZa.js');
+var ChangePassword_container = require('./ChangePassword.container-C4Du3Wb1.js');
+require('./sagas-OfBUtx74.js');
+require('reselect');
+require('immer');
+require('deep-equal');
+require('deepmerge');
+var util = require('./util-wQwG9vit.js');
+require('contensis-core-api');
+var matchGroups = require('./matchGroups-dqONU-vY.js');
+var RouteLoader = require('./RouteLoader-Bbt-nG3v.js');
+require('query-string');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -43,6 +55,45 @@ var log__namespace = /*#__PURE__*/_interopNamespace(log);
 var to__default = /*#__PURE__*/_interopDefault(to);
 var React__default = /*#__PURE__*/_interopDefault(React);
 
+const deparameterise = path => {
+  return path.replace(/\/:\w+\??/g, '');
+};
+
+/** Create static routes for routes with specified locales */
+const createLocaleRoutes = routes => {
+  const localeRoutes = {};
+  for (const route of routes.StaticRoutes) {
+    // If the route has defined locales, create entries for each locale
+    if (route.i18n && route.path) {
+      for (const [language, path] of Object.entries(route.i18n)) {
+        // We already have a locale route, so just append the language and path
+        const deparameterisedPath = deparameterise(route.path);
+        const deparameterisedLocalePath = deparameterise(path);
+        if (localeRoutes[deparameterisedPath]) localeRoutes[deparameterisedPath][language] = deparameterisedLocalePath;
+        // Otherwise, create a new entry for this route path
+        else localeRoutes[deparameterisedPath] = {
+          [language]: deparameterisedLocalePath
+        };
+        if (deparameterise(route.path) !== deparameterisedLocalePath) {
+          // I think we are OK to mutate here as this is only run once on app init
+          // we can change this if needed later
+          routes.StaticRoutes.push({
+            ...route,
+            path,
+            // Add the path with any parameters included
+            language,
+            i18n: undefined
+          });
+        } else {
+          // Just set the language on the existing route instead of creating a duplicate
+          route.language = language;
+        }
+      }
+    }
+  }
+  return localeRoutes;
+};
+
 // Create a history depending on the environment
 const selectedHistory = typeof window !== 'undefined' ? history$1.createBrowserHistory : history$1.createMemoryHistory;
 const history = (options = {}) => selectedHistory(options);
@@ -55,12 +106,17 @@ function* ensureNodeTreeSaga(action) {
     language,
     project,
     versionStatus,
+    subsitePath,
     treeDepth
   } = action;
   const state = yield effects.select();
   try {
     if (!version.hasNavigationTree(state)) {
-      const nodes = yield api.getRootNode({
+      const nodes = subsitePath ? yield api.getNode({
+        path: subsitePath,
+        depth: treeDepth || 0,
+        language
+      }, project) : yield api.getRootNode({
         depth: treeDepth || 0,
         language
       }, versionStatus, project);
@@ -84,6 +140,238 @@ function* ensureNodeTreeSaga(action) {
   }
 }
 
+const i18nSagas = [effects.takeEvery(slice.actions.INIT_LOCALES.type, getProjectLanguages), effects.takeEvery(slice.actions.UPDATE_LANGUAGE.type, updateLanguage), effects.takeEvery(slice.actions.SET_LANGUAGE.type, setLanguageRoute)];
+
+/**
+ * Resolve the current route language based on the entry, node, static route or path
+ * Is called directly from the routing saga as soon as an entry or node has been fetched
+ */
+function* resolveCurrentRouteLanguage({
+  entry,
+  node
+}) {
+  var _entry$sys, _staticRoute$route;
+  const currentLanguage = yield effects.select(selectors.selectCurrentLanguage);
+  const staticRoute = yield effects.select(selectors$1.selectStaticRoute);
+  let nextLanguage = currentLanguage;
+  if (entry !== null && entry !== void 0 && (_entry$sys = entry.sys) !== null && _entry$sys !== void 0 && _entry$sys.language) nextLanguage = entry.sys.language;else if (node !== null && node !== void 0 && node.language) nextLanguage = node.language;else if (staticRoute !== null && staticRoute !== void 0 && (_staticRoute$route = staticRoute.route) !== null && _staticRoute$route !== void 0 && _staticRoute$route.language) nextLanguage = staticRoute.route.language;else {
+    var _currentPath$split$fi;
+    // attempt to infer language from the path
+    const currentPath = yield effects.select(selectors$1.selectCurrentPath);
+
+    // path is normally lowercase
+    const firstPathSegment = (_currentPath$split$fi = currentPath.split('/').find(segment => segment.length)) === null || _currentPath$split$fi === void 0 ? void 0 : _currentPath$split$fi.toLowerCase();
+    const locales = yield effects.select(selectors.selectLocales);
+    const matchedLanguage = Object.keys(locales).find(lang => lang.toLowerCase() === firstPathSegment);
+    // matched a supported language in the path
+    if (matchedLanguage) nextLanguage = matchedLanguage;else
+      // falling back to primary language
+      nextLanguage = yield effects.select(selectors.selectPrimaryLanguage);
+  }
+  if (nextLanguage && nextLanguage !== currentLanguage) {
+    const dictionary = yield effects.call(resolveDictionaryForLanguage, nextLanguage);
+    yield effects.put(slice.actions.SET_LANGUAGE({
+      language: nextLanguage,
+      dictionary
+    }));
+  }
+}
+
+/**
+ * Resolve the current dictionary for route language either using a supplied resolver
+ * function or directly derive from the locales stored in state
+ * Is called directly any time the language is changed
+ */
+function* resolveDictionaryForLanguage(language) {
+  let dictionary = yield effects.select(selectors.selectDictionary);
+  // try and resolve a dictionary for this language
+  const resolver = yield effects.select(selectors.selectDictionaryResolver);
+  if (typeof resolver === 'function') {
+    try {
+      // dynamic import of dictionary file
+      const loadedDictionary = yield effects.call(resolver, language);
+      dictionary = loadedDictionary;
+    } catch (error) {
+      console.error(`No dictionary resolved for language ${language}`, error);
+    }
+  } else {
+    // Load dictionary from locales in state
+    const locales = yield effects.select(selectors.selectLocales);
+    if (locales && locales[language]) {
+      dictionary = locales[language];
+    }
+  }
+  return dictionary;
+}
+
+/**
+ * Side effects triggered from updating the language via dispatched action
+ * in language switching components, including resolving the next route,
+ * update the dictionary and subsequently redirect if needed
+ */
+function* updateLanguage({
+  payload: {
+    language,
+    redirect,
+    fallbackPath
+  }
+}) {
+  const currentLanguage = yield effects.select(selectors.selectCurrentLanguage);
+  if (language === currentLanguage) {
+    // no change needed
+    return;
+  } else {
+    const dictionary = language !== currentLanguage ? yield effects.call(resolveDictionaryForLanguage, language) : yield effects.select(selectors.selectDictionary);
+    const uri = yield effects.call(resolveNextLanguageRoute, {
+      language,
+      redirect,
+      fallbackPath
+    });
+    yield effects.put(slice.actions.SET_LANGUAGE({
+      language,
+      dictionary: dictionary != null ? dictionary : undefined,
+      redirect: redirect !== false ? uri : undefined
+    }));
+  }
+}
+
+/** Handle any route redirection after we have set the language */
+function* setLanguageRoute({
+  payload
+}) {
+  if (payload !== null && payload !== void 0 && payload.redirect) {
+    const currentPath = yield effects.select(selectors$1.selectCurrentPath);
+    if (payload.redirect === currentPath) {
+      // already on the correct path, no need to redirect
+      return;
+    }
+    yield effects.put(selectors$1.setRoute(payload.redirect));
+  }
+}
+
+/** Determine the correct route uri when the language changes */
+function* resolveNextLanguageRoute({
+  language,
+  redirect,
+  fallbackPath
+}) {
+  // have they supplied the route to go to?
+  if (typeof redirect === 'string') {
+    return redirect;
+  }
+
+  // is this an entry or a static route?
+  const availableLanguages = yield effects.select(selectors$1.selectRouteEntryAvailableLanguages);
+  if (availableLanguages.find(l => l.toLowerCase() === language.toLowerCase())) {
+    // if entry, get the uri for this language variation from the api
+    const entryUri = yield effects.call(getEntryUriForLanguage, {
+      entryId: yield effects.select(selectors$1.selectRouteEntryID),
+      language
+    });
+    if (entryUri) {
+      return entryUri;
+    }
+  }
+
+  // if static route, get the uri from the routes config
+  const staticRouteUri = yield effects.call(getStaticRouteUri, {
+    language
+  });
+  if (staticRouteUri) {
+    return staticRouteUri;
+  }
+
+  // if all else fails, fallback to the supplied fallback path or homepage
+  return fallbackPath || `/${language.toLowerCase()}`;
+}
+
+/** Check any current static route for a language variation we have stored in i18n.routes */
+function* getStaticRouteUri({
+  language
+}) {
+  const staticRoute = yield effects.select(selectors$1.selectStaticRoute);
+  if (staticRoute !== null && staticRoute !== void 0 && staticRoute.route.path) {
+    var _Object$entries$find;
+    // Routes can have parameters such as `/:facet?` we need to deparameterise
+    // so we can check against our stored locale routes
+    const deparameterisedPath = deparameterise(staticRoute.route.path);
+    const localeRoutes = yield effects.select(selectors.selectLocaleRoutes);
+    const originalPath = (_Object$entries$find = Object.entries(localeRoutes || {}).find(([, locales]) => Object.values(locales).includes(deparameterisedPath))) === null || _Object$entries$find === void 0 ? void 0 : _Object$entries$find[0];
+    const routeLocales = localeRoutes[deparameterisedPath] || localeRoutes[originalPath || ''];
+    const routeUri = routeLocales === null || routeLocales === void 0 ? void 0 : routeLocales[language];
+    return routeUri;
+  }
+}
+
+/**
+ * Run when the app initiates locales, populating supported languages from the config
+ * or fetching from the project if not provided
+ */
+function* getProjectLanguages({
+  payload
+}) {
+  const stateLocales = yield effects.select(selectors.selectLocales);
+  if (stateLocales && Object.keys(stateLocales).length > 0)
+    // Locales already set in state, no need to fetch again
+    return;
+  const locales = {};
+  let primaryLanguage = payload.primaryLanguage;
+  const supportedLanguages = [...(payload.supportedLanguages || [])];
+  if (supportedLanguages !== null && supportedLanguages !== void 0 && supportedLanguages.length) {
+    // If supported languages are provided in config, use these
+    for (const supportedLanguage of supportedLanguages) {
+      locales[supportedLanguage] = {};
+    }
+  } else {
+    // Fallback to getting languages from the project
+    const [error, project] = yield to__default.default(ContensisDeliveryApi.cachedSearch.getClient().project.get());
+    if (error) {
+      console.error('Problem fetching project languages:', error);
+    } else if (project) {
+      var _project$primaryLangu;
+      for (const supportedLanguage of project.supportedLanguages || []) {
+        locales[supportedLanguage] = {};
+        supportedLanguages.push(supportedLanguage);
+      }
+      // Set primary language from project if we have it
+      primaryLanguage = (_project$primaryLangu = project.primaryLanguage) != null ? _project$primaryLangu : primaryLanguage;
+    }
+  }
+  if (Object.keys(locales).length === 0) {
+    // Ensure at least the primary language is included
+    locales[payload.primaryLanguage] = {};
+    supportedLanguages.push(payload.primaryLanguage);
+  }
+
+  // Only commit if we have locales to set or we will end up in an infinite loop
+  if (Object.keys(locales).length) yield effects.put(slice.actions.SET_LOCALES({
+    ...payload,
+    primaryLanguage,
+    supportedLanguages,
+    locales
+  }));
+}
+
+/**
+ * Run a Delivery API query to get the uri for the chosen language variation of this entryId
+ * */
+function* getEntryUriForLanguage({
+  entryId,
+  language
+}) {
+  try {
+    const versionStatus = yield effects.select(version$1.selectVersionStatus);
+    const query = new contensisDeliveryApi.Query(contensisDeliveryApi.Op.equalTo('sys.id', entryId), contensisDeliveryApi.Op.equalTo('sys.language', language), contensisDeliveryApi.Op.equalTo('sys.versionStatus', versionStatus));
+    query.fields = ['sys.uri'];
+    query.pageSize = 1;
+    const result = yield ContensisDeliveryApi.cachedSearch.search(query);
+    return result.items.length ? result.items[0].sys.uri : null;
+  } catch (error) {
+    console.error('Error fetching language variations:', error);
+    yield effects.put(slice.actions.GET_ENTRY_URI_ERROR(error));
+  }
+}
+
 const sys = {
   versionStatus: 'sys.versionStatus'
 };
@@ -106,7 +394,87 @@ const routeEntryByFieldsQuery = (id, language = 'en-GB', contentTypeId = '', fie
   return query;
 };
 
-const routingSagas = [effects.takeEvery(selectors.SET_NAVIGATION_PATH, getRouteSaga), effects.takeEvery(selectors.SET_ROUTE, setRouteSaga)];
+function* reduxInjectorSaga(injectorFn) {
+  if (typeof injectorFn === 'function') {
+    const {
+      key,
+      reducer,
+      saga
+    } = yield injectorFn();
+    version.injectRedux({
+      key,
+      reducer,
+      saga
+    });
+  }
+}
+
+/**
+ * @description Asynchronously load and inject assets related to Search
+ */
+const importSearchAssets = () => Promise.resolve().then(function () { return require('./search.js'); });
+
+/**
+ * Invokes the Search saga if:
+ * - `searchOptions` is present on `staticRoute` or `contentTypeRoute`
+ * - `searchOptions` is provided by the consumer app
+ *   - and path starts with one of `onPaths: ['/search']`
+ *   - or a `facet` or `listingType` is present in provided `searchOptions`
+ *
+ * A `config` is required if we want to inject the redux reducer here, sagas are injected automatically
+ */
+function* handleSearchSaga({
+  location,
+  params,
+  routeSearchOptions,
+  searchOptions,
+  ssr
+}) {
+  // Merge supplied mappers with route-supplied mappers taking precedence
+  const mappers = {
+    results: e => e,
+    ...((searchOptions === null || searchOptions === void 0 ? void 0 : searchOptions.mappers) || {}),
+    ...((routeSearchOptions === null || routeSearchOptions === void 0 ? void 0 : routeSearchOptions.mappers) || {})
+  };
+
+  // Merge all other search options with route-supplied options taking precedence
+  const {
+    onPaths = ['/search'],
+    ...searchOpts
+  } = {
+    ...(routeSearchOptions || {}),
+    ...(searchOptions || {})
+  };
+
+  // Check do we meet conditions to run the search saga
+  const invokeSearch = onPaths.find(p => location.pathname.startsWith(p)) || searchOpts.composition || searchOpts.facet || searchOpts.listingType;
+
+  // An empty routeSearchOptions object can be used to import assets and load config for a minilist
+  const importAssets = routeSearchOptions;
+  if (importAssets || invokeSearch) {
+    // Async load search assets
+    const {
+      reducer,
+      sagas,
+      setRouteFilters
+    } = yield importSearchAssets();
+
+    // Inject search reducer and sagas
+    yield effects.call(reduxInjectorSaga, async () => ({
+      key: 'search',
+      reducer: searchOpts.config && reducer(searchOpts.config),
+      saga: sagas
+    }));
+    if (invokeSearch) yield effects.call(setRouteFilters, {
+      params,
+      ssr,
+      ...searchOpts,
+      mappers
+    });
+  }
+}
+
+const routingSagas = [effects.takeEvery(selectors$1.SET_NAVIGATION_PATH, getRouteSaga), effects.takeEvery(selectors$1.SET_ROUTE, setRouteSaga)];
 
 /**
  * To navigate / push a specific route via redux middleware
@@ -124,7 +492,7 @@ function* setRouteSaga(action) {
 function* getRouteSaga(action) {
   let entry = null;
   try {
-    var _staticRoute$route, _staticRoute$route2, _staticRoute$route3, _staticRoute$route4, _appsays, _appsays2, _appsays3, _pathNode3, _pathNode4;
+    var _staticRoute$route, _staticRoute$route2, _staticRoute$route3, _staticRoute$route4, _appsays, _appsays2, _appsays3, _pathNode3, _pathNode4, _pathNode5;
     const {
       withEvents,
       routes: {
@@ -133,7 +501,8 @@ function* getRouteSaga(action) {
       staticRoute,
       // get api instance from ssr context that is connected to the specific request in ssr
       ssr: {
-        api
+        api,
+        subsitePath
       }
     } = action;
 
@@ -150,7 +519,8 @@ function* getRouteSaga(action) {
     // These variables are the return values from
     // calls to withEvents.onRouteLoad and onRouteLoaded
     let appsays,
-      requireLogin = false;
+      requireLogin = false,
+      searchOptions = false;
     if (withEvents && withEvents.onRouteLoad) {
       appsays = yield withEvents.onRouteLoad(action);
     }
@@ -168,14 +538,16 @@ function* getRouteSaga(action) {
     const setStaticRouteLimits = typeof linkDepth !== 'undefined' || fields || fieldLinkDepths;
     const setContentTypeLimits = !!ContentTypeMappings.find(ct => ct.fields || ct.linkDepth || ct.nodeOptions || ct.fieldLinkDepths);
     const state = yield effects.select();
-    const routeEntry = selectors.selectRouteEntry(state, 'js');
-    const routeNode = selectors.selectCurrentNode(state, 'js');
+    const routeEntry = selectors$1.selectRouteEntry(state, 'js');
+    const routeNode = selectors$1.selectCurrentNode(state, 'js');
     const currentPath = action.path; //selectCurrentPath(state);
+    const contentPath = action.contentPath;
     const deliveryApiStatus = version$1.selectVersionStatus(state);
-    const project = selectors.selectCurrentProject(state);
+    const project = selectors$1.selectCurrentProject(state);
     // const isHome = currentPath === '/';
     const isPreview = currentPath && currentPath.startsWith('/preview/');
-    const defaultLang = appsays && appsays.defaultLang || 'en-GB';
+    const currentLanguage = selectors.selectCurrentLanguage(state);
+    const defaultLang = appsays && appsays.defaultLang || currentLanguage || 'en-GB';
     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
@@ -188,18 +560,11 @@ function* getRouteSaga(action) {
           entry: null
         };
         pathNode.entry = entry = routeEntry;
-        //Do nothing, the entry is allready the right one.
-        // yield put({
-        //   type: SET_ENTRY,
-        //   entry,
-        //   node: routeNode,
-        //   isLoading: false,
-        // });
         yield effects.put({
-          type: selectors.UPDATE_LOADING_STATE,
+          type: selectors$1.UPDATE_LOADING_STATE,
           isLoading: false
         });
-      } else yield effects.call(setRouteEntry, currentPath, routeEntry, yield effects.select(selectors.selectCurrentNode), yield effects.select(selectors.selectCurrentAncestors), yield effects.select(selectors.selectCurrentSiblings));
+      } else yield effects.call(setRouteEntry, currentPath, routeEntry, yield effects.select(selectors$1.selectCurrentNode), yield effects.select(selectors$1.selectCurrentAncestors), yield effects.select(selectors$1.selectCurrentSiblings));
     } else {
       var _staticRoute$route6;
       // Handle preview routes
@@ -215,7 +580,6 @@ function* getRouteSaga(action) {
           // for previewing entries as it gives a response of []
           // -- apparently it is not correct to request latest content
           // with Node API
-
           let previewEntry = yield api.getClient(deliveryApiStatus, project).entries.get({
             id: entryGuid,
             language,
@@ -238,11 +602,13 @@ function* getRouteSaga(action) {
         // Resolve the complete entry with the node if we are setting limits in a static route
         [nodeError, pathNode] = yield to__default.default(api.getNode({
           depth: 0,
-          path: currentPath,
+          path: contentPath,
           entryFields: setStaticRouteLimits ? fields || '*' : setContentTypeLimits ? ['sys.contentTypeId', 'sys.id'] : '*',
           entryLinkDepth: setStaticRouteLimits && typeof linkDepth !== 'undefined' ? linkDepth : entryLinkDepth || 0,
           entryFieldLinkDepths: setStaticRouteLimits ? fieldLinkDepths : setContentTypeLimits ? undefined : entryFieldLinkDepths,
-          language: defaultLang,
+          // language parameter is not used when resolving a node by path
+          // https://www.contensis.com/help-and-docs/apis/delivery-http/navigation/nodes/get-a-node-by-path
+          // language: defaultLang,
           versionStatus: deliveryApiStatus
         }, project));
         if (nodeError) {
@@ -309,25 +675,43 @@ function* getRouteSaga(action) {
         appsays,
         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,
+        path: contentPath,
         pathNode,
         project,
+        subsitePath,
         versionStatus: deliveryApiStatus
       });
       if (children) pathNode.children = children;
     }
-    const resolvedContentTypeMapping = ChangePassword_container.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) || {};
+
+    // We initially listened for SET_ENTRY to complete before
+    // resolving the current route language, but this meant
+    // that the language change was not captured in time for the SSR response
+    yield effects.call(resolveCurrentRouteLanguage, {
+      entry: (_pathNode3 = pathNode) === null || _pathNode3 === void 0 ? void 0 : _pathNode3.entry,
+      node: pathNode
+    });
+    const contentTypeRoute = ChangePassword_container.findContentTypeMapping(ContentTypeMappings, (_pathNode4 = pathNode) === null || _pathNode4 === void 0 || (_pathNode4 = _pathNode4.entry) === null || _pathNode4 === void 0 || (_pathNode4 = _pathNode4.sys) === null || _pathNode4 === void 0 ? void 0 : _pathNode4.contentTypeId);
 
     // Inject redux { key, reducer, saga } provided by ContentTypeMapping
-    if (resolvedContentTypeMapping.injectRedux) yield effects.call(reduxInjectorSaga, resolvedContentTypeMapping.injectRedux);
+    if (contentTypeRoute !== null && contentTypeRoute !== void 0 && contentTypeRoute.injectRedux) yield effects.call(reduxInjectorSaga, contentTypeRoute.injectRedux);
+
+    // Have we defined search options in the route configuration (for triggering search)
+    const routeSearchOptions = ChangePassword_container.getSearchOptions(staticRoute, contentTypeRoute);
+    const params = util.routeParams(staticRoute, action.location);
     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
+      // The app can provide an object to invoke the search saga
       ({
-        requireLogin
+        requireLogin,
+        searchOptions
       } = (yield withEvents.onRouteLoaded({
         ...action,
-        entry
+        contentTypeRoute,
+        entry,
+        params,
+        searchOptions: routeSearchOptions
       })) || {});
     }
     if (requireLogin !== false) {
@@ -338,14 +722,20 @@ function* getRouteSaga(action) {
         requireLogin
       });
     }
+    if (searchOptions || routeSearchOptions) yield effects.call(handleSearchSaga, {
+      ...action,
+      params,
+      routeSearchOptions,
+      searchOptions
+    });
     if (!appsays || !appsays.preventScrollTop) {
       // Scroll into View
       if (typeof window !== 'undefined') window.scrollTo(0, 0);
     }
-    if ((_pathNode4 = pathNode) !== null && _pathNode4 !== void 0 && (_pathNode4 = _pathNode4.entry) !== null && _pathNode4 !== void 0 && (_pathNode4 = _pathNode4.sys) !== null && _pathNode4 !== void 0 && _pathNode4.id) {
+    if ((_pathNode5 = pathNode) !== null && _pathNode5 !== void 0 && (_pathNode5 = _pathNode5.entry) !== null && _pathNode5 !== void 0 && (_pathNode5 = _pathNode5.sys) !== null && _pathNode5 !== void 0 && _pathNode5.id) {
       var _appsays4;
       entry = pathNode.entry;
-      yield effects.call(setRouteEntry, currentPath, entry, pathNode, ancestors, siblings, entryMapper || resolvedContentTypeMapping.entryMapper, false, (_appsays4 = appsays) === null || _appsays4 === void 0 ? void 0 : _appsays4.refetchNode);
+      yield effects.call(setRouteEntry, currentPath, entry, pathNode, ancestors, siblings, entryMapper || (contentTypeRoute === null || contentTypeRoute === void 0 ? void 0 : contentTypeRoute.entryMapper), false, (_appsays4 = appsays) === null || _appsays4 === void 0 ? void 0 : _appsays4.refetchNode);
     } else {
       if (staticRoute) yield effects.call(setRouteEntry, currentPath, null, pathNode, ancestors, siblings);else yield effects.call(do404);
     }
@@ -363,6 +753,7 @@ function* resolveCurrentNodeOrdinates(action) {
     path,
     pathNode,
     project,
+    subsitePath,
     versionStatus
   } = action;
   const apiCall = [() => null, () => null, () => null, () => null];
@@ -385,7 +776,8 @@ function* resolveCurrentNodeOrdinates(action) {
           return yield api.getAncestors({
             id: pathNode.id,
             language,
-            versionStatus
+            versionStatus,
+            startLevel: (subsitePath || '').split('/').length
           }, project);
         } catch (ex) {
           log__namespace.info('Problem fetching ancestors', ex);
@@ -459,16 +851,16 @@ function* setRouteEntry(currentPath, entry, node, ancestors, siblings, entryMapp
   // 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 effects.select(selectors.selectRouteEntryEntryId);
-  const currentEntryLang = yield effects.select(selectors.selectRouteEntryLanguage);
-  const mappedEntry = !entryMapper ? null : currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (yield effects.select(selectors.selectMappedEntry, 'js')) || {} : yield mapRouteEntry(entryMapper, {
+  const currentEntryId = yield effects.select(selectors$1.selectRouteEntryEntryId);
+  const currentEntryLang = yield effects.select(selectors$1.selectRouteEntryLanguage);
+  const mappedEntry = !entryMapper ? null : currentEntryId === entrySys.id && currentEntryLang === entrySys.language && remapEntry === false ? (yield effects.select(selectors$1.selectMappedEntry, 'js')) || {} : yield mapRouteEntry(entryMapper, {
     ...node,
     entry,
     ancestors,
     siblings
   });
   yield effects.all([effects.put({
-    type: selectors.SET_ENTRY,
+    type: selectors$1.SET_ENTRY,
     id: entrySys.id,
     currentPath,
     entry,
@@ -476,10 +868,10 @@ function* setRouteEntry(currentPath, entry, node, ancestors, siblings, entryMapp
     node,
     notFound
   }), ancestors && effects.put({
-    type: selectors.SET_ANCESTORS,
+    type: selectors$1.SET_ANCESTORS,
     ancestors
   }), siblings && effects.put({
-    type: selectors.SET_SIBLINGS,
+    type: selectors$1.SET_SIBLINGS,
     siblings
   })]);
 }
@@ -499,14 +891,14 @@ function* mapRouteEntry(entryMapper, node) {
 function* do404() {
   yield effects.call(clientReloadHitServer);
   yield effects.put({
-    type: selectors.SET_ENTRY,
+    type: selectors$1.SET_ENTRY,
     id: null,
     entry: null,
     notFound: true
   });
 }
 function* clientReloadHitServer() {
-  const stateEntry = yield effects.select(selectors.selectRouteEntry);
+  const stateEntry = yield effects.select(selectors$1.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,
@@ -517,7 +909,7 @@ function* clientReloadHitServer() {
 }
 function* do500(error) {
   yield effects.put({
-    type: selectors.SET_ENTRY,
+    type: selectors$1.SET_ENTRY,
     id: null,
     entry: null,
     notFound: true,
@@ -526,22 +918,8 @@ function* do500(error) {
     statusCode: error && error.status ? error.status : 500
   });
 }
-function* reduxInjectorSaga(injectorFn) {
-  if (typeof injectorFn === 'function') {
-    const {
-      key,
-      reducer,
-      saga
-    } = yield injectorFn();
-    version.injectRedux({
-      key,
-      reducer,
-      saga
-    });
-  }
-}
 
-const registerSagas = [effects.takeEvery(selectors.REGISTER_USER, registerSaga), effects.takeEvery(selectors.REGISTER_USER_SUCCESS, redirectSaga)];
+const registerSagas = [effects.takeEvery(selectors$1.REGISTER_USER, registerSaga), effects.takeEvery(selectors$1.REGISTER_USER_SUCCESS, redirectSaga)];
 function* registerSaga({
   user,
   mappers
@@ -573,13 +951,13 @@ function* registerSaga({
       }
       // Update user object with mappedResponse or responseBody
       yield effects.put({
-        type: selectors.REGISTER_USER_SUCCESS,
+        type: selectors$1.REGISTER_USER_SUCCESS,
         user: mappedResponse || responseBody
       });
     } else {
       // OK response but unable to parse the response body
       yield effects.put({
-        type: selectors.REGISTER_USER_FAILED,
+        type: selectors$1.REGISTER_USER_FAILED,
         error: {
           message: 'Unable to parse the created user from the register service response'
         }
@@ -597,18 +975,18 @@ function* registerSaga({
       error.status = response.status;
     }
     yield effects.put({
-      type: selectors.REGISTER_USER_FAILED,
+      type: selectors$1.REGISTER_USER_FAILED,
       error
     });
   }
 }
 function* redirectSaga() {
   // Check if querystring contains a redirect_uri
-  const currentQs = selectors.queryParams(yield effects.select(selectors.selectCurrentSearch));
+  const currentQs = selectors$1.queryParams(yield effects.select(selectors$1.selectCurrentSearch));
   const redirectUri = currentQs.redirect_uri || currentQs.redirect;
 
   // We must use redux based navigation to preserve the registration state
-  if (redirectUri) yield effects.put(selectors.setRoute(redirectUri));
+  if (redirectUri) yield effects.put(selectors$1.setRoute(redirectUri));
 }
 
 const PAP_URL = 'https://pap.zengenti.com';
@@ -676,11 +1054,11 @@ async function api(url, options) {
   });
 }
 
-const resetPasswordSagas = [effects.takeEvery(selectors.REQUEST_USER_PASSWORD_RESET, requestPasswordResetSaga), effects.takeEvery(selectors.RESET_USER_PASSWORD, resetPasswordSaga), effects.takeEvery(selectors.CHANGE_USER_PASSWORD, changePasswordSaga)];
+const resetPasswordSagas = [effects.takeEvery(selectors$1.REQUEST_USER_PASSWORD_RESET, requestPasswordResetSaga), effects.takeEvery(selectors$1.RESET_USER_PASSWORD, resetPasswordSaga), effects.takeEvery(selectors$1.CHANGE_USER_PASSWORD, changePasswordSaga)];
 function* requestPasswordResetSaga(action) {
   const userEmailObject = action.userEmailObject;
   yield effects.put({
-    type: selectors.REQUEST_USER_PASSWORD_RESET_SENDING
+    type: selectors$1.REQUEST_USER_PASSWORD_RESET_SENDING
   });
   if (userEmailObject && userEmailObject.userEmail) {
     try {
@@ -688,29 +1066,29 @@ function* requestPasswordResetSaga(action) {
       if (passwordResetRequestResponse) {
         if (!passwordResetRequestResponse.error) {
           yield effects.put({
-            type: selectors.REQUEST_USER_PASSWORD_RESET_SUCCESS
+            type: selectors$1.REQUEST_USER_PASSWORD_RESET_SUCCESS
           });
         } else {
           yield effects.put({
-            type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
+            type: selectors$1.REQUEST_USER_PASSWORD_RESET_ERROR,
             error: passwordResetRequestResponse.error.message
           });
         }
       } else {
         yield effects.put({
-          type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
+          type: selectors$1.REQUEST_USER_PASSWORD_RESET_ERROR,
           error: 'No response from server'
         });
       }
     } catch (error) {
       yield effects.put({
-        type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
+        type: selectors$1.REQUEST_USER_PASSWORD_RESET_ERROR,
         error: error && error.toString()
       });
     }
   } else {
     yield effects.put({
-      type: selectors.REQUEST_USER_PASSWORD_RESET_ERROR,
+      type: selectors$1.REQUEST_USER_PASSWORD_RESET_ERROR,
       error: 'Invalid object'
     });
   }
@@ -718,7 +1096,7 @@ function* requestPasswordResetSaga(action) {
 function* resetPasswordSaga(action) {
   const resetPasswordObject = action.resetPasswordObject;
   yield effects.put({
-    type: selectors.RESET_USER_PASSWORD_SENDING
+    type: selectors$1.RESET_USER_PASSWORD_SENDING
   });
   if (resetPasswordObject.token && resetPasswordObject.password) {
     try {
@@ -726,30 +1104,30 @@ function* resetPasswordSaga(action) {
       if (resetPasswordResponse) {
         if (!resetPasswordResponse.error) {
           yield effects.put({
-            type: selectors.RESET_USER_PASSWORD_SUCCESS
+            type: selectors$1.RESET_USER_PASSWORD_SUCCESS
           });
         } else {
           const error = resetPasswordResponse.error.data && resetPasswordResponse.error.data.length > 0 && resetPasswordResponse.error.data[0].message || resetPasswordResponse.error.message;
           yield effects.put({
-            type: selectors.RESET_USER_PASSWORD_ERROR,
+            type: selectors$1.RESET_USER_PASSWORD_ERROR,
             error
           });
         }
       } else {
         yield effects.put({
-          type: selectors.RESET_USER_PASSWORD_ERROR,
+          type: selectors$1.RESET_USER_PASSWORD_ERROR,
           error: 'No response from server'
         });
       }
     } catch (error) {
       yield effects.put({
-        type: selectors.RESET_USER_PASSWORD_ERROR,
+        type: selectors$1.RESET_USER_PASSWORD_ERROR,
         error: error && error.toString()
       });
     }
   } else {
     yield effects.put({
-      type: selectors.RESET_USER_PASSWORD_ERROR,
+      type: selectors$1.RESET_USER_PASSWORD_ERROR,
       error: 'Invalid object'
     });
   }
@@ -761,7 +1139,7 @@ function* resetPasswordSaga(action) {
 function* changePasswordSaga(action) {
   if (!action || !action.userId || !action.currentPassword || !action.newPassword) {
     yield effects.put({
-      type: selectors.CHANGE_USER_PASSWORD_ERROR,
+      type: selectors$1.CHANGE_USER_PASSWORD_ERROR,
       error: 'Invalid action object sent to changePassword saga'
     });
     return;
@@ -773,9 +1151,9 @@ function* changePasswordSaga(action) {
       new: action.newPassword
     };
     yield effects.put({
-      type: selectors.CHANGE_USER_PASSWORD_SENDING
+      type: selectors$1.CHANGE_USER_PASSWORD_SENDING
     });
-    const clientCredentials = yield effects.select(ToJs.selectClientCredentials, 'js');
+    const clientCredentials = yield effects.select(matchGroups.selectClientCredentials, 'js');
     const client = yield ChangePassword_container.getManagementApiClient({
       ...clientCredentials
     });
@@ -784,22 +1162,17 @@ function* changePasswordSaga(action) {
       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 effects.put({
-        type: selectors.CHANGE_USER_PASSWORD_ERROR,
+        type: selectors$1.CHANGE_USER_PASSWORD_ERROR,
         error
       });
       return;
     }
-
-    // // eslint-disable-next-line no-console
-    // console.log(changePasswordObject);
-    // // eslint-disable-next-line no-console
-    // console.log(userCredentialsObject);
     yield effects.put({
-      type: selectors.CHANGE_USER_PASSWORD_SUCCESS
+      type: selectors$1.CHANGE_USER_PASSWORD_SUCCESS
     });
   } catch (error) {
     yield effects.put({
-      type: selectors.CHANGE_USER_PASSWORD_ERROR,
+      type: selectors$1.CHANGE_USER_PASSWORD_ERROR,
       error: error && error.toString()
     });
   }
@@ -807,13 +1180,16 @@ function* changePasswordSaga(action) {
 
 const userSagas = [...ChangePassword_container.loginSagas, ...registerSagas, ...resetPasswordSagas];
 
-// index.js
-function rootSaga (featureSagas = []) {
-  return function* rootSaga() {
-    const subSagas = [...routingSagas, ...navigationSagas, ...userSagas];
-    yield effects.all([...subSagas, ...featureSagas]);
-  };
-}
+var rootSaga = (featureSagas = []) => {
+  return [...i18nSagas, ...routingSagas, ...navigationSagas, ...userSagas, ...featureSagas];
+};
+
+// export default function (featureSagas: Effect[] = []) {
+//   return function* rootSaga() {
+//     const subSagas = [...routingSagas, ...navigationSagas, ...userSagas];
+//     yield all([...subSagas, ...featureSagas]);
+//   };
+// }
 
 const servers = SERVERS; /* global SERVERS */
 const alias = servers.alias.toLowerCase();
@@ -860,7 +1236,8 @@ const AppRoot = props => {
 
 exports.AppRoot = AppRoot;
 exports.browserHistory = browserHistory;
+exports.createLocaleRoutes = createLocaleRoutes;
 exports.history = history;
 exports.pickProject = pickProject;
 exports.rootSaga = rootSaga;
-//# sourceMappingURL=App-vZrUfVgQ.js.map
+//# sourceMappingURL=App-Dr56ZsQj.js.map