diff --git a/front/src/app/pages/cocktails/EditCocktailPage.js b/front/src/app/pages/cocktails/EditCocktailPage.js index f76bbef..b9290b0 100644 --- a/front/src/app/pages/cocktails/EditCocktailPage.js +++ b/front/src/app/pages/cocktails/EditCocktailPage.js @@ -11,7 +11,6 @@ import {requests} from "../../../requests"; import {useAlert} from "../../../hooks/useAlert"; import Stack from "@mui/material/Stack"; import Button from "@mui/material/Button"; -import CheckMarks from "../../../components/cocktails/CheckMarks"; import {EditCocktailReceipt} from "../../../components/cocktails/EditCocktailReceipt"; import {SelectEdit} from "../../../components/cocktails/SelectEdit"; import {getComparator} from "../../../components/core/getComparator"; @@ -97,11 +96,19 @@ export function EditCocktailPage() { .catch(() => createError("Ошибка получения данных")) api().get(requests.bar.category) - .then((r) => setCategory(r.data.sort(getComparator()))) + .then((r) => { + setCategory(r.data.sort(getComparator()) + .map((item, i) => { + return {id: i, name: item} + })) + }) .catch(() => createError("Ошибка получения категорий")) api().get(requests.bar.glass) - .then((r) => setGlass(r.data.sort(getComparator()))) + .then((r) => setGlass(r.data.sort(getComparator()) + .map((item, i) => { + return {id: i, name: item} + }))) .catch(() => createError("Ошибка получения посуды")) // eslint-disable-next-line }, []); diff --git a/front/src/components/cocktails/SelectEdit.js b/front/src/components/cocktails/SelectEdit.js index 6d32ef7..d9ac00d 100644 --- a/front/src/components/cocktails/SelectEdit.js +++ b/front/src/components/cocktails/SelectEdit.js @@ -4,6 +4,7 @@ import MenuItem from "@mui/material/MenuItem"; import * as React from "react"; export function SelectEdit({label, value, array, handler, attributeName, width, margin}) { + return ( {label}