From 23c1688d012d0f26f45116e2917a3410bd0f1a43 Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Mon, 4 Dec 2023 16:36:30 +0300
Subject: [PATCH] fix: questions multianswer logic

---
 .../BranchingQuestionsModal/index.tsx         | 26 ++++++++++---------
 src/pages/ViewPublicationPage/Footer.tsx      |  4 +--
 src/stores/questions/store.ts                 |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/pages/Questions/BranchingQuestionsModal/index.tsx b/src/pages/Questions/BranchingQuestionsModal/index.tsx
index 9099e3f9..068c1abf 100644
--- a/src/pages/Questions/BranchingQuestionsModal/index.tsx
+++ b/src/pages/Questions/BranchingQuestionsModal/index.tsx
@@ -1,24 +1,28 @@
-import { useParams } from "react-router-dom";
 import { Box, Modal, Button, Typography } from "@mui/material";
 import { useQuestionsStore } from "@root/questions/store";
-import { AnyTypedQuizQuestion, UntypedQuizQuestion } from "@model/questionTypes/shared";
-
-type AnyQuestion = UntypedQuizQuestion | AnyTypedQuizQuestion
+import { AnyTypedQuizQuestion } from "@model/questionTypes/shared";
 
 interface Props {
   openedModalQuestions: boolean;
-  setModalQuestionTargetContentId: (contentId:string) => void;
-  setOpenedModalQuestions: (open:boolean) => void;
+  setModalQuestionTargetContentId: (contentId: string) => void;
+  setOpenedModalQuestions: (open: boolean) => void;
 }
 
-export const BranchingQuestionsModal = ({ openedModalQuestions, setOpenedModalQuestions, setModalQuestionTargetContentId}:Props) => {
-  const quizId = Number(useParams().quizId);
+export const BranchingQuestionsModal = ({
+  openedModalQuestions,
+  setOpenedModalQuestions,
+  setModalQuestionTargetContentId,
+}: Props) => {
   const { questions } = useQuestionsStore();
 
   const handleClose = () => {
     setOpenedModalQuestions(false);
   };
 
+  const typedQuestions: AnyTypedQuizQuestion[] = questions.filter(
+    (question) => question.type && !question.content.rule.parentId
+  ) as AnyTypedQuizQuestion[];
+
   return (
     <Modal open={openedModalQuestions} onClose={handleClose}>
       <Box
@@ -37,13 +41,11 @@ export const BranchingQuestionsModal = ({ openedModalQuestions, setOpenedModalQu
         }}
       >
         <Box sx={{ margin: "0 auto", maxWidth: "350px" }}>
-          {questions.filter((q:AnyQuestion) => { 
-if (q.content === null) return true
-          return (q.type && !q.content.rule.parentId)}).map((question: AnyTypedQuizQuestion, index:number) => (
+          {typedQuestions.map((question) => (
             <Button
               key={question.content.id}
               onClick={() => {
-                setModalQuestionTargetContentId(question.content.id)
+                setModalQuestionTargetContentId(question.content.id);
                 handleClose();
               }}
               sx={{
diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx
index 95a672aa..70cd41c4 100644
--- a/src/pages/ViewPublicationPage/Footer.tsx
+++ b/src/pages/ViewPublicationPage/Footer.tsx
@@ -55,9 +55,9 @@ export const Footer = ({ setCurrentQuestion, question }: FooterProps) => {
           i < longerArray;
           i++ // Цикл по всем эле­мен­там бОльшего массива
         ) {
-          debugger;
-          if (rules[0].answers[i] === answers.at(-1)?.answer)
+          if (rules[0].answers[i] === answers.at(-1)?.answer) {
             readyBeNextQuestion = next; // Ес­ли хоть один эле­мент от­ли­ча­ет­ся, мас­си­вы не рав­ны
+          }
         }
       });
       if (readyBeNextQuestion) {
diff --git a/src/stores/questions/store.ts b/src/stores/questions/store.ts
index ffd5cb4d..b5877be5 100644
--- a/src/stores/questions/store.ts
+++ b/src/stores/questions/store.ts
@@ -4,7 +4,7 @@ import { devtools } from "zustand/middleware";
 
 
 export type QuestionsStore = {
-    questions: (AnyTypedQuizQuestion | UntypedQuizQuestion);
+    questions: (AnyTypedQuizQuestion | UntypedQuizQuestion)[];
     openedModalSettingsId: string | null;
     dragQuestionContentId: string | null;
 };