#3 - исправление NPE для загрузки фото

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

@@ -14,57 +14,8 @@ import {useUser} from "../../../hooks/useUser";
 import {blue} from "@mui/material/colors";
 import UpIcon from "@mui/icons-material/KeyboardArrowUp";
 import {sortList} from "../../../components/cocktails/sortingList";
-import {getComparator} from "../../../components/core/getComparator";
 import Button from "@mui/material/Button";
-import Paper from "@mui/material/Paper";
-import CheckMarks from "../../../components/cocktails/CheckMarks";
-
-const filterList = (rows, filter, allowIngredients) => {
-    let regExp = new RegExp("(.*?)" + filter.search + "(.*?)", "i");
-    const sortingObj = sortList.find((s) => s.name === filter.sorting);
-    const sortingValues = sortingObj.id.split("|");
-    return rows
-        .filter((row) => {
-            const nameReg = row.name.split(" ").map((n) => n.match(regExp) !== null).includes(true);
-            const ingredientReg = row.components
-                .split(", ")
-                .map((r) => r.match(regExp) !== null)
-                .includes(true);
-            return nameReg || ingredientReg;
-        })
-        .filter((row) => filter.onlyFavourite ? row.rating.favourite : true)
-        .filter((row) => filter.glass.length === 0 || filter.glass.includes(row.glass))
-        .filter((row) => filter.category.length === 0 || filter.category.includes(row.category))
-        .filter((row) => filter.alcohol.length === 0 || filter.alcohol.includes(row.alcoholic))
-        .filter((row) => {
-            if (filter.tags.length === 0) {
-                return true;
-            }
-
-            if (row.tags.length === 0) {
-                return false;
-            }
-            return row.tags.split(",").find((tag) => filter.tags.includes(tag))
-        })
-        .filter((row) => {
-            if (filter.iCount.length === 0) {
-                return true;
-            }
-            const arr = row.components.split(", ");
-            const count = arr.filter((n) => !allowIngredients.includes(n)).length;
-            const filt = filter.ingredient.length === 0 || arr.filter((n) => filter.ingredient.includes(n)).length > 0;
-
-            return filter.iCount === count && filt;
-        })
-        .filter((row) => {
-            if (filter.inMenu === "") {
-                return row;
-            }
-            const filterValue = filter.inMenu === "Есть в меню";
-            return filterValue === row.inMenu;
-        })
-        .sort(getComparator(sortingValues[1], sortingValues[0], "name"))
-}
+import {useSelect} from "../../../hooks/useSelect";
 
 const emptyFilter = {
     search: "",
@@ -86,14 +37,14 @@ const CocktailsPageContent = ({all}) => {
     const [allowIngredients, setAllowIngredients] = useState([])
     const [rows, setRows] = useState([]);
     const [filter, setFilter] = useState(emptyFilter)
-    const [open, setOpen] = useState(false);
-    const [selectedCocktail, setSelectedCocktail] = useState(null)
-    const [chips, setChips] = useState([])
+    // const [chips, setChips] = useState([])
     const [page, setPage] = useState(-1);
     const [load, setLoad] = useState(false);
     const [isEnd, setIsEnd] = useState(false);
     const [isNew, setIsNew] = useState(true);
 
+    const {selectCocktail, getCocktail, getOpenCocktail} = useSelect();
+
     const loading = useCallback(() => {
         const size = Math.floor((window.innerWidth) / 350) * 5;
         if (load || (!isNew && isEnd)) {
@@ -111,7 +62,7 @@ const CocktailsPageContent = ({all}) => {
         api().post(requests.cocktails.menu, request)
             .then((r) => {
                 if (r.data.length === 0) {
-                    if(isNew) {
+                    if (isNew) {
                         setRows([]);
                     }
                     setIsEnd(true);
@@ -139,6 +90,7 @@ const CocktailsPageContent = ({all}) => {
         }
         window.addEventListener('scroll', handleScroll);
         return () => window.removeEventListener('scroll', handleScroll);
+        // eslint-disable-next-line
     }, [loading]);
     useEffect(() => {
         api().get(requests.bar.ingredientSimple)
@@ -152,6 +104,7 @@ const CocktailsPageContent = ({all}) => {
     }, [])
     useEffect(() => {
         loading();
+        // eslint-disable-next-line
     }, [filter])
     useEffect(() => {
         if (!all) {
@@ -164,7 +117,8 @@ 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])
 
     const renderSkeleton = () => {
@@ -230,12 +184,9 @@ const CocktailsPageContent = ({all}) => {
         setFilter(emptyFilter);
     }
     const handleSelectCocktail = (row) => {
-        setSelectedCocktail(row.id)
-        setOpen(true)
-    }
-    const handleCloseCocktailModal = () => {
-        setOpen(false);
-        setSelectedCocktail(null);
+        selectCocktail(row.id)
+        // setSelectedCocktail(row.id)
+        // setOpen(true)
     }
     const handleEditMenu = (row, value) => {
         const newState = rows.map((r) => {
@@ -271,8 +222,7 @@ const CocktailsPageContent = ({all}) => {
         <Box>
             {/*<Loading loading={load}/>*/}
             {/*Модальное окно информации о коктейле*/}
-            <CocktailInfoModal row={selectedCocktail} open={open}
-                               closeHandler={handleCloseCocktailModal}/>
+            <CocktailInfoModal row={getCocktail()} open={getOpenCocktail()}/>
             {/*Блок фильтров*/}
             <FilterBlock
                 filter={filter}