@zengenti/contensis-react-base 3.0.0-beta.2 → 3.0.0-beta.20

package/esm/search.js

@@ -1,18 +1,18 @@
 import React, { useMemo, useEffect } from 'react';
 import { connect, useDispatch, useSelector } from 'react-redux';
 import mapJson, { jpath } from 'jsonpath-mapper';
-import { produce } from 'immer';
+import * as log from 'loglevel';
 import { takeEvery, select, put, call, all } from '@redux-saga/core/effects';
 import { Client } from 'contensis-delivery-api';
-import queryString from 'query-string';
-import { error } from 'loglevel';
-import { createSelector } from 'reselect';
+import { stringify, parse } from 'query-string';
 import { Op, OrderBy, Query } from 'contensis-core-api';
 import merge from 'deepmerge';
+import { createSelector } from 'reselect';
+import { produce } from 'immer';
 import equals from 'deep-equal';
 
 /* eslint-disable import/default */
-const toJS = WrappedComponent => wrappedComponentProps => {
+const toJS$1 = WrappedComponent => wrappedComponentProps => {
   const KEY = 0;
   const VALUE = 1;
   const propsJS = Object.entries(wrappedComponentProps).reduce((newProps, wrappedComponentProp) => {
@@ -121,30 +121,30 @@ const navigate = (path, state) => {
     state
   };
 };
-const clearFilters = () => {
+const clearFilters$1 = () => {
   return {
     type: CLEAR_FILTERS
   };
 };
-const updatePageIndex = pageIndex => {
+const updatePageIndex$1 = pageIndex => {
   return {
     type: UPDATE_PAGE_INDEX,
     pageIndex
   };
 };
-const updateCurrentFacet = facet => {
+const updateCurrentFacet$1 = facet => {
   return {
     type: UPDATE_CURRENT_FACET,
     facet
   };
 };
-const updateCurrentTab = id => {
+const updateCurrentTab$1 = id => {
   return {
     type: UPDATE_CURRENT_TAB,
     id
   };
 };
-const updateSearchTerm = term => {
+const updateSearchTerm$1 = term => {
   return {
     type: UPDATE_SEARCH_TERM,
     term
@@ -157,7 +157,7 @@ const updateSelectedFilters = (filter, key) => {
     key
   };
 };
-const updateSortOrder = (orderBy, facet) => {
+const updateSortOrder$1 = (orderBy, facet) => {
   return {
     type: UPDATE_SORT_ORDER,
     orderBy,
@@ -171,22 +171,22 @@ var actions = /*#__PURE__*/Object.freeze({
   triggerSearch: triggerSearch,
   initListing: initListing,
   navigate: navigate,
-  clearFilters: clearFilters,
-  updatePageIndex: updatePageIndex,
-  updateCurrentFacet: updateCurrentFacet,
-  updateCurrentTab: updateCurrentTab,
-  updateSearchTerm: updateSearchTerm,
+  clearFilters: clearFilters$1,
+  updatePageIndex: updatePageIndex$1,
+  updateCurrentFacet: updateCurrentFacet$1,
+  updateCurrentTab: updateCurrentTab$1,
+  updateSearchTerm: updateSearchTerm$1,
   updateSelectedFilters: updateSelectedFilters,
-  updateSortOrder: updateSortOrder
+  updateSortOrder: updateSortOrder$1
 });
 
-let Context; // export type Context = 'facets' | 'listings' | 'minilist';
+let Context$1; // export type Context = 'facets' | 'listings' | 'minilist';
 
 (function (Context) {
   Context["facets"] = "facets";
   Context["listings"] = "listings";
   Context["minilist"] = "minilist";
-})(Context || (Context = {}));
+})(Context$1 || (Context$1 = {}));
 
 // or replace with a stub function for non-immutable gets
 
@@ -217,12 +217,12 @@ const getImmutableOrJS = (state, stateKey, fallbackValue, returnType = globalThi
   return result;
 };
 
-const getSearchContext = state => getImmutableOrJS(state, ['search', 'context'], Context.facets);
-const getCurrent = (state, context = Context.facets) => context === Context.facets ? getCurrentFacet(state) : getCurrentListing(state);
+const getSearchContext = state => getImmutableOrJS(state, ['search', 'context'], Context$1.facets);
+const getCurrent = (state, context = Context$1.facets) => context === Context$1.facets ? getCurrentFacet(state) : getCurrentListing(state);
 const getCurrentFacet = state => getImmutableOrJS(state, ['search', 'currentFacet']);
 const getCurrentListing = state => getImmutableOrJS(state, ['search', 'currentListing']);
-const getCurrentTab = state => getImmutableOrJS(state, ['search', Context.facets, getCurrentFacet(state), 'tabId'], 0);
-const getFacets = (state, returnType) => getImmutableOrJS(state, ['search', Context.facets], {}, returnType);
+const getCurrentTab = state => getImmutableOrJS(state, ['search', Context$1.facets, getCurrentFacet(state), 'tabId'], 0);
+const getFacets = (state, returnType) => getImmutableOrJS(state, ['search', Context$1.facets], {}, returnType);
 const getTabFacets = state => Object.fromEntries(Object.entries(getFacets(state, 'js')).filter(([key]) => getImmutableOrJS(getFacets(state), [key, 'tabId'], 0) === getCurrentTab(state)));
 const getFacetTitles = state => Object.entries(getFacets(state, 'js')).map(([key, facet = {}]) => {
   var _facet$pagingInfo;
@@ -233,19 +233,19 @@ const getFacetTitles = state => Object.entries(getFacets(state, 'js')).map(([key
     totalCount: (_facet$pagingInfo = facet.pagingInfo) === null || _facet$pagingInfo === void 0 ? void 0 : _facet$pagingInfo.totalCount
   };
 });
-const getFacet = (state, facetName = '', context = Context.facets, returnType) => {
+const getFacet = (state, facetName = '', context = Context$1.facets, returnType) => {
   const currentFacet = facetName || getCurrentFacet(state);
   return getImmutableOrJS(state, ['search', context, currentFacet], {}, returnType);
 };
 const getListing = (state, listing = '') => {
   const currentListing = listing || getCurrentListing(state);
-  return getImmutableOrJS(state, ['search', Context.listings, currentListing], {});
+  return getImmutableOrJS(state, ['search', Context$1.listings, currentListing], {});
 };
-const getFilters = (state, facet, context = Context.facets, returnType) => {
+const getFilters = (state, facet, context = Context$1.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'filters'], {}, returnType);
 };
-const getRenderableFilters = (state, facet = '', context = Context.facets) => Object.fromEntries(Object.entries(getFilters(state, facet, context, 'js')).filter(([, f = {}]) => typeof f.renderable !== 'boolean' ? true : f.renderable));
-const getFiltersToLoad = (state, facet, context = Context.facets, returnType) => {
+const getRenderableFilters = (state, facet = '', context = Context$1.facets) => Object.fromEntries(Object.entries(getFilters(state, facet, context, 'js')).filter(([, f = {}]) => typeof f.renderable !== 'boolean' ? true : f.renderable));
+const getFiltersToLoad = (state, facet, context = Context$1.facets, returnType) => {
   const filters = getFilters(state, facet, context, returnType);
   const loadedFilters = Object.entries(filters).map(([key, f = {}]) => [key, (f.items || []).filter(i => {
     const title = i === null || i === void 0 ? void 0 : i.title;
@@ -254,7 +254,7 @@ const getFiltersToLoad = (state, facet, context = Context.facets, returnType) =>
   return loadedFilters.map(([filterKey, isLoaded]) => !isLoaded ? filterKey : null).filter(f => !!f);
 }; // We lowercase the filter key unless it's an ISO date string where the T must be uppercase
 
-const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
+const getSelectedFilters = (state, facet = '', context = Context$1.facets, returnType) => {
   const filters = getFilters(state, facet, context, 'js');
   const isoDateRegex = RegExp(/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d/);
   const selectedFilters = Object.fromEntries(Object.entries(filters).map(([key, filter = {}]) => [key, (filter.items || []).filter(item => !!(item.isSelected || false)).map(item => {
@@ -265,56 +265,56 @@ const getSelectedFilters = (state, facet = '', context = Context.facets, returnT
   const fromJS = makeFromJS(returnType);
   return fromJS(selectedFilters);
 };
-const getResults = (state, current = '', context = Context.facets, returnType) => {
+const getResults = (state, current = '', context = Context$1.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'results'], [], returnType);
 };
-const getIsInternalPaging = (state, current, context = Context.facets) => {
+const getIsInternalPaging = (state, current, context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'queryParams', 'internalPaging'], false);
 };
-const getIsLoaded = (state, context = Context.facets, facet) => {
+const getIsLoaded = (state, context = Context$1.facets, facet) => {
   return !!getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'queryDuration'], 0);
 };
-const getIsLoading = (state, context = Context.facets, facet) => {
+const getIsLoading = (state, context = Context$1.facets, facet) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent(state, context), 'entries', 'isLoading']);
 };
 const getIsSsr = state => getImmutableOrJS(state, ['search', 'config', 'ssr'], false);
-const getFeaturedResults = (state, current = '', context = Context.facets) => {
+const getFeaturedResults = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'featuredResults'], []);
 };
-const getPaging = (state, current = '', context = Context.facets, returnType) => {
+const getPaging = (state, current = '', context = Context$1.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo'], {}, returnType);
 };
-const getPageIndex = (state, current = '', context = Context.facets) => {
+const getPageIndex = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'pageIndex']);
 };
-const getPrevPageIndex = (state, current = '', context = Context.facets) => {
+const getPrevPageIndex = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'prevPageIndex']);
 };
-const getPageIsLoading = (state, current = '', context = Context.facets) => {
+const getPageIsLoading = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'isLoading']);
 };
-const getPagesLoaded = (state, current = '', context = Context.facets) => {
+const getPagesLoaded = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'pagesLoaded'], [], 'js');
 };
-const getTotalCount = (state, current = '', context = Context.facets) => {
+const getTotalCount = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'pagingInfo', 'totalCount']);
 };
 const getSearchTerm = state => getImmutableOrJS(state, ['search', 'term']);
 const getSearchTabs = (state, returnType) => getImmutableOrJS(state, ['search', 'tabs'], [], returnType);
-const getQueryParams = (state, current = '', context = Context.facets) => {
+const getQueryParams = (state, current = '', context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'queryParams'], {}, 'js');
 };
 const getQueryParameter = ({
   state,
   facet,
-  context = Context.facets
+  context = Context$1.facets
 }, key, ifnull = null) => {
   return getImmutableOrJS(getQueryParams(state, facet, context), key, ifnull, 'js');
 };
-const getCustomApi = (state, current, context = Context.facets, returnType) => {
+const getCustomApi = (state, current, context = Context$1.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'customApi'], null, returnType);
 };
-const getCustomEnv = (state, current, context = Context.facets) => {
+const getCustomEnv = (state, current, context = Context$1.facets) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent(state, context), 'env']);
 };
 const getTabsAndFacets = (state, returnType) => {
@@ -330,7 +330,7 @@ const getTabsAndFacets = (state, returnType) => {
       return 0;
     }).reduce((a, b) => a + b, 0);
     return { ...tab,
-      [Context.facets]: Object.fromEntries(thisTabFacets),
+      [Context$1.facets]: Object.fromEntries(thisTabFacets),
       totalCount: thisTabTotal
     };
   });
@@ -370,14 +370,14 @@ const selectFacets = {
   getPageIsLoading,
   getPagesLoaded,
   getPaging,
-  getQueryParams: (state, facet) => getQueryParams(state, facet, Context.facets),
+  getQueryParams: (state, facet) => getQueryParams(state, facet, Context$1.facets),
   getQueryParameter: ({
     state,
     facet
   }, key, ifnull) => getQueryParameter({
     state,
     facet,
-    context: Context.facets
+    context: Context$1.facets
   }, key, ifnull),
   getRenderableFilters,
   getResults,
@@ -392,30 +392,30 @@ const selectFacets = {
 
 const selectListing = {
   getCurrent: getCurrentListing,
-  getFeaturedResults: (state, listing = '') => getFeaturedResults(state, listing, Context.listings),
-  getFilters: (state, listing = '') => getFilters(state, listing, Context.listings),
-  getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, Context.listings),
+  getFeaturedResults: (state, listing = '') => getFeaturedResults(state, listing, Context$1.listings),
+  getFilters: (state, listing = '') => getFilters(state, listing, Context$1.listings),
+  getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, Context$1.listings),
   getListing,
-  getIsLoaded: state => getIsLoaded(state, Context.listings),
-  getIsLoading: state => getIsLoading(state, Context.listings),
-  getPageIndex: (state, listing = '') => getPageIndex(state, listing, Context.listings),
-  getPaging: (state, listing = '') => getPaging(state, listing, Context.listings),
-  getPageIsLoading: (state, listing = '') => getPageIsLoading(state, listing, Context.listings),
-  getPagesLoaded: (state, listing = '') => getPagesLoaded(state, listing, Context.listings),
-  getQueryParams: (state, listing = '') => getQueryParams(state, listing, Context.listings),
+  getIsLoaded: state => getIsLoaded(state, Context$1.listings),
+  getIsLoading: state => getIsLoading(state, Context$1.listings),
+  getPageIndex: (state, listing = '') => getPageIndex(state, listing, Context$1.listings),
+  getPaging: (state, listing = '') => getPaging(state, listing, Context$1.listings),
+  getPageIsLoading: (state, listing = '') => getPageIsLoading(state, listing, Context$1.listings),
+  getPagesLoaded: (state, listing = '') => getPagesLoaded(state, listing, Context$1.listings),
+  getQueryParams: (state, listing = '') => getQueryParams(state, listing, Context$1.listings),
   getQueryParameter: ({
     state,
     facet
   }, key, ifnull) => getQueryParameter({
     state,
     facet,
-    context: Context.listings
+    context: Context$1.listings
   }, key, ifnull),
-  getRenderableFilters: (state, listing = '') => getRenderableFilters(state, listing, Context.listings),
-  getResults: (state, listing = '') => getResults(state, listing, Context.listings),
+  getRenderableFilters: (state, listing = '') => getRenderableFilters(state, listing, Context$1.listings),
+  getResults: (state, listing = '') => getResults(state, listing, Context$1.listings),
   getSearchTerm,
-  getTotalCount: (state, listing = '') => getTotalCount(state, listing, Context.listings),
-  getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context.listings)
+  getTotalCount: (state, listing = '') => getTotalCount(state, listing, Context$1.listings),
+  getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context$1.listings)
 };
 const selectCurrentPath = state => getImmutableOrJS(state, ['routing', 'currentPath']);
 const selectVersionStatus = state => getImmutableOrJS(state, ['version', 'contensisVersionStatus']);
@@ -500,16 +500,16 @@ const withSearch = mappers => SearchComponent => {
   };
 
   const mapDispatchToProps = {
-    clearFilters: () => withMappers(clearFilters(), mappers),
-    updateCurrentFacet: facet => withMappers(updateCurrentFacet(facet), mappers),
-    updateCurrentTab: id => withMappers(updateCurrentTab(id), mappers),
-    updatePageIndex: pageIndex => withMappers(updatePageIndex(pageIndex), mappers),
-    updateSearchTerm: term => withMappers(updateSearchTerm(term), mappers),
+    clearFilters: () => withMappers(clearFilters$1(), mappers),
+    updateCurrentFacet: facet => withMappers(updateCurrentFacet$1(facet), mappers),
+    updateCurrentTab: id => withMappers(updateCurrentTab$1(id), mappers),
+    updatePageIndex: pageIndex => withMappers(updatePageIndex$1(pageIndex), mappers),
+    updateSearchTerm: term => withMappers(updateSearchTerm$1(term), mappers),
     updateSelectedFilters: (filter, key) => withMappers(updateSelectedFilters(filter, key), mappers),
-    updateSortOrder: orderBy => withMappers(updateSortOrder(orderBy), mappers)
+    updateSortOrder: orderBy => withMappers(updateSortOrder$1(orderBy), mappers)
   };
   const connector = connect(mapStateToProps, mapDispatchToProps);
-  return connector(toJS(Wrapper));
+  return connector(toJS$1(Wrapper));
 };
 
 /* eslint-disable @typescript-eslint/naming-convention */
@@ -552,14 +552,14 @@ const withListing = mappers => ListingComponent => {
   };
 
   const mapDispatchToProps = {
-    clearFilters: () => withMappers(clearFilters(), mappers),
-    updateCurrentFacet: facet => withMappers(updateCurrentFacet(facet), mappers),
-    updatePageIndex: pageIndex => withMappers(updatePageIndex(pageIndex), mappers),
-    updateSearchTerm: term => withMappers(updateSearchTerm(term), mappers),
+    clearFilters: () => withMappers(clearFilters$1(), mappers),
+    updateCurrentFacet: facet => withMappers(updateCurrentFacet$1(facet), mappers),
+    updatePageIndex: pageIndex => withMappers(updatePageIndex$1(pageIndex), mappers),
+    updateSearchTerm: term => withMappers(updateSearchTerm$1(term), mappers),
     updateSelectedFilters: (filter, key) => withMappers(updateSelectedFilters(filter, key), mappers),
-    updateSortOrder: orderBy => withMappers(updateSortOrder(orderBy), mappers)
+    updateSortOrder: orderBy => withMappers(updateSortOrder$1(orderBy), mappers)
   };
-  return connect(mapStateToProps, mapDispatchToProps)(toJS(Wrapper));
+  return connect(mapStateToProps, mapDispatchToProps)(toJS$1(Wrapper));
 };
 
 const getClientConfig = (project, env) => {
@@ -768,7 +768,7 @@ const extractQuotedPhrases = searchTerm => {
   return (searchTerm.match(pattern) || []).map(match => match.replace(/"/g, ''));
 };
 const buildUrl = (route, params) => {
-  const qs = queryString.stringify(params);
+  const qs = stringify(params);
   const path = qs ? `${route}?${qs}` : route;
   return path;
 };
@@ -873,8 +873,17 @@ const contentTypeIdExpression = (contentTypeIds, webpageTemplates, assetTypes) =
 const filterExpressions = filters => {
   if (!filters) return [];
   const expressions = [];
-  filters.map(param => {
-    expressions.push(...fieldExpression(param.key, param.value, param.operator || 'in'));
+  filters.map(selectedFilter => {
+    if (selectedFilter.logicOperator === 'and') // using 'and' logic operator we loop through each filter
+      // and loop through all values to add an expression for each filter value
+      selectedFilter.values.forEach(value => expressions.push(...fieldExpression(selectedFilter.key, value, selectedFilter.fieldOperator || 'equalTo')));else if (selectedFilter.logicOperator === 'not') {
+      const fieldExpressions = fieldExpression(selectedFilter.key, selectedFilter.values, selectedFilter.fieldOperator || 'in');
+      fieldExpressions.forEach(expr => {
+        expressions.push(Op.not(expr));
+      });
+    } // using 'or' logic operator we loop over each filter
+    // and simply add the array of values to an expression with an 'in' operator
+    else expressions.push(...fieldExpression(selectedFilter.key, selectedFilter.values, selectedFilter.fieldOperator || 'in'));
   });
   return expressions;
 };
@@ -891,8 +900,8 @@ const dataFormatExpression = (contentTypeIds, dataFormat = DataFormats.entry) =>
     const withExpr = fieldExpression(Fields.sys.contentTypeId, withContentTypeIds)[0];
     const notExpr = Op.not(fieldExpression(Fields.sys.contentTypeId, notContentTypeIds)[0]);
     andExpr.add(dataFormatExpr);
-    if (withContentTypeIds.length > 0) andExpr.add(withExpr);
-    if (notContentTypeIds.length > 0) andExpr.add(notExpr);
+    if (withContentTypeIds.length > 0 && withExpr) andExpr.add(withExpr);
+    if (notContentTypeIds.length > 0 && notExpr) andExpr.add(notExpr);
     return [andExpr];
   }
 
@@ -948,8 +957,8 @@ const equalToOrIn = (field, value, operator = 'equalTo') => {
   if (value.length === 0) return [];
 
   if (Array.isArray(value)) {
-    if (value.length === 1) return [Op[operator](field, value[0], undefined, undefined)];
-    return [Op.in(field, ...value)];
+    if (operator === 'equalTo') return [Op.in(field, ...value)];
+    return [Op.or(...value.map(innerValue => Op[operator](field, innerValue, undefined, undefined)))];
   }
 
   return [];
@@ -1029,7 +1038,7 @@ const customWhereExpressions = where => {
       if (idx === 1 && // operator !== 'and' &&
       // operator !== 'or' &&
       operator !== 'between' && operator !== 'distanceWithin') {
-        expression = operator === 'freeText' || operator === 'contains' ? Op[operator](field, value) : operator === 'in' ? Op[operator](field, ...value) : Op[operator](field, value);
+        expression = operator === 'freeText' || operator === 'contains' ? Op[operator](field, value) : operator === 'in' ? Op[operator](field, ...value) : operator === 'exists' ? Op[operator](field, value) : Op[operator](field, value);
         if (typeof weight === 'number') expression = expression.weight(weight);
       }
     });
@@ -1142,7 +1151,7 @@ const searchUriTemplate = {
     facet,
     pageIndex
   }) => {
-    const currentFacet = getSearchContext(state) !== Context.listings && (facet || getCurrentFacet(state));
+    const currentFacet = getSearchContext(state) !== Context$1.listings && (facet || getCurrentFacet(state));
     const currentPath = selectCurrentPath(state) || '/search';
     const newPath = currentFacet ? `${currentPath}/${currentFacet}` : currentPath;
     if (pageIndex) return `${newPath}/${pageIndex + 1}`;
@@ -1159,7 +1168,7 @@ const searchUriTemplate = {
 
     const stateFilters = term ? {} : Object.fromEntries(Object.entries(getSelectedFilters(state, facet, searchContext, 'js')).map(([key, f]) => [key, f === null || f === void 0 ? void 0 : f.join(',')]));
     const currentSearch = !term && getImmutableOrJS(state, ['routing', 'location', 'search']);
-    const currentQs = removeEmptyAttributes(queryString.parse(currentSearch));
+    const currentQs = removeEmptyAttributes(parse(currentSearch));
     if (orderBy) currentQs.orderBy = orderBy;
     const searchTerm = getSearchTerm(state); // Use Immutable's merge to merge the stateFilters with any current Qs
     // to build the new Qs.
@@ -1167,7 +1176,7 @@ const searchUriTemplate = {
     const mergedSearch = removeEmptyAttributes({ ...merge(currentQs, stateFilters),
       term: searchTerm
     });
-    return queryString.stringify(mergedSearch);
+    return stringify(mergedSearch);
   },
   hash: {
     $path: 'state',
@@ -1317,14 +1326,15 @@ const filterTemplate = {
 const filterExpressionMapper = {
   // Expression type: so we can identify how to build the query
   expressionType: ({
-    filter
-  }) => filter.contentTypeId ? FilterExpressionTypes.contentType : FilterExpressionTypes.field,
+    contentTypeId
+  }) => contentTypeId ? FilterExpressionTypes.contentType : FilterExpressionTypes.field,
   // Key: so we can target the query to a specific field
-  key: 'filter.fieldId',
+  key: 'fieldId',
   // Value: so we can filter a specific field by an array of values
   // e.g. taxonomy key or contentTypeId array
-  value: 'selectedValue',
-  operator: 'filter.fieldOperator'
+  values: 'selectedValues',
+  fieldOperator: 'fieldOperator',
+  logicOperator: 'logicOperator'
 };
 
 const mapFilterToFilterExpression = filter => mapJson(filter, filterExpressionMapper);
@@ -1334,18 +1344,15 @@ const mapFiltersToFilterExpression = (filters, selectedFilters) => {
   const filterExpressions = []; // Iterate through the keys in selectedFilters and locate
   // the items that are selected and queryable
 
-  Object.entries(selectedFilters).map(([fkey, selectedValue]) => {
+  Object.entries(selectedFilters).map(([fkey, selectedValues]) => {
     const filter = filters[fkey];
 
-    if (selectedValue && filter) {
-      const selectedItems = filter.items && filter.items.filter(itm => itm.isSelected) || []; // Where we have a value for a selectedFilter
+    if (selectedValues && filter) {
+      // Where we have a value for a selectedFilter
       // and a filter is found for the current key
       // map the filter to a filterExpression object
-
-      const expr = mapFilterToFilterExpression({
-        filter,
-        selectedItems,
-        selectedValue
+      const expr = mapFilterToFilterExpression({ ...filter,
+        selectedValues
       });
       filterExpressions.push(expr);
     }
@@ -1426,7 +1433,7 @@ const queryParamsTemplate = {
 
     return (_getFacet = getFacet(state, facet, context)) === null || _getFacet === void 0 ? void 0 : _getFacet.projectId;
   },
-  searchTerm: root => root.context !== Context.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
+  searchTerm: root => root.context !== Context$1.minilist || getQueryParameter(root, 'useSearchTerm', false) ? getSearchTerm(root.state) : '',
   selectedFilters: ({
     state,
     facet,
@@ -1489,7 +1496,7 @@ const runSearch = (action, state, queryParams) => {
   stateParams.pageIndex = getPageIndex(ogState, facet, context);
   stateParams.searchTerm = getSearchTerm(ogState);
 
-  if (context === Context.facets && ssr || // context === Context.minilist ||
+  if (context === Context$1.facets && ssr || // context === Context.minilist ||
   preload || !facetIsLoaded || filterParamsChanged(action) || defaultLang) {
     willRun = true;
   } else {
@@ -1526,7 +1533,7 @@ const filterParamsChanged = (action, state) => {
     params,
     ogState = state
   } = action;
-  const selectedFilters = getSelectedFilters(ogState, facet, context);
+  const selectedFilters = getSelectedFilters(ogState, facet, context, 'js');
   const paramsChanged = Object.entries(selectedFilters).map(([filterKey, selectedValues]) => {
     const inboundValues = params && params[filterKey] && params[filterKey].split(',') || [];
     if (!areArraysEqualSets(selectedValues, inboundValues)) return true;
@@ -1542,7 +1549,7 @@ const debugExecuteSearch = (action, state) => {
   stateParams.pageIndex = getPageIndex(action.ogState || state, action.facet, action.context);
   stateParams.searchTerm = getSearchTerm(action.ogState || state);
   console.log(stateParams, queryParams);
-  console.log('getSelectedFilters', getSelectedFilters(action.ogState || state, action.facet, action.context), 'params', action.params);
+  console.log('getSelectedFilters', getSelectedFilters(action.ogState || state, action.facet, action.context, 'js'), 'params', action.params);
 };
 
 // Base mapping, fields that are the same across all mappings
@@ -1570,9 +1577,9 @@ const mapEntriesToFilterItems = entries => {
   });
 };
 
-const searchSagas = [takeEvery(CLEAR_FILTERS, clearFilters$1), takeEvery(DO_SEARCH, doSearch), takeEvery(SET_ROUTE_FILTERS, loadFilters), takeEvery(SET_SEARCH_ENTRIES, preloadOtherFacets), takeEvery(UPDATE_CURRENT_FACET, updateCurrentFacet$1), takeEvery(UPDATE_CURRENT_TAB, updateCurrentTab$1), takeEvery(UPDATE_PAGE_INDEX, updatePageIndex$1), takeEvery(UPDATE_SEARCH_TERM, updateSearchTerm$1), takeEvery(UPDATE_SORT_ORDER, updateSortOrder$1), takeEvery(UPDATE_SELECTED_FILTERS, applySearchFilter)];
+const searchSagas = [takeEvery(CLEAR_FILTERS, clearFilters), takeEvery(DO_SEARCH, doSearch), takeEvery(SET_ROUTE_FILTERS, loadFilters), takeEvery(SET_SEARCH_ENTRIES, preloadOtherFacets), takeEvery(UPDATE_CURRENT_FACET, updateCurrentFacet), takeEvery(UPDATE_CURRENT_TAB, updateCurrentTab), takeEvery(UPDATE_PAGE_INDEX, updatePageIndex), takeEvery(UPDATE_SEARCH_TERM, updateSearchTerm), takeEvery(UPDATE_SORT_ORDER, updateSortOrder), takeEvery(UPDATE_SELECTED_FILTERS, applySearchFilter)];
 
-const toJS$1 = obj => obj && 'toJS' in obj && typeof obj.toJS === 'function' ? obj.toJS() : obj;
+const toJS = obj => obj && 'toJS' in obj && typeof obj.toJS === 'function' ? obj.toJS() : obj;
 
 function* setRouteFilters(action) {
   const {
@@ -1582,8 +1589,8 @@ function* setRouteFilters(action) {
     defaultLang,
     debug
   } = action;
-  const context = listingType ? Context.listings : Context.facets;
-  const state = toJS$1(yield select());
+  const context = listingType ? Context$1.listings : Context$1.facets;
+  const state = toJS(yield select());
   const ssr = getIsSsr(state); // Get current facet from params or state
 
   let currentFacet = params && params.facet || listingType; // Pick the default facet from initialState
@@ -1613,7 +1620,7 @@ function* setRouteFilters(action) {
   });
 }
 function* doSearch(action) {
-  const state = toJS$1(yield select());
+  const state = toJS(yield select());
 
   if (action.config) {
     // If the action contains a config object, we can add this to the
@@ -1746,9 +1753,9 @@ function* ensureSearch(action) {
         debug
       });
     }
-  } catch (error$1) {
+  } catch (error) {
     // eslint-disable-next-line import/namespace
-    error(...['Error running search saga:', error$1, error$1.stack]);
+    log.error(...['Error running search saga:', error, error.stack]);
   }
 }
 
@@ -1797,9 +1804,9 @@ function* executeSearch(action) {
     };
     const nextAction = mapJson(createStateFrom, facetTemplate);
     yield put(nextAction);
-  } catch (error$1) {
+  } catch (error) {
     // eslint-disable-next-line import/namespace
-    error(...['Error running search saga:', error$1, error$1.stack]);
+    log.error(...['Error running search saga:', error, error.stack]);
   }
 }
 
@@ -1813,7 +1820,7 @@ function* preloadOtherFacets(action) {
   const state = yield select();
   const currentFacet = getCurrentFacet(state);
 
-  if (!preload && facet === currentFacet && context !== Context.listings) {
+  if (!preload && facet === currentFacet && context !== Context$1.listings) {
     const allFacets = getFacets(state, 'js');
     const otherFacets = Object.keys(allFacets).filter(f => f !== currentFacet);
     yield all(otherFacets.map((preloadFacet = '') => {
@@ -1833,7 +1840,7 @@ function* preloadOtherFacets(action) {
   }
 }
 
-function* updateCurrentTab$1(action) {
+function* updateCurrentTab(action) {
   const {
     id,
     mappers
@@ -1852,10 +1859,10 @@ function* updateCurrentTab$1(action) {
 
 
   if (!nextFacet) nextFacet = Object.entries(facets).filter(([, f]) => f.tabId === id)[0][0];
-  yield put(withMappers(updateCurrentFacet(nextFacet), mappers));
+  yield put(withMappers(updateCurrentFacet$1(nextFacet), mappers));
 }
 
-function* clearFilters$1(action) {
+function* clearFilters(action) {
   const {
     mappers
   } = action;
@@ -1863,7 +1870,7 @@ function* clearFilters$1(action) {
   yield put(navigate(uri));
 }
 
-function* updateCurrentFacet$1(action) {
+function* updateCurrentFacet(action) {
   const {
     facet,
     mappers
@@ -1876,7 +1883,7 @@ function* updateCurrentFacet$1(action) {
   yield put(navigate(uri));
 }
 
-function* updateSearchTerm$1(action) {
+function* updateSearchTerm(action) {
   const {
     term,
     mappers
@@ -1887,7 +1894,7 @@ function* updateSearchTerm$1(action) {
   yield put(navigate(uri));
 }
 
-function* updateSortOrder$1(action) {
+function* updateSortOrder(action) {
   const {
     orderBy,
     facet,
@@ -1900,7 +1907,7 @@ function* updateSortOrder$1(action) {
   yield put(navigate(uri));
 }
 
-function* updatePageIndex$1(action) {
+function* updatePageIndex(action) {
   const {
     pageIndex,
     mappers
@@ -1939,11 +1946,11 @@ function* buildUri({
 }
 
 const makeSelectMinilistProps = () => createSelector(state => state, (_, id) => id, (state, id) => ({
-  facet: getFacet(state, id, Context.minilist, 'js'),
-  filters: getFilters(state, id, Context.minilist, 'js'),
-  isLoading: getIsLoading(state, Context.minilist, id),
-  pagingInfo: getPaging(state, id, Context.minilist, 'js'),
-  results: getResults(state, id, Context.minilist, 'js'),
+  facet: getFacet(state, id, Context$1.minilist, 'js'),
+  filters: getFilters(state, id, Context$1.minilist, 'js'),
+  isLoading: getIsLoading(state, Context$1.minilist, id),
+  pagingInfo: getPaging(state, id, Context$1.minilist, 'js'),
+  results: getResults(state, id, Context$1.minilist, 'js'),
   searchTerm: getSearchTerm(state)
 }));
 
@@ -1981,7 +1988,7 @@ const useMinilist = ({
     if (id && (mapper || mappers && mappers.results)) {
       dispatch(triggerSearch({
         config,
-        context: Context.minilist,
+        context: Context$1.minilist,
         defaultLang,
         facet: id,
         mapper,
@@ -2196,9 +2203,9 @@ var reducers = (config => {
   // Add facets from SearchConfig to initialState
   const initState = { ...initialState,
     tabs: config.tabs,
-    facets: generateSearchFacets(Context.facets, config),
-    listings: generateSearchFacets(Context.listings, config),
-    minilist: generateSearchFacets(Context.minilist, config)
+    facets: generateSearchFacets(Context$1.facets, config),
+    listings: generateSearchFacets(Context$1.listings, config),
+    minilist: generateSearchFacets(Context$1.minilist, config)
   };
   return produce((state = initState, action) => {
     const context = state.context;
@@ -2325,7 +2332,7 @@ var reducers = (config => {
           }));
           state.context = context;
           state[context] = nextFacets;
-          state[action.context === Context.facets ? 'currentFacet' : 'currentListing'] = facet;
+          state[action.context === Context$1.facets ? 'currentFacet' : 'currentListing'] = facet;
           state.term = term;
           state.tabs[tabId].currentFacet = facet;
           state[context][facet].pagingInfo.pageIndex = Number(pageIndex) - 1 || (state[context][facet].queryParams.loadMorePaging ? state[context][facet].pagingInfo.pageIndex || 0 : 0);
@@ -2358,9 +2365,9 @@ var reducers = (config => {
             isCurrentFacet: true
           }, state);
           const term = action === null || action === void 0 ? void 0 : (_action$params = action.params) === null || _action$params === void 0 ? void 0 : _action$params.term;
-          const useSearchTerm = state[action.context || Context.minilist][action.facet].queryParams.useSearchTerm || false;
-          state[action.context || Context.minilist][action.facet].filters = filters;
-          state[action.context || Context.minilist][action.facet].queryParams.excludeIds = action.excludeIds;
+          const useSearchTerm = state[action.context || Context$1.minilist][action.facet].queryParams.useSearchTerm || false;
+          state[action.context || Context$1.minilist][action.facet].filters = filters;
+          state[action.context || Context$1.minilist][action.facet].queryParams.excludeIds = action.excludeIds;
           state.term = useSearchTerm ? term : state.term;
           state.config.ssr = typeof window === 'undefined';
           return;
@@ -2433,11 +2440,11 @@ var reducers = (config => {
 });
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const Context$1 = {
+const Context = {
   facets: 'facets',
   listings: 'listings',
   minilist: 'minilist'
 };
 
-export { Context$1 as Context, actions, doSearch, queries, reducers as reducer, searchSagas as sagas, schema, selectors, setRouteFilters, types, useMinilist, withListing, withSearch };
+export { Context, actions, doSearch, queries, reducers as reducer, searchSagas as sagas, schema, selectors, setRouteFilters, types, useMinilist, withListing, withSearch };
 //# sourceMappingURL=search.js.map