diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx index fdb734e..899b06c 100644 --- a/lib/components/ViewPublicationPage/ResultForm.tsx +++ b/lib/components/ViewPublicationPage/ResultForm.tsx @@ -77,7 +77,10 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => { }, []); const choiceImgUrlQuestion = useMemo(() => { - if (resultQuestion.content.editedUrlImagesList !== undefined) { + if ( + resultQuestion.content.editedUrlImagesList !== undefined && + resultQuestion.content.editedUrlImagesList !== null + ) { return resultQuestion.content.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return resultQuestion.content.back; diff --git a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx index 2f6fee8..a871e87 100644 --- a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx +++ b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx @@ -123,7 +123,7 @@ export const ImageVariant = ({ }; const choiceImgUrl = useMemo(() => { - if (variant.editedUrlImagesList !== undefined) { + if (variant.editedUrlImagesList !== undefined && variant.editedUrlImagesList !== null) { return variant.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return variant.extendedText; diff --git a/lib/components/ViewPublicationPage/questions/Text/TextNormal.tsx b/lib/components/ViewPublicationPage/questions/Text/TextNormal.tsx index c8c3c2c..73760cb 100644 --- a/lib/components/ViewPublicationPage/questions/Text/TextNormal.tsx +++ b/lib/components/ViewPublicationPage/questions/Text/TextNormal.tsx @@ -28,7 +28,10 @@ export const TextNormal = ({ currentQuestion, answer }: TextNormalProps) => { updateAnswer(currentQuestion.id, target.value, 0); }; const choiceImgUrlQuestion = useMemo(() => { - if (currentQuestion.content.editedUrlImagesList !== undefined) { + if ( + currentQuestion.content.editedUrlImagesList !== undefined && + currentQuestion.content.editedUrlImagesList !== null + ) { return currentQuestion.content.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return currentQuestion.content.back; diff --git a/lib/components/ViewPublicationPage/questions/Variant/index.tsx b/lib/components/ViewPublicationPage/questions/Variant/index.tsx index 53b0a2a..e990c0c 100644 --- a/lib/components/ViewPublicationPage/questions/Variant/index.tsx +++ b/lib/components/ViewPublicationPage/questions/Variant/index.tsx @@ -34,7 +34,10 @@ export const Variant = ({ currentQuestion }: VariantProps) => { }, []); const choiceImgUrlQuestion = useMemo(() => { - if (currentQuestion.content.editedUrlImagesList !== undefined) { + if ( + currentQuestion.content.editedUrlImagesList !== undefined && + currentQuestion.content.editedUrlImagesList !== null + ) { return currentQuestion.content.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return currentQuestion.content.back; diff --git a/lib/components/ViewPublicationPage/questions/Varimg/index.tsx b/lib/components/ViewPublicationPage/questions/Varimg/index.tsx index 03860e6..0a73dc1 100644 --- a/lib/components/ViewPublicationPage/questions/Varimg/index.tsx +++ b/lib/components/ViewPublicationPage/questions/Varimg/index.tsx @@ -38,7 +38,7 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { const choiceImgUrlAnswer = useMemo(() => { if (variant !== undefined) { - if (variant.editedUrlImagesList !== undefined) { + if (variant.editedUrlImagesList !== undefined && variant.editedUrlImagesList !== null) { return variant.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return variant.extendedText; @@ -47,7 +47,10 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { }, [variant]); const choiceImgUrlQuestion = useMemo(() => { - if (currentQuestion.content.editedUrlImagesList !== undefined) { + if ( + currentQuestion.content.editedUrlImagesList !== undefined && + currentQuestion.content.editedUrlImagesList !== null + ) { return currentQuestion.content.editedUrlImagesList[isMobile ? "mobile" : isTablet ? "tablet" : "desktop"]; } else { return currentQuestion.content.back; diff --git a/lib/model/questionTypes/result.ts b/lib/model/questionTypes/result.ts index cb8e4a0..e777b56 100644 --- a/lib/model/questionTypes/result.ts +++ b/lib/model/questionTypes/result.ts @@ -15,7 +15,7 @@ export interface QuizQuestionResult extends QuizQuestionBase { price: [number] | [number, number]; useImage: boolean; rule: ResultQuestionBranchingRule; - editedUrlImagesList: EditedUrlImagesList; + editedUrlImagesList?: EditedUrlImagesList | null; hint: QuestionHint; autofill: boolean; usage: boolean; diff --git a/lib/model/questionTypes/shared.ts b/lib/model/questionTypes/shared.ts index 5ea61e2..c32ebca 100644 --- a/lib/model/questionTypes/shared.ts +++ b/lib/model/questionTypes/shared.ts @@ -54,7 +54,7 @@ export type QuestionVariant = { points?: number; }; export interface QuestionVariantWithEditedImages extends QuestionVariant { - editedUrlImagesList?: EditedUrlImagesList; + editedUrlImagesList?: EditedUrlImagesList | null; } export type QuestionType = diff --git a/lib/model/questionTypes/text.ts b/lib/model/questionTypes/text.ts index 0c57722..abbf660 100644 --- a/lib/model/questionTypes/text.ts +++ b/lib/model/questionTypes/text.ts @@ -14,7 +14,7 @@ export interface QuizQuestionText extends QuizQuestionBase { /** Чекбокс "Автозаполнение адреса" */ autofill: boolean; answerType: "single" | "multi" | "numberOnly"; - editedUrlImagesList: EditedUrlImagesList; + editedUrlImagesList?: EditedUrlImagesList | null; hint: QuestionHint; rule: QuestionBranchingRule; back: string | null; diff --git a/lib/model/questionTypes/variant.ts b/lib/model/questionTypes/variant.ts index 18cd606..c1a57ca 100644 --- a/lib/model/questionTypes/variant.ts +++ b/lib/model/questionTypes/variant.ts @@ -20,7 +20,7 @@ export interface QuizQuestionVariant extends QuizQuestionBase { innerNameCheck: boolean; /** Чекбокс "Необязательный вопрос" */ required: boolean; - editedUrlImagesList: EditedUrlImagesList; + editedUrlImagesList?: EditedUrlImagesList | null; /** Поле "Внутреннее название вопроса" */ innerName: string; /** Варианты ответов */ diff --git a/lib/model/questionTypes/varimg.ts b/lib/model/questionTypes/varimg.ts index 8546d97..4b2e564 100644 --- a/lib/model/questionTypes/varimg.ts +++ b/lib/model/questionTypes/varimg.ts @@ -19,7 +19,7 @@ export interface QuizQuestionVarImg extends QuizQuestionBase { /** Чекбокс "Необязательный вопрос" */ required: boolean; variants: QuestionVariantWithEditedImages[]; - editedUrlImagesList: EditedUrlImagesList; + editedUrlImagesList?: EditedUrlImagesList | null; hint: QuestionHint; rule: QuestionBranchingRule; back: string | null;