@riosst100/pwa-marketplace 2.4.0 → 2.4.2

package/package.json

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

package/src/components/FilterTop/CurrentTopFilters/currentTopFilter.js

@@ -31,7 +31,7 @@ const CurrentTopFilter = props => {
         }
     );
 
-    return group && group != "card_game" && group != "character" && group != "product_series" && group != "scale" && group != "product_line" && group != "filterby" && group != "trains" && group != "franchise" && group != "brands" && group != "category" && group != "shopby" ? (
+    return group && group != "sc_sports_categories" && group != "card_game" && group != "character" && group != "product_series" && group != "scale" && group != "product_line" && group != "filterby" && group != "trains" && group != "franchise" && group != "brands" && group != "category" && group != "shopby" ? (
         <span className={classes.item} data-cy="CurrentTopFilter-root">
             <Trigger
                 action={handleClick}

package/src/components/FilterTop/CurrentTopFilters/currentTopFilters.js

@@ -21,7 +21,7 @@ const CurrentTopFilters = props => {
                 const { title, value } = item || {};
                 const key = `${group}::${title}_${value}`;
 
-                const customAttributeLandingPage = ['card_game','card_set', 'sc_baseball_release'];
+                const customAttributeLandingPage = ['card_game','card_set', 'sc_sports_categories'];
 
                 if (group === currentGroup && !customAttributeLandingPage.includes(group)) {
                     elements.push(

package/src/components/FilterTop/CustomFilters/customFilter.js

@@ -43,7 +43,7 @@ const CustomFilter = props => {
 
     const subCategory = [];
 
-    const customAttributeLandingPage = ['card_game','card_set', 'sc_baseball_release'];
+    const customAttributeLandingPage = ['card_game','card_set', 'sc_sports_categories'];
 
     if (customAttributeLandingPage.includes(group)) {
         normalizedData && normalizedData.map(({ label, path }, index) => {

package/src/components/FilterTop/FilterBlockList/filterTopItem.js

@@ -14,7 +14,7 @@ const FilterTopItem = props => {
 
     const handleOnchange = useCallback(
         e => {
-            filterApi.clear();
+            // filterApi.clear();
 
             if (group != "category_uid") {
                 removeGroup({ group });

package/src/components/FilterTop/FilterBlockList/filterTopItemGroup.js

@@ -87,7 +87,7 @@ const FilterTopItemGroup = props => {
         <div className={classes.root}>
             {radioItems}
             {filterElements && filterElements.length > 10 ? <span className={classes.item}><b>More Item</b></span> : ''}
-            {filterElements && filterElements.length ? filterElements : group && group != "character" && group != "product_series" && group != "scale" && group != "product_line" && group != "trains" && group != "franchise" && group != "brands" && group != "category" && group != "card_game" && group != "filterby" && group != "shopby" && group != "cat_id" ? (<span className={classes.item}><b>All</b></span>) : ''}
+            {filterElements && filterElements.length ? filterElements : group && group != "character" && group != "product_series" && group != "scale" && group != "product_line" && group != "trains" && group != "franchise" && group != "brands" && group != "category" && group != "sc_sports_categories" && group != "card_game" && group != "filterby" && group != "shopby" && group != "cat_id" ? (<span className={classes.item}><b>All</b></span>) : ''}
         </div>
     );
 };

package/src/components/SetsData/setsData.js

@@ -247,7 +247,7 @@ const SetsData = props => {
                 if (label == "Singles") {
                     isSingles = true;
                 }
-                if (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 == "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)) {
                     activeFilters.push(
                         {
                             'label': label,

package/src/overwrites/peregrine/lib/talons/FilterSidebar/useFilterSidebar.js

@@ -226,14 +226,14 @@ export const useFilterSidebar = props => {
     // on apply, write filter state to location
     useEffect(() => {
         if (isApplying) {
-            const nextSearch = getSearchFromState(
-                search,
-                filterKeys,
-                filterState
-            );
+            // const nextSearch = getSearchFromState(
+            //     search,
+            //     filterKeys,
+            //     filterState
+            // );
 
-            // write filter state to history
-            history.push({ pathname, search: nextSearch });
+            // // write filter state to history
+            // history.push({ pathname, search: nextSearch });
 
             // mark the operation as complete
             setIsApplying(false);
@@ -258,24 +258,24 @@ export const useFilterSidebar = props => {
             filterApi.removeGroup({ group: subFilter });
         }
 
-        if (group.includes('card_set')) {
-            const subFilter = group.replace("card_set", "card_release");
+        if (group.includes('sc_release')) {
+            const subFilter = group.replace("sc_release", "sc_set_name");
             filterApi.removeGroup({ group: subFilter });
         }
 
-        if (group.includes('card_game')) {
-            if (allActiveFilters && allActiveFilters.size > 0) {
-                allActiveFilters.forEach((value, key) => {
-                    if (key !== 'card_game') {
-                        filterApi.removeGroup({ group: key });
-                    }
-                });
-            }
+        if (group.includes('sc_set_name')) {
+            const subFilter = group.replace("sc_set_name", "sc_release");
+            filterApi.removeGroup({ group: subFilter });
+        }
+
+        if (group.includes('card_set')) {
+            const subFilter = group.replace("card_set", "card_release");
+            filterApi.removeGroup({ group: subFilter });
         }
 
         setIsApplying(true);
         handleClose();
-    }, [handleClose, filterApi, allActiveFilters]);
+    }, [handleClose]);
 
     const handleReset = useCallback(() => {
         filterApi.clear();

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

@@ -274,7 +274,7 @@ const CategoryContent = props => {
                 if (label == "Singles") {
                     isSingles = true;
                 }
-                if (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 == "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)) {
                     activeFilters.push(
                         {
                             'label': label,

package/src/overwrites/venia-ui/lib/components/Breadcrumbs/breadcrumbs.js

@@ -83,9 +83,6 @@ const Breadcrumbs = props => {
 
     // const previousSearch = useRef(search);
 
-    console.log('search')
-    console.log(search)
-
     const removeShopbyParam = (url) => {
         const urlParts = url.split("?"); // Pisahkan URL sebelum dan sesudah tanda tanya
         if (urlParts.length < 2) return url; // Jika tidak ada query string, kembalikan URL asli
@@ -104,9 +101,6 @@ const Breadcrumbs = props => {
     }
 
     const params = removeShopbyParam(search);
-
-    console.log("paramsparamsparams")
-    console.log(params)
     
     currentFilter && currentFilter.length && currentFilter.map((filter, index) => {
         currentProduct ? (

package/src/overwrites/venia-ui/lib/components/FilterModal/CurrentFilters/currentFilters.js

@@ -20,7 +20,7 @@ const CurrentFilters = props => {
                 const { title, value } = item || {};
                 const key = `${group}::${title}_${value}`;
 
-                const customAttributeLandingPage = ['card_game','card_set', 'sc_baseball_release','auction','special_price','lof_preorder','sc_baseball_inserts','sc_baseball_parallel','sc_set_type'];
+                const customAttributeLandingPage = ['sc_sports_categories','card_game','card_set', 'sc_baseball_release','auction','special_price','lof_preorder','sc_baseball_inserts','sc_baseball_parallel','sc_set_type'];
 
                 // if (!customAttributeLandingPage.includes(group)) {
                     elements.push(

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterItemRadioGroup.js

@@ -32,9 +32,7 @@ const FilterItemRadioGroup = props => {
             let newAllowedSubFilters = [];
             
             if (subFilter && subFilterItems) {
-                const result = subFilterItems.find(item => item.attribute_code === "card_release");
-
-                
+                const result = subFilterItems.find(item => item.attribute_code === "card_release" || item.attribute_code === "sc_release");
 
                 // Ambil options jika ditemukan
                 const options = result ? result.options : [];

package/src/overwrites/venia-ui/lib/components/FilterModal/FilterList/filterList.js

@@ -152,10 +152,6 @@ const FilterList = props => {
         // if (filterFrontendInput === 'boolean') {
             
             const key = `item-${group}`;
-
-            const cardSetGroup = group.replace('card_release', 'card_set');
-
-            // const mewSubFilterBlock = subFilterBlock;
             
             return (
                 <li

package/src/overwrites/venia-ui/lib/components/FilterSidebar/filterSidebar.js

@@ -104,8 +104,16 @@ const FilterSidebar = props => {
                     
                     // if (!allowedFiltersArr?.length && group != "category_uid" || allowedFiltersArr?.length && allowedFiltersArr.includes(group)) {
                         let subFilter = null;
-                        if (group.includes('card_release')) {
-                            const subGroup = group.replace('card_release', 'card_set');
+                        if (group.includes('sc_release') || group.includes('card_release')) {
+                            let subGroup = '';
+                            if (group.includes('card_release')) {
+                                subGroup = group.replace('card_release', 'card_set');
+                            }
+
+                            if (group.includes('sc_release')) {
+                                subGroup = group.replace('sc_release', 'sc_set_name');
+                            }
+
                             const subBlockState = filterState.get(subGroup);
                             const subFrontendInput = filterFrontendInput.get(subGroup);
                             const subFilterItems = filterItems.get(subGroup);

package/src/talons/FilterTop/useFilterTop.js

@@ -213,6 +213,8 @@ export const useFilterTop = props => {
     // on apply, write filter state to location
     useEffect(() => {
         if (isApplying) {
+            console.log('APPLY')
+            console.log(search)
             const nextSearch = getSearchFromState(
                 search,
                 filterKeys,