diff --git a/src/pages/Questions/branchingQuestions.tsx b/src/pages/Questions/branchingQuestions.tsx index b61e35ed..adcb2065 100644 --- a/src/pages/Questions/branchingQuestions.tsx +++ b/src/pages/Questions/branchingQuestions.tsx @@ -24,14 +24,13 @@ import RadioIcon from "@ui_kit/RadioIcon"; import { questionStore, resetSomeField } from "@root/questions"; export default function BranchingQuestions() { - const {openedModalSettings} = questionStore() - const theme = useTheme(); + const { openedModalSettings } = questionStore(); + const theme = useTheme(); const [condition, setCondition] = useState(false); const handleClose = () => { - resetSomeField({openedModalSettings: ""}) - - } + resetSomeField({ openedModalSettings: "" }); + }; const [display, setDisplay] = React.useState("1"); const handleChange = (event: SelectChangeEvent) => { setDisplay(event.target.value); @@ -170,7 +169,7 @@ export default function BranchingQuestions() { Условие 1 - + @@ -247,29 +246,23 @@ export default function BranchingQuestions() { } icon={}/>} + control={} icon={} />} label="Все условия обязательны" /> } icon={}/>} + control={} icon={} />} label="Обязательно хотя бы одно условие" /> - - + diff --git a/src/pages/Questions/questionList.tsx b/src/pages/Questions/questionList.tsx index 11afd74a..072c23d0 100644 --- a/src/pages/Questions/questionList.tsx +++ b/src/pages/Questions/questionList.tsx @@ -2,7 +2,7 @@ import React, { useRef, useState } from "react"; import { Box, Paper, Typography } from "@mui/material"; import { useDrag, useDrop } from "react-dnd"; import QuestionsPageCard from "./QuestionPageCard"; -import { questionStore, updateQuestionsLists } from "@root/questions"; +import { questionStore, updateQuestionsListDragAndDrop } from "@root/questions"; import IconPlus from "@icons/IconPlus"; export const ItemTypes = { @@ -117,9 +117,11 @@ const QuestionList: React.FC = () => { const updatedQuestions = [...listQuestions]; const [movedItem] = updatedQuestions.splice(fromIndex, 1); updatedQuestions.splice(toIndex, 0, movedItem); - updateQuestionsLists(updatedQuestions); + updateQuestionsListDragAndDrop(updatedQuestions); }; + console.log(listQuestions); + return ( {listQuestions.map((event: any, index: number) => ( diff --git a/src/stores/questions.ts b/src/stores/questions.ts index 65e9511a..20f8a040 100644 --- a/src/stores/questions.ts +++ b/src/stores/questions.ts @@ -12,7 +12,7 @@ interface Question { title: string; description: string; type: string; - required: true; + required: boolean; deleted: true; page: number; content: { @@ -43,13 +43,13 @@ export const questionStore = create()( } ) ); -export const updateQuestionsList = (index: number, data: any) => { +export const updateQuestionsList = (index: number, data: Partial) => { const array = [...questionStore.getState()["listQuestions"]]; array.splice(index, 1, { ...array[index], ...data }); questionStore.setState({ listQuestions: array }); }; -export const updateQuestionsLists = (updatedQuestions: any[]) => { +export const updateQuestionsListDragAndDrop = (updatedQuestions: Question[]) => { questionStore.setState({ listQuestions: updatedQuestions }); }; @@ -89,14 +89,14 @@ export const removeQuestion = (index: number) => { questionStore.setState({ listQuestions: array }); }; -export const resetSomeField = (data: any) => { +export const resetSomeField = (data: Record) => { questionStore.setState(data); }; -export const findQuestionById = (id_question: number): null | any => { +export const findQuestionById = (id_question: number) => { let found = null; - questionStore.getState()["listQuestions"].some((quiz: any, index: number) => { - if (quiz.id_question === id_question) { + questionStore.getState()["listQuestions"].some((quiz: Question, index: number) => { + if (quiz.id === id_question) { found = { quiz, index }; return true; }