@riosst100/pwa-marketplace 3.1.2 → 3.1.4

package/src/components/SellerMegaMenu/shopByColumn.js

@@ -0,0 +1,121 @@
+import React, { useMemo } from 'react';
+import { Link } from 'react-router-dom';
+
+import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import defaultClasses from './submenuColumn.module.css';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+import cn from 'classnames';
+
+const ShopByColumn = props => {
+    const classes = useStyle(defaultClasses, props.classes);
+
+    const { formatMessage } = useIntl();
+
+    const {
+        shopBy,
+        category,
+        categoryUrlSuffix,
+        handleCloseSubMenu,
+        onNavigate
+    } = props;
+
+    const { url_path } = category;
+
+    let items = null;
+
+    const itemCountToShow = 9999;
+
+    if (shopBy.items.length) {
+        const childrenItems = shopBy.items.map((shopByItem, index) => {
+
+            if (index >= itemCountToShow) {
+                return null;
+            }
+
+            const { name, option_id } = shopByItem;
+    //         const categoryUrl = resourceUrl(
+    //             `/${url_path}${categoryUrlSuffix || ''}`
+    //         );
+
+            // setting keyboardProps if it is last child of that shopBy
+            const keyboardProps =
+                index === shopBy.items.length - 1
+                    ? props.keyboardProps
+                    : {};
+
+            const categoryUrl = 
+                `/${shopByItem.url_path}`
+            ;
+
+            return (
+                <li key={index} className={cn(classes.submenuChildItem, 'mt-0')}>
+                    <Link
+                        {...keyboardProps}
+                        // className={isActive ? classes.linkActive : classes.link}
+                        className={classes.link}
+                        data-cy="MegaMenu-ShopByColumn-link"
+                        to={categoryUrl}
+                        onClick={() => {
+                            handleCloseSubMenu();
+                            onNavigate();
+                        }}
+                    >
+                        {name}
+                    </Link>
+                </li>
+            );
+        });
+
+        items = <ul className={classes.submenuChild}>{childrenItems}</ul>;
+    }
+
+    const viewAll = useMemo(() => {
+        if (shopBy.items.length <= itemCountToShow) {
+            return null;
+        }
+
+        const label = formatMessage({
+            id: 'filterList.viewAll',
+            defaultMessage: 'View All'
+        });
+
+        const categoryUrl = resourceUrl(
+            `/shop/${shopBy.code}`
+        );
+
+        return (
+            <li className={classes.submenuChildItem}>
+                <Link
+                    // className={isActive ? classes.linkActive : classes.link}
+                    className={classes.link}
+                    data-cy="MegaMenu-ShopByColumn-link"
+                    to={categoryUrl}
+                    onClick={handleCloseSubMenu}
+                >
+                    {label}
+                </Link>
+            </li>
+        );
+    }, [
+        // handleViewAll,
+        shopBy,
+        itemCountToShow,
+        formatMessage,
+        // classes
+    ]);
+
+    return (
+        <div className={classes.submenuItems}>
+            <div className={classes.submenuColumn}>
+                <span className={classes.heading}>{shopBy.name}</span>
+                {items}
+                {viewAll}
+            </div>
+        </div>
+    );
+};
+
+export default ShopByColumn;

package/src/components/SellerProducts/productContent.js

@@ -25,7 +25,6 @@ import Gallery, { GalleryShimmer } from '@magento/venia-ui/lib/components/Galler
 import Pagination from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/Pagination';
 import SellerMegaMenu from '@riosst100/pwa-marketplace/src/components/SellerMegaMenu';
 import AlphaFilter from '@riosst100/pwa-marketplace/src/components/AlphaFilter';
-import CustomSubCategory from '@riosst100/pwa-marketplace/src/components/SubCategory/customSubCategory';
 import SubCategory from '@riosst100/pwa-marketplace/src/components/SubCategory/subCategory';
 import { useLocation, useHistory } from 'react-router-dom';
 import { getFiltersFromSearch } from '@magento/peregrine/lib/talons/FilterModal/helpers';
@@ -86,7 +85,7 @@ const ProductContent = props => {
     const shouldShowFilterShimmer = filters === null;
 
     const sidebar = shouldShowFilterButtons ? (
-        <FilterSidebar hideFilters={false} children={[]} filters={filters} allowedFilters={[]} />
+        <FilterSidebar children={[]} filters={filters} />
     ) : shouldShowFilterShimmer ? (
         <FilterSidebarShimmer />
     ) : null;
@@ -269,11 +268,10 @@ const ProductContent = props => {
                 </div>
                 <>
                     {currentFilter && <AlphaFilter isSingles={isSingles} items={items} handleActiveLetter={handleActiveLetter} activeLetter={activeLetter} />}
-                    {!currentFilter && <CustomSubCategory categoryName={category ? category.name : null} customSubCategory={category ? category.custom_subcategory : null} />}
                     {shopby != "gauge" && category?.name != "Collectible Card Games" ? <SubCategory parent={parent} children={children} /> : ''}
                     
                 </>
-                <FilterTop shopby={shopby} filters={filters} category={category} children={children} allowedFilters={category ? category.allowed_filters : []} />
+                <FilterTop shopby={shopby} filters={filters} category={category} children={children} />
             </div>
             <div className='w-full flex items-start gap-x-[30px]'>
                 <div className={classes.contentWrapper}>

package/src/components/SetsData/setsData.js

@@ -50,21 +50,6 @@ const SetsData = props => {
     // Sorting
     const sortProps = useCustomSort({ sortFromSearch: false, defaultSort: defaultSort});
     const [currentSort] = sortProps;
-    // const [sortBy, setSortBy] = useState({
-    //     sortText: 'All (A-Z)',
-    //     value: 'all'
-    // });
-
-    // let availableSortBy = [
-    //     {
-    //         'label': 'All (A-Z)',
-    //         'value': 'all'
-    //     },
-    //     {
-    //         'label': 'By Year',
-    //         'value': 'newest'
-    //     }
-    // ];
 
     const classes = useStyle(defaultClasses);
 
@@ -100,14 +85,7 @@ const SetsData = props => {
         return result;
     }
 
-    let allSetsTitle = "Sets";
     let attributeCode = attributeData ? attributeData.attribute_code : '';
-    let byYearTitle = "By Year";
-    // if (shopby == "singles") {
-    //     attributeCode = "lego_set_name";
-    //     // allSetsTitle = "Singles";
-    //     byYearTitle = "By Year";
-    // }
 
     let newfilterSearchArr = search ? search.split('&') : [];
     newfilterSearchArr = newfilterSearchArr.filter(function(data) {
@@ -258,9 +236,6 @@ const SetsData = props => {
                 
                 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(
                         {

package/src/components/ShopBy/shopBy.js

@@ -1,38 +1,9 @@
 import React, { Fragment, useEffect, Suspense, useMemo, useRef, useState } from 'react';
-import { FormattedMessage } from 'react-intl';
-import { array, number, shape, string } from 'prop-types';
-
-import { useIsInViewport } from '@magento/peregrine/lib/hooks/useIsInViewport';
-import { useCategoryContent } from '@magento/peregrine/lib/talons/RootComponents/Category';
-
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import Breadcrumbs from '@magento/venia-ui/lib/components/Breadcrumbs';
-import FilterModalOpenButton, {
-    FilterModalOpenButtonShimmer
-} from '@magento/venia-ui/lib/components/FilterModalOpenButton';
-import { FilterSidebarShimmer } from '@magento/venia-ui/lib/components/FilterSidebar';
-import Gallery, { GalleryShimmer } from '@magento/venia-ui/lib/components/Gallery';
-import Pagination from '@magento/venia-ui/lib/components/Pagination';
-import ProductSort, { ProductSortShimmer } from '@magento/venia-ui/lib/components/ProductSort';
-import RichContent from '@magento/venia-ui/lib/components/RichContent';
-import Shimmer from '@magento/venia-ui/lib/components/Shimmer';
-import SortedByContainer, {
-    SortedByContainerShimmer
-} from '@magento/venia-ui/lib/components/SortedByContainer';
-import NoProductsFound from '@magento/venia-ui/lib/RootComponents/Category/NoProductsFound';
 import cn from 'classnames';
-import ProductListTab, { ProductListTabShimmer } from '@riosst100/pwa-marketplace/src/components/ProductListTab';
-import SubCategory from '@riosst100/pwa-marketplace/src/components/SubCategory/subCategory';
-import AttributesBlock from '@riosst100/pwa-marketplace/src/components/AttributesBlock/attributesBlock';
-
-import BrandSlider from '@riosst100/pwa-marketplace/src/components/BrandSlider';
-import CollectibleGameSets from '@riosst100/pwa-marketplace/src/components/CollectibleGameSets/collectibleGameSets';
 import { useLocation } from 'react-router-dom';
 import { getFiltersFromSearch } from '@magento/peregrine/lib/talons/FilterModal/helpers';
-import CustomSubCategory from '@riosst100/pwa-marketplace/src/components/SubCategory/customSubCategory';
-import AlphaFilter from '@riosst100/pwa-marketplace/src/components/AlphaFilter';
-import ShopByFilters from '@riosst100/pwa-marketplace/src/components/ShopByFilters';
-
 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';
@@ -45,10 +16,6 @@ import ArraySearchInput from '@riosst100/pwa-marketplace/src/components/ArraySea
 import { useCustomSort } from '@riosst100/pwa-marketplace/src/hooks/useCustomSort';
 import { useShopBy } from '@riosst100/pwa-marketplace/src/talons/ShopBy/useShopBy';
 
-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')
 );
@@ -57,33 +24,8 @@ const ShopBy = 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;
+
     useEffect(() => {
         window.scrollTo(0, 0);
     }, []);
@@ -102,12 +44,6 @@ const ShopBy = props => {
 
     const [currentSort] = sortProps;
 
-    // const [sortBy, setSortBy] = useState({
-    //     sortText: 'All (A-Z)',
-    //     value: 'all'
-    // });
-
-
     const classes = useStyle(defaultClasses);
 
     const talonProps = useShopBy({ activeFilter, searchQuery, active, setActive, currentSort, categoryId, shopby });
@@ -217,21 +153,13 @@ const ShopBy = props => {
         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 = [];
@@ -347,9 +275,6 @@ const ShopBy = props => {
                 
                 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(
                         {
@@ -367,7 +292,7 @@ const ShopBy = props => {
         <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 : []} />}
+            {category?.url_path.includes('model-railway') && <FilterTop shopby={shopby} filters={[]} category={category} children={[]} />}
             {/* <ShopByFilters handleActiveFilter={handleActiveFilter} activeFilter={activeFilter} category={category} /> */}
             {availableFilterOption.length ? 
                 <ul className={classes.nav}>

package/src/components/ShopBySets/shopBySets.js

@@ -179,14 +179,14 @@ const ShopBySets = props => {
     } else if (productType == "artist") {
         title = "By Artist";
     } else if (shopby == "release_year") {
-        title = "By Year";
+        title = "Year";
     }
 
 
     return (
         <Fragment>
             <StoreTitle>{title}</StoreTitle>
-            <Breadcrumbs categoryId={categoryId} customPage={shopby == "secret_lair" ? "Secret Lair" : (shopby == "expansion_sets" ? "Expansion Sets" : (shopby == "release_year" ? "By Year" : "All Set3s"))} />
+            <Breadcrumbs categoryId={categoryId} customPage={shopby == "secret_lair" ? "Secret Lair" : (shopby == "expansion_sets" ? "Expansion Sets" : (shopby == "release_year" ? "Year" : "All Set3s"))} />
             {shopby != "release_year" && productType != "secret_lair" && productType != "expansion_sets" && <h1 className='mx-auto relative block text-xl font-bold text-center pt-10 pb-4'>
                 {title}
             </h1>}

package/src/components/ShowMore/showMore.js

@@ -1,4 +1,4 @@
-import React, { Fragment, Suspense, useMemo, useRef, useState } from 'react';
+import React, { Fragment, useState } from 'react';
 
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import Breadcrumbs from '@magento/venia-ui/lib/components/Breadcrumbs';
@@ -7,7 +7,7 @@ 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 { StoreTitle } 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';
@@ -18,10 +18,6 @@ import ArraySearchInput from '@riosst100/pwa-marketplace/src/components/ArraySea
 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')
 );
@@ -30,33 +26,7 @@ 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');
@@ -72,11 +42,6 @@ const ShowMore = props => {
 
     const [currentSort] = sortProps;
 
-    // const [sortBy, setSortBy] = useState({
-    //     sortText: 'All (A-Z)',
-    //     value: 'all'
-    // });
-
 
     const classes = useStyle(defaultClasses);
 
@@ -188,13 +153,6 @@ const ShowMore = props => {
         setSearchQuery('')
     }
 
-    // let availableSortBy = [
-    //     {
-    //         'label': 'All (A-Z)',
-    //         'value': 'all'
-    //     }
-    // ];
-
     let availableSortBy = [
         {
             'label': 'All (A-Z)',
@@ -202,7 +160,6 @@ const ShowMore = props => {
         }
     ];
     
-    // 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 = [];
@@ -318,9 +275,6 @@ const ShowMore = props => {
                 
                 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(
                         {
@@ -338,7 +292,7 @@ const ShowMore = props => {
         <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 : []} />}
+            {category?.url_path.includes('model-railway') && <FilterTop shopby={shopby} filters={[]} category={category} children={[]} />}
             {availableFilterOption.length ? 
                 <ul className={classes.nav}>
                     {availableFilterOption.map((filter, index) => (

package/src/overwrites/peregrine/lib/talons/OrderHistoryPage/orderHistoryPage.gql.js

@@ -20,9 +20,6 @@ const CustomerOrdersFragment = gql`
             }
             items {
                 id
-                is_preorder
-                pre_order_deposit
-                pre_order_payment_type
                 product_image_url
                 product_name
                 product_sale_price {
@@ -115,17 +112,6 @@ export const GET_CUSTOMER_ORDERS = gql`
     ${CustomerOrdersFragment}
 `;
 
-export const COMPLETE_PREORDER = gql`
-    mutation CompletePreorder($input: CompletePreorderInput!) {
-        completePreorder(input: $input) {
-            cart_id
-            message
-            success
-        }
-    }
-`;
-
 export default {
-    getCustomerOrdersQuery: GET_CUSTOMER_ORDERS,
-    completePreorderMutation: COMPLETE_PREORDER
+    getCustomerOrdersQuery: GET_CUSTOMER_ORDERS
 };

package/src/overwrites/peregrine/lib/talons/OrderHistoryPage/orderRow.gql.js

@@ -44,14 +44,3 @@ export default {
     getProductThumbnailsQuery: GET_PRODUCT_THUMBNAILS,
     getConfigurableThumbnailSource: GET_CONFIGURABLE_THUMBNAIL_SOURCE
 };
-
-// Mutation to complete preorder
-export const COMPLETE_PREORDER = gql`
-    mutation CompletePreorder($input: CompletePreorderInput!) {
-        completePreorder(input: $input) {
-            cart_id
-            message
-            success
-        }
-    }
-`;

package/src/overwrites/peregrine/lib/talons/RelatedProducts/productReview.gql.js

@@ -0,0 +1,89 @@
+import { gql } from '@apollo/client';
+
+const GET_PRODUCT_REVIEW_RATINGS_METADATA = gql`
+	query getProductReviewRatingsMetadata {
+		productReviewRatingsMetadata {
+			items {
+				id
+				name
+				values {
+					value
+					value_id
+				}
+			}
+		}
+	}
+`;
+
+const CREATE_PRODUCT_REVIEW = gql`
+	mutation CreateProductReview($input: CreateProductReviewInput!) {
+		createProductReview(input: $input) {
+			review {
+				average_rating
+				created_at
+				nickname
+				product {
+					uuid: uid
+					uid
+					name
+					sku
+				}
+				ratings_breakdown {
+					name
+					value
+				}
+				summary
+				text
+			}
+		}
+	}
+`;
+
+const GET_PRODUCT_REVIEWS = gql`
+	query getProductReviews($url_key: String) {
+		products(
+			filter: { url_key: { eq: $url_key } }
+			pageSize: 20
+			currentPage: 1
+		) {
+			items {
+				uid
+				rating_summary
+				review_count
+				reviews(pageSize: 20, currentPage: 1){
+					items {
+						average_rating
+						created_at
+						nickname
+						summary
+						text
+						product {
+							uid
+							name
+							sku
+						}
+						ratings_breakdown {
+							name
+							value
+						}
+					}
+					page_info {
+						total_pages
+						current_page
+						page_size
+					}
+				}
+			}
+			page_info {
+				total_pages
+				current_page
+			}
+		}
+	}
+`;
+
+export default {
+	getProductReviews: GET_PRODUCT_REVIEWS,
+	createProductReview: CREATE_PRODUCT_REVIEW,
+	getProductReviewRatingsMetadata: GET_PRODUCT_REVIEW_RATINGS_METADATA
+};