@riosst100/pwa-marketplace 1.7.7 → 1.7.8

package/package.json

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

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 > 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.length - 1;
+    // 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'];
 
                 if (!customAttributeLandingPage.includes(group)) {
                     elements.push(