From 5aeddf65b1093ed5508f9bddf6643cf3cd636ff2 Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jan 2024 20:04:17 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B8=D0=BD=D0=BF=D1=83=D1=82=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=B7=D1=83=D0=BD=D0=BA=D0=B0=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D0=B5=D1=82=20=D0=B1?= =?UTF-8?q?=D1=83=D0=BA=D0=B2=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ViewPublicationPage/Footer.tsx | 2 +- src/pages/ViewPublicationPage/ResultQuestion.tsx | 0 src/pages/ViewPublicationPage/index.tsx | 7 +------ src/pages/ViewPublicationPage/questions/Number.tsx | 6 +++--- 4 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 src/pages/ViewPublicationPage/ResultQuestion.tsx diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index 7b10a56d..f75bc37b 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -221,7 +221,7 @@ export const Footer = ({ const questionIndex = questions.findIndex(({ id }) => id === question.id); const previousQuestion = questions[questionIndex - 1]; - + followPreviousStep if (previousQuestion) { setCurrentQuestion(previousQuestion); } diff --git a/src/pages/ViewPublicationPage/ResultQuestion.tsx b/src/pages/ViewPublicationPage/ResultQuestion.tsx deleted file mode 100644 index e69de29b..00000000 diff --git a/src/pages/ViewPublicationPage/index.tsx b/src/pages/ViewPublicationPage/index.tsx index a75416b5..3677a5e8 100644 --- a/src/pages/ViewPublicationPage/index.tsx +++ b/src/pages/ViewPublicationPage/index.tsx @@ -1,19 +1,14 @@ import { useEffect, useState } from "react"; -import { Box, Button, ThemeProvider, useTheme } from "@mui/material"; +import { Box, ThemeProvider, useTheme } from "@mui/material"; import { StartPageViewPublication } from "./StartPageViewPublication"; import { Question } from "./Question"; -import { useQuestions } from "@root/questions/hooks"; import { useCurrentQuiz } from "@root/quizes/hooks"; -import useSWR from "swr"; import { quizApi } from "@api/quiz"; import { setQuizes, updateQuiz } from "@root/quizes/actions"; -import { isAxiosError } from "axios"; -import { devlog } from "@frontend/kitui"; import { useQuizStore } from "@root/quizes/store"; import type { AnyTypedQuizQuestion } from "../../model/questionTypes/shared"; -import { enqueueSnackbar } from "notistack"; import { useQuestionsStore } from "@root/questions/store"; import { setQuestions } from "@root/questions/actions"; import { questionApi } from "@api/question"; diff --git a/src/pages/ViewPublicationPage/questions/Number.tsx b/src/pages/ViewPublicationPage/questions/Number.tsx index 54875ddd..7047bb3f 100644 --- a/src/pages/ViewPublicationPage/questions/Number.tsx +++ b/src/pages/ViewPublicationPage/questions/Number.tsx @@ -122,7 +122,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { onChange={({ target }) => { updateAnswer( currentQuestion.content.id, - window.Number(target.value) > max + window.Number(target.value.replace (/\D/, '')) > max ? String(max) : window.Number(target.value) < min ? String(min) @@ -155,7 +155,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { placeholder="0" value={minRange} onChange={({ target }) => { - setMinRange(target.value); + setMinRange(target.value.replace (/\D/, '')); if (window.Number(target.value) >= window.Number(maxRange)) { updateMinRangeDebounced(`${maxRange}—${maxRange}`, true); @@ -181,7 +181,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { placeholder="0" value={maxRange} onChange={({ target }) => { - setMaxRange(target.value); + setMaxRange(target.value.replace (/\D/, '')); if (window.Number(target.value) <= window.Number(minRange)) { updateMaxRangeDebounced(`${minRange}—${minRange}`, true); From 8bfe78550474ad900af467dde7d4204aa0e2af4a Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jan 2024 22:43:58 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=20=20=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=BA=D0=B2=D0=B8=D0=B7=D1=8B=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=B4=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B5=20=D0=BC=D0=B5=D0=B9=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Questions/QuestionsPage.tsx | 7 +++++++ src/pages/ResultPage/ResultSettings.tsx | 19 ++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx index df99635e..10056da3 100755 --- a/src/pages/Questions/QuestionsPage.tsx +++ b/src/pages/Questions/QuestionsPage.tsx @@ -10,6 +10,7 @@ import { import { collapseAllQuestions, createUntypedQuestion, + setQuestions, } from "@root/questions/actions"; import { decrementCurrentStep, @@ -25,6 +26,8 @@ import { QuestionSwitchWindowTool } from "./QuestionSwitchWindowTool"; import { useQuestionsStore } from "@root/questions/store"; import { updateEditSomeQuestion } from "@root/uiTools/actions"; import { useUiTools } from "@root/uiTools/store"; +import { questionApi } from "@api/question"; +import { useNavigate } from "react-router-dom"; interface Props { openBranchingPage: boolean; @@ -39,6 +42,8 @@ export default function QuestionsPage({ const { openedModalSettingsId } = useUiTools(); const isMobile = useMediaQuery(theme.breakpoints.down(660)); const quiz = useCurrentQuiz(); + const navigate = useNavigate() + const { questions } = useQuestionsStore(); useLayoutEffect(() => { updateEditSomeQuestion(); }, []); @@ -46,6 +51,8 @@ export default function QuestionsPage({ const ref = useRef(); if (!quiz) return null; + + return ( <> { const { questions } = useQuestionsStore(); const quiz = useCurrentQuiz(); + const navigate = useNavigate() const results = useQuestionsStore().questions.filter( (q): q is QuizQuestionResult => q.type === "result", ); @@ -56,20 +59,6 @@ export const ResultSettings = () => { [results], ); - useEffect(() => { - //Всегда должен существовать хоть 1 резулт - "line" - if ( - !questions?.find( (q) => (q.type === "result" && q.content.rule.parentId === "line")) - ) { - createResult(quiz?.backendId, "line"); - console.log("Я не нашёл линейный резулт и собираюсь создать новый"); - } - return () => { - if (!isReadyToLeaveRef.current && window.location.pathname !== "/edit") { - setOpenNotificationModal(true); - } - }; - }, []); const cnsl = results.filter((q) => q.content.usage);