@riosst100/pwa-marketplace 1.9.1 → 1.9.3

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/overwrites/venia-ui/lib/components/ProductFullDetail/components/auctionDetail.js

@@ -101,7 +101,6 @@ const AuctionDetail = (props) => {
                     </div>
 
                     <BidList expanded />
-
                     <Form
                         data-cy="form_bid"
                         className="flex flex-col gap-y-5"

package/src/overwrites/venia-ui/lib/components/ProductFullDetail/productFullDetail.js

@@ -35,6 +35,7 @@ import AuctionDetail from './components/auctionDetail';
 import CrossSeller from '@riosst100/pwa-marketplace/src/components/CrossSeller';
 import RelatedProduct from '@riosst100/pwa-marketplace/src/components/RelatedProduct';
 import ProductLabel from '@riosst100/pwa-marketplace/src/components/ProductLabel';
+import RFQ from '@riosst100/pwa-marketplace/src/components/RFQ';
 
 // Correlate a GQL error message to a field. GQL could return a longer error
 // string but it may contain contextual info such as product id. We can use
@@ -576,6 +577,10 @@ const ProductFullDetail = props => {
                         </div>
                     </section>
                     <Divider />
+                    <section className={cn(classes.quantity, 'py-[30px] !border-none')}>
+                        <RFQ />
+                    </section>
+                    <Divider />
                     <section className='product_from-other-platform py-[30px]'>
                         <div className='text-sm flex mb-5'>
                             Also available in

package/src/overwrites/venia-ui/lib/components/TextArea/index.js

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

package/src/overwrites/venia-ui/lib/components/TextArea/textArea.js

@@ -0,0 +1,44 @@
+import React, { Fragment } from 'react';
+import { number, node, oneOf, oneOfType, shape, string } from 'prop-types';
+import { TextArea as InformedTextArea } from 'informed';
+import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';
+
+import { useStyle } from '@magento/venia-ui/lib/classify';
+import { Message } from '@magento/venia-ui/lib/components/Field';
+import defaultClasses from './textArea.module.css';
+
+const TextArea = props => {
+    const { classes: propClasses, field, message, ...rest } = props;
+    const fieldState = useFieldState(field);
+    const classes = useStyle(defaultClasses, propClasses);
+
+    return (
+        <Fragment>
+            <InformedTextArea
+                {...rest}
+                className={classes.input}
+                field={field}
+            />
+            <Message fieldState={fieldState}>{message}</Message>
+        </Fragment>
+    );
+};
+
+export default TextArea;
+
+TextArea.defaultProps = {
+    cols: 40,
+    rows: 4,
+    wrap: 'hard'
+};
+
+TextArea.propTypes = {
+    classes: shape({
+        input: string
+    }),
+    cols: oneOfType([number, string]),
+    field: string.isRequired,
+    message: node,
+    rows: oneOfType([number, string]),
+    wrap: oneOf(['hard', 'soft'])
+};

package/src/overwrites/venia-ui/lib/components/TextArea/textArea.module.css

@@ -0,0 +1,27 @@
+.input {
+    /* composes: input from '@magento/venia-ui/lib/components/Field/field.module.css'; */
+
+    composes: h-auto from global;
+    composes: max-w-full from global;
+    composes: min-w-full from global;
+    composes: px-xs from global;
+    composes: py-3 from global;
+    composes: border from global;
+    composes: border-gray-100 from global;
+    composes: rounded-md from global;
+    composes: rounded-md from global;
+    composes: focus-visible_outline-none from global;
+}
+
+.input_shimmer {
+    composes: h-auto from global;
+    composes: m-0 from global;
+    composes: max-w-full from global;
+    composes: min-h-[6.75rem] from global;
+    composes: min-w-full from global;
+    composes: px-[15px] from global;
+    composes: py-[12px] from global;
+    composes: rounded-md from global;
+    composes: w-full from global;
+    font-size: 1rem;
+}

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
     ]);