From a4179a46f4d3d1eecfff6af99ae86a1768dee33a Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 17 Jul 2024 01:02:56 +0300 Subject: [PATCH 1/2] v1.0.53 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index db3f0d1..af1aefe 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@frontend/squzanswerer", - "version": "1.0.51", + "version": "1.0.53", "type": "module", "main": "./dist-package/index.js", "module": "./dist-package/index.js", From 7a10673d8a41c7b7e92437f6ac05768040f75d34 Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 17 Jul 2024 03:08:20 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A1=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0?= =?UTF-8?q?=20=D0=B0=D0=BD=D0=B0=D0=BB=D0=B8=D0=B7=D0=B8=D1=80=D1=83=D0=B5?= =?UTF-8?q?=D1=82=20=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BB=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=20=D0=B8=D0=BB=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/api/hooks.ts | 4 ++-- lib/components/QuizAnswerer.tsx | 6 +++--- lib/components/ViewPublicationPage/ApologyPage.tsx | 1 + lib/components/ViewPublicationPage/ViewPublicationPage.tsx | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/api/hooks.ts b/lib/api/hooks.ts index 633b773..e54c8c1 100644 --- a/lib/api/hooks.ts +++ b/lib/api/hooks.ts @@ -1,8 +1,8 @@ import useSWR from "swr"; import { getQuizData } from "./quizRelase"; -export function useQuizData(quizId: string) { - return useSWR(["quizData", quizId], (params) => getQuizData(params[1]), { +export function useQuizData(quizId: string, preview: boolean = false) { + return useSWR(preview ? null : ["quizData", quizId], (params) => getQuizData(params[1]), { revalidateOnFocus: false, revalidateOnReconnect: false, shouldRetryOnError: false, diff --git a/lib/components/QuizAnswerer.tsx b/lib/components/QuizAnswerer.tsx index d632a8b..4328b76 100644 --- a/lib/components/QuizAnswerer.tsx +++ b/lib/components/QuizAnswerer.tsx @@ -43,7 +43,7 @@ function QuizAnswererInner({ const [quizViewStore] = useState(createQuizViewStore); const [rootContainerWidth, setRootContainerWidth] = useState(() => window.innerWidth); const rootContainerRef = useRef(null); - const { data, error, isLoading } = useQuizData(quizId); + const { data, error, isLoading } = useQuizData(quizId, preview); const vkMetrics = useVkMetricsGoals(quizSettings?.settings.cfg.vkMetricsNumber); const yandexMetrics = useYandexMetricsGoals(quizSettings?.settings.cfg.yandexMetricsNumber); @@ -74,10 +74,10 @@ function QuizAnswererInner({ if (isLoading) return ; if (error) return ; - if (!data) return ; + // if (!data) return ; quizSettings ??= data; - if (!quizSettings) throw new Error("Quiz data is null"); + if (!quizSettings) return ; if (quizSettings.questions.length === 0) return ; if (!quizId) return ; diff --git a/lib/components/ViewPublicationPage/ApologyPage.tsx b/lib/components/ViewPublicationPage/ApologyPage.tsx index a7c3e6b..8633053 100644 --- a/lib/components/ViewPublicationPage/ApologyPage.tsx +++ b/lib/components/ViewPublicationPage/ApologyPage.tsx @@ -10,6 +10,7 @@ export const ApologyPage = ({ error }: Props) => { if (error.message === "No questions found") message = "Нет созданных вопросов"; if (error.message === "Quiz already completed") message = "Вы уже прошли этот опрос"; if (error.message === "No quiz id") message = "Отсутствует id квиза"; + if (error.message === "Quiz data is null") message = "Не были переданы параметры квиза"; if (error.response?.data === "Invalid request data") message = "Такого квиза не существует"; return ( diff --git a/lib/components/ViewPublicationPage/ViewPublicationPage.tsx b/lib/components/ViewPublicationPage/ViewPublicationPage.tsx index b4c22cd..8bf9e27 100644 --- a/lib/components/ViewPublicationPage/ViewPublicationPage.tsx +++ b/lib/components/ViewPublicationPage/ViewPublicationPage.tsx @@ -34,8 +34,8 @@ export default function ViewPublicationPage() { showResultAfterContactForm, setQuestion, } = useQuestionFlowControl(); - useYandexMetrics(settings?.cfg?.yandexMetricsNumber); - useVKMetrics(settings?.cfg?.vkMetricsNumber); + // useYandexMetrics(settings?.cfg?.yandexMetricsNumber); + // useVKMetrics(settings?.cfg?.vkMetricsNumber); useEffect( function setFaviconAndTitle() {