From 242d7cdd7248f092818c8b0d55b3ba6e0f2b7d74 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Wed, 27 Sep 2023 23:16:22 -0300 Subject: [PATCH 1/3] Fixed custom node field on PromptTemplate not saving --- src/frontend/src/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts index d6ba802ee..e08218a4d 100644 --- a/src/frontend/src/constants/constants.ts +++ b/src/frontend/src/constants/constants.ts @@ -529,7 +529,7 @@ export const URL_EXCLUDED_FROM_ERROR_RETRIES = [ "http://localhost:7860/login", ]; -export const skipNodeUpdate = ["CustomComponent"]; +export const skipNodeUpdate = ["CustomComponent", "PromptTemplate"]; export const CONTROL_INPUT_STATE = { password: "", From a82925b760b2a7c43d936127a5de3a95717f69f7 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Wed, 27 Sep 2023 23:42:09 -0300 Subject: [PATCH 2/3] Fixed bugs on Prompt modals --- .../src/modals/genericModal/index.tsx | 24 ++++++++++++------- .../components/PageComponent/index.tsx | 2 -- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/frontend/src/modals/genericModal/index.tsx b/src/frontend/src/modals/genericModal/index.tsx index 4a4f80877..e82b40fbb 100644 --- a/src/frontend/src/modals/genericModal/index.tsx +++ b/src/frontend/src/modals/genericModal/index.tsx @@ -33,6 +33,7 @@ export default function GenericModal({ }: genericModalPropsType): JSX.Element { const [myButtonText] = useState(buttonText); const [myModalTitle] = useState(modalTitle); + const [modalOpen, setModalOpen] = useState(false); const [myModalType] = useState(type); const [inputValue, setInputValue] = useState(value); const [isEdit, setIsEdit] = useState(true); @@ -85,7 +86,7 @@ export default function GenericModal({ useEffect(() => { setInputValue(value); - }, [value]); + }, [value, modalOpen]); const coloredContent = (inputValue || "") .replace(/ { if (apiReturn.data) { - setValue(inputValue); - apiReturn.data.frontend_node["template"]["template"]["value"] = - inputValue; - setNodeClass!(apiReturn?.data?.frontend_node); - let inputVariables = apiReturn.data.input_variables ?? []; if (inputVariables && inputVariables.length === 0) { setIsEdit(true); @@ -121,6 +117,15 @@ export default function GenericModal({ title: "Your template does not have any variables.", }); setModalOpen(false); + if ( + JSON.stringify(apiReturn.data?.frontend_node) !== + JSON.stringify({}) + ) + setNodeClass!(apiReturn.data?.frontend_node); + setModalOpen(closeModal); + setValue(inputValue); + apiReturn.data.frontend_node["template"]["template"]["value"] = + inputValue; } else { setIsEdit(false); setSuccessData({ @@ -133,6 +138,8 @@ export default function GenericModal({ setNodeClass!(apiReturn.data?.frontend_node); setModalOpen(closeModal); setValue(inputValue); + apiReturn.data.frontend_node["template"]["template"]["value"] = + inputValue; } } else { setIsEdit(true); @@ -142,16 +149,15 @@ export default function GenericModal({ } }) .catch((error) => { + console.log(error); setIsEdit(true); return setErrorData({ title: "There is something wrong with this prompt, please review it", - list: [error?.response?.data?.detail], + list: [error.toString()], }); }); } - const [modalOpen, setModalOpen] = useState(false); - return ( {}} diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx index a1036de87..c0945e219 100644 --- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx @@ -114,13 +114,11 @@ export default function Page({ } } if (!isWrappedWithClass(event, "nodelete")) { - console.log(event); if ( (event.key === "Delete" || event.key === "Backspace") && lastSelection ) { event.preventDefault(); - console.log(lastSelection); deleteNode(lastSelection.nodes.map((node) => node.id)); } } From 5d0d43184cf21c9ac267a16f304cc72b6c018b77 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Wed, 27 Sep 2023 23:44:28 -0300 Subject: [PATCH 3/3] Fixed formatting --- src/frontend/src/types/components/index.ts | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts index 579e19780..d97c4ef5d 100644 --- a/src/frontend/src/types/components/index.ts +++ b/src/frontend/src/types/components/index.ts @@ -135,18 +135,18 @@ export type TooltipComponentType = { children: ReactElement; title: string | ReactElement; placement?: - | "bottom-end" - | "bottom-start" - | "bottom" - | "left-end" - | "left-start" - | "left" - | "right-end" - | "right-start" - | "right" - | "top-end" - | "top-start" - | "top"; + | "bottom-end" + | "bottom-start" + | "bottom" + | "left-end" + | "left-start" + | "left" + | "right-end" + | "right-start" + | "right" + | "top-end" + | "top-start" + | "top"; }; export type ProgressBarType = {