@riosst100/pwa-marketplace 2.4.6 → 2.4.7

package/package.json

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

package/src/components/SellerProducts/productContent.js

@@ -30,10 +30,15 @@ const FilterSidebar = React.lazy(() =>
 
 const FilterModal = React.lazy(() => import('@magento/venia-ui/lib/components/FilterModal'));
 
+const FilterTop = React.lazy(() =>
+    import('@riosst100/pwa-marketplace/src/components/FilterTop')
+);
+
 const ProductContent = props => {
     const {
         categoryId,
         data,
+        shopby,
         pageControl,
         sortProps,
         isLoading,
@@ -63,6 +68,8 @@ const ProductContent = props => {
         availableSortMethods,
         filters,
         items,
+        category,
+        children,
         totalPagesFromData
     } = talonProps;
 
@@ -107,6 +114,9 @@ const ProductContent = props => {
         <SortedByContainerShimmer />
     ) : null;
 
+    console.log('filters')
+    console.log(filters)
+
     const filtersModal = shouldShowFilterButtons ? (
         <FilterModal filters={filters} />
     ) : null;
@@ -202,6 +212,9 @@ const ProductContent = props => {
                     </Link>
                 </div>
             </div>
+            <div className='w-full mb-[0px]'>
+                <FilterTop shopby={shopby} filters={filters} category={category} children={children} allowedFilters={category ? category.allowed_filters : []} />
+            </div>
             <div className='w-full flex items-start gap-x-[30px]'>
                 <div className={classes.contentWrapper}>
                     <div ref={sidebarRef} className={classes.sidebar}>

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

@@ -324,12 +324,7 @@ const CategoryContent = props => {
                     </>
                 {/* ) : ( */}
                     <>
-                        {/* <SubCategory filters={filters} children={children} /> */}
                         <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 />
-                        </section> */}
                         <div className={classes.contentWrapper}>
                             <div ref={sidebarRef} className={classes.sidebar}>
                                 <Suspense fallback={<FilterSidebarShimmer />}>

package/src/overwrites/venia-ui/lib/components/Adapter/adapter.js

@@ -37,6 +37,7 @@ const Adapter = props => {
     websiteCodes.sort((a, b) => b.length - a.length);
 
     const { location } = globalThis;
+    const pathname = location.pathname;
     const match = location && location.pathname.split("/")[1];
     let websiteCodeInUrl = websiteCodes.find((str) => str === match);
 
@@ -47,16 +48,12 @@ const Adapter = props => {
 
     // Check split cart
     useEffect(() => {
-        if (websiteCodeInUrl) {
-            setVerifyUserIp(false);
-
-            storage.removeItem('access_base_website');
-
-            routerProps.basename = websiteCodeInUrl != process.env.WEBSITE_CODE ? '/'+websiteCodeInUrl : '/';
-
-            setNewRouterProps(routerProps);
+        if (pathname && pathname.includes('cart')) {
+            console.log('INI CART PAGE')
+        } else {
+            console.log('INI BUKAN CART PAGE')
         }
-    }, [websiteCodeInUrl])
+    }, [pathname]);
     
     useEffect(() => {
         if (websiteCodeInUrl) {

package/src/talons/SellerProducts/useProductContent.js

@@ -9,6 +9,8 @@ import DEFAULT_OPERATIONS from './productContent.gql';
 export const useProductContent = props => {
     const { sellerId, data, pageSize = 6 } = props;
 
+    const categoryUid = 'MTI=';
+
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
 
     const {
@@ -56,9 +58,9 @@ export const useProductContent = props => {
         {
             fetchPolicy: 'cache-and-network',
             nextFetchPolicy: 'cache-first',
-            skip: !sellerId,
+            skip: !categoryUid,
             variables: {
-                id: sellerId
+                id: categoryUid
             }
         }
     );
@@ -66,47 +68,50 @@ export const useProductContent = props => {
     const [, { dispatch }] = useEventingContext();
 
     useEffect(() => {
-        if (sellerId) {
+        if (categoryUid) {
             getFilters({
                 variables: {
                     categoryIdFilter: {
-                        eq: sellerId
+                        eq: categoryUid
                     }
                 }
             });
         }
-    }, [sellerId, getFilters]);
+    }, [categoryUid, getFilters]);
 
     useEffect(() => {
-        if (sellerId) {
+        if (categoryUid) {
             getSortMethods({
                 variables: {
                     categoryIdFilter: {
-                        in: sellerId
+                        in: categoryUid
                     }
                 }
             });
         }
-    }, [sellerId, getSortMethods]);
+    }, [categoryUid, getSortMethods]);
 
-    // console.log('data')
-    // console.log(data)
+    console.log('filterData')
+    console.log(filterData)
 
     const rawFilters = filterData ? filterData.products.aggregations : null;
     const items = data ? data.items : placeholderItems;
-    const category = null;
-    const children = null;
-    // const category =
-    //     categoryData && categoryData.categories.items.length
-    //         ? categoryData.categories.items[0]
-    //         : null;
-    // const children =
-    //     categoryData && categoryData.categories.items.length
-    //         ? categoryData.categories.items[0].children
-    //         : null;
+    // const category = null;
+    // const children = null;
+    const category =
+        categoryData && categoryData.categories.items.length
+            ? categoryData.categories.items[0]
+            : null;
+    const children =
+        categoryData && categoryData.categories.items.length
+            ? categoryData.categories.items[0].children
+            : null;
 
     const filters = [];
 
+    console.log('rawFilters')
+    console.log(rawFilters)
+
     rawFilters && rawFilters.map((filter, index) => {
 
         const filterOptions = [];

package/src/talons/SellerProducts/useSellerProducts.js

@@ -132,7 +132,7 @@ export const useSellerProducts = props => {
     const categoryId = useMemo(() => {
         let uid = null;
         if (categoryData) {
-            uid = categoryData.categories.items[0].id;
+            uid = categoryData?.categories?.items[0].id;
         }
         return uid;
     }, [categoryData]);