@riosst100/pwa-marketplace 1.9.1 → 1.9.2

package/package.json

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

package/src/components/FilterTop/CurrentTopFilters/currentTopFilter.js

@@ -31,7 +31,7 @@ const CurrentTopFilter = props => {
         }
     );
 
-    return group != "shopby" ? (
+    return group != "trains" && group != "trains_gauge" && group != "category" && group != "shopby" ? (
         <span className={classes.item} data-cy="CurrentTopFilter-root">
             <Trigger
                 action={handleClick}

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

@@ -27,7 +27,9 @@ const FilterTopItem = props => {
         [group, item, onApply, removeGroup, toggleItem]
     );
 
-    const element = group == "shopby" || group == "shopby_with_all" ? (
+    const element = group == "category" ? (
+        <Link className={classes.item} to={'/'+value}>{title}</Link>
+    ) : group == "shopby" || group == "shopby_with_all" ? (
         <Link className={classes.item} to={search ? search + '&shopby=' + value : '?shopby=' + value}>{title}</Link>
     ) : (
         activeFilters.includes(value) ? (

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

@@ -85,7 +85,7 @@ const FilterTopItemGroup = props => {
         <div className={classes.root}>
             {radioItems}
             {filterElements && filterElements.length > 10 ? <span className={classes.item}><b>More Item</b></span> : ''}
-            {filterElements && filterElements.length ? filterElements : group != "shopby" ? (<span className={classes.item}><b>All</b></span>) : ''}
+            {filterElements && filterElements.length ? filterElements : group != "trains" && group != "trains_gauge" && group != "category" && group != "shopby" ? (<span className={classes.item}><b>All</b></span>) : ''}
         </div>
     );
 };

package/src/components/FilterTop/filterTop.js

@@ -22,8 +22,8 @@ const SCROLL_OFFSET = 150;
  * @param {Object} props.filters - filters to display
  */
 const FilterTop = props => {
-    const { filters, filterCountToOpen, allowedFilters, category } = props;
-    const talonProps = useFilterTop({ filters, category });
+    const { shopby, filters, filterCountToOpen, allowedFilters, category } = props;
+    const talonProps = useFilterTop({ shopby, filters, category });
     const {
         filterApi,
         filterItems,

package/src/components/ShopBy/shopBy.js

@@ -278,6 +278,47 @@ const ShopBy = props => {
         ];
     }
 
+    // console.log(category)
+
+    if (shopby == "toys_brands" || shopby == "toys_product_line") {
+        if (category && category.url_path.includes('anime-figures')) {
+            availableFilterOption = [
+                {
+                    'code': 'anime_figures',
+                    'value': 'Complete Figures',
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Articulated Figures'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Statues'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Mini-Figures'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Capsule Toys (Gashapon)'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Candy Toys'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'R18+'
+                },
+                {
+                    'code': 'anime_figures',
+                    'value': 'Model Kits'
+                }
+            ];
+        }
+    }
+
     const handleActiveTab = (val) => {
         setActiveTab(val);
         setActive('all');

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

@@ -103,7 +103,7 @@ const Category = props => {
                 isLoading={loading} /> : shopby == "sets" || shopby == "expansion_sets" || shopby == "release_year" ? <ShopBySets
                 categoryId={uid}
                 shopby={shopby}
-                isLoading={loading} /> : (shopby ? (
+                isLoading={loading} /> : (shopby && shopby != "gauge" ? (
                     <ShopBy
                     categoryId={uid}
                     shopby={shopby}
@@ -113,6 +113,7 @@ const Category = props => {
                     categoryId={uid}
                     classes={classes}
                     data={categoryData}
+                    shopby={shopby}
                     isLoading={loading}
                     pageControl={pageControl}
                     sortProps={sortProps}

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

@@ -46,6 +46,7 @@ const CategoryContent = props => {
     const {
         categoryId,
         data,
+        shopby,
         isLoading,
         pageControl,
         sortProps,
@@ -288,9 +289,13 @@ const CategoryContent = props => {
          : currentFilter
     ) : categoryName;
 
+    if (shopby == "gauge") {
+        title = "Trains By Gauge";
+    }
+
     return (
         <Fragment>
-            <Breadcrumbs categoryId={categoryId} currentFilter={activeFilters} />
+            <Breadcrumbs categoryId={categoryId} customPage={shopby == "gauge" ? title : ''} currentFilter={activeFilters} />
             <StoreTitle>{title}</StoreTitle>
             <article className={classes.root} data-cy="CategoryContent-root">
                 <div className={classes.categoryHeader}>
@@ -307,13 +312,13 @@ const CategoryContent = props => {
                 {/* {activeFilters.size <= 0 && category && category.custom_landing_page ? ( */}
                     <>
                         {currentFilter && <AlphaFilter isSingles={isSingles} items={items} handleActiveLetter={handleActiveLetter} activeLetter={activeLetter} />}
-                        <SubCategory parent={parent} children={children} />
+                        {shopby != "gauge" ? <SubCategory parent={parent} children={children} /> : ''}
                         {!currentFilter && <CustomSubCategory categoryName={category ? category.name : null} customSubCategory={category ? category.custom_subcategory : null} />}
                     </>
                 {/* ) : ( */}
                     <>
                         {/* <SubCategory filters={filters} children={children} /> */}
-                        <FilterTop filters={filters} category={category} children={children} allowedFilters={category ? category.allowed_filters : []} />
+                        <FilterTop shopby={shopby} filters={filters} category={category} children={children} allowedFilters={category ? category.allowed_filters : []} />
                         {/* <AttributesBlock category={category} attributesBlock={attributesBlock} /> */}
                         {/* <section className='category_brand-slider my-5'>
                             <BrandSlider />

package/src/overwrites/venia-ui/lib/components/MegaMenu/shopByColumn.js

@@ -46,9 +46,9 @@ const ShopByColumn = props => {
                     ? props.keyboardProps
                     : {};
 
-            const categoryUrl = resourceUrl(
-                `/${url_path}${categoryUrlSuffix || ''}?shopby=${shopByItem.option_id}`
-            );
+            const categoryUrl = 
+                `/${shopByItem.url_path}`
+            ;
 
             return (
                 <li key={index} className={cn(classes.submenuChildItem, 'mt-4')}>

package/src/talons/FilterTop/filterTop.gql.js

@@ -1,8 +1,8 @@
 import { gql } from '@apollo/client';
 
 export const GET_CUSTOM_FILTERS = gql`
-    query GetCustomFilters($category: String!, $filters: ProductAttributeFilterInput!) {
-        customSubFilters(category: $category, filters: $filters) {
+    query GetCustomFilters($shopby: String, $category: String!, $filters: ProductAttributeFilterInput!) {
+        customSubFilters(shopby: $shopby, category: $category, filters: $filters) {
             label
             count
             attribute_code

package/src/talons/FilterTop/useFilterTop.js

@@ -21,7 +21,7 @@ import DEFAULT_OPERATIONS from './filterTop.gql';
 const DRAWER_NAME = 'filter';
 
 export const useFilterTop = props => {
-    const { filters, category } = props;
+    const { filters, category, shopby } = props;
 
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
     const { getFilterInputsQuery, getCustomFilters } = operations;
@@ -77,7 +77,8 @@ export const useFilterTop = props => {
         runQuery({
             variables: {
                 filters: newFilters,
-                category: category?.url_path
+                category: category?.url_path,
+                shopby: shopby
             }
         });
     }, [

package/src/talons/ShopBy/useShopBy.js

@@ -100,8 +100,8 @@ export const useShopBy = props => {
         runQuery,
         activeFilter,
         shopby,
-        categoryUrlKey,
-        filters
+        // categoryUrlKey,
+        // filters
         // filterTypeMap,
         // search
     ]);