diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index d827fad4..1691676b 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -98,6 +98,9 @@ export default function ButtonsOptions({ deleteQuestion(question.id); + const result = questions.find(q => q.type === "result" && q.content.rule.parentId === question.content.id) + if (result) deleteQuestion(result.id); + } else { deleteQuestion(question.id); } diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 528932fe..67fe8f5d 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -99,6 +99,9 @@ export default function ButtonsOptionsAndPict({ deleteQuestion(question.id); + const result = questions.find(q => q.type === "result" && q.content.rule.parentId === question.content.id) + if (result) deleteQuestion(result.id); + } else { deleteQuestion(question.id); } diff --git a/src/pages/Questions/DraggableList/QuestionPageCard.tsx b/src/pages/Questions/DraggableList/QuestionPageCard.tsx index 38343340..7d81a89c 100644 --- a/src/pages/Questions/DraggableList/QuestionPageCard.tsx +++ b/src/pages/Questions/DraggableList/QuestionPageCard.tsx @@ -133,6 +133,9 @@ const maxLengthTextField = 225; deleteQuestion(question.id); + + const result = questions.find(q => q.type === "result" && q.content.rule.parentId === question.content.id) + if (result) deleteQuestion(result.id); } else { deleteQuestion(question.id); } diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx index 752c2df8..0cc5d781 100755 --- a/src/pages/startPage/EditPage.tsx +++ b/src/pages/startPage/EditPage.tsx @@ -145,6 +145,7 @@ export default function EditPage() { clearUserData(); navigate("/"); } + console.log(questions) if (!quizConfig) return <> return ( diff --git a/src/stores/questions/actions.ts b/src/stores/questions/actions.ts index 456f4566..78671ca3 100644 --- a/src/stores/questions/actions.ts +++ b/src/stores/questions/actions.ts @@ -19,7 +19,7 @@ import { QuizQuestionResult } from "@model/questionTypes/result"; export const setQuestions = (questions: RawQuestion[] | null) => setProducedState(state => { - const untypedResultQuestions = state.questions.filter(q => q.type === null || q.type === "result"); + const untypedResultQuestions = state.questions.filter(q => q.type === null); state.questions = questions?.map(rawQuestionToQuestion) ?? []; state.questions.push(...untypedResultQuestions);