From f188bcee2d2b485669c635510446ce148c59739e Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Mon, 8 Apr 2024 02:16:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D1=8F=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Analytics/Answers/Answers.tsx | 33 +++++++++----------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/pages/Analytics/Answers/Answers.tsx b/src/pages/Analytics/Answers/Answers.tsx
index d7aab21a..be050f3b 100644
--- a/src/pages/Analytics/Answers/Answers.tsx
+++ b/src/pages/Analytics/Answers/Answers.tsx
@@ -206,20 +206,13 @@ export const Answers: FC<AnswersProps> = ({ data }) => {
     () =>
       data === null
         ? []
-        : Object.keys(data ?? {})
-            .map((key) =>
-              Object.entries(data[key]).map(([title, percent]) => ({
-                title,
-                percent,
-                key,
-              })),
-            )
-            .flat(),
+        : Object.entries(data ?? {}),
     [data],
   );
 
-  console.log(answers);
-  console.log(page);
+  console.log("data", data);
+  console.log("answers", answers);
+  console.log("page", page);
   if (!data) {
     return (
       <Typography textAlign="center" m="10px 0">
@@ -275,10 +268,7 @@ export const Answers: FC<AnswersProps> = ({ data }) => {
           >
             Заголовок вопроса.{" "}
             {
-              answers.slice(
-                ANSWERS_PER_PAGE * (page - 1),
-                ANSWERS_PER_PAGE * page,
-              )[0]?.key
+              answers[page-1][0]
             }
           </Typography>
           <ButtonBase>
@@ -288,13 +278,14 @@ export const Answers: FC<AnswersProps> = ({ data }) => {
             <NextIcon />
           </ButtonBase>
         </Box>
-        {answers
-          .slice(ANSWERS_PER_PAGE * (page - 1), ANSWERS_PER_PAGE * page)
-          .map(({ title, percent }, index) => (
+        {
+          Object.entries(answers[page-1][1])
+        
+          .map((element, index) => (
             <Answer
               key={index}
-              title={title}
-              percent={percent}
+              title={element[0]}
+              percent={element[1]}
               highlight={!index}
             />
           ))}
@@ -302,7 +293,7 @@ export const Answers: FC<AnswersProps> = ({ data }) => {
       <Pagination
         page={page}
         setPage={setPage}
-        pagesAmount={Math.ceil(answers.length / ANSWERS_PER_PAGE)}
+        pagesAmount={answers.length}
       />
     </Box>
   );