@riosst100/pwa-marketplace 2.9.1 → 2.9.2

package/src/components/ShowMore/showMore.js

@@ -0,0 +1,428 @@
+import React, { Fragment, Suspense, useMemo, useRef, useState } from 'react';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import Breadcrumbs from '@magento/venia-ui/lib/components/Breadcrumbs';
+import cn from 'classnames';
+import { useLocation } from 'react-router-dom';
+import { getFiltersFromSearch } from '@magento/peregrine/lib/talons/FilterModal/helpers';
+
+import ErrorView from '@magento/venia-ui/lib/components/ErrorView';
+import { StoreTitle, Meta } from '@magento/venia-ui/lib/components/Head';
+import { Link } from 'react-router-dom';
+import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
+import defaultClasses from '@riosst100/pwa-marketplace/src/components/ShopBy/shopBy.module.css';
+import Divider from '@riosst100/pwa-marketplace/src/components/Divider';
+import { ShowMoreShimmer } from '@riosst100/pwa-marketplace/src/components/ShowMore';
+import CustomSortBy from '@riosst100/pwa-marketplace/src/components/CustomSortBy';
+import ArraySearchInput from '@riosst100/pwa-marketplace/src/components/ArraySearchInput';
+import { useCustomSort } from '@riosst100/pwa-marketplace/src/hooks/useCustomSort';
+import { useShowMore } from '@riosst100/pwa-marketplace/src/talons/ShowMore/useShowMore';
+
+const FilterModal = React.lazy(() => import('@magento/venia-ui/lib/components/FilterModal'));
+const FilterSidebar = React.lazy(() =>
+    import('@magento/venia-ui/lib/components/FilterSidebar')
+);
+const FilterTop = React.lazy(() =>
+    import('@riosst100/pwa-marketplace/src/components/FilterTop')
+);
+
+const ShowMore = props => {
+    const {
+        categoryId,
+        shopby
+    //     data,
+    //     isLoading,
+    //     pageControl,
+    //     sortProps,
+    //     pageSize
+    } = props || {};
+    // const [currentSort] = sortProps;
+
+    // const talonProps = useCategoryContent({
+    //     categoryId,
+    //     data,
+    //     pageSize
+    // });
+
+    // const {
+    //     availableSortMethods,
+    //     categoryName,
+    //     categoryDescription,
+    //     filters,
+    //     items,
+    //     children,
+    //     parent,
+    //     totalCount,
+    //     totalPagesFromData,
+    //     attributesBlock,
+    //     category,
+    // } = talonProps;
+    
+    const [active, setActive] = useState('all')
+    const [activeTab, setActiveTab] = useState('all');
+    const [activeFilter, setActiveFilter] = useState('');
+    const [searchQuery, setSearchQuery] = useState('');
+
+    const { search } = useLocation();
+    
+    const sortProps = useCustomSort({ sortFromSearch: false, defaultSort: {
+        sortText: 'All (A-Z)',
+        value: 'all'
+    }});
+
+    const [currentSort] = sortProps;
+
+    // const [sortBy, setSortBy] = useState({
+    //     sortText: 'All (A-Z)',
+    //     value: 'all'
+    // });
+
+
+    const classes = useStyle(defaultClasses);
+
+    const talonProps = useShowMore({ activeFilter, searchQuery, active, setActive, currentSort, categoryId, shopby });
+
+    const { error, loading, dataResult, categoryUrlSuffix, categoryUrlKey, productType, filteredAvailableGroups, availableGroups, attributeData, alpha, category, pageInfo } = talonProps;
+
+    if (loading) {
+        return <ShowMoreShimmer />;
+    } else if (error) {
+        return <ErrorView />;
+    }
+
+    const newAvailableGroups = searchQuery ? filteredAvailableGroups : availableGroups;
+
+    const splitToNChunks = (array, n) => {
+        let result = [];
+        for (let i = n; i > 0; i--) {
+            result.push(array.splice(0, Math.ceil(array.length / i)));
+        }
+        return result;
+    }
+
+    let filterSearchArr = search ? search.split('&') : [];
+    filterSearchArr = filterSearchArr.filter(function(data) {
+        return !data.includes('show_more');
+    })
+    filterSearchArr = filterSearchArr.filter(function(data) {
+        return !data.includes('trains_roadname_country');
+    })
+    let filterSearch = filterSearchArr.join('&')
+
+    if (!filterSearch.includes('?')) {
+        filterSearch = '?'+filterSearch;
+    }
+
+    let additionalFilter = '';
+    if (shopby == 'sc_brands') {
+        additionalFilter = '&shopby=release&active_tab=brand';
+    }
+
+    const setRelases = newAvailableGroups && newAvailableGroups.length && newAvailableGroups.map((group, index) => {
+        const optionsResult = [];
+
+        if (active === 'all' || active === group) {
+            dataResult[group] && dataResult[group].length && dataResult[group].map((option, index) => {
+                const { count, label, value } = option;
+
+                const filter = attributeData.attribute_code + '[filter]=' + label + ',' + value;
+                const params = filterSearch ? filterSearch + '&' + filter + additionalFilter : '?' + filter + additionalFilter;
+
+                const categoryUrl = resourceUrl(
+                    `/${category?.url_path}${categoryUrlSuffix || ''}${params}`
+                );
+
+                optionsResult.push(<li key={index} className='list-none'>
+                    <Link to={categoryUrl} className="hover_bg-darkblue-900 hover_text-white w-full block text-[14px] py-[2px] px-0">
+                        {label}
+                         {/* <span className='text-[12px]'>({count})</span> */}
+                    </Link>
+                </li>)
+            });
+
+            let optionsResultSplitted = [];
+            if (newAvailableGroups.length == 1 || active == group) {
+                optionsResultSplitted = splitToNChunks(optionsResult, 3);
+            }
+
+            const all = active == "all" ? (
+                newAvailableGroups.length == 1 ? (
+                    optionsResultSplitted && optionsResultSplitted.length && optionsResultSplitted.map((data, index) => (
+                        <div key={index} className={cn('singles_group-wrapper mb-4 px-2 inline-block', classes.singlesGroupWrapper)}>
+                            {searchQuery && availableGroups.length > 1 && (index == 0 ? <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2'>{group}</div> : 
+                            <div className='singles_item_group_letter text-xl font-medium pb-1 mb-2' style={{"marginTop":"35px"}}></div>)}
+                            <div className={cn('singles_item-list flex flex-col')}>{data}</div>
+                        </div>
+                        )
+                    )
+                ) : (
+                    <div className={cn('singles_group-wrapper mb-4 px-2 inline-block', classes.singlesGroupWrapper)}>
+                        <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' >
+                            {group}
+                        </div>
+                        <div className={cn('singles_item-list flex flex-col')}>{optionsResult}</div>
+                    </div>
+                )
+            ) : '';
+
+            return (
+                <>
+                    {all}
+                    {active == group ? optionsResultSplitted && optionsResultSplitted.length && optionsResultSplitted.map((optionsResult, index) =>
+                        <div key={index} className={cn('singles_group-wrapper mb-4 px-2 inline-block', classes.singlesGroupWrapper)}>
+                            {index == 0 ? <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2'>{group}</div> : 
+                            <div className='singles_item_group_letter text-xl font-medium pb-1 mb-2' style={{"marginTop":"35px"}}></div>}
+                            <div className={cn('singles_item-list flex flex-col')}>{optionsResult}</div>
+                        </div>
+                    )
+                    : ''}
+                </>
+            );
+        }
+        
+        return null;
+    });
+
+    const handleActive = (val) => {
+        setActive(val);
+        setSearchQuery('')
+    }
+
+    // let availableSortBy = [
+    //     {
+    //         'label': 'All (A-Z)',
+    //         'value': 'all'
+    //     }
+    // ];
+
+    let availableSortBy = [
+        {
+            'label': 'All (A-Z)',
+            'value': 'all'
+        }
+    ];
+    
+    // const title = attributeData ? (attributeData.attribute_code == "sc_baseball_parallel" ? "Parallel Sets" : (attributeData.attribute_code == "sc_baseball_inserts" ? "Insert Sets" : attributeData.label)) : "Shop By"
+    const title = pageInfo ? pageInfo.label : '';
+
+    let availableFilterOption = [];
+
+    if (shopby == "vehicles_make" || shopby == "vehicles_brands") {
+        availableFilterOption = [
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Cars',
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Formula Racing'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Motorsport'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Aircraft'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Bikes'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Military'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Transport'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Emergency Services'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'Heavy Machinery'
+            },
+            {
+                'code': 'vehicles_diecast',
+                'value': 'TV/Movies'
+            }
+        ];
+    }
+
+    if (shopby == "brands" || shopby == "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');
+        setActiveFilter('');
+
+        setSearchQuery('')
+    }
+
+    const handleActiveFilter = (val) => {
+        setActiveFilter(val);
+
+        setActive('all');
+
+        setSearchQuery('')
+    }
+
+    const activeFilters = [];
+        
+    const allActiveFilters = getFiltersFromSearch(search);
+
+    if (allActiveFilters && allActiveFilters.size > 0) {
+        allActiveFilters.forEach((value, key) => {
+            value.forEach((value) => {
+                const filterArr = value.split(',');
+                
+                const label = filterArr[0];
+                const optionId = filterArr[1];
+                if (label == "Singles") {
+                    isSingles = true;
+                }
+                if (key == "bricks_categories" || key == "sc_sports_categories" || key == "card_game" || key == "product_line" && urlKey == "brands" || key == "product_line" && urlKey == "franchise" || key == "franchise" && urlKey == "brands" || key == "franchise" && urlKey == "franchise" || key == "brands" && urlKey == "franchise" || key == "brands" && urlKey == "brands") {
+                    activeFilters.push(
+                        {
+                            'label': label,
+                            'code': key,
+                            'option_id': optionId
+                        }
+                    )
+                }
+            })
+        });
+    }
+
+    return (
+        <Fragment>
+            <StoreTitle>{title}</StoreTitle>
+            <Breadcrumbs categoryId={categoryId} customPage={title} currentFilter={activeFilters} />
+            {category?.url_path.includes('model-railway') && <FilterTop shopby={shopby} filters={[]} category={category} children={[]} allowedFilters={category ? category.allowed_filters : []} />}
+            {/* <ShopByFilters handleActiveFilter={handleActiveFilter} activeFilter={activeFilter} category={category} /> */}
+            {availableFilterOption.length ? 
+                <ul className={classes.nav}>
+                    {availableFilterOption.map((filter, index) => (
+                        <li className={classes.nav_item}>
+                            <button
+                                onClick={() => {
+                                    handleActiveFilter(filter.code + '|' + filter.value)
+                                }}
+                            >
+                                {activeFilter == filter.code + '|' + filter.value ? <b>{filter.value}</b> : filter.value}
+                            </button>
+                        </li>
+                    ))}
+                    <li className={classes.nav_item}>
+                        <button
+                            onClick={() => {
+                                handleActiveFilter('')
+                            }}
+                        >
+                            {activeFilter == '' ? <b>All</b> : 'All'}
+                        </button>
+                    </li>
+                </ul>
+            : ''}
+            <h1 className='mx-auto relative block text-xl font-bold text-center pt-10 pb-4'>
+                {title}
+            </h1>
+            <div className='border border-gray-100 px-6'>
+                {dataResult ? (
+                    <div
+                        className={classes.toolbar}
+                    >
+                        <div style={{"width":"35%"}}><ArraySearchInput active={active} searchQuery={searchQuery} placeholder="Search sets..." isOpen={true} setSearchQuery={setSearchQuery} /></div>
+                        <CustomSortBy sortProps={sortProps} availableSortMethods={availableSortBy} />
+                    </div>
+                ) : ''}
+                {shopby != "vehicles_year" && shopby != "trains_gauge" && shopby != "vehicles_scale" && shopby != "lego_theme" && shopby != "lego_subtheme" && shopby != "lego_interest" && 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'>
+                                <li>
+                                    <button
+                                        className={cn(
+                                            'rounded-md border border-solid border-gray-100 p-2 min-w-[28px]',
+                                            'leading-4 font-medium text-base hover_bg-gray-50'
+                                        )}
+                                        onClick={() => {
+                                            handleActive('all')
+                                        }}
+                                    >
+                                        {active == 'all' ? <b>All</b> : 'All'}
+                                    </button>
+                                </li>
+                                {alpha && alpha.length && alpha.map((letter, index) => (
+                                    <li key={index}>
+                                        <button
+                                            className={cn(
+                                                'rounded-md border border-solid border-gray-100 p-2 min-w-[28px]',
+                                                'leading-4 font-medium text-base ',
+                                                availableGroups.includes(letter) > 0 ? 'hover_bg-gray-50' : 'bg-gray-100 text-gray-400',
+                                            )}
+                                            onClick={() => {
+                                                handleActive(letter)
+                                            }}
+                                            disabled={availableGroups.includes(letter) > 0 ? false : true}
+                                        >
+                                            {active == letter ? <b>{letter}</b> : letter}
+                                        </button>
+                                    </li>
+                                ))}
+                            </ul>
+                        </section>
+                    </>
+                ) : ''}
+                <Divider className="mb-5 px-4 mt-5" />
+                <section className='singles-container'>
+                    <div className={cn('singles-wrapper block -mx-4', classes.singlesWrapper)}>
+                        {dataResult && Object.keys(dataResult).length != 0 ? setRelases : (searchQuery ? <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No data found for <b>{searchQuery}</b> search query.</div> : <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No data found.</div>)}
+                    </div>
+                </section>
+            </div>
+        </Fragment>
+    );
+};
+
+export default ShowMore;

package/src/components/ShowMore/showMore.module.css

@@ -0,0 +1,76 @@
+.toolbar {
+    composes: relative from global;
+    composes: ml-2xs from global;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20px;
+}
+
+.nav {
+    composes: flex from global;
+    composes: flex-wrap from global;
+    margin: 50px 0 30px 0;
+    composes: gap-[10px] from global;
+}
+
+.nav_item {
+    composes: px-4 from global;
+    composes: py-2 from global;
+    composes: transition-colors from global;
+    composes: duration-150 from global;
+    composes: border from global;
+    composes: border-solid from global;
+    composes: leading-normal from global;
+    composes: text-base from global;
+    composes: text-colorDefault from global;
+    composes: bg-white from global;
+    composes: border-gray-100 from global;
+    border-radius: 5px;
+}
+
+.tabs {
+    composes: flex from global;
+    composes: flex-wrap from global;
+    composes: mt-3 from global;
+    composes: gap-[10px] from global;
+    margin-bottom: 30px;
+}
+
+.tabs_item {
+    composes: px-4 from global;
+    composes: py-2 from global;
+    composes: transition-colors from global;
+    composes: duration-150 from global;
+    composes: border from global;
+    composes: border-solid from global;
+    composes: leading-normal from global;
+    composes: text-base from global;
+    composes: text-colorDefault from global;
+    composes: bg-white from global;
+    composes: border-gray-100 from global;
+    border-radius: 5px;
+}
+
+.singlesWrapper {
+    column-count: 1;
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+    flex-direction: row;
+}
+
+.singlesGroupWrapper {
+    width: 100%;
+}
+
+@media screen and (min-width: 768px) {
+    .singlesGroupWrapper {
+        width: 50%;
+    }
+}
+
+@media screen and (min-width: 1023px) {
+    .singlesGroupWrapper {
+        width: 33.33%;
+    }
+}

package/src/components/ShowMore/showMore.shimmer.js

@@ -0,0 +1,50 @@
+import React from 'react';
+import { shape, string } from 'prop-types';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+
+import Shimmer from '@magento/venia-ui/lib/components/Shimmer';
+import defaultClasses from '@riosst100/pwa-marketplace/src/components/ShowMore/showMore';
+import cn from 'classnames';
+import Divider from '@riosst100/pwa-marketplace/src/components/Divider';
+
+const ShowMoreShimmer = props => {
+    const classes = useStyle(defaultClasses, props.classes);
+
+    return (
+        <>
+            <h1 className='mx-auto relative block text-xl font-bold text-center pt-10 pb-4'><Shimmer width="25%" height="6vh" /></h1>
+            <div className='border border-gray-100 px-6'>
+                <center>
+                    <section className='single_list-indexing-container relative m-auto pt-5'>
+                        <Shimmer width="95%" height="6vh" />
+                    </section>
+                </center>
+                <Divider className="mb-5 px-4" />
+                <section className='singles-container'>
+                    <div className={cn('singles-wrapper block -mx-4', classes.singlesWrapper)}>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                        <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
+                            <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' ><Shimmer width="95%" height="100vh" /></div>
+                        </div>
+                    </div>
+                </section>
+            </div>
+        </>
+    );
+};
+
+export default ShowMoreShimmer;

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

@@ -20,6 +20,7 @@ import LegoSets from '@riosst100/pwa-marketplace/src/components/LegoSets/legoSet
 import TrainsSets from '@riosst100/pwa-marketplace/src/components/TrainsSets/trainsSets';
 import SetsData from '@riosst100/pwa-marketplace/src/components/SetsData/setsData';
 import FilterContent from '@riosst100/pwa-marketplace/src/components/FilterContent/filterContent';
+import ShowMore from '@riosst100/pwa-marketplace/src/components/ShowMore/showMore';
 
 const MESSAGES = new Map().set(
     'NOT_FOUND',
@@ -40,6 +41,7 @@ const Category = props => {
 
     const query = new URLSearchParams(location.search);
     const shopby = query.get('shopby') || null;
+    const show_more = query.get('show_more') || null;
     const filterby = query.get('filterby') || null;
     const showSubcategory = query.get('show_subcategory') || null;
 
@@ -125,7 +127,12 @@ const Category = props => {
                 isLoading={loading} /> : shopby == "card" ? <ShopByCard
                 categoryId={uid}
                 shopby={shopby}
-                isLoading={loading} /> : (shopby && shopby != "gauge" ? (
+                isLoading={loading} /> : (show_more ? (
+                    <ShowMore
+                    categoryId={uid}
+                    shopby={show_more}
+                    isLoading={loading} />
+                ) : shopby && shopby != "gauge" ? (
                     <ShopBy
                     categoryId={uid}
                     shopby={shopby}

package/src/talons/ShopBy/useShopBy.js

@@ -150,13 +150,11 @@ export const useShopBy = props => {
         }
         
         const rawData = queryResponse?.products?.aggregations;
-        if (!rawData) {
+        if (!rawData.length) {
             return null;
         }
 
         let options = rawData.find(item => item.attribute_code === shopby).options;
-        
-        // let options = rawData[0].options;
 
         const mappingData = options.reduce((acc, item) => {
             let firstLetter = item.label.charAt(0).toUpperCase();
@@ -182,7 +180,7 @@ export const useShopBy = props => {
         }
         
         const rawData = queryResponse?.products?.aggregations;
-        if (!rawData) {
+        if (!rawData.length) {
             return null;
         }