@riosst100/pwa-marketplace 2.7.0 → 2.7.2

package/package.json

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

package/src/componentOverrideMapping.js

@@ -15,6 +15,7 @@ module.exports = componentOverrideMapping = {
     [`@magento/peregrine/lib/context/cart.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/context/cart.js',
     [`@magento/peregrine/lib/talons/CheckoutPage/useCheckoutPage.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/CheckoutPage/useCheckoutPage.js',
     [`@magento/peregrine/lib/talons/SignIn/signIn.gql.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/SignIn/signIn.gql.js',
+    [`@magento/peregrine/lib/talons/SearchPage/searchPage.gql.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/SearchPage/searchPage.gql.js',
     [`@magento/peregrine/lib/talons/SignIn/useSignIn.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/SignIn/useSignIn.js',
     [`@magento/peregrine/lib/talons/AccountMenu/useAccountMenuItems.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/AccountMenu/useAccountMenuItems.js',
     [`@magento/peregrine/lib/talons/MegaMenu/megaMenu.gql.js`]: '@riosst100/pwa-marketplace/src/overwrites/peregrine/lib/talons/MegaMenu/megaMenu.gql.js',

package/src/components/FilterListContent/filterListPage.js

@@ -245,7 +245,7 @@ const FilterListPage = props => {
                 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" || virtualCategoryFilters && virtualCategoryFilters.includes(key)) {
+                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,

package/src/components/ProductLabel/index.js

@@ -17,6 +17,8 @@ const ProductLabel = (props) => {
 
     const salePrice = priceRangeData?.maximum_price?.discount?.amount_off;
     const regularPrice = priceRangeData?.maximum_price?.regular_price?.value;
+
+    // const isPreOrder = true;
     
     return (
         <div

package/src/components/SellerProducts/productContent.js

@@ -228,7 +228,7 @@ const ProductContent = props => {
                 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" || virtualCategoryFilters && virtualCategoryFilters.includes(key)) {
+                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,

package/src/components/SetsData/setsData.js

@@ -261,7 +261,7 @@ const SetsData = props => {
                 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" || virtualCategoryFilters && virtualCategoryFilters.includes(key)) {
+                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,

package/src/components/ShopBy/shopBy.js

@@ -83,7 +83,6 @@ const ShopBy = props => {
     //     totalPagesFromData,
     //     attributesBlock,
     //     category,
-    //     virtualCategoryFilters
     // } = talonProps;
     
     const [active, setActive] = useState('all')
@@ -348,7 +347,7 @@ const ShopBy = props => {
                 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" || virtualCategoryFilters && virtualCategoryFilters.includes(key)) {
+                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,

package/src/overwrites/peregrine/lib/talons/ProductFullDetail/useProductFullDetail.js

@@ -221,6 +221,33 @@ const getConfigPrice = (product, optionCodes, optionSelections) => {
     return value;
 };
 
+const getConfigName = (product, optionCodes, optionSelections) => {
+    let value;
+
+    const { variants } = product;
+    const isConfigurable = isProductConfigurable(product);
+
+    const optionsSelected =
+        Array.from(optionSelections.values()).filter(value => !!value).length >
+        0;
+
+    if (!isConfigurable) {
+        value = product.name;
+    } else {
+        const item = findMatchingVariant({
+            optionCodes,
+            optionSelections,
+            variants
+        });
+
+        value = optionsSelected && item
+            ? item.product.name
+            : product.name;
+    }
+
+    return value;
+};
+
 const attributeLabelCompare = (attribute1, attribute2) => {
     const label1 = attribute1['attribute_metadata']['label'].toLowerCase();
     const label2 = attribute2['attribute_metadata']['label'].toLowerCase();
@@ -418,6 +445,11 @@ export const useProductFullDetail = props => {
         [product, optionCodes, optionSelections]
     );
 
+    const productName = useMemo(
+        () => getConfigName(product, optionCodes, optionSelections),
+        [product, optionCodes, optionSelections]
+    );
+
     // The map of ids to values (and their uids)
     // For example:
     // { "179" => [{ uid: "abc", value_index: 1 }, { uid: "def", value_index: 2 }]}
@@ -590,7 +622,7 @@ export const useProductFullDetail = props => {
     const productDetails = {
         description: product.description,
         shortDescription: product.short_description,
-        name: product.name,
+        name: productName,
         price: productPrice?.final_price,
         price_range: product?.price_range,
         sku: product.sku,

package/src/overwrites/peregrine/lib/talons/RootComponents/Product/productDetailFragment.gql.js

@@ -110,8 +110,10 @@ export const ProductDetailsFragment = gql`
         }
         preorder {
             is_preorder
-            preorder_notes
-            preorder_availability
+            pre_order_payment_type
+            pre_order_deposit
+            pre_order_notes
+            pre_order_date
         }
         term_and_conditions
         shipping_policy
@@ -191,6 +193,7 @@ export const ProductDetailsFragment = gql`
                         label
                         position
                     }
+                    name
                     sku
                     stock_status
                     price {

package/src/overwrites/peregrine/lib/talons/SearchPage/searchPage.gql.js

@@ -0,0 +1,126 @@
+import { gql } from '@apollo/client';
+
+export const GET_PAGE_SIZE = gql`
+    query getPageSize {
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
+        storeConfig {
+            store_code
+            grid_per_page
+        }
+    }
+`;
+
+export const GET_PRODUCT_FILTERS_BY_SEARCH = gql`
+    query getProductFiltersBySearch($search: String!) {
+        products(search: $search) {
+            aggregations {
+                label
+                count
+                attribute_code
+                options {
+                    label
+                    value
+                }
+                position
+            }
+        }
+    }
+`;
+
+export const GET_SEARCH_TERM_DATA = gql`
+    query getSearchTermData($search: String) {
+        searchTerm(Search: $search) {
+            query_text
+            redirect
+            popularity
+        }
+    }
+`;
+
+export const PRODUCT_SEARCH = gql`
+    query ProductSearch(
+        $currentPage: Int = 1
+        $inputText: String!
+        $pageSize: Int = 6
+        $filters: ProductAttributeFilterInput!
+        $sort: ProductAttributeSortInput
+    ) {
+        products(
+            currentPage: $currentPage
+            pageSize: $pageSize
+            search: $inputText
+            filter: $filters
+            sort: $sort
+        ) {
+            items {
+                id
+                uid
+                name
+                price_range {
+                    maximum_price {
+                        final_price {
+                            currency
+                            value
+                        }
+                        regular_price {
+                            currency
+                            value
+                        }
+                        discount {
+                            amount_off
+                        }
+                    }
+                }
+                sku
+                preorder {
+                    is_preorder
+                }
+                small_image {
+                    url
+                }
+                stock_status
+                __typename
+                url_key
+            }
+            page_info {
+                total_pages
+            }
+            total_count
+        }
+    }
+`;
+
+export const GET_FILTER_INPUTS = gql`
+    query GetFilterInputsForSearch {
+        __type(name: "ProductAttributeFilterInput") {
+            inputFields {
+                name
+                type {
+                    name
+                }
+            }
+        }
+    }
+`;
+
+export const GET_SEARCH_AVAILABLE_SORT_METHODS = gql`
+    query getSearchAvailableSortMethods($search: String!) {
+        products(search: $search) {
+            sort_fields {
+                options {
+                    label
+                    value
+                }
+            }
+        }
+    }
+`;
+
+export default {
+    getFilterInputsQuery: GET_FILTER_INPUTS,
+    getPageSize: GET_PAGE_SIZE,
+    getSearchTermData: GET_SEARCH_TERM_DATA,
+    getProductFiltersBySearchQuery: GET_PRODUCT_FILTERS_BY_SEARCH,
+    getSearchAvailableSortMethods: GET_SEARCH_AVAILABLE_SORT_METHODS,
+    productSearchQuery: PRODUCT_SEARCH
+};

package/src/overwrites/venia-ui/lib/components/Image/image.js

@@ -87,19 +87,20 @@ const Image = props => {
             {...rest}
         />
     ) : (
-        <ResourceImage
-            alt={alt}
-            className={imageClass}
-            handleError={handleError}
-            handleLoad={handleImageLoad}
-            height={talonResourceHeight}
-            resource={resource}
-            type={type}
-            width={talonResourceWidth}
-            widths={widths}
-            ratio={ratio}
-            {...rest}
-        />
+        // <ResourceImage
+        //     alt={alt}
+        //     className={imageClass}
+        //     handleError={handleError}
+        //     handleLoad={handleImageLoad}
+        //     height={talonResourceHeight}
+        //     resource={resource}
+        //     type={type}
+        //     width={talonResourceWidth}
+        //     widths={widths}
+        //     ratio={ratio}
+        //     {...rest}
+        // />
+        <></>
     );
 
     return (