@zengenti/contensis-react-base 3.0.0-beta.49 → 3.0.0-beta.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/search.js +29 -23
- package/cjs/search.js.map +1 -1
- package/esm/search.js +29 -23
- package/esm/search.js.map +1 -1
- package/models/search/models/SearchProps.d.ts +7 -3
- package/models/search/redux/selectors.d.ts +2 -2
- package/package-lock.json +2 -2
- package/package.json +1 -1
package/cjs/search.js
CHANGED
|
@@ -296,7 +296,7 @@ const getSelectedFilters = (state, facet = '', context = Context$1.facets, retur
|
|
|
296
296
|
const fromJS = makeFromJS(returnType);
|
|
297
297
|
return fromJS(selectedFilters);
|
|
298
298
|
};
|
|
299
|
-
const getResults
|
|
299
|
+
const getResults = (state, current = '', context = Context$1.facets, returnType) => {
|
|
300
300
|
return getImmutableOrJS(state, ['search', context, current || getCurrent$1(state, context), 'results'], [], returnType);
|
|
301
301
|
};
|
|
302
302
|
const getIsInternalPaging = (state, current, context = Context$1.facets) => {
|
|
@@ -309,10 +309,10 @@ const getIsLoading$1 = (state, context = Context$1.facets, facet) => {
|
|
|
309
309
|
return getImmutableOrJS(state, ['search', context, facet || getCurrent$1(state, context), 'entries', 'isLoading']);
|
|
310
310
|
};
|
|
311
311
|
const getIsSsr = state => getImmutableOrJS(state, ['search', 'config', 'ssr'], false);
|
|
312
|
-
const getFeaturedResults$1 = (state, current = '', context = Context$1.facets) => {
|
|
313
|
-
return getImmutableOrJS(state, ['search', context, current || getCurrent$1(state, context), 'featuredResults'], []);
|
|
312
|
+
const getFeaturedResults$1 = (state, current = '', context = Context$1.facets, returnType) => {
|
|
313
|
+
return getImmutableOrJS(state, ['search', context, current || getCurrent$1(state, context), 'featuredResults'], [], returnType);
|
|
314
314
|
};
|
|
315
|
-
const getPaging
|
|
315
|
+
const getPaging = (state, current = '', context = Context$1.facets, returnType) => {
|
|
316
316
|
return getImmutableOrJS(state, ['search', context, current || getCurrent$1(state, context), 'pagingInfo'], {}, returnType);
|
|
317
317
|
};
|
|
318
318
|
const getPageIndex$1 = (state, current = '', context = Context$1.facets) => {
|
|
@@ -400,7 +400,7 @@ const selectFacets = {
|
|
|
400
400
|
getPageIndex: getPageIndex$1,
|
|
401
401
|
getPageIsLoading: getPageIsLoading$1,
|
|
402
402
|
getPagesLoaded,
|
|
403
|
-
getPaging
|
|
403
|
+
getPaging,
|
|
404
404
|
getQueryParams: (state, facet) => getQueryParams(state, facet, Context$1.facets),
|
|
405
405
|
getQueryParameter: ({
|
|
406
406
|
state,
|
|
@@ -411,7 +411,7 @@ const selectFacets = {
|
|
|
411
411
|
context: Context$1.facets
|
|
412
412
|
}, key, ifnull),
|
|
413
413
|
getRenderableFilters: getRenderableFilters$1,
|
|
414
|
-
getResults
|
|
414
|
+
getResults,
|
|
415
415
|
getTabFacets,
|
|
416
416
|
getTabsAndFacets,
|
|
417
417
|
getTotalCount,
|
|
@@ -423,14 +423,14 @@ const selectFacets = {
|
|
|
423
423
|
|
|
424
424
|
const selectListing = {
|
|
425
425
|
getCurrent: getCurrentListing,
|
|
426
|
-
getFeaturedResults: (state, listing = '') => getFeaturedResults$1(state, listing, Context$1.listings),
|
|
427
|
-
getFilters: (state, listing = '') => getFilters(state, listing, Context$1.listings),
|
|
426
|
+
getFeaturedResults: (state, listing = '') => getFeaturedResults$1(state, listing, Context$1.listings, 'js'),
|
|
427
|
+
getFilters: (state, listing = '') => getFilters(state, listing, Context$1.listings, 'js'),
|
|
428
428
|
getFiltersToLoad: (state, listing = '') => getFiltersToLoad(state, listing, Context$1.listings),
|
|
429
429
|
getListing: getListing$1,
|
|
430
430
|
getIsLoaded: state => getIsLoaded(state, Context$1.listings),
|
|
431
431
|
getIsLoading: state => getIsLoading$1(state, Context$1.listings),
|
|
432
432
|
getPageIndex: (state, listing = '') => getPageIndex$1(state, listing, Context$1.listings),
|
|
433
|
-
getPaging: (state, listing = '') => getPaging
|
|
433
|
+
getPaging: (state, listing = '') => getPaging(state, listing, Context$1.listings, 'js'),
|
|
434
434
|
getPageIsLoading: (state, listing = '') => getPageIsLoading$1(state, listing, Context$1.listings),
|
|
435
435
|
getPagesLoaded: (state, listing = '') => getPagesLoaded(state, listing, Context$1.listings),
|
|
436
436
|
getQueryParams: (state, listing = '') => getQueryParams(state, listing, Context$1.listings),
|
|
@@ -443,10 +443,10 @@ const selectListing = {
|
|
|
443
443
|
context: Context$1.listings
|
|
444
444
|
}, key, ifnull),
|
|
445
445
|
getRenderableFilters: (state, listing = '') => getRenderableFilters$1(state, listing, Context$1.listings),
|
|
446
|
-
getResults: (state, listing = '') => getResults
|
|
446
|
+
getResults: (state, listing = '') => getResults(state, listing, Context$1.listings, 'js'),
|
|
447
447
|
getSearchTerm: getSearchTerm$1,
|
|
448
448
|
getTotalCount: (state, listing = '') => getTotalCount(state, listing, Context$1.listings),
|
|
449
|
-
getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context$1.listings)
|
|
449
|
+
getSelectedFilters: (state, listing = '') => getSelectedFilters(state, listing, Context$1.listings, 'js')
|
|
450
450
|
};
|
|
451
451
|
const selectCurrentPath = state => getImmutableOrJS(state, ['routing', 'currentPath']);
|
|
452
452
|
const selectCurrentProject = state => getImmutableOrJS(state, ['routing', 'currentProject']);
|
|
@@ -468,13 +468,13 @@ var selectors = /*#__PURE__*/Object.freeze({
|
|
|
468
468
|
getRenderableFilters: getRenderableFilters$1,
|
|
469
469
|
getFiltersToLoad: getFiltersToLoad,
|
|
470
470
|
getSelectedFilters: getSelectedFilters,
|
|
471
|
-
getResults: getResults
|
|
471
|
+
getResults: getResults,
|
|
472
472
|
getIsInternalPaging: getIsInternalPaging,
|
|
473
473
|
getIsLoaded: getIsLoaded,
|
|
474
474
|
getIsLoading: getIsLoading$1,
|
|
475
475
|
getIsSsr: getIsSsr,
|
|
476
476
|
getFeaturedResults: getFeaturedResults$1,
|
|
477
|
-
getPaging: getPaging
|
|
477
|
+
getPaging: getPaging,
|
|
478
478
|
getPageIndex: getPageIndex$1,
|
|
479
479
|
getPrevPageIndex: getPrevPageIndex,
|
|
480
480
|
getPageIsLoading: getPageIsLoading$1,
|
|
@@ -517,12 +517,13 @@ const withSearch = mappers => SearchComponent => {
|
|
|
517
517
|
featuredResults: getFeaturedResults$1(state),
|
|
518
518
|
filters: getRenderableFilters$1(state),
|
|
519
519
|
isLoading: getIsLoading$1(state),
|
|
520
|
-
paging: getPaging
|
|
520
|
+
paging: getPaging(state),
|
|
521
521
|
pageIsLoading: getPageIsLoading$1(state),
|
|
522
|
-
results: getResults
|
|
522
|
+
results: getResults(state),
|
|
523
523
|
resultsInfo: (mappers === null || mappers === void 0 ? void 0 : mappers.resultsInfo) && mappers.resultsInfo(state),
|
|
524
524
|
searchTerm: getSearchTerm$1(state),
|
|
525
525
|
searchTotalCount: getSearchTotalCount(state),
|
|
526
|
+
selectedFilters: getSelectedFilters(state),
|
|
526
527
|
sortOrder: getQueryParameter$1({
|
|
527
528
|
state
|
|
528
529
|
}, 'dynamicOrderBy', []),
|
|
@@ -577,6 +578,7 @@ const withListing = mappers => ListingComponent => {
|
|
|
577
578
|
results: getResults(state),
|
|
578
579
|
resultsInfo: mappers && typeof mappers.resultsInfo === 'function' && mappers.resultsInfo(state),
|
|
579
580
|
searchTerm: getSearchTerm(state),
|
|
581
|
+
selectedFilters: getSelectedFilters(state),
|
|
580
582
|
sortOrder: getQueryParameter({
|
|
581
583
|
state
|
|
582
584
|
}, 'dynamicOrderBy', [])
|
|
@@ -989,7 +991,7 @@ const equalToOrIn = (field, value, operator = 'equalTo') => {
|
|
|
989
991
|
if (value.length === 0) return [];
|
|
990
992
|
|
|
991
993
|
if (Array.isArray(value)) {
|
|
992
|
-
if (operator === 'equalTo') return [contensisCoreApi.Op.in(field, ...value)];
|
|
994
|
+
if (operator === 'equalTo' || operator === 'in') return [contensisCoreApi.Op.in(field, ...value)];
|
|
993
995
|
return [contensisCoreApi.Op.or(...value.map(innerValue => {
|
|
994
996
|
switch (operator) {
|
|
995
997
|
case 'between':
|
|
@@ -997,6 +999,9 @@ const equalToOrIn = (field, value, operator = 'equalTo') => {
|
|
|
997
999
|
// Not implemented
|
|
998
1000
|
return contensisCoreApi.Op.equalTo(field, innerValue);
|
|
999
1001
|
|
|
1002
|
+
case 'exists':
|
|
1003
|
+
return contensisCoreApi.Op.exists(field, innerValue);
|
|
1004
|
+
|
|
1000
1005
|
case 'freeText':
|
|
1001
1006
|
// TODO: Potentially needs further implementation of new options
|
|
1002
1007
|
return contensisCoreApi.Op[operator](field, innerValue, false, undefined);
|
|
@@ -1869,7 +1874,7 @@ function* executeSearch(action) {
|
|
|
1869
1874
|
action,
|
|
1870
1875
|
featuredResult,
|
|
1871
1876
|
pageIndex: queryParams.internalPaging && queryParams.internalPageIndex || queryParams.pageIndex,
|
|
1872
|
-
prevResults: getResults
|
|
1877
|
+
prevResults: getResults(state, facet, action.context, 'js'),
|
|
1873
1878
|
result,
|
|
1874
1879
|
state
|
|
1875
1880
|
};
|
|
@@ -2028,10 +2033,8 @@ const {
|
|
|
2028
2033
|
getListing,
|
|
2029
2034
|
getPageIndex,
|
|
2030
2035
|
getPageIsLoading,
|
|
2031
|
-
getPaging,
|
|
2032
2036
|
getQueryParameter,
|
|
2033
2037
|
getRenderableFilters,
|
|
2034
|
-
getResults,
|
|
2035
2038
|
getSearchTerm
|
|
2036
2039
|
} = selectListing;
|
|
2037
2040
|
|
|
@@ -2043,10 +2046,11 @@ const makeSelectListingProps = () => reselect.createSelector(state => state, (_,
|
|
|
2043
2046
|
filters: getRenderableFilters(state),
|
|
2044
2047
|
isLoading: getIsLoading(state),
|
|
2045
2048
|
pageIsLoading: getPageIsLoading(state),
|
|
2046
|
-
paging: getPaging(state),
|
|
2047
|
-
results: getResults(state),
|
|
2049
|
+
paging: getPaging(state, '', Context$1.listings, 'js'),
|
|
2050
|
+
results: getResults(state, '', Context$1.listings, 'js'),
|
|
2048
2051
|
resultsInfo: mappers && typeof mappers.resultsInfo === 'function' && mappers.resultsInfo(state),
|
|
2049
2052
|
searchTerm: getSearchTerm(state),
|
|
2053
|
+
selectedFilters: getSelectedFilters(state, '', Context$1.listings, 'js'),
|
|
2050
2054
|
sortOrder: getQueryParameter({
|
|
2051
2055
|
state
|
|
2052
2056
|
}, 'dynamicOrderBy', [])
|
|
@@ -2080,6 +2084,7 @@ const useListing = ({
|
|
|
2080
2084
|
results,
|
|
2081
2085
|
resultsInfo,
|
|
2082
2086
|
searchTerm,
|
|
2087
|
+
selectedFilters,
|
|
2083
2088
|
sortOrder
|
|
2084
2089
|
} = reactRedux.useSelector(state => selectListingProps(state, m));
|
|
2085
2090
|
return {
|
|
@@ -2094,6 +2099,7 @@ const useListing = ({
|
|
|
2094
2099
|
results,
|
|
2095
2100
|
resultsInfo,
|
|
2096
2101
|
searchTerm,
|
|
2102
|
+
selectedFilters,
|
|
2097
2103
|
sortOrder,
|
|
2098
2104
|
title: listing.title,
|
|
2099
2105
|
...dispatchProps
|
|
@@ -2104,8 +2110,8 @@ const makeSelectMinilistProps = () => reselect.createSelector(state => state, (_
|
|
|
2104
2110
|
facet: getFacet(state, id, Context$1.minilist, 'js'),
|
|
2105
2111
|
filters: getFilters(state, id, Context$1.minilist, 'js'),
|
|
2106
2112
|
isLoading: getIsLoading$1(state, Context$1.minilist, id),
|
|
2107
|
-
pagingInfo: getPaging
|
|
2108
|
-
results: getResults
|
|
2113
|
+
pagingInfo: getPaging(state, id, Context$1.minilist, 'js'),
|
|
2114
|
+
results: getResults(state, id, Context$1.minilist, 'js'),
|
|
2109
2115
|
searchTerm: getSearchTerm$1(state)
|
|
2110
2116
|
}));
|
|
2111
2117
|
|