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

package/cjs/redux.js

@@ -2,15 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version$1 = require('./version-38afaf2a.js');
-var selectors$1 = require('./selectors-c76c2676.js');
-var version$2 = require('./version-886f49d8.js');
+var version$1 = require('./version-fb4ba30b.js');
+var selectors$1 = require('./selectors-8e56cc34.js');
+var version$2 = require('./version-91b90ee8.js');
 require('redux');
 require('redux-thunk');
 require('redux-saga');
 require('redux-injectors');
 require('immer');
-require('deepmerge');
 require('./reducers-9afb5f89.js');
 require('jsonpath-mapper');
 require('query-string');

package/cjs/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,oBAAU;WAAEC,mBAAO;AAAEC,WAAAA,iBAAAA;AAAQ,CAAC;;ACAxC,MAAMC,kBAAkB,GAAGA,MAAMC,kBAAM,CAACC,uBAAa,CAAC;;;;;;;ACA7D,cAAe;cAAEL,YAAU;WAAEC,qBAAO;AAAEC,WAAAA,iBAAAA;AAAQ,CAAC;;ACA/C,gBAAe;cAAEF,oBAAU;WAAEC,qBAAO;AAAEC,WAAAA,mBAAAA;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,oBAAU;WAAEC,mBAAO;AAAEC,WAAAA,iBAAAA;AAAQ,CAAC;;ACAxC,MAAMC,kBAAkB,GAAGA,MAAMC,kBAAM,CAACC,uBAAa,CAAC;;;;;;;ACA7D,cAAe;cAAEL,YAAU;WAAEC,qBAAO;AAAEC,WAAAA,iBAAAA;AAAQ,CAAC;;ACA/C,gBAAe;cAAEF,oBAAU;WAAEC,qBAAO;AAAEC,WAAAA,mBAAAA;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/cjs/routing.js

@@ -2,17 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var selectors = require('./selectors-c76c2676.js');
-var RouteLoader = require('./RouteLoader-47d70a26.js');
+var selectors = require('./selectors-8e56cc34.js');
+var RouteLoader = require('./RouteLoader-014a95b9.js');
 require('jsonpath-mapper');
 require('query-string');
 require('react');
+require('react-cookie');
 require('react-redux');
 require('react-hot-loader');
 require('react-router-dom');
 require('react-router-config');
 require('reselect');
-require('./ToJs-61c03582.js');
+require('./ToJs-64970869.js');
 
 
 

package/cjs/routing.js.map

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

package/cjs/{sagas-6d12e7ca.js → sagas-e04b94c1.js}

@@ -137,18 +137,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 => {
@@ -169,13 +169,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) => {
@@ -1047,7 +1047,7 @@ const customWhereExpressions = where => {
   });
 };
 const makeJsExpression = (operator, field, value) => operator === 'freeText' || operator === 'contains' ? contensisCoreApi.Op[operator](field, value) : operator === 'in' ? contensisCoreApi.Op[operator](field, ...value) : operator === 'exists' ? contensisCoreApi.Op[operator](field, value) : operator === 'between' ? contensisCoreApi.Op[operator](field, value[0], value[1]) : operator === 'distanceWithin' ? contensisCoreApi.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) : contensisCoreApi.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);
@@ -1095,11 +1095,25 @@ const termExpressions = (searchTerm, weightedSearchFields, fuzzySearch) => {
     });
 
     // Wrap operators in an Or operator
-    return [contensisCoreApi.Op.or().addRange(operators).add(contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+    const expressions = contensisCoreApi.Op.or().addRange(operators);
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent))
+      // include "searchContent" field by default unless omitted
+      return [expressions.add(contensisCoreApi.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 [contensisCoreApi.Op.or(contensisCoreApi.Op.equalTo(Fields.entryTitle, searchTerm).weight(10), contensisCoreApi.Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2), contensisCoreApi.Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2), contensisCoreApi.Op.contains(Fields.keywords, searchTerm).weight(2), contensisCoreApi.Op.contains(Fields.sys.uri, searchTerm).weight(2), contensisCoreApi.Op.contains(Fields.sys.allUris, searchTerm), contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch))];
+
+    const exp = [];
+    if (!omitSearchFields.find(sf => sf === Fields.entryTitle)) {
+      exp.push(contensisCoreApi.Op.equalTo(Fields.entryTitle, searchTerm).weight(10));
+      exp.push(contensisCoreApi.Op.freeText(Fields.entryTitle, searchTerm, fuzzySearch).weight(2));
+    }
+    if (!omitSearchFields.find(sf => sf === Fields.entryDescription)) exp.push(contensisCoreApi.Op.freeText(Fields.entryDescription, searchTerm, fuzzySearch).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.keywords)) exp.push(contensisCoreApi.Op.contains(Fields.keywords, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.uri)) exp.push(contensisCoreApi.Op.contains(Fields.sys.uri, searchTerm).weight(2));
+    if (!omitSearchFields.find(sf => sf === Fields.sys.allUris)) exp.push(contensisCoreApi.Op.contains(Fields.sys.allUris, searchTerm));
+    if (!omitSearchFields.find(sf => sf === Fields.searchContent)) exp.push(contensisCoreApi.Op.freeText(Fields.searchContent, searchTerm, fuzzySearch));
+    return [contensisCoreApi.Op.or(...exp)];
   } else {
     return [];
   }
@@ -1142,13 +1156,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 contensisCoreApi.Query(...expressions);
@@ -1384,6 +1399,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 {
@@ -1417,7 +1433,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: ({
@@ -1538,8 +1554,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 ***
@@ -1919,34 +1943,34 @@ function* updatePageIndex(action) {
   const {
     pageIndex,
     mappers,
-    scrollYPos
+    scrollToElement
   } = action;
   const uri = yield buildUri({
     pageIndex
   }, mappers);
   yield effects.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 effects.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 effects.put(navigate(uri));
-  if (typeof scrollYPos !== 'undefined') scrollTop(scrollYPos);
+  if (typeof scrollToElement !== 'undefined') scrollTo(scrollToElement);
 }
 function* buildUri({
   facet,
@@ -2049,4 +2073,4 @@ exports.updateSearchTerm = updateSearchTerm$1;
 exports.updateSelectedFilters = updateSelectedFilters;
 exports.updateSortOrder = updateSortOrder$1;
 exports.withMappers = withMappers;
-//# sourceMappingURL=sagas-6d12e7ca.js.map
+//# sourceMappingURL=sagas-e04b94c1.js.map