From c19e4c684e8478b05378220cd3548362947a5996 Mon Sep 17 00:00:00 2001
From: IDONTSUDO <idontsudo@gmail.com>
Date: Sat, 5 Oct 2024 12:59:11 +0300
Subject: [PATCH] fixed form builder object bug

---
 p.json                                                   | 1 +
 ui/src/core/ui/form_builder/form_view_model.ts           | 8 ++++++--
 .../presentation/calculation_instance_screen.tsx         | 9 +++++----
 ui/src/features/dataset/dataset_model.tsx                | 1 -
 ui/src/features/digital_twins/digital_twins_screen.tsx   | 2 +-
 ui/src/index.tsx                                         | 4 ++++
 6 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 p.json

diff --git a/p.json b/p.json
new file mode 100644
index 0000000..8ba6c88
--- /dev/null
+++ b/p.json
@@ -0,0 +1 @@
+{"name": "default","collision_shape": "BOX","loc_xyz": [0, 0, 0],"rot_euler": [0,0, 0],"material_randomization": {   "specular": [0, 1],    "roughness": [0, 1],    "metallic": [0, 1],    "base_color": [        [            0,            0,            0,            1        ],        [            1,            1,            1,            1        ]    ]}}
diff --git a/ui/src/core/ui/form_builder/form_view_model.ts b/ui/src/core/ui/form_builder/form_view_model.ts
index 1c6e6f2..1f4f045 100644
--- a/ui/src/core/ui/form_builder/form_view_model.ts
+++ b/ui/src/core/ui/form_builder/form_view_model.ts
@@ -2,7 +2,7 @@ import { makeAutoObservable, observable } from "mobx";
 import { Result } from "../../helper/result";
 import { v4 as uuidv4 } from "uuid";
 import { FormBuilderValidationModel } from "../../model/form_builder_validation_model";
- 
+
 export enum InputType {
   NUMBER = "number",
   STRING = "string",
@@ -158,7 +158,11 @@ export class FormViewModel {
           }
         }
       }
-      if (inputResult instanceof Array) inputResult = JSON.stringify(inputResult.map((el) => JSON.parse(el)));
+
+      // if(inputResult instanceof Array) console.log(inputResult.map((el) => JSON.parse(el)))
+
+      if (inputResult instanceof Array)
+        inputResult = JSON.stringify(inputResult.map((el) => JSON.parse(el.replace(/[^\x00-\x7F]/g, ""))));
       operations.push({ regExp: new RegExp("\\${" + element.name + ".*?}"), result: inputResult });
     });
 
diff --git a/ui/src/features/calculation_instance/presentation/calculation_instance_screen.tsx b/ui/src/features/calculation_instance/presentation/calculation_instance_screen.tsx
index edbb757..57b5ad4 100644
--- a/ui/src/features/calculation_instance/presentation/calculation_instance_screen.tsx
+++ b/ui/src/features/calculation_instance/presentation/calculation_instance_screen.tsx
@@ -15,6 +15,7 @@ import { TemplateModelCard } from "./ui/template_model_card";
 import { Icon } from "../../../core/ui/icons/icons";
  import { useStore } from "../../../core/helper/use_store";
 import { FormBuilderValidationModel } from "../../../core/model/form_builder_validation_model";
+import { InputV2 } from "../../../core/ui/input/input_v2";
 
 interface IItem {
   name: string;
@@ -144,15 +145,15 @@ export const CalculationInstanceScreen = observer(() => {
                   />
                   <CoreInput label="Имя" onChange={(text) => store.updateForm({ name: text })} />
                   <CoreInput label="Команда для запуска" onChange={(text) => store.updateForm({ script: text })} />
-                  <CoreInput
+                  <InputV2
                     label="FormBuilder Result"
                     onChange={(text) => (store.viewModel.formBuilder.result = text)}
-                    style={{ height: 200, overflow: "overlay" }}
+                    // style={{ height: 200, overflow: "overlay" }}
                   />
-                  <CoreInput
+                  <InputV2
                     label="FormBuilder Context"
                     onChange={(text) => (store.viewModel.formBuilder.context = text)}
-                    style={{ height: 200, overflow: "overlay" }}
+                    // style={{ height: 200, overflow: "overlay" }}
                   />
                   <div style={{ height: 10 }} />
                   <CoreButton
diff --git a/ui/src/features/dataset/dataset_model.tsx b/ui/src/features/dataset/dataset_model.tsx
index f3544f4..f80e9af 100644
--- a/ui/src/features/dataset/dataset_model.tsx
+++ b/ui/src/features/dataset/dataset_model.tsx
@@ -96,7 +96,6 @@ export const datasetFormMockResult = `
     "loc_range_low":  [\${LOC_RANGE_LOW_1:number:-1}, \${LOC_RANGE_LOW_2:number:-1},\${LOC_RANGE_LOW_3:number:0}],
     "loc_range_high": [\${LOC_RANGE_HIGH_1:number:1}, \${LOC_RANGE_HIGH_2:number:1},\${LOC_RANGE_HIGH_3:number:2}]
   },
-  "selectParts":\${<SelectScene/>:OBJECT:{"details": []},
   "scene":{
     "objects": \${OBJECTS_SCENE:Array<OBJECTS_SCENE>:[]},
     "lights": \${LIGHTS:Array<LIGHTS>:[]}
diff --git a/ui/src/features/digital_twins/digital_twins_screen.tsx b/ui/src/features/digital_twins/digital_twins_screen.tsx
index cea035b..a0bfbba 100644
--- a/ui/src/features/digital_twins/digital_twins_screen.tsx
+++ b/ui/src/features/digital_twins/digital_twins_screen.tsx
@@ -29,7 +29,7 @@ export const DigitalTwinsScreen = observer(() => {
           onClick={() => store.editDrawer(DrawersDigitalTwin.newInstanceTwinTemplate, true)}
         />
       </div>
-
+      <div>{store.digitalTwinsInstances?.map((el) => <>{el.name}</>)}</div>
       <Drawer
         width={(window.innerWidth / 100) * 50}
         title={store.titleDrawer}
diff --git a/ui/src/index.tsx b/ui/src/index.tsx
index a8d3fea..46f2dda 100644
--- a/ui/src/index.tsx
+++ b/ui/src/index.tsx
@@ -7,6 +7,8 @@ import { RouterProvider } from "react-router-dom";
 import { router } from "./core/routers/routers";
 import { configure } from "mobx";
 import { ThemeStore } from "./core/store/theme_store";
+import { FormBuilder } from "./core/ui/form_builder/form_builder";
+import { FormBuilderValidationModel } from "./core/model/form_builder_validation_model";
 
 configure({
   enforceActions: "never",
@@ -21,6 +23,8 @@ root.render(
   <>
     <SocketListener>
       <RouterProvider router={router} />
+
+ 
     </SocketListener>
   </>
 );