@riosst100/pwa-marketplace 1.7.7 → 1.7.9

package/package.json

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

package/src/components/ShopBy/shopBy.js

@@ -184,10 +184,6 @@ const ShopBy = props => {
 
     const handleActive = (val) => {
         setActive(val);
-
-        // 
-
-
         setSearchQuery('')
     }
 
@@ -197,15 +193,15 @@ const ShopBy = props => {
             'value': 'all'
         }
     ];
-
-    console.log(activeFilters)
+    
+    const title = attributeData ? (attributeData.attribute_code == "sc_baseball_parallel" ? "Parallel Sets" : (attributeData.attribute_code == "sc_baseball_inserts" ? "Insert Sets" : attributeData.label)) : "Shop By"
 
     return (
         <Fragment>
-            <StoreTitle>{attributeData ? 'By ' + attributeData.label : 'Shop By'}</StoreTitle>
-            <Breadcrumbs categoryId={categoryId} customPage={'By ' + attributeData.label} currentFilter={activeFilters} />
+            <StoreTitle>{title}</StoreTitle>
+            <Breadcrumbs categoryId={categoryId} customPage={title} currentFilter={activeFilters} />
             <h1 className='mx-auto relative block text-xl font-bold text-center pt-10 pb-4'>
-                {attributeData ? 'By ' + attributeData.label : 'Shop By'}
+                {title}
             </h1>
             <div className='border border-gray-100 px-6'>
                 {dataResult ? (

package/src/overwrites/venia-ui/lib/RootComponents/Category/categoryContent.js

@@ -226,6 +226,8 @@ const CategoryContent = props => {
 
     let isSingles = false;
 
+    // console.log(allActiveFilters)
+
     if (allActiveFilters && allActiveFilters.size > 0) {
         allActiveFilters.forEach((value, key) => {
             value.forEach((value) => {
@@ -239,7 +241,9 @@ const CategoryContent = props => {
                 if (virtualCategoryFilters && virtualCategoryFilters.includes(key)) {
                     activeFilters.push(
                         {
-                            'label': label
+                            'label': label,
+                            'code': key,
+                            'option_id': optionId
                         }
                     )
                 }
@@ -249,10 +253,19 @@ const CategoryContent = props => {
 
     const currentFilter = activeFilters && activeFilters.length ? activeFilters[activeFilters.length - 1].label : '';
 
+    // console.log(activeFilters.length)
+    // console.log(activeFilters.map(u => u.label).join(' - '))
+
+    const title = activeFilters && activeFilters.length ? (
+        activeFilters.length > 1 ? 
+            activeFilters.map(u => u.label).join(': ')
+         : currentFilter
+    ) : categoryName;
+
     return (
         <Fragment>
             <Breadcrumbs categoryId={categoryId} currentFilter={activeFilters} />
-            <StoreTitle>{currentFilter ? currentFilter : categoryName}</StoreTitle>
+            <StoreTitle>{title}</StoreTitle>
             <article className={classes.root} data-cy="CategoryContent-root">
                 <div className={classes.categoryHeader}>
                     <h1 aria-live="polite" className={classes.title}>
@@ -260,7 +273,7 @@ const CategoryContent = props => {
                             className={classes.categoryTitle}
                             data-cy="CategoryContent-categoryTitle"
                         >
-                            {currentFilter ? currentFilter : categoryTitle}
+                            {title}
                         </span>
                     </h1>
                     {categoryDescriptionElement}

package/src/overwrites/venia-ui/lib/components/Breadcrumbs/breadcrumbs.js

@@ -73,8 +73,12 @@ const Breadcrumbs = props => {
     // console.log(currentFilter)
 
     const filterBreadcrumbsElement = [];
+
+    const lastIndex = currentFilter ? currentFilter.length - 1 : 0;
+    // const filterpath = ;
     
     currentFilter && currentFilter.length && currentFilter.map((filter, index) => {
+        console.log(filter)
         currentProduct ? (
             filterBreadcrumbsElement.push(
                 <>
@@ -82,7 +86,7 @@ const Breadcrumbs = props => {
                 <Link
                     key={index}
                     className={classes.link}
-                    to={filter.path}
+                    to={resourceUrl('/'+currentCategoryPath)}
                     onClick={handleClick}
                 >
                     {filter.label}
@@ -97,7 +101,7 @@ const Breadcrumbs = props => {
                     <Link
                         key={index}
                         className={classes.link}
-                        to={resourceUrl(currentCategoryPath)}
+                        to={resourceUrl('/'+currentCategoryPath)}
                         onClick={handleClick}
                     >
                         {filter.label}
@@ -105,10 +109,21 @@ const Breadcrumbs = props => {
                     </>
                 )
             ) : filterBreadcrumbsElement.push(
+                index == lastIndex ?
                 <span key={index}>
                     <span className={classes.divider}>{DELIMITER}</span>
                     <span className={cn(classes.currentCategory, 'text-blue-700 font-medium')}>{filter.label}</span>
-                </span>
+                </span> : <>
+                    <span className={classes.divider}>{DELIMITER}</span>
+                    <Link
+                        key={index}
+                        className={classes.link}
+                        to={resourceUrl('/'+currentCategoryPath+'?' + filter.code + '[filter]=' + filter.label + ',' + filter.option_id)}
+                        onClick={handleClick}
+                    >
+                        {filter.label}
+                    </Link>
+                    </>
             )
         );
     });

package/src/overwrites/venia-ui/lib/components/FilterModal/CurrentFilters/currentFilters.js

@@ -20,7 +20,7 @@ const CurrentFilters = props => {
                 const { title, value } = item || {};
                 const key = `${group}::${title}_${value}`;
 
-                const customAttributeLandingPage = ['card_set', 'sc_baseball_release','auction','special_price','lof_preorder'];
+                const customAttributeLandingPage = ['card_set', 'sc_baseball_release','auction','special_price','lof_preorder','sc_baseball_inserts','sc_baseball_parallel','sc_set_type'];
 
                 if (!customAttributeLandingPage.includes(group)) {
                     elements.push(

package/src/overwrites/venia-ui/lib/components/FilterSidebar/filterSidebar.js

@@ -91,7 +91,7 @@ const FilterSidebar = props => {
                 const groupName = filterNames.get(group);
                 const frontendInput = filterFrontendInput.get(group);
 
-                const hideFilters = ['lof_preorder','auction','special_price'];
+                const hideFilters = ['lof_preorder','auction','special_price','sc_baseball_inserts','sc_baseball_parallel','sale','sc_set_type','sc_brands'];
                 if (!hideFilters.includes(group)) {
                 // if (!allowedFilters && !allowedFiltersArr.length && group != "category_uid" || allowedFilters && allowedFiltersArr.length && allowedFiltersArr.includes(group)) {
                     

package/src/talons/CollectibleGameSets/useCollectibleGameSets.js

@@ -103,7 +103,6 @@ export const useCollectibleGameSets = props => {
             collectibleGameSets.map(({ release_type, sets }, index) => {
                 const newSets = sets.filter(function(set) {
                     return set.set_name.search(new RegExp(searchQuery, "i")) != -1 || set.set_abbreviation.search(new RegExp(searchQuery, "i")) != -1 || release_type.search(new RegExp(searchQuery, "i")) != -1;
-                    // return set.set_name.includes(searchQuery);
                 });
 
                 if (newSets && newSets.length) {

package/src/talons/ShopBy/useShopBy.js

@@ -149,7 +149,7 @@ export const useShopBy = props => {
         const sortbyData = [];
 
         return sortby != "all" ? sortbyData && sortbyData.length ? sortbyData.sort((a, b) => b.release_type.toLowerCase().localeCompare(a.release_type.toLowerCase())) : sortbyData : mappingData;
-    }, [queryResponse, sortby, searchQuery]);
+    }, [queryResponse, sortby]);
 
     const dataResult = useMemo(() => {
         if (!queryResponse) {
@@ -163,12 +163,31 @@ export const useShopBy = props => {
         
         let options = rawData[0].options;
 
-        if (searchQuery) {
-            setActive('all')
-            options = options.filter(function(option) {
-                return option.label.search(new RegExp(searchQuery, "i")) != -1;
-            });
-        }
+        const filteredSets = [];
+
+        let filteredOptions = [];
+
+        // let mappingData = [];
+
+        // if (searchQuery) {
+        //     setActive('all')
+        //     mappingData = options.filter(function(option) {
+        //         return option.label.search(new RegExp(searchQuery, "i")) != -1;
+        //     }).reduce((acc, item) => {
+        //         let firstLetter = item.label.charAt(0).toUpperCase();
+        //         if (!alpha.includes(firstLetter)) {
+        //             firstLetter = '#';
+        //         }
+        //         acc[firstLetter] = acc[firstLetter] || [];
+        //         acc[firstLetter].push(item);
+        //         return acc;
+        //     }, {});
+        // } else {
+
+        //     console.log(filteredOptions)
+
+           
+        // }
 
         const mappingData = options.reduce((acc, item) => {
             let firstLetter = item.label.charAt(0).toUpperCase();