filter Mileage

OlenaIa · Dec 3, 2023 · bbf3fcb · bbf3fcb
1 parent a230c4f
commit bbf3fcb
Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/src/components/CarsList/CarsList.jsx b/src/components/CarsList/CarsList.jsx
@@ -55,18 +55,35 @@ export const CarsList = () => {
         console.log('filterBrandPriceCars', filterBrandPriceCars)
         // priceTo === 'all' -> filterBrandCars || allCars
 
-        // mileage !== 'all' -> filterBrandCars(true) -> filterBrandCars.filter -> filterBrandPriceCars
+        // mileage !== '' -> filterBrandPriceCars(true)) -> filterBrandPriceCars.filter -> filterBrandPriceMileageCars
 
+        let filterBrandPriceMileageCars = false;
+        if (from !== '' && to !== '' && priceTo !== 'all') {
+            filterBrandPriceMileageCars = filterBrandPriceCars.filter(car => (car.mileage > from && car.mileage < to));
+        } else {
+            if (from !== '' && to !== '' && brand !== 'all') {
+                filterBrandPriceMileageCars = filterBrandCars.filter(car => (car.mileage > from && car.mileage < to));
+            } else {
+                    filterBrandPriceMileageCars = allCars.filter(car => (car.mileage > from && car.mileage < to));
+                }
+        };
+
+        console.log('filterBrandPriceMileageCars', filterBrandPriceMileageCars);
+
 
-        if (priceTo !== 'all') {
-            dispatch(filterCarsSet(filterBrandPriceCars))
+        if ((from !== '' && to !== '')) {
+            dispatch(filterCarsSet(filterBrandPriceMileageCars))
         } else {
-           if (brand !== 'all') {
-            dispatch(filterCarsSet(filterBrandCars))
-           } else {
-               return;
-           }
-        }
+            if (priceTo !== 'all') {
+                dispatch(filterCarsSet(filterBrandPriceCars))
+            } else {
+                if (brand !== 'all') {
+                    dispatch(filterCarsSet(filterBrandCars))
+                } else {
+                    return;
+                }
+            }
+        };
 
     }, [dispatch, filter, allCars]);
 

diff --git a/src/components/Filters/Filters.jsx b/src/components/Filters/Filters.jsx
@@ -32,13 +32,19 @@ export const Filters = () => {
     };
 
     const onClickFilter = () => {
-        console.log('typeof filterMileageFrom', typeof filterMileageFrom); 
+if (mileageFrom !== '' && mileageTo !== '') {
+    if (mileageFrom >= mileageTo) {
+        alert('Mileage "From" must be less than mileage "To"')
+        return;
+    }
+        };
+
         const commonFilter = {
             brand: brand.value,
             priceTo: toPrice.value,
             mileage: {
-                from: mileageFrom,
-                to: mileageTo
+                from: parseInt(mileageFrom),
+                to: parseInt(mileageTo)
             }
         };
         console.log(commonFilter);