@zengenti/contensis-react-base 3.0.2-beta.9 → 3.1.1-beta.0

package/esm/redux.js

@@ -1,15 +1,14 @@
-import { n as navigation$2, v as version$1, G as GET_NODE_TREE, e as version$3 } from './version-dd31c7f0.js';
-export { r as store } from './version-dd31c7f0.js';
-import { E as routing$1, D as action, F as routing$2, G as routing$3 } from './selectors-3f0d804d.js';
-export { D as action, g as getIn, H as getJS } from './selectors-3f0d804d.js';
-import { v as version$2, n as navigation$3 } from './version-f4629693.js';
-export { c as convertSagaArray, b as injectReducer, i as injectRedux, d as injectSaga, u as useInjectRedux } from './version-f4629693.js';
+import { n as navigation$2, v as version$1, G as GET_NODE_TREE, e as version$3 } from './version-7ea8bea8.js';
+export { r as store } from './version-7ea8bea8.js';
+import { F as routing$1, E as action, G as routing$2, H as routing$3 } from './selectors-0fe67d47.js';
+export { E as action, g as getIn, I as getJS } from './selectors-0fe67d47.js';
+import { v as version$2, n as navigation$3 } from './version-f42f7bdc.js';
+export { c as convertSagaArray, b as injectReducer, i as injectRedux, d as injectSaga, u as useInjectRedux } from './version-f42f7bdc.js';
 import 'redux';
 import 'redux-thunk';
 import 'redux-saga';
 import 'redux-injectors';
 import 'immer';
-import 'deepmerge';
 import './reducers-3d5c37d1.js';
 import 'jsonpath-mapper';
 import 'query-string';

package/esm/redux.js.map

@@ -1 +1 @@
-{"version":3,"file":"redux.js","sources":["../src/redux/types/index.js","../src/redux/actions/navigation.js","../src/redux/actions/index.js","../src/redux/selectors/index.js","../src/redux/index.ts"],"sourcesContent":["import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/types';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import { action } from '../util';\n\nimport { GET_NODE_TREE } from '~/redux/types/navigation';\n\nexport const loadNavigationTree = () => action(GET_NODE_TREE);\n","import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/actions';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/selectors';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import types from './types';\nimport actions from './actions';\nimport selectors from './selectors';\n\nexport { action, getJS, getImmutableOrJS as getIn } from './util';\n\nexport { reduxStore as store } from './store/store';\n\nexport {\n  convertSagaArray,\n  injectRedux,\n  injectReducer,\n  injectSaga,\n  useInjectRedux,\n} from './store/injectors';\n\n// Remap the objects so they are presented in \"feature\" hierarchy\n// e.g. { routing: { types, actions }, navigation: { types, actions } }\n// instead of { types: { routing, navigation }, actions: { routing, navigation } }\n\nexport const navigation = {\n  types: types.navigation,\n  actions: actions.navigation,\n  selectors: selectors.navigation,\n};\nexport const routing = {\n  types: types.routing,\n  actions: actions.routing,\n  selectors: selectors.routing,\n};\nexport const version = {\n  types: types.version,\n  actions: actions.version,\n  selectors: selectors.version,\n};\n"],"names":["navigation","routing","version","loadNavigationTree","action","GET_NODE_TREE","types","actions","selectors"],"mappings":";;;;;;;;;;;;;;;;;AAIA,YAAe;cAAEA,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACAxC,MAAMC,kBAAkB,GAAGA,MAAMC,MAAM,CAACC,aAAa,CAAC;;;;;;;ACA7D,cAAe;cAAEL,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACA/C,gBAAe;cAAEF,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACY/C;AACA;AACA;;AAEO,MAAMF,UAAU,GAAG;EACxBM,KAAK,EAAEA,KAAK,CAACN,UAAU;EACvBO,OAAO,EAAEA,OAAO,CAACP,UAAU;EAC3BQ,SAAS,EAAEA,SAAS,CAACR,UAAAA;AACvB,EAAC;AACM,MAAMC,OAAO,GAAG;EACrBK,KAAK,EAAEA,KAAK,CAACL,OAAO;EACpBM,OAAO,EAAEA,OAAO,CAACN,OAAO;EACxBO,SAAS,EAAEA,SAAS,CAACP,OAAAA;AACvB,EAAC;AACM,MAAMC,OAAO,GAAG;EACrBI,KAAK,EAAEA,KAAK,CAACJ,OAAO;EACpBK,OAAO,EAAEA,OAAO,CAACL,OAAO;EACxBM,SAAS,EAAEA,SAAS,CAACN,OAAAA;AACvB;;;;"}
+{"version":3,"file":"redux.js","sources":["../src/redux/types/index.js","../src/redux/actions/navigation.js","../src/redux/actions/index.js","../src/redux/selectors/index.js","../src/redux/index.ts"],"sourcesContent":["import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/types';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import { action } from '../util';\n\nimport { GET_NODE_TREE } from '~/redux/types/navigation';\n\nexport const loadNavigationTree = () => action(GET_NODE_TREE);\n","import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/actions';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import * as navigation from './navigation';\nimport * as routing from '~/routing/redux/selectors';\nimport * as version from './version';\n\nexport default { navigation, routing, version };\n","import types from './types';\nimport actions from './actions';\nimport selectors from './selectors';\n\nexport { action, getJS, getImmutableOrJS as getIn } from './util';\n\nexport { reduxStore as store } from './store/store';\n\nexport {\n  convertSagaArray,\n  injectRedux,\n  injectReducer,\n  injectSaga,\n  useInjectRedux,\n} from './store/injectors';\n\n// Remap the objects so they are presented in \"feature\" hierarchy\n// e.g. { routing: { types, actions }, navigation: { types, actions } }\n// instead of { types: { routing, navigation }, actions: { routing, navigation } }\n\nexport const navigation = {\n  types: types.navigation,\n  actions: actions.navigation,\n  selectors: selectors.navigation,\n};\nexport const routing = {\n  types: types.routing,\n  actions: actions.routing,\n  selectors: selectors.routing,\n};\nexport const version = {\n  types: types.version,\n  actions: actions.version,\n  selectors: selectors.version,\n};\n"],"names":["navigation","routing","version","loadNavigationTree","action","GET_NODE_TREE","types","actions","selectors"],"mappings":";;;;;;;;;;;;;;;;AAIA,YAAe;cAAEA,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACAxC,MAAMC,kBAAkB,GAAGA,MAAMC,MAAM,CAACC,aAAa,CAAC;;;;;;;ACA7D,cAAe;cAAEL,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACA/C,gBAAe;cAAEF,YAAU;WAAEC,SAAO;AAAEC,WAAAA,SAAAA;AAAQ,CAAC;;ACY/C;AACA;AACA;;AAEO,MAAMF,UAAU,GAAG;EACxBM,KAAK,EAAEA,KAAK,CAACN,UAAU;EACvBO,OAAO,EAAEA,OAAO,CAACP,UAAU;EAC3BQ,SAAS,EAAEA,SAAS,CAACR,UAAAA;AACvB,EAAC;AACM,MAAMC,OAAO,GAAG;EACrBK,KAAK,EAAEA,KAAK,CAACL,OAAO;EACpBM,OAAO,EAAEA,OAAO,CAACN,OAAO;EACxBO,SAAS,EAAEA,SAAS,CAACP,OAAAA;AACvB,EAAC;AACM,MAAMC,OAAO,GAAG;EACrBI,KAAK,EAAEA,KAAK,CAACJ,OAAO;EACpBK,OAAO,EAAEA,OAAO,CAACL,OAAO;EACxBM,SAAS,EAAEA,SAAS,CAACN,OAAAA;AACvB;;;;"}

package/esm/routing.js

@@ -1,12 +1,13 @@
-export { F as actions, G as selectors, E as types } from './selectors-3f0d804d.js';
-export { R as RouteLoader } from './RouteLoader-f5d5f733.js';
+export { G as actions, H as selectors, F as types } from './selectors-0fe67d47.js';
+export { R as RouteLoader } from './RouteLoader-fe64ca81.js';
 import 'jsonpath-mapper';
 import 'query-string';
 import 'react';
+import 'react-cookie';
 import 'react-redux';
 import 'react-hot-loader';
 import 'react-router-dom';
 import 'react-router-config';
 import 'reselect';
-import './ToJs-0066e629.js';
+import './ToJs-c75473e9.js';
 //# sourceMappingURL=routing.js.map

package/esm/routing.js.map

@@ -1 +1 @@
-{"version":3,"file":"routing.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;"}
+{"version":3,"file":"routing.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}

package/esm/{sagas-53d2aefb.js → sagas-933a8fc8.js}

@@ -111,18 +111,18 @@ const clearFilters$1 = filterKey => {
     filterKey
   };
 };
-const updatePageIndex$1 = (pageIndex, scrollYPos) => {
+const updatePageIndex$1 = (pageIndex, scrollToElement) => {
   return {
     type: UPDATE_PAGE_INDEX,
     pageIndex,
-    scrollYPos
+    scrollToElement
   };
 };
-const updatePageSize$1 = (pageSize, scrollYPos) => {
+const updatePageSize$1 = (pageSize, scrollToElement) => {
   return {
     type: UPDATE_PAGE_SIZE,
     pageSize,
-    scrollYPos
+    scrollToElement
   };
 };
 const updateCurrentFacet$1 = facet => {
@@ -143,13 +143,13 @@ const updateSearchTerm$1 = term => {
     term
   };
 };
-const updateSelectedFilters = (filter, key, isUnknownItem = false, scrollYPos) => {
+const updateSelectedFilters = (filter, key, isUnknownItem = false, scrollToElement) => {
   return {
     type: UPDATE_SELECTED_FILTERS,
     filter,
     key,
     isUnknownItem,
-    scrollYPos
+    scrollToElement
   };
 };
 const updateSortOrder$1 = (orderBy, facet) => {
@@ -1021,7 +1021,7 @@ const customWhereExpressions = where => {
   });
 };
 const makeJsExpression = (operator, field, value) => operator === 'freeText' || operator === 'contains' ? Op[operator](field, value) : operator === 'in' ? Op[operator](field, ...value) : operator === 'exists' ? Op[operator](field, value) : operator === 'between' ? Op[operator](field, value[0], value[1]) : operator === 'distanceWithin' ? Op[operator](field, value === null || value === void 0 ? void 0 : value.lat, value === null || value === void 0 ? void 0 : value.lon, value === null || value === void 0 ? void 0 : value.distance) : Op[operator](field, value);
-const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch) => {
+const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch, omitSearchFields = []) => {
   if (searchTerm && weightedSearchFields && weightedSearchFields.length > 0) {
     // Extract any phrases in quotes to array
     const quotedPhrases = extractQuotedPhrases(searchTerm);
@@ -1069,11 +1069,25 @@ const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch) => {
     });
 
     // Wrap operators in an Or operator
-    return [Op.or().addRange(operators).add(Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+    const expressions = Op.or().addRange(operators);
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent))
+      // include "searchContent" field by default unless omitted
+      return [expressions.add(Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];else return [expressions];
   } else if (searchTerm) {
     // Searching without weightedSearchFields defined will fall back
     // to a default set of search fields with arbritary weights set.
-    return [Op.or(Op.equalTo(Fields.entryTitle, searchTerm).weight(10), Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2), Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2), Op.contains(Fields.keywords, searchTerm).weight(2), Op.contains(Fields.sys.uri, searchTerm).weight(2), Op.contains(Fields.sys.allUris, searchTerm), Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+
+    const exp = [];
+    if (!omitSearchFields.find(sf => sf === Fields.entryTitle)) {
+      exp.push(Op.equalTo(Fields.entryTitle, searchTerm).weight(10));
+      exp.push(Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2));
+    }
+    if (!omitSearchFields.find(sf => sf === Fields.entryDescription)) exp.push(Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.keywords)) exp.push(Op.contains(Fields.keywords, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.uri)) exp.push(Op.contains(Fields.sys.uri, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.allUris)) exp.push(Op.contains(Fields.sys.allUris, searchTerm));
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent)) exp.push(Op.freeText(Fields.searchContent, searchTerm, fuzzySearch));
+    return [Op.or(...exp)];
   } else {
     return [];
   }
@@ -1116,13 +1130,14 @@ const searchQuery = ({
   languages,
   pageSize,
   pageIndex,
+  omitDefaultSearchFields,
   orderBy,
   searchTerm,
   versionStatus,
   webpageTemplates,
   weightedSearchFields
 }, isFeatured = false) => {
-  let expressions = [...termExpressions(searchTerm, weightedSearchFields, fuzzySearch), ...defaultExpressions(versionStatus), ...includeInSearchExpressions(webpageTemplates, includeInSearchFields), ...languagesExpression(languages), ...customWhereExpressions(customWhere), ...excludeIdsExpression(excludeIds)];
+  let expressions = [...termExpressions(searchTerm, weightedSearchFields, fuzzySearch, omitDefaultSearchFields), ...defaultExpressions(versionStatus), ...includeInSearchExpressions(webpageTemplates, includeInSearchFields), ...languagesExpression(languages), ...customWhereExpressions(customWhere), ...excludeIdsExpression(excludeIds)];
   if (isFeatured) expressions = [...expressions, ...featuredResultsExpression(featuredResults)];
   if (!isFeatured || featuredResults && !featuredResults.contentTypeId) expressions = [...expressions, ...filterExpressions(filters), ...contentTypeIdExpression(contentTypeIds, webpageTemplates, assetTypes)];
   const query = new Query(...expressions);
@@ -1358,6 +1373,7 @@ const queryParamsTemplate = {
   }) => action.defaultLang ? [action.defaultLang] : [],
   linkDepth: root => getQueryParameter(root, 'linkDepth', 0),
   loadMorePaging: root => getQueryParameter(root, 'loadMorePaging', false),
+  omitDefaultSearchFields: root => getQueryParameter(root, 'omitDefaultSearchFields', []),
   orderBy: root => getQueryParameter(root, 'orderBy', []),
   pageIndex: root => {
     const {
@@ -1391,7 +1407,7 @@ const queryParamsTemplate = {
     context
   }) => {
     var _getFacet;
-    return ((_getFacet = getFacet(state, facet, context)) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
+    return ((_getFacet = getFacet(state, facet, context, 'js')) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId) || selectCurrentProject(state);
   },
   searchTerm: root => root.context !== Context.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
   selectedFilters: ({
@@ -1512,8 +1528,16 @@ const debugExecuteSearch = (action, state) => {
   console.log(stateParams, queryParams);
   console.log('getSelectedFilters', getSelectedFilters(action.ogState || state, action.facet, action.context, 'js'), 'params', action.params);
 };
-const scrollTop = scrollYPos => {
-  if (typeof window !== 'undefined') window.scrollTo(0, scrollYPos);
+const scrollTo = scrollToElement => {
+  if (typeof window !== 'undefined') {
+    if (typeof scrollToElement === 'number')
+      // Used to be Y coordinate, deprecated, because it's not accessible
+      console.warn('updatePageIndex arg2 needs string');else if (typeof scrollToElement === 'string') {
+      /* Effectively simulates an anchor link. Needed for accessibility, as window.scrollTo
+         does not change focus, only scrolls the screen */
+      window.location.href = `${location.pathname}${location.search}#${scrollToElement}`;
+    }
+  }
 };
 
 // *** FILTER ITEM MAPPING ***
@@ -1893,34 +1917,34 @@ function* updatePageIndex(action) {
   const {
     pageIndex,
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({
     pageIndex
   }, mappers);
   yield put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
 function* updatePageSize(action) {
   const {
     pageSize,
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({
     pageSize
   }, mappers);
   yield put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
 function* applySearchFilter(action) {
   const {
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({}, mappers);
   yield put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
 function* buildUri({
   facet,
@@ -1956,4 +1980,4 @@ function* triggerSearchSsr(options) {
 }
 
 export { EXECUTE_SEARCH as $, clearFilters$1 as A, updateCurrentFacet$1 as B, updateCurrentTab$1 as C, updatePageIndex$1 as D, updatePageSize$1 as E, updateSearchTerm$1 as F, updateSelectedFilters as G, updateSortOrder$1 as H, selectListing as I, mapStateToSearchUri as J, Context as K, selectFacets as L, triggerSearch as M, getFilters as N, toArray as O, UPDATE_SELECTED_FILTERS as P, UPDATE_SEARCH_TERM as Q, UPDATE_PAGE_SIZE as R, UPDATE_PAGE_INDEX as S, SET_SEARCH_FILTERS as T, UPDATE_SORT_ORDER as U, SET_SEARCH_ENTRIES as V, SET_ROUTE_FILTERS as W, LOAD_FILTERS_COMPLETE as X, LOAD_FILTERS_ERROR as Y, LOAD_FILTERS as Z, EXECUTE_SEARCH_ERROR as _, customWhereExpressions as a, CLEAR_FILTERS as a0, APPLY_CONFIG as a1, actions as a2, selectors as a3, types as a4, expressions as a5, queries as a6, doSearch as a7, setRouteFilters as a8, searchSagas as a9, triggerListingSsr as aa, triggerMinilistSsr as ab, triggerSearchSsr as ac, routeParams as ad, getPageIndex as b, contentTypeIdExpression as c, defaultExpressions as d, getCurrentTab as e, filterExpressions as f, getCurrentFacet as g, getFacet as h, getTabFacets as i, getFacetsTotalCount as j, getFacetTitles as k, getFeaturedResults as l, getRenderableFilters as m, getIsLoading as n, orderByExpression as o, getPaging as p, getPageIsLoading as q, getResults as r, getSearchTerm as s, termExpressions as t, getSearchTotalCount as u, getSelectedFilters as v, getQueryParameter as w, getTabsAndFacets as x, getTotalCount as y, withMappers as z };
-//# sourceMappingURL=sagas-53d2aefb.js.map
+//# sourceMappingURL=sagas-933a8fc8.js.map