@riosst100/pwa-marketplace 2.6.1 → 2.6.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/components/FilterTop/FilterBlockList/filterTopItem.js

@@ -51,9 +51,7 @@ const FilterTopItem = props => {
     //     console.log(search)
 
     //     let filterSearchArr = search ? search.split('&') : [];
-    //     filterSearchArr = filterSearchArr.filter(function(data) {
-    //         return !data.includes('shopby');
-    //     })
+        
     //     let filterSearch = filterSearchArr.join('&')
 
     //     if (!filterSearch.includes('?')) {
@@ -65,7 +63,7 @@ const FilterTopItem = props => {
 
     let newfilterSearchArr = search ? search.split('&') : [];
     newfilterSearchArr = newfilterSearchArr.filter(function(data) {
-        return data.includes('card_game%5Bfilter%5D');
+        return !data.includes('card_game%5Bfilter%5D');
     });
     
     let filterSearch = newfilterSearchArr.join('&')

package/src/components/SetsData/setsData.js

@@ -411,7 +411,7 @@ const SetsData = props => {
                 <Divider className="mb-5 px-4 mt-5" />
                 <section className='singles-container'>
                     <div className={cn('singles-wrapper block', classes.singlesWrapper)}>
-                        {newSetsData && newSetsData.length ? setRelases : (searchQuery ? <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No sets found for <b>{searchQuery}</b> search query.</div> : <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No sets found.</div>)}
+                        {setsData && Object.keys(setsData).length != 0  ? setRelases : (searchQuery ? <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No sets found for <b>{searchQuery}</b> search query.</div> : <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No sets found.</div>)}
                     </div>
                 </section>
             </div>

package/src/components/ShopBy/shopBy.js

@@ -112,8 +112,7 @@ const ShopBy = props => {
 
     const { error, loading, dataResult, categoryUrlSuffix, categoryUrlKey, productType, filteredAvailableGroups, availableGroups, attributeData, alpha, category, activeFilters, pageInfo } = talonProps;
 
-    console.log('error', error)
-    console.log('loading', loading)
+    console.log('dataResult SHOPBY', dataResult)
 
     if (loading) {
         return <ShopByShimmer />;

package/src/talons/ShopBy/useShopBy.js

@@ -155,7 +155,7 @@ export const useShopBy = props => {
             return null;
         }
         
-        const rawData = queryResponse?.shopByData?.data?.options;
+        const rawData = queryResponse?.shopByData?.data;
         if (!rawData) {
             return null;
         }
@@ -181,11 +181,12 @@ export const useShopBy = props => {
     }, [queryResponse, sortby]);
 
     const filteredOptions = useMemo(() => {
+        console.log('queryResponse', queryResponse)
         if (!queryResponse) {
             return null;
         }
         
-        const rawData = queryResponse?.shopByData?.data?.options;
+        const rawData = queryResponse?.shopByData?.data;
         if (!rawData) {
             return null;
         }
@@ -221,6 +222,8 @@ export const useShopBy = props => {
         return options;
     }, [queryResponse, searchQuery]);
 
+    console.log('filteredOptions',filteredOptions)
+
     const dataResult = useMemo(() => {
         if (filteredOptions) {
             return filteredOptions.reduce((acc, item) => {
@@ -240,7 +243,7 @@ export const useShopBy = props => {
         return filteredOptions;
     }, [filteredOptions])
 
-    // console.log(dataResult)
+    console.log('dataResult',dataResult)
 
     let availableGroups = originalDataResult ? Object.keys(originalDataResult).sort() : [];