gthdst ghfdrb

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

@@ -28,7 +28,6 @@ const emptyFilter = {
     glass: [],
     category: [],
     alcohol: [],
-    tags: [],
     iCount: [],
     ingredient: [],
     inMenu: "",
@@ -210,17 +209,6 @@ const CocktailsPageContent = () => {
             .then(() => setRows(newState))
             .catch(() => createError("Ошибка сохранения данных"))
     }
-    const editMenuBlock = (row) => {
-        if (user.role === "USER" || user.role === "ADMIN_NOT_BARMEN") {
-            return null;
-        }
-        return (
-            <Button color={row.inMenu ? 'error' : 'success'} variant='contained'
-                    onClick={() => handleEditMenu(row, !row.inMenu)}>
-                {(row.inMenu ? 'Удалить из' : 'Добавить в') + ' меню'}
-            </Button>
-        )
-    }
 
     return (
         <Box>
@@ -254,7 +242,6 @@ const CocktailsPageContent = () => {
                             <Cocktail key={row.id} row={row} handleFavourite={handleFavourite}
                                       handleChangeRating={handleChangeRating}
                                       handleSelect={handleSelectCocktail}
-                                      editMenuBlock={editMenuBlock}
                             />
                         )
                     })}

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

@@ -74,7 +74,6 @@ export function EditCocktailPage() {
 
     const [glass, setGlass] = useState([]);
     const [category, setCategory] = useState([]);
-    const [tags, setTags] = useState([])
 
     useEffect(() => {
         api().get(requests.cocktails.simple)
@@ -98,16 +97,12 @@ export function EditCocktailPage() {
             .catch(() => createError("Ошибка получения данных"))
 
         api().get(requests.bar.category)
-            .then((r) => setCategory(r.data.sort(getComparator("asc", "name"))))
+            .then((r) => setCategory(r.data.sort(getComparator())))
             .catch(() => createError("Ошибка получения категорий"))
 
         api().get(requests.bar.glass)
-            .then((r) => setGlass(r.data.sort(getComparator("asc", "name"))))
+            .then((r) => setGlass(r.data.sort(getComparator())))
             .catch(() => createError("Ошибка получения посуды"))
-
-        api().get(requests.bar.tags)
-            .then((r) => setTags(r.data.sort(getComparator("asc", "name"))))
-            .catch(() => createError("Ошибка получения тегов"))
         // eslint-disable-next-line
     }, []);
     useEffect(() => {
@@ -235,8 +230,6 @@ export function EditCocktailPage() {
                         <SelectEdit value={cocktail.alcoholic} label={"Алкогольность"} width={300} margin={1}
                                     array={alcohol}
                                     attributeName={"alcoholic"} handler={changeCocktailValue}/>
-                        <CheckMarks rows={tags} width={300} name={"Теги"} handleChange={changeCocktailValue}
-                                    filterValue={cocktail.tags.split(",")} filterName={"tags"}/>
                     </Box>
                     {/*Рецепт*/}
                     <EditCocktailReceipt receipt={cocktail.receipt} handler={changeCocktailValue}/>