@zengenti/contensis-react-base 4.0.0-beta.14 → 4.0.0-beta.16

package/README.md

@@ -6,6 +6,12 @@ Handles web app routing with Contensis Site View and component rendering based o
 
 ## Upgrade notes (older projects)
 
+### React 18 (v4.0+)
+
+This version introduces major updates to React, React Router and Express
+
+We have prepared a [Migration Guide: v3 → v4](https://github.com/zengenti/contensis-react-base/blob/feat/react18/MIGRATE-V4.md) with detailed steps to follow to ensure your upgrade goes smoothly
+
 ### Styled Components 6 (v3.3+)
 
 Some projects may see console warnings in the web app like the example below after upgrading to v3.3+ which updates Styled Components from version 5 to 6

package/cjs/contensis-react-base.js

@@ -7,7 +7,7 @@ var contensisDeliveryApi = require('contensis-delivery-api');
 var React = require('react');
 var reactRedux = require('react-redux');
 var mapJson = require('jsonpath-mapper');
-var sagas = require('./sagas-BtPnqKAF.js');
+var sagas = require('./sagas-C0t6j-SQ.js');
 require('reselect');
 require('immer');
 require('deep-equal');

package/cjs/{sagas-BtPnqKAF.js → sagas-C0t6j-SQ.js}

@@ -262,9 +262,13 @@ const getListing$1 = (state, listing = '') => {
   const currentListing = listing || getCurrentListing(state);
   return getImmutableOrJS(state, ['search', Context.listings, currentListing], {});
 };
+
+/** Return filter state for the current (or provided) facet */
 const getFilters = (state, facet, context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, facet || getCurrent$2(state, context), 'filters'], {}, returnType);
 };
+
+/** Return filter state for the current (or provided) facet, excluding filters configured as `renderable: false` */
 const getRenderableFilters$2 = (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 filters = getFilters(state, facet, context, returnType);
@@ -275,16 +279,30 @@ 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 filters = getFilters(state, facet, context, 'js');
+/** Reduce filters state to a simple object containing all filter keys and the selected values */
+const reduceSelectedFilters = filters => {
   const selectedFilters = Object.fromEntries(Object.entries(filters).map(([key, filter = {}]) => [key, (filter.items || []).filter(item => !!(item.isSelected || false)).map(item => {
     const key = (item === null || item === void 0 ? void 0 : item.key) || '';
     return key;
   })]));
+  return selectedFilters;
+};
+
+/** Return keyed object for all filters in the current facet with all selected values for each filter */
+const getSelectedFilters = (state, facet = '', context = Context.facets, returnType) => {
+  const filters = getFilters(state, facet, context, 'js');
+  const selectedFilters = reduceSelectedFilters(filters);
   const fromJS = makeFromJS(returnType);
   return fromJS(selectedFilters);
 };
+
+/** Return keyed object for all _renderable_ filters in the current facet with all selected values for each filter */
+const getRenderableSelectedFilters = (state, facet = '', context = Context.facets) => {
+  const filters = getRenderableFilters$2(state, facet, context);
+
+  // new in CRB4: intended no support for immutable state type
+  return reduceSelectedFilters(filters);
+};
 const getResults = (state, current = '', context = Context.facets, returnType) => {
   return getImmutableOrJS(state, ['search', context, current || getCurrent$2(state, context), 'results'], [], returnType);
 };
@@ -476,6 +494,7 @@ var selectors = /*#__PURE__*/Object.freeze({
   getQueryParameter: getQueryParameter$2,
   getQueryParams: getQueryParams,
   getRenderableFilters: getRenderableFilters$2,
+  getRenderableSelectedFilters: getRenderableSelectedFilters,
   getResults: getResults,
   getSearchContext: getSearchContext,
   getSearchTabs: getSearchTabs,
@@ -522,7 +541,7 @@ const searchUriTemplate = {
     const searchContext = getSearchContext(state);
     // Lose stateFilters and currentSearch if a new
     // term is passed via an argument
-    const stateFilters = term ? {} : Object.fromEntries(Object.entries(getSelectedFilters(state, facet, searchContext, 'js')).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
+    const stateFilters = term ? {} : Object.fromEntries(Object.entries(getRenderableSelectedFilters(state, facet, searchContext)).map(([k, f]) => [k, f === null || f === void 0 ? void 0 : f.join(',')]));
     const currentSearch = !term && getImmutableOrJS(state, ['routing', 'location', 'search']);
     const currentQs = util.removeEmptyAttributes(queryString.parse(currentSearch));
     if (orderBy) currentQs.orderBy = orderBy;
@@ -5758,4 +5777,4 @@ exports.updateSortOrder = updateSortOrder$1;
 exports.useFacets = useFacets;
 exports.useListing = useListing;
 exports.withMappers = withMappers;
-//# sourceMappingURL=sagas-BtPnqKAF.js.map
+//# sourceMappingURL=sagas-C0t6j-SQ.js.map