From 488638885c89b6c82169d7b6561b4bc1e79cbe18 Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Thu, 21 Aug 2025 14:33:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D1=81=D1=83=D0=B4=D1=8B?= =?UTF-8?q?=20=D0=B8=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BA=D1=82=D0=B5=D0=B9=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/app/pages/cocktails/EditCocktailPage.js | 13 ++++++++++--- front/src/components/cocktails/SelectEdit.js | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) 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}