From 14efa160f13106d9e5d4ca45f7d145c925773277 Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Sat, 9 Dec 2023 22:10:27 -0300
Subject: [PATCH] Fixed node name not changing on Share modal

---
 src/frontend/src/CustomNodes/GenericNode/index.tsx    | 11 +++++------
 src/frontend/src/modals/shareModal/index.tsx          | 10 +++-------
 .../components/nodeToolbarComponent/index.tsx         | 10 +++++++++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 5c4fc741f..032349cfd 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -174,6 +174,7 @@ export default function GenericNode({
                           if (nodeName.trim() !== "") {
                             setNodeName(nodeName);
                             data.node!.display_name = nodeName;
+                            updateNodeInternals(data.id);
                           } else {
                             setNodeName(data.node!.display_name);
                           }
@@ -376,12 +377,9 @@ export default function GenericNode({
                   autoFocus
                   onBlur={() => {
                     setInputDescription(false);
-                    if (nodeDescription.trim() !== "") {
-                      setNodeDescription(nodeDescription);
-                      data.node!.description = nodeDescription;
-                    } else {
-                      setNodeDescription(data.node!.description);
-                    }
+                    setNodeDescription(nodeDescription);
+                    data.node!.description = nodeDescription;
+                    updateNodeInternals(data.id);
                   }}
                   value={nodeDescription}
                   onChange={(e) => setNodeDescription(e.target.value)}
@@ -396,6 +394,7 @@ export default function GenericNode({
                       setInputDescription(false);
                       setNodeDescription(nodeDescription);
                       data.node!.description = nodeDescription;
+                      updateNodeInternals(data.id);
                     }
                   }}
                 />
diff --git a/src/frontend/src/modals/shareModal/index.tsx b/src/frontend/src/modals/shareModal/index.tsx
index b5d25efa9..a6941c618 100644
--- a/src/frontend/src/modals/shareModal/index.tsx
+++ b/src/frontend/src/modals/shareModal/index.tsx
@@ -44,8 +44,6 @@ export default function ShareModal({
   const { setSuccessData, setErrorData } = useContext(alertContext);
   const { reactFlowInstance } = useContext(typesContext);
   const [checked, setChecked] = useState(false);
-  const [name, setName] = useState(component?.name ?? "");
-  const [description, setDescription] = useState(component?.description ?? "");
   const [internalOpen, internalSetOpen] = useState(children ? false : true);
   const [openConfirmationModal, setOpenConfirmationModal] = useState(false);
   const nameComponent = is_component ? "component" : "flow";
@@ -61,6 +59,9 @@ export default function ShareModal({
 
   const [loadingNames, setLoadingNames] = useState(false);
 
+  const name = component?.name ?? "";
+  const description = component?.description ?? "";
+
   useEffect(() => {
     if (open || internalOpen) {
       if (hasApiKey && hasStore) {
@@ -94,11 +95,6 @@ export default function ShareModal({
     });
   }
 
-  useEffect(() => {
-    setName(component?.name ?? "");
-    setDescription(component?.description ?? "");
-  }, [component, open, internalOpen]);
-
   const handleShareComponent = async (update = false) => {
     //remove file names from flows before sharing
     removeFileNameFromComponents(component);
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index dc01727ef..e6024e46f 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -77,7 +77,15 @@ export default function NodeToolbarComponent({
 
   useEffect(() => {
     setFlowComponent(createFlowComponent(cloneDeep(data), version));
-  }, [data, data.node, showModalAdvanced]);
+  }, [
+    data,
+    data.node,
+    data.node?.display_name,
+    data.node?.description,
+    data.node?.template,
+    showModalAdvanced,
+    showconfirmShare,
+  ]);
 
   const handleSelectChange = (event) => {
     switch (event) {