@riosst100/pwa-marketplace 2.5.8 → 2.5.9

package/package.json

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

package/src/components/FilterContent/filterContent.js

@@ -0,0 +1,376 @@
+import React, { Fragment, useEffect, useMemo, useState } from 'react';
+import ErrorView from '@magento/venia-ui/lib/components/ErrorView';
+import { StoreTitle, Meta } from '@magento/venia-ui/lib/components/Head';
+// import { useSetsData } from '@riosst100/pwa-marketplace/src/talons/SetsData/useSetsData';
+import { Link } from 'react-router-dom';
+import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
+import defaultClasses from './filterContent.module.css';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import cn from 'classnames';
+import Divider from '@riosst100/pwa-marketplace/src/components/Divider';
+// import { SetsDataShimmer } from '@riosst100/pwa-marketplace/src/components/SetsData';
+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 Breadcrumbs from '@magento/venia-ui/lib/components/Breadcrumbs';
+import { useLocation } from 'react-router-dom';
+// import { getFiltersFromSearch } from '@magento/peregrine/lib/talons/FilterModal/helpers';
+import { useFilterContent } from '@riosst100/pwa-marketplace/src/talons/FilterContent/useFilterContent';
+
+const FilterContent = props => {
+    const {
+        categoryId,
+        data,
+        filterby,
+        isLoading
+    } = props || {};
+    
+    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 { search } = useLocation();
+    
+    // const sortProps = useCustomSort({ sortFromSearch: false, defaultSort: {
+    //     sortText: 'All (A-Z)',
+    //     value: 'all'
+    // }});
+
+    // const [currentSort] = sortProps;
+    const classes = useStyle(defaultClasses);
+
+    const talonProps = useFilterContent({ 
+        activeFilter, searchQuery, active, setActive, currentSort,
+        categoryId,
+        filterby,
+        data
+    });
+
+    const {
+        title,
+        filterData,
+        error, loading, dataResult, categoryUrlSuffix, categoryUrlKey, productType, filteredAvailableGroups, availableGroups, attributeData, alpha, category, activeFilters
+    } = talonProps;
+
+    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('filterby');
+    })
+    filterSearchArr = filterSearchArr.filter(function(data) {
+        return !data.includes('trains_roadname_country');
+    })
+
+    filterSearchArr = filterSearchArr.filter(function(data) {
+        return !data.includes(filterData.attribute_code);
+    })
+
+    let filterSearch = filterSearchArr.join('&')
+
+    if (!filterSearch.includes('?')) {
+        filterSearch = '?'+filterSearch;
+    }
+
+    let additionalFilter = '';
+    if (filterby == 'sc_brands') {
+        additionalFilter = '&filterby=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 = filterData.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);
+            }
+
+            // console.log(dataResult)
+
+            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'
+        }
+    ];
+
+    let availableFilterOption = [];
+
+    if (filterby == "vehicles_make" || filterby == "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'
+            }
+        ];
+    }
+
+    // console.log(category)
+
+    if (filterby == "brands" || filterby == "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('')
+    }
+
+    return (
+        <Fragment>
+            <StoreTitle>{title}</StoreTitle>
+            <Breadcrumbs categoryId={categoryId} customPage={title} currentFilter={activeFilters} />
+            {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>
+                ) : ''}
+                {filterby != "vehicles_year" && filterby != "trains_gauge" && filterby != "vehicles_scale" && filterby != "lego_theme" && filterby != "lego_subtheme" && filterby != "lego_interest" && filterby != "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>
+                    </>
+                ) : ''}
+                {dataResult && Object.keys(dataResult).length != 0 ? <Divider className="mb-5 px-4 mt-5" /> : <span className="mb-5 px-4 mt-5"></span>}
+                <section className='singles-container'>
+                    <div className={cn('singles-wrapper block', classes.singlesWrapper)}>
+                        {dataResult && Object.keys(dataResult).length != 0 ? setRelases : (searchQuery ? <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No filter options found for <b>{searchQuery}</b> search query.</div> : <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No filter options found.</div>)}
+                    </div>
+                </section>
+            </div>
+        </Fragment>
+    );
+}
+
+export default FilterContent;

package/src/components/FilterContent/filterContent.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/FilterContent/filterDefault.js

@@ -0,0 +1,84 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { bool, shape, string } from 'prop-types';
+
+import Checkbox from '@magento/venia-ui/lib/components/Checkbox';
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import defaultClasses from './filterDefault.module.css';
+import { useCurrencySwitcher } from '@magento/peregrine/lib/talons/Header/useCurrencySwitcher';
+
+const FilterDefault = props => {
+    const {
+        classes: propsClasses,
+        isSelected,
+        item,
+        onMouseDown,
+        group,
+        ...restProps
+    } = props;
+
+    const { label, value_index } = item || {};
+    const classes = useStyle(defaultClasses, propsClasses);
+    const { currentCurrencyCode } = useCurrencySwitcher();
+    const currencySymbolMap = {
+        USD: '$',
+        EUR: '€'
+    };
+    const currencySymbol = currencySymbolMap[currentCurrencyCode] != undefined ? currencySymbolMap[currentCurrencyCode] : currentCurrencyCode;
+    const title =
+        group === 'price'
+            ? label.replace('-', ' - ') 
+            : label;
+    const { formatMessage } = useIntl();
+
+    const ariaLabel = !isSelected
+        ? formatMessage(
+            {
+                id: 'filterModal.item.applyFilter',
+                defaultMessage: 'Apply filter "{optionName}".'
+            },
+            {
+                optionName: label
+            }
+        )
+        : formatMessage(
+            {
+                id: 'filterModal.item.clearFilter',
+                defaultMessage: 'Remove filter "{optionName}".'
+            },
+            {
+                optionName: label
+            }
+        );
+
+    return (
+        <Checkbox
+            classes={classes}
+            field={`${label}-${value_index}`}
+            fieldValue={!!isSelected}
+            label={title}
+            ariaLabel={ariaLabel}
+            data-cy="FilterDefault-checkbox"
+            onClick={onMouseDown}
+            {...restProps}
+        />
+    );
+};
+
+export default FilterDefault;
+
+FilterDefault.propTypes = {
+    classes: shape({
+        root: string,
+        icon: string,
+        label: string,
+        checked: string
+    }),
+    group: string,
+    isSelected: bool,
+    item: shape({
+        label: string.isRequired,
+        value_index: string.isRequired
+    }).isRequired,
+    label: string
+};

package/src/components/FilterContent/filterItem.js

@@ -0,0 +1,80 @@
+import React, { useCallback, useMemo } from 'react';
+import { func, number, oneOfType, shape, string } from 'prop-types';
+import setValidator from '@magento/peregrine/lib/validators/set';
+
+import FilterDefault from './filterDefault';
+
+const FilterItem = props => {
+    const { filterApi, filterState, group, item, onApply } = props;
+    const { toggleItem } = filterApi;
+    const { title, value } = item;
+    const isSelected = filterState && filterState.has(item);
+
+    // create and memoize an item that matches the tile interface
+    const tileItem = useMemo(
+        () => ({
+            label: title,
+            value_index: value
+        }),
+        [title, value]
+    );
+
+    const handleClick = useCallback(
+        e => {
+            // use only left click for selection
+            if (e.button !== 0) return;
+
+            toggleItem({ group, item });
+
+            if (typeof onApply === 'function') {
+                onApply(group, item);
+            }
+        },
+        [group, item, toggleItem, onApply]
+    );
+
+    const handleKeyDown = useCallback(
+        e => {
+            if (e.key === 'Enter' || e.key === ' ') {
+                e.preventDefault();
+                toggleItem({ group, item });
+                if (typeof onApply === 'function') {
+                    onApply(group, item);
+                }
+            }
+        },
+        [group, item, onApply, toggleItem]
+    );
+
+    return (
+        <FilterDefault
+            isSelected={isSelected}
+            item={tileItem}
+            onMouseDown={handleClick}
+            onKeyDown={handleKeyDown}
+            group={group}
+            title={title}
+            value={value}
+        />
+    );
+};
+
+FilterItem.defaultProps = {
+    onChange: null
+};
+
+FilterItem.propTypes = {
+    filterApi: shape({
+        toggleItem: func.isRequired
+    }).isRequired,
+    filterState: setValidator,
+    group: string.isRequired,
+    item: shape({
+        title: string.isRequired,
+        value: oneOfType([number, string]).isRequired,
+        path: string
+    }).isRequired,
+    onChange: func
+};
+
+export default FilterItem;

package/src/components/FilterContent/index.js

@@ -0,0 +1 @@
+export { default } from './filterContent';