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 = ({ 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 ( @@ -275,10 +268,7 @@ export const Answers: FC = ({ data }) => { > Заголовок вопроса.{" "} { - answers.slice( - ANSWERS_PER_PAGE * (page - 1), - ANSWERS_PER_PAGE * page, - )[0]?.key + answers[page-1][0] } @@ -288,13 +278,14 @@ export const Answers: FC = ({ data }) => { - {answers - .slice(ANSWERS_PER_PAGE * (page - 1), ANSWERS_PER_PAGE * page) - .map(({ title, percent }, index) => ( + { + Object.entries(answers[page-1][1]) + + .map((element, index) => ( ))} @@ -302,7 +293,7 @@ export const Answers: FC = ({ data }) => { );