From 19be2e81780d70ff32dceb29596b68d0770b5eb9 Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Thu, 22 Jun 2023 18:21:41 -0300 Subject: [PATCH] refactor(parameterComponent): change setTemplate to setNodeClass to improve semantics and fix bug refactor(codeAreaComponent): change template to nodeClass and setTemplate to setNodeClass to improve semantics refactor(API): change UpdateTemplate function parameter from template to nodeClass to improve semantics refactor(codeAreaModal): change template to nodeClass and setTemplate to setNodeClass to improve semantics and fix bug refactor(types): add APIClassType to import and change APITemplateType to import in relevant files to improve semantics --- .../components/parameterComponent/index.tsx | 4 ++-- .../src/components/codeAreaComponent/index.tsx | 12 ++++++------ src/frontend/src/controllers/API/index.ts | 3 ++- .../src/modals/codeAreaModal/index.tsx | 18 +++++++++--------- src/frontend/src/types/components/index.ts | 6 +++--- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index c35fd869b..915ab41ae 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -227,8 +227,8 @@ export default function ParameterComponent({ ) : left === true && type === "code" ? ( {data.node.template = template}} - template={data.node.template} + setNodeClass={(nodeClass)=>{data.node = nodeClass}} + nodeClass={data.node} disabled={disabled} value={data.node.template[name].value ?? ""} onChange={handleOnNewValue} diff --git a/src/frontend/src/components/codeAreaComponent/index.tsx b/src/frontend/src/components/codeAreaComponent/index.tsx index a4b7231c8..14e444ccc 100644 --- a/src/frontend/src/components/codeAreaComponent/index.tsx +++ b/src/frontend/src/components/codeAreaComponent/index.tsx @@ -11,8 +11,8 @@ export default function CodeAreaComponent({ onChange, disabled, editNode = false, - template, - setTemplate, + nodeClass, + setNodeClass, }: CodeAreaComponentType) { const [myValue, setMyValue] = useState(value); const { openPopUp } = useContext(PopUpContext); @@ -39,8 +39,8 @@ export default function CodeAreaComponent({ openPopUp( { setMyValue(t); onChange(t); @@ -63,9 +63,9 @@ export default function CodeAreaComponent({ onClick={() => { openPopUp( { setMyValue(t); onChange(t); diff --git a/src/frontend/src/controllers/API/index.ts b/src/frontend/src/controllers/API/index.ts index 60820bb7e..c7a8ee776 100644 --- a/src/frontend/src/controllers/API/index.ts +++ b/src/frontend/src/controllers/API/index.ts @@ -5,6 +5,7 @@ import { InitTypeAPI, TemplateVariableType, APITemplateType, + APIClassType, } from "./../../types/api/index"; import { APIObjectType, sendAllProps } from "../../types/api/index"; import axios, { AxiosResponse } from "axios"; @@ -322,6 +323,6 @@ export async function postBuildInit( return await axios.post(`/api/v1/build/init`, flow); } -export async function UpdateTemplate(type:string, template:APITemplateType):Promise>{ +export async function UpdateTemplate(type:string, nodeClass:APIClassType):Promise>{ return await axios.get(`/dynamic_node`); } \ No newline at end of file diff --git a/src/frontend/src/modals/codeAreaModal/index.tsx b/src/frontend/src/modals/codeAreaModal/index.tsx index 451946b0e..6448702a7 100644 --- a/src/frontend/src/modals/codeAreaModal/index.tsx +++ b/src/frontend/src/modals/codeAreaModal/index.tsx @@ -23,18 +23,18 @@ import { import { Button } from "../../components/ui/button"; import { CODE_PROMPT_DIALOG_SUBTITLE } from "../../constants"; import Loading from "../../components/ui/loading"; -import { APITemplateType } from "../../types/api"; +import { APIClassType, APITemplateType } from "../../types/api"; export default function CodeAreaModal({ value, setValue, - template, - setTemplate + nodeClass, + setNodeClass }: { setValue: (value: string) => void; value: string; - template: APITemplateType, - setTemplate: (template: APITemplateType) => void; + nodeClass: APIClassType, + setNodeClass: (Class: APIClassType) => void; }) { const [open, setOpen] = useState(true); const [code, setCode] = useState(value); @@ -93,11 +93,11 @@ export default function CodeAreaModal({ }) } ); - UpdateTemplate('code',template).then((apiReturn) => { + UpdateTemplate('code',nodeClass).then((apiReturn) => { const data = apiReturn.data; - if (data.template) { - console.log('updated') - setTemplate(data.template); + if (data) { + console.log(data) + setNodeClass(data); setModalOpen(false); } }) diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index 5b31d63f1..845b853c8 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -1,7 +1,7 @@ import { ForwardRefExoticComponent, ReactElement, ReactNode } from "react"; import { NodeDataType } from "../flow/index"; import { typesContextType } from "../typesContext"; -import { APITemplateType } from "../api"; +import { APIClassType, APITemplateType } from "../api"; export type InputComponentType = { value: string; disabled?: boolean; @@ -56,8 +56,8 @@ export type CodeAreaComponentType = { onChange: (value: string[] | string) => void; value: string; editNode?: boolean; - template: APITemplateType; - setTemplate: (value: APITemplateType) => void; + nodeClass: APIClassType; + setNodeClass: (value: APIClassType) => void; }; export type FileComponentType = {