From 47808b382bbf464b421fab9ca05e428bae45a374 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sat, 16 Dec 2023 08:04:51 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BA=D0=BE=D0=B2=200=20-=20=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=82,=20?=
 =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B2=20=D0=A4=D0=9A?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/model/quizSettings.ts                     |  4 ++++
 src/pages/ContactFormPage/ContactFormPage.tsx | 22 ++++++++++++++++---
 .../NewField/SwitchNewField.tsx               |  1 +
 .../NewField/WindowNewField.tsx               |  7 +-----
 .../Questions/BranchingMap/CsComponent.tsx    |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/model/quizSettings.ts b/src/model/quizSettings.ts
index d99cdd46..d11d871e 100644
--- a/src/model/quizSettings.ts
+++ b/src/model/quizSettings.ts
@@ -59,6 +59,8 @@ export interface QuizConfig {
         };
     };
     formContact: {
+        title: string;
+        desc: string;
         name: FCField;
         email: FCField;
         phone: FCField;
@@ -123,6 +125,8 @@ export const defaultQuizConfig: QuizConfig = {
         law: "",
     },
     formContact: {
+        title: "",
+        desc: "",
         name: {
             text: "",
             innerText: "",
diff --git a/src/pages/ContactFormPage/ContactFormPage.tsx b/src/pages/ContactFormPage/ContactFormPage.tsx
index e6cac120..382bd023 100644
--- a/src/pages/ContactFormPage/ContactFormPage.tsx
+++ b/src/pages/ContactFormPage/ContactFormPage.tsx
@@ -115,8 +115,8 @@ export default function ContactFormPage() {
       <Box sx={{ display: "flex", justifyContent: "space-between", maxWidth: "796px" }}>
         <Box sx={{ display: "flex", gap: "8px" }}>
           <Button
-          onClick={decrementCurrentStep}
-          variant="outlined">
+            onClick={decrementCurrentStep}
+            variant="outlined">
             <ArrowLeft />
           </Button>
           <Button variant="contained" sx={{ padding: "10px 20px" }} onClick={incrementCurrentStep}>
@@ -142,6 +142,7 @@ interface Props {
 function ContactFormParent({ outerContainerSx: sx, children }: Props) {
   const theme = useTheme();
   const isTablet = useMediaQuery(theme.breakpoints.down(1000))
+  const quiz = useCurrentQuiz()
   return (
     <Paper
       sx={{
@@ -164,8 +165,22 @@ function ContactFormParent({ outerContainerSx: sx, children }: Props) {
             gap: "20px",
           }}
         >
-          <CustomTextField placeholder="Заголовок формы" text={""} />
+          <CustomTextField
+            onChange={({ target }) => {
+              updateQuiz(quiz.id, (quiz) => {
+                quiz.config.formContact.title = target.value
+              })
+            }}
+            value={quiz.config.formContact.title}
+            placeholder="Заголовок формы" text={""} />
           <TextField
+
+            onChange={({ target }) => {
+              updateQuiz(quiz.id, (quiz) => {
+                quiz.config.formContact.desc = target.value
+              })
+            }}
+            value={quiz.config.formContact.desc}
             id="outlined-multiline-static"
             multiline
             rows={8}
@@ -177,6 +192,7 @@ function ContactFormParent({ outerContainerSx: sx, children }: Props) {
                 borderRadius: "10px",
                 alignItems: "start",
                 color: theme.palette.grey2.main,
+              color:"black",
               },
             }}
           />
diff --git a/src/pages/ContactFormPage/NewField/SwitchNewField.tsx b/src/pages/ContactFormPage/NewField/SwitchNewField.tsx
index 2a962539..139add09 100644
--- a/src/pages/ContactFormPage/NewField/SwitchNewField.tsx
+++ b/src/pages/ContactFormPage/NewField/SwitchNewField.tsx
@@ -14,6 +14,7 @@ interface Props {
 
 export default function SwitchNewField({switchState ='name', drawerNewFieldHC}: Props) {
     const [SwitchMask, setSwitchMask] = React.useState(false);
+    console.log(switchState)
     const SwitchMaskHC = (bool:boolean) => {
         setSwitchMask(bool)
     }
diff --git a/src/pages/ContactFormPage/NewField/WindowNewField.tsx b/src/pages/ContactFormPage/NewField/WindowNewField.tsx
index 980cdbda..a7c69458 100644
--- a/src/pages/ContactFormPage/NewField/WindowNewField.tsx
+++ b/src/pages/ContactFormPage/NewField/WindowNewField.tsx
@@ -14,10 +14,7 @@ export default function WindowNewField({ type, drawerNewFieldHC }: { type: strin
     const [switchState, setSwitchState] = React.useState("");
     React.useEffect(() => {
         for (let val in quiz?.config.formContact) {
-            console.log(quiz?.config.formContact)
-            console.log(quiz?.config.formContact[val])
-            console.log(quiz?.config.formContact[val].used)
-            if (!quiz?.config.formContact[val].used) {
+            if (!quiz?.config.formContact[val]?.used && (val !== "title" && val !== "desc" && val !== "button")) {
                 setSwitchState(val)
                 return
             }
@@ -28,8 +25,6 @@ export default function WindowNewField({ type, drawerNewFieldHC }: { type: strin
         setSwitchState(data)
     }
 
-    console.log(switchState)
-
     return (
         <>
             <Box sx={{ padding: '10px 10px 10px 20px', display: 'flex', justifyContent: 'space-between', alignItems: 'center', background: theme.palette.background.default }}>
diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx
index 46705cd0..3df6a30e 100644
--- a/src/pages/Questions/BranchingMap/CsComponent.tsx
+++ b/src/pages/Questions/BranchingMap/CsComponent.tsx
@@ -274,7 +274,7 @@ console.log('AN2', parentNodeContentId,parentNodeChildren,targetQuestion)
 
       const parentQuestionContentId = cy?.$('edge[target = "' + targetNodeContentId + '"]')?.toArray()?.[0]?.data()?.source
       if (targetNodeContentId && parentQuestionContentId) {
-if (cy?.edges(`[source="${parentQuestionContentId}"]`).length <= 1)
+if (cy?.edges(`[source="${parentQuestionContentId}"]`).length === 0)
       createFrontResult(quiz.backendId, parentQuestionContentId)
         clearDataAfterRemoveNode({ targetQuestionContentId: targetNodeContentId, parentQuestionContentId })
         cy?.remove(cy?.$('#' + targetNodeContentId)).layout(lyopts).run()