Merge pull request #2639 from Ri2-4/main

codervivek5 · web-flow · commit 65502186214c · 2025-08-30T13:27:43.000+05:30
Fix: rating filter now shows only exact star matches across categories
diff --git a/src/User/components/Popular_Categories/Filters.jsx b/src/User/components/Popular_Categories/Filters.jsx
@@ -40,15 +40,15 @@ function Filters({
           onChange={(e) => setPriceFilter(e.target.value)}
         />
         {/* Filter section for Rating */}
-        <FilterSection
-          title="Rating"
-          options={["1", "2", "3", "4", "5"]}
-          onChange={(e) => {
-            const value = parseInt(e.target.value, 10); //converting into int from decimal
-            setRatingFilter(Number.isNaN(value) ? 0.00 : value); //applying condition for rating or higher
-          }
-        }  
-        />
+<FilterSection
+  title="Rating"
+  options={["1", "2", "3", "4", "5"]}
+  onChange={(e) => {
+    const value = parseInt(e.target.value, 10);
+    setRatingFilter(Number.isNaN(value) ? null : value); // null means "All"
+  }}
+/>
+
       </div>
     </aside>
   );
diff --git a/src/User/pages/Latest_in_the_Market/ArtSupplies.jsx b/src/User/pages/Latest_in_the_Market/ArtSupplies.jsx
@@ -4,6 +4,8 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
+
 
 
 
@@ -35,7 +37,7 @@ function ArtSupplies() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate: Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -72,11 +74,8 @@ function ArtSupplies() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+     updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/BambooProducts.jsx b/src/User/pages/Latest_in_the_Market/BambooProducts.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -35,7 +36,7 @@ function BambooProducts() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate: Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -72,11 +73,8 @@ function BambooProducts() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/CeramicDinnerware.jsx b/src/User/pages/Latest_in_the_Market/CeramicDinnerware.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -35,7 +36,7 @@ function CeramicDinnerware() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -72,11 +73,8 @@ function CeramicDinnerware() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+     updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/HandMadeSoaps.jsx b/src/User/pages/Latest_in_the_Market/HandMadeSoaps.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -34,7 +35,7 @@ function HandMadeSoaps() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -71,11 +72,8 @@ function HandMadeSoaps() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/NaturalCosmetics.jsx b/src/User/pages/Latest_in_the_Market/NaturalCosmetics.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -35,7 +36,7 @@ function NaturalCosmetics() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -72,11 +73,8 @@ function NaturalCosmetics() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+     updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/OrganicSoaps.jsx b/src/User/pages/Latest_in_the_Market/OrganicSoaps.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -35,7 +36,7 @@ function OrganicSoaps() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -72,11 +73,8 @@ function OrganicSoaps() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+     updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/OrganicTea.jsx b/src/User/pages/Latest_in_the_Market/OrganicTea.jsx
@@ -4,6 +4,8 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
+
 
 
 
@@ -34,7 +36,7 @@ function OrganicTea() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -71,11 +73,8 @@ function OrganicTea() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+     updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Latest_in_the_Market/StorageBaskets.jsx b/src/User/pages/Latest_in_the_Market/StorageBaskets.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 
@@ -34,7 +35,7 @@ function StorageBaskets() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -71,11 +72,8 @@ function StorageBaskets() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Popular_Categories/Beauty-Wellness.jsx b/src/User/pages/Popular_Categories/Beauty-Wellness.jsx
@@ -4,6 +4,8 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
+
 
 
 function BeautyWellness() {
@@ -32,7 +34,7 @@ function BeautyWellness() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -69,11 +71,8 @@ function BeautyWellness() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Popular_Categories/Body-Care.jsx b/src/User/pages/Popular_Categories/Body-Care.jsx
@@ -4,6 +4,8 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
+
 
 
 function BodyCare() {
@@ -32,7 +34,7 @@ function BodyCare() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -69,11 +71,8 @@ function BodyCare() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Popular_Categories/Customized-Gifts.jsx b/src/User/pages/Popular_Categories/Customized-Gifts.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 
 function CustomizedGifts() {
@@ -32,7 +33,7 @@ function CustomizedGifts() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate:  Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -69,11 +70,7 @@ function CustomizedGifts() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+       updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Popular_Categories/Fashion-Accessories.jsx b/src/User/pages/Popular_Categories/Fashion-Accessories.jsx
@@ -4,6 +4,7 @@ import ProductGrid from "../../components/Popular_Categories/ProductGrid";
 import toast from "react-hot-toast";
 import axios from "axios";
 import { Helmet } from "react-helmet-async";
+import { normalizeAndFilterByRating } from "../../utils/productFilters";
 
 function FashionAccessories() {
   const [products, setProducts] = useState([]);
@@ -31,7 +32,7 @@ function FashionAccessories() {
               image: product.images[0] || "",
               discountPercentage: product.discountPercentage,
               rating: {
-                rate: product.rating,
+                rate: Math.round(product.rating),
                 count: product.reviews ? product.reviews.length : 0,
               },
             }));
@@ -68,11 +69,8 @@ function FashionAccessories() {
           (product) => product.price <= parseInt(priceFilter)
         );
       }
-      if (ratingFilter) {
-        updatedProducts = updatedProducts.filter(
-          (product) => Math.round(product.rating.rate) >= ratingFilter
-        );
-      }
+      updatedProducts = normalizeAndFilterByRating(updatedProducts, ratingFilter);
+
       setFilteredProducts(updatedProducts);
     };
 
diff --git a/src/User/pages/Popular_Categories/Food-Beverages.jsx b/src/User/pages/Popular_Categories/Food-Beverages.jsx
diff --git a/src/User/pages/Popular_Categories/Furniture-Decor.jsx b/src/User/pages/Popular_Categories/Furniture-Decor.jsx
diff --git a/src/User/pages/Popular_Categories/Health-Supplements.jsx b/src/User/pages/Popular_Categories/Health-Supplements.jsx
diff --git a/src/User/pages/Popular_Categories/Popular_Categories.jsx b/src/User/pages/Popular_Categories/Popular_Categories.jsx
diff --git a/src/User/pages/Popular_Categories/Printing-Stationery.jsx b/src/User/pages/Popular_Categories/Printing-Stationery.jsx
diff --git a/src/User/utils/productFilters.js b/src/User/utils/productFilters.js
