@riosst100/pwa-marketplace 1.8.4 → 1.8.5

package/package.json

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

package/src/components/LegoSets/legoSets.js

@@ -103,6 +103,15 @@ const LegoSets = props => {
         return result;
     }
 
+    let allSetsTitle = "Sets";
+    let attributeCode = "lego_sets";
+    let byYearTitle = "By Year";
+    if (shopby == "singles") {
+        attributeCode = "lego_singles";
+        allSetsTitle = "Singles";
+        byYearTitle = "By Year";
+    }
+
     const setRelases = newLegoSets && newLegoSets.length && newLegoSets.map((setRelease, index) => {
         const { group, sets } = setRelease;
 
@@ -113,7 +122,7 @@ const LegoSets = props => {
                 const { set_name, option_id, release_year } = set;
 
                 const categoryUrl = resourceUrl(
-                    `/${category?.url_path}${categoryUrlSuffix || ''}?lego_set_name[filter]=${set_name},${option_id}`
+                    `/${category?.url_path}${categoryUrlSuffix || ''}?${attributeCode}[filter]=${set_name},${option_id}`
                 );
 
                 setsResult.push(<li className='list-none'>
@@ -158,6 +167,7 @@ const LegoSets = props => {
 
     const handleActiveTab = (val) => {
         setActiveTab(val);
+        setActive('all')
 
         setSearchQuery('')
     }
@@ -168,15 +178,23 @@ const LegoSets = props => {
 
     let alpha = ['#', 'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'];
 
-    let title = "All Sets";
+    let title = "Sets";
     if (activeTab == "year") {
-        title = "By Year";
+        title = "Sets | By Year";
     }
 
+    if (shopby == "singles") {
+        title = "Singles";
+        if (activeTab == "year") {
+            title = "Singles | By Year";
+        }
+    }
+    
+
     return (
         <Fragment>
             <StoreTitle>{title}</StoreTitle>
-            <Breadcrumbs categoryId={categoryId} customPage={shopby == "release_year" ? "By Year" : "By Release/Set"} />
+            <Breadcrumbs categoryId={categoryId} customPage={title} />
             <ul className={classes.nav}>
                 <li className={classes.nav_item}>
                     <button
@@ -184,7 +202,7 @@ const LegoSets = props => {
                             handleActiveTab('year')
                         }}
                     >
-                        {activeTab == 'year' ? <b>By Year</b> : 'By Year'}
+                        {activeTab == 'year' ? <b>{byYearTitle}</b> : byYearTitle}
                     </button>
                 </li>
                 <li className={classes.nav_item}>
@@ -193,7 +211,7 @@ const LegoSets = props => {
                             handleActiveTab('all')
                         }}
                     >
-                        {activeTab == 'all' ? <b>All Sets</b> : 'All Sets'}
+                        {activeTab == 'all' ? <b>{allSetsTitle}</b> : allSetsTitle}
                     </button>
                 </li>
             </ul>

package/src/components/ShopBy/shopBy.js

@@ -239,7 +239,7 @@ const ShopBy = props => {
                         <CustomSortBy sortProps={sortProps} availableSortMethods={availableSortBy} />
                     </div>
                 ) : ''}
-                {shopby != "lego_theme" && shopby != "lego_age_level" && productType != "expansion-sets" ? (
+                {shopby != "lego_age_level" && productType != "expansion-sets" ? (
                     <>
                         <section className='single_list-indexing-container relative m-auto pt-5'>
                             <ul className='flex gap-2 justify-center flex-wrap'>

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

@@ -85,7 +85,7 @@ const Category = props => {
                 categoryId={uid}
                 isLoading={loading} />
             ) : (
-                shopby == "lego_set_name" && parentCategoryUrlKey == "lego" ? <LegoSets
+                shopby == "singles" || shopby == "lego_set_name" && parentCategoryUrlKey == "lego" ? <LegoSets
                 categoryId={uid}
                 shopby={shopby}
                 isLoading={loading} /> : shopby == "release" && parentCategoryUrlKey == "sport-cards" ? <SportCardsSets

package/src/talons/LegoSets/legoSets.gql.js

@@ -12,8 +12,8 @@ export const GET_STORE_CONFIG_DATA = gql`
 `;
 
 export const GET_LEGO_SETS_QUERY = gql`
-    query getLegoSets($categoryUrlKey: String!, $activeTab: String, $filters: ProductAttributeFilterInput!) {
-        legoSets(categoryUrlKey: $categoryUrlKey, activeTab: $activeTab, filters: $filters) {
+    query getLegoSets($categoryUrlKey: String!, $activeTab: String, $filters: ProductAttributeFilterInput!, $shopby: String) {
+        legoSets(categoryUrlKey: $categoryUrlKey, activeTab: $activeTab, filters: $filters, shopby: $shopby) {
             group
             sets {
                 set_name

package/src/talons/LegoSets/useLegoSets.js

@@ -92,7 +92,8 @@ export const useLegoSets = props => {
             variables: {
                 filters: newFilters,
                 categoryUrlKey: categoryUrlKey,
-                activeTab: activeTab
+                activeTab: activeTab,
+                shopby: shopby
             }
         });
     // }