#2, 11 - восстановлены фильтры на фронте, фикс сброса фильтров

front/src/app/pages/cocktails/CocktailsPageContent.js

@@ -16,6 +16,9 @@ import UpIcon from "@mui/icons-material/KeyboardArrowUp";
 import {sortList} from "../../../components/cocktails/sortingList";
 import Button from "@mui/material/Button";
 import {useSelect} from "../../../hooks/useSelect";
+import Paper from "@mui/material/Paper";
+import CheckMarks from "../../../components/cocktails/CheckMarks";
+import {getComparator} from "../../../components/core/getComparator";
 
 const emptyFilter = {
     search: "",
@@ -37,7 +40,7 @@ const CocktailsPageContent = ({all}) => {
     const [allowIngredients, setAllowIngredients] = useState([])
     const [rows, setRows] = useState([]);
     const [filter, setFilter] = useState(emptyFilter)
-    // const [chips, setChips] = useState([])
+    const [chips, setChips] = useState([])
     const [page, setPage] = useState(-1);
     const [load, setLoad] = useState(false);
     const [isEnd, setIsEnd] = useState(false);
@@ -77,7 +80,7 @@ const CocktailsPageContent = ({all}) => {
             })
             .catch((r) => {
                 setLoad(false);
-                createError("Ошибка загрузки данных от сервера Status:" + r.status)
+                createError("Ошибка загрузки данных от сервера Status:" + r.code)
             })
         // eslint-disable-next-line
     }, [load, isEnd, page]);
@@ -117,7 +120,7 @@ const CocktailsPageContent = ({all}) => {
             .filter((nhc) => nhc.length === 1)
             .map((fc) => fc[0])
             .forEach((i) => ingredients.add(i))
-        // setChips(Array.from(ingredients).sort(getComparator()));
+        setChips(Array.from(ingredients).sort(getComparator()));
         // eslint-disable-next-line
     }, [rows, allowIngredients])
 
@@ -182,11 +185,12 @@ const CocktailsPageContent = ({all}) => {
     }
     const handleFilterClear = () => {
         setFilter(emptyFilter);
+        setIsNew(true);
+        setIsEnd(false);
+        setPage(-1);
     }
     const handleSelectCocktail = (row) => {
         selectCocktail(row.id)
-        // setSelectedCocktail(row.id)
-        // setOpen(true)
     }
     const handleEditMenu = (row, value) => {
         const newState = rows.map((r) => {
@@ -233,17 +237,17 @@ const CocktailsPageContent = ({all}) => {
             />
 
             {/*todo: доделать фильтр по количеству недостающих ингредиентов*/}
-            {/*{*/}
-            {/*    (all && filter.iCount === 1) && (*/}
-            {/*        <Paper sx={{mt: 1}}>*/}
-            {/*            <CheckMarks rows={chips} name={"Выбор ингредиента"} filterName={"ingredient"}*/}
-            {/*                        filterValue={filter.ingredient}*/}
-            {/*                        handleChange={handleFilterChange}*/}
-            {/*                        identity*/}
-            {/*            />*/}
-            {/*        </Paper>*/}
-            {/*    )*/}
-            {/*}*/}
+            {
+                (all && filter.iCount === 1) && (
+                    <Paper sx={{mt: 1}}>
+                        <CheckMarks rows={chips} name={"Выбор ингредиента"} filterName={"ingredient"}
+                                    filterValue={filter.ingredient}
+                                    handleChange={handleFilterChange}
+                                    identity
+                        />
+                    </Paper>
+                )
+            }
             <Box>
                 {/*Основное содержимое*/}
                 <Grid container rowSpacing={2} columnSpacing={{xs: 1, sm: 1, md: 2}} sx={{m: 1}}>