@sentecacommerce-theme/lib 0.13.7-alpha.5 → 0.13.8

package/dist/cjs/listing/hooks/useSlideFilter.js

@@ -8,16 +8,24 @@ var _utils = require("../../utils");
 var _utils1 = require("../utils");
 var _useListingFilters = require("./useListingFilters");
 var _index = require("../../index");
+var _ = require(".");
+function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
 function _arrayWithHoles(arr) {
     if (Array.isArray(arr)) return arr;
 }
 function _iterableToArrayLimit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
     var _arr = [];
     var _n = true;
     var _d = false;
-    var _e = undefined;
+    var _s, _e;
     try {
-        for(var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true){
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
             _arr.push(_s.value);
             if (i && _arr.length === i) break;
         }
@@ -34,16 +42,24 @@ function _iterableToArrayLimit(arr, i) {
     return _arr;
 }
 function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
 var useSlideFilter = function(filterName, min, max) {
-    var ref;
+    var ref3;
     var router = (0, _router).useRouter();
-    var slug = (0, _index).useListingAlias().slug;
-    var config = (0, _index).useConfigState();
+    var meta = (0, _).useListingConfig().meta;
+    var slug = (0, _index).useListingAlias(meta).slug;
     var allFilters = router.query.filter;
     var filterQuery = "".concat(filterName, ";range;");
     var getFilter = function() {
@@ -55,7 +71,7 @@ var useSlideFilter = function(filterName, min, max) {
         }
         if (allFilters.includes(filterQuery)) return allFilters;
     };
-    var filter = (ref = getFilter()) === null || ref === void 0 ? void 0 : ref.replace(filterQuery, '');
+    var filter = (ref3 = getFilter()) === null || ref3 === void 0 ? void 0 : ref3.replace(filterQuery, '');
     var ref1 = _slicedToArray(filter ? filter.split(',') : [
         min,
         max
@@ -65,16 +81,38 @@ var useSlideFilter = function(filterName, min, max) {
         to: +to || max
     }), 2), state = ref2[0], setState = ref2[1];
     var timeoutRef = (0, _react).useRef();
-    var updateValue = (0, _react).useCallback(function(data) {
+    var getFormattedPriceRange = function(data) {
         var formattedFrom = Math.min(Math.max(data.from, min), data.to);
         var formattedTo = Math.max(data.from, Math.min(data.to, max));
+        return {
+            formattedFrom: formattedFrom,
+            formattedTo: formattedTo
+        };
+    };
+    var updateValue = (0, _react).useCallback(function(data) {
+        var ref = getFormattedPriceRange(data), formattedFrom = ref.formattedFrom, formattedTo = ref.formattedTo;
+        setState({
+            from: formattedFrom,
+            to: formattedTo
+        });
+    }, [
+        filterName,
+        max,
+        min,
+        router,
+        slug
+    ]);
+    var applyFilter = (0, _react).useCallback(function(data) {
+        var ref = getFormattedPriceRange(data), formattedFrom = ref.formattedFrom, formattedTo = ref.formattedTo;
         clearTimeout(timeoutRef.current);
         timeoutRef.current = setTimeout(function() {
-            router.push((0, _utils).createAggregateQuery((0, _utils1).getListingPageType(router, slug, config), router.query.slug, {
+            router.push((0, _utils).createAggregateQuery((0, _utils1).getListingPageType(router, slug, meta), router.query.slug, {
                 aggType: filterName,
                 aggKey: "".concat(formattedFrom, ",").concat(formattedTo),
                 aggOperator: _useListingFilters.filtersOperatorsMap.stats
-            }, false, router, true));
+            }, false, router, true), undefined, {
+                shallow: true
+            });
         }, 500);
         setState({
             from: formattedFrom,
@@ -89,6 +127,7 @@ var useSlideFilter = function(filterName, min, max) {
     ]);
     return {
         value: state,
+        applyFilter: applyFilter,
         updateValue: updateValue
     };
 };

package/dist/cjs/listing/hooks/useSort.js

@@ -4,50 +4,78 @@ Object.defineProperty(exports, "__esModule", {
 exports.useSort = void 0;
 var _router = require("next/router");
 var _react = require("react");
-var useSort = function(param) {
-    var onSelect = param.onSelect, sorts = param.sorts, defaultSortKey = param.defaultSortKey;
-    var ref1;
-    // Not ready yet
-    // const { sortOptions: sorts, defaultSortKey } = useListingConfig()
+var _ = require(".");
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _objectSpread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _defineProperty(target, key, source[key]);
+        });
+    }
+    return target;
+}
+var useSort = function(props) {
+    var ref2;
+    var ref1 = (0, _).useListingConfig(), sorts = ref1.sortOptions, defaultSortRaw = ref1.defaultSortKey;
+    var defaultSortKey = defaultSortRaw || 'defaultSort';
     var router = (0, _router).useRouter();
-    var currentSortQuery = (router === null || router === void 0 ? void 0 : (ref1 = router.query) === null || ref1 === void 0 ? void 0 : ref1.sort) || defaultSortKey;
+    var currentSortQuery = (router === null || router === void 0 ? void 0 : (ref2 = router.query) === null || ref2 === void 0 ? void 0 : ref2.sort) || defaultSortKey;
     var changeSort = (0, _react).useCallback(function(value) {
         return function() {
-            var ref;
-            var query = router.query.filter ? {
-                sort: value,
-                filter: (ref = router.query) === null || ref === void 0 ? void 0 : ref.filter
-            } : {
+            if (!value) return;
+            var query = _objectSpread({}, router.query, {
                 sort: value
-            };
+            });
             if (defaultSortKey === value) {
                 delete query.sort;
             }
             setTimeout(function() {
-                onSelect === null || onSelect === void 0 ? void 0 : onSelect();
+                var ref;
+                props === null || props === void 0 ? void 0 : (ref = props.onSelect) === null || ref === void 0 ? void 0 : ref.call(props);
             });
             return router.push({
                 href: router.pathname,
                 query: query
+            }, undefined, {
+                shallow: true
             });
         };
     }, [
         defaultSortKey,
         router,
-        onSelect
+        props === null || props === void 0 ? void 0 : props.onSelect
     ]);
     var result = (0, _react).useMemo(function() {
+        var ref;
         var selectedSort = {
             key: defaultSortKey,
             label: '',
             isDefault: true,
-            select: function() {
-            }
+            select: function() {}
         };
-        var sortOptions = sorts.map(function(sort) {
+        var sortOptions = (ref = sorts || []) === null || ref === void 0 ? void 0 : ref.map(function(sort) {
             var data = {
-                key: sort.key,
-                label: sort.label,
+                key: sort.key || 'defaultSort',
+                label: sort.label || '',
                 select: changeSort(sort.key),
                 isDefault: sort.key === defaultSortKey
             };

package/dist/cjs/listing/hooks/utils.js

@@ -12,7 +12,8 @@ function processCategoriesResponse(response, type, term) {
     return result;
 }
 function getAggregateTypeAndTerm(aggregates) {
-    var type = aggregates === null || aggregates === void 0 ? void 0 : aggregates.aggregationType.toString();
+    var ref;
+    var type = (aggregates === null || aggregates === void 0 ? void 0 : (ref = aggregates.aggregationType) === null || ref === void 0 ? void 0 : ref.toString()) || '';
     var term = aggregates === null || aggregates === void 0 ? void 0 : aggregates.aggregationDefinition;
     return {
         type: type,

package/dist/cjs/listing/index.js

@@ -1,8 +1,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-var _exportNames = {
-};
+var _exportNames = {};
 var _types = _interopRequireWildcard(require("./types"));
 Object.keys(_types).forEach(function(key) {
     if (key === "default" || key === "__esModule") return;
@@ -79,13 +78,11 @@ function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
     } else {
-        var newObj = {
-        };
+        var newObj = {};
         if (obj != null) {
             for(var key in obj){
                 if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {
-                    };
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
                     if (desc.get || desc.set) {
                         Object.defineProperty(newObj, key, desc);
                     } else {

package/dist/cjs/listing/ssr/index.js

@@ -1,8 +1,7 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-var _exportNames = {
-};
+var _exportNames = {};
 var _prefetchPredicate = _interopRequireWildcard(require("./prefetchPredicate"));
 Object.keys(_prefetchPredicate).forEach(function(key) {
     if (key === "default" || key === "__esModule") return;
@@ -43,13 +42,11 @@ function _interopRequireWildcard(obj) {
     if (obj && obj.__esModule) {
         return obj;
     } else {
-        var newObj = {
-        };
+        var newObj = {};
         if (obj != null) {
             for(var key in obj){
                 if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {
-                    };
+                    var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {};
                     if (desc.get || desc.set) {
                         Object.defineProperty(newObj, key, desc);
                     } else {

package/dist/cjs/listing/ssr/prefetchCategories.js

@@ -45,7 +45,7 @@ function prefetchCategories(queryCache, router, predicate, aggregates, config) {
 }
 function _prefetchCategories() {
     _prefetchCategories = _asyncToGenerator(_regeneratorRuntime.default.mark(function _callee(queryCache, router, predicate, aggregates, config) {
-        var aggregateKeys, aliasedSlug, slug, query, response;
+        var aggregateKeys, aliasedSlug, query, response;
         return _regeneratorRuntime.default.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
@@ -54,30 +54,29 @@ function _prefetchCategories() {
                         router: router,
                         config: config
                     });
-                    slug = (0, _utils).getSlug(router, aliasedSlug);
                     query = (0, _api).prepareAggregateQuery({
                         request: _api.AggregateRequestEnum.Categories,
                         router: router,
                         predicate: predicate,
                         slug: aliasedSlug,
                         aggregates: aggregates,
-                        postFilter: undefined,
+                        postFilter: (0, _utils).getPostFilters(router),
                         config: config
                     });
-                    _ctx.next = 6;
+                    _ctx.next = 5;
                     return (0, _sdk).CatalogAggregate(query);
-                case 6:
+                case 5:
                     response = _ctx.sent;
                     queryCache.setQueryData([
                         _api.AggregateRequestEnum.Categories,
                         aggregateKeys,
                         aliasedSlug,
-                        null
+                        (0, _utils).getPostFilters(router), 
                     ], response, {
                         staleTime: 30000
                     });
                     return _ctx.abrupt("return", response);
-                case 9:
+                case 8:
                 case "end":
                     return _ctx.stop();
             }

package/dist/cjs/listing/ssr/prefetchListing.js

@@ -44,11 +44,11 @@ function prefetchListing(_) {
 }
 function _prefetchListing() {
     _prefetchListing = _asyncToGenerator(_regeneratorRuntime.default.mark(function _callee(param) {
-        var queryCache, router, predicate, config, ref, aliasedSlug, type, postFilter, ref1, ref2, sort, _limit, limit, offset, queryKeys, data;
+        var queryCache, router, predicate, config, defaultSortKey, ref, aliasedSlug, type, postFilter, ref1, ref2, sort, limit, offset, queryKeys, data;
         return _regeneratorRuntime.default.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    queryCache = param.queryCache, router = param.router, predicate = param.predicate, config = param.config;
+                    queryCache = param.queryCache, router = param.router, predicate = param.predicate, config = param.config, defaultSortKey = param.defaultSortKey;
                     ;
                     aliasedSlug = (0, _utils).getListingAlias({
                         router: router,
@@ -57,9 +57,8 @@ function _prefetchListing() {
                     type = (0, _utils).getListingPageType(router, aliasedSlug, config);
                     postFilter = (0, _utils).getPostFilters(router);
                     ;
-                    sort = (ref2 = (ref1 = router.query.sort) !== null && ref1 !== void 0 ? ref1 : config === null || config === void 0 ? void 0 : config.listing.defaultSortKey) !== null && ref2 !== void 0 ? ref2 : 'defaultSort';
-                    ;
-                    limit = !!router.query.limit ? Number(router.query.limit) : (_limit = config === null || config === void 0 ? void 0 : config.listing.limit) !== null && _limit !== void 0 ? _limit : 24;
+                    sort = (ref2 = (ref1 = router.query.sort) !== null && ref1 !== void 0 ? ref1 : defaultSortKey) !== null && ref2 !== void 0 ? ref2 : 'defaultSort';
+                    limit = !!router.query.limit ? Number(router.query.limit) : (config === null || config === void 0 ? void 0 : config.limit) || 24;
                     offset = (0, _utils).calculateOffset((ref = router.query) === null || ref === void 0 ? void 0 : ref.page, limit);
                     queryKeys = (0, _api).getListingQueryKeys({
                         type: type,
@@ -69,7 +68,7 @@ function _prefetchListing() {
                         slug: aliasedSlug,
                         offset: offset
                     });
-                    _ctx.next = 13;
+                    _ctx.next = 12;
                     return (0, _api).processListingQuery({
                         router: router,
                         predicate: predicate,
@@ -78,15 +77,16 @@ function _prefetchListing() {
                         postFilter: postFilter,
                         offset: offset,
                         config: config,
-                        slug: aliasedSlug
+                        slug: aliasedSlug,
+                        includeVariants: Boolean(config.includeVariants)
                     });
-                case 13:
+                case 12:
                     data = _ctx.sent;
                     queryCache.setQueryData(queryKeys, data, {
                         staleTime: 30000
                     });
                     return _ctx.abrupt("return", data);
-                case 16:
+                case 15:
                 case "end":
                     return _ctx.stop();
             }

package/dist/cjs/listing/ssr/prefetchPredicate.js

@@ -44,20 +44,20 @@ function prefetchPredicate(queryCache, router, config) {
 }
 function _prefetchPredicate() {
     _prefetchPredicate = _asyncToGenerator(_regeneratorRuntime.default.mark(function _callee(queryCache, router, config) {
-        var attribute, aliasedSlug, slug, data;
+        var aliasedSlug, slug, data, attribute;
         return _regeneratorRuntime.default.wrap(function _callee$(_ctx) {
             while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    attribute = router.query.cat && router.query.slug;
                     aliasedSlug = (0, _utils).getListingAlias({
                         router: router,
                         config: config
                     });
                     slug = (0, _utils).getSlug(router, aliasedSlug);
-                    _ctx.next = 5;
+                    _ctx.next = 4;
                     return (0, _api).processPredicateRequest(slug, router, aliasedSlug);
-                case 5:
+                case 4:
                     data = _ctx.sent;
+                    attribute = router.query.cat && aliasedSlug;
                     queryCache.setQueryData([
                         _api.ListingQueryKeysEnum.usePredicate,
                         slug,

package/dist/cjs/listing/types.js

@@ -2,15 +2,14 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 exports.ComponentTypeEnum = exports.AggregationTypeEnum = exports.GenderNamesEnum = exports.ListingTypesEnum = exports.AggregateSortEnum = void 0;
-var AggregateSortEnum1;
-exports.AggregateSortEnum = AggregateSortEnum1;
+var AggregateSortEnum;
+exports.AggregateSortEnum = AggregateSortEnum;
 (function(AggregateSortEnum) {
     AggregateSortEnum["Index"] = 'index';
     AggregateSortEnum["Alphabetically"] = 'alphabetically';
-})(AggregateSortEnum1 || (exports.AggregateSortEnum = AggregateSortEnum1 = {
-}));
-var ListingTypesEnum1;
-exports.ListingTypesEnum = ListingTypesEnum1;
+})(AggregateSortEnum || (exports.AggregateSortEnum = AggregateSortEnum = {}));
+var ListingTypesEnum;
+exports.ListingTypesEnum = ListingTypesEnum;
 (function(ListingTypesEnum) {
     ListingTypesEnum["Category"] = 'category';
     ListingTypesEnum["Brand"] = 'brand';
@@ -18,26 +17,23 @@ exports.ListingTypesEnum = ListingTypesEnum1;
     ListingTypesEnum["Search"] = 'text';
     ListingTypesEnum["Collection"] = 'collection';
     ListingTypesEnum["AttrPage"] = 'attribute page';
-})(ListingTypesEnum1 || (exports.ListingTypesEnum = ListingTypesEnum1 = {
-}));
-var GenderNamesEnum1;
-exports.GenderNamesEnum = GenderNamesEnum1;
+})(ListingTypesEnum || (exports.ListingTypesEnum = ListingTypesEnum = {}));
+var GenderNamesEnum;
+exports.GenderNamesEnum = GenderNamesEnum;
 (function(GenderNamesEnum) {
     GenderNamesEnum["Men"] = 'Мъже';
     GenderNamesEnum["Women"] = 'Жени';
     GenderNamesEnum["Kids"] = 'Деца';
-})(GenderNamesEnum1 || (exports.GenderNamesEnum = GenderNamesEnum1 = {
-}));
-var AggregationTypeEnum1;
-exports.AggregationTypeEnum = AggregationTypeEnum1;
+})(GenderNamesEnum || (exports.GenderNamesEnum = GenderNamesEnum = {}));
+var AggregationTypeEnum;
+exports.AggregationTypeEnum = AggregationTypeEnum;
 (function(AggregationTypeEnum) {
     AggregationTypeEnum["Terms"] = 'terms';
     AggregationTypeEnum["Ranges"] = 'ranges';
     AggregationTypeEnum["Stats"] = 'stats';
-})(AggregationTypeEnum1 || (exports.AggregationTypeEnum = AggregationTypeEnum1 = {
-}));
-var ComponentTypeEnum1;
-exports.ComponentTypeEnum = ComponentTypeEnum1;
+})(AggregationTypeEnum || (exports.AggregationTypeEnum = AggregationTypeEnum = {}));
+var ComponentTypeEnum;
+exports.ComponentTypeEnum = ComponentTypeEnum;
 (function(ComponentTypeEnum) {
     ComponentTypeEnum["Text"] = 'text';
     ComponentTypeEnum["TextWithLink"] = 'text-with-link';
@@ -48,5 +44,4 @@ exports.ComponentTypeEnum = ComponentTypeEnum1;
     ComponentTypeEnum["Dropdown"] = 'dropdown';
     ComponentTypeEnum["RangeCheckbox"] = 'range-checkbox';
     ComponentTypeEnum["RangeSlider"] = 'range-slider';
-})(ComponentTypeEnum1 || (exports.ComponentTypeEnum = ComponentTypeEnum1 = {
-}));
+})(ComponentTypeEnum || (exports.ComponentTypeEnum = ComponentTypeEnum = {}));

package/dist/cjs/listing/utils/buildCategoryQuery.js

@@ -19,8 +19,7 @@ function _defineProperty(obj, key, value) {
 }
 function _objectSpread(target) {
     for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {
-        };
+        var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
         if (typeof Object.getOwnPropertySymbols === "function") {
             ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
@@ -33,17 +32,15 @@ function _objectSpread(target) {
     }
     return target;
 }
-var _obj;
 var buildCategoryQuery = function(param) {
     var aggregates = param.aggregates, predicate = param.predicate, postFilter = param.postFilter, pageType = param.pageType, config = param.config, router = param.router, slug = param.slug;
     var ref2, ref1;
-    var type = aggregates === null || aggregates === void 0 ? void 0 : (ref2 = aggregates[0]) === null || ref2 === void 0 ? void 0 : ref2.aggregationType;
-    var term = aggregates === null || aggregates === void 0 ? void 0 : (ref1 = aggregates[0]) === null || ref1 === void 0 ? void 0 : ref1.aggregationDefinition;
+    var type = (aggregates === null || aggregates === void 0 ? void 0 : (ref2 = aggregates[0]) === null || ref2 === void 0 ? void 0 : ref2.aggregationType) || '';
+    var term = (aggregates === null || aggregates === void 0 ? void 0 : (ref1 = aggregates[0]) === null || ref1 === void 0 ? void 0 : ref1.aggregationDefinition) || '';
     var aggValue = getAggValue({
         id: predicate === null || predicate === void 0 ? void 0 : predicate._id,
         term: term
     });
-    var listingConfig = config === null || config === void 0 ? void 0 : config.listing;
     var getFilters = function() {
         var filter = '';
         switch(pageType){
@@ -51,30 +48,30 @@ var buildCategoryQuery = function(param) {
                 filter += "brand;eq;\"".concat(predicate === null || predicate === void 0 ? void 0 : predicate._id, "\"").concat(applyBrandsPostFilter({
                     postFilter: postFilter
                 }));
-                if (router.query.cat) filter += (0, _extendFilter).extendFilter({
+                if (router.query.cat) filter += '&' + (0, _extendFilter).extendFilter({
                     slug: slug,
-                    filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                    filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                 });
                 break;
             case _index.ListingTypesEnum.Category:
                 if (router.query.cat) {
                     filter += (0, _extendFilter).extendFilter({
                         slug: slug,
-                        filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                        filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                     });
                 } else {
                     var ref;
-                    filter += (ref = listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension) !== null && ref !== void 0 ? ref : '';
+                    filter += (ref = config === null || config === void 0 ? void 0 : config.filterExtension) !== null && ref !== void 0 ? ref : '';
                 }
                 if (postFilter) {
-                    if (router.query.cat) filter += '&';
+                    if (filter) filter += '&';
                     filter += postFilter;
                 }
                 break;
             case _index.ListingTypesEnum.AttrPage:
                 filter += (0, _extendFilter).extendFilter({
                     slug: slug,
-                    filterExtension: listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension
+                    filterExtension: config === null || config === void 0 ? void 0 : config.filterExtension
                 });
                 if (postFilter) filter += "&".concat(postFilter);
                 break;
@@ -84,17 +81,24 @@ var buildCategoryQuery = function(param) {
                 filter += "text;eq;\"".concat(searchQuery, "\"");
                 if (postFilter) filter += "&".concat(postFilter);
                 break;
+            case _index.ListingTypesEnum.View:
+                filter += applyViewsPostFilter({
+                    postFilter: postFilter
+                });
+                if (config === null || config === void 0 ? void 0 : config.filterExtension) {
+                    filter += filter ? "&".concat(config === null || config === void 0 ? void 0 : config.filterExtension) : config === null || config === void 0 ? void 0 : config.filterExtension;
+                }
+                break;
             default:
-                return "".concat((listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.filterExtension) + "".concat(postFilter !== null && postFilter !== void 0 ? postFilter : ''));
+                return "".concat((config === null || config === void 0 ? void 0 : config.filterExtension) + "".concat(postFilter !== null && postFilter !== void 0 ? postFilter : ''));
         }
         return filter;
     };
-    var query = (_obj = {
-    }, _defineProperty(_obj, type, aggValue), _defineProperty(_obj, "filter", getFilters()), _obj);
+    var _obj;
+    var query = (_obj = {}, _defineProperty(_obj, type, aggValue), _defineProperty(_obj, "filter", getFilters()), _obj);
     if (pageType === _index.ListingTypesEnum.Collection) {
-        var collapseMode = listingConfig === null || listingConfig === void 0 ? void 0 : listingConfig.collapseMode;
-        query = _objectSpread({
-        }, query, {
+        var collapseMode = config === null || config === void 0 ? void 0 : config.collapseMode;
+        query = _objectSpread({}, query, {
             collapseMode: collapseMode
         });
     }
@@ -109,11 +113,25 @@ var applyBrandsPostFilter = function(param) {
     var postFilter = param.postFilter;
     if (postFilter) {
         var filtersArr = postFilter.split('&');
-        var filters = filtersArr.reduce(function(res, val, i) {
+        var filters = filtersArr.reduce(function(res, val) {
+            if (val.includes('category')) return res;
+            return res += "&".concat(val);
+        }, '');
+        if (!filters) return '';
+        return filters[0] === '&' ? filters : "&".concat(filters);
+    }
+    return '';
+};
+var applyViewsPostFilter = function(param) {
+    var postFilter = param.postFilter;
+    if (postFilter) {
+        var filtersArr = postFilter.split('&');
+        var filters = filtersArr.reduce(function(res, val) {
             if (val.includes('category')) return res;
+            if (!res) return res + "".concat(val);
             return res += "&".concat(val);
         }, '');
-        return "".concat(filters);
+        return filters || '';
     }
     return '';
 };