From f6ff9f702f916f1f8251d866002e771e12e1e7b6 Mon Sep 17 00:00:00 2001
From: igorrCarvalho <igorsilvabhz6@gmail.com>
Date: Tue, 5 Mar 2024 17:01:42 -0300
Subject: [PATCH] Fix: Refactor save node shortcut to avoid override modal
 opening when it shouldnt

---
 .../components/nodeToolbarComponent/index.tsx | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 5eabcc905..35f2dd57d 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -211,7 +211,7 @@ export default function NodeToolbarComponent({
 
   const [openModal, setOpenModal] = useState(false);
   const hasCode = Object.keys(data.node!.template).includes("code");
-
+  
   useEffect(() => {
     function onKeyDown(event: KeyboardEvent) {
       if (
@@ -273,22 +273,17 @@ export default function NodeToolbarComponent({
       if (
         selected &&
         (event.ctrlKey || event.metaKey) &&
-        event.key === "s" &&
-        isSaved
+        event.key === "s"
       ) {
-        event.preventDefault();
-        return setShowOverrideModal((state) => !state);
-      }
-      if (
-        selected &&
-        (event.ctrlKey || event.metaKey) &&
-        event.key === "s" &&
-        hasCode
-      ) {
-        event.preventDefault();
-        saveComponent(cloneDeep(data), false);
-        setSuccessData({title: `${data.id} saved successfully`})
-        unselectAll();
+        if (isSaved) {
+          event.preventDefault();
+          return setShowOverrideModal((state) => !state);
+        }
+        if (hasCode) {
+          event.preventDefault();
+          saveComponent(cloneDeep(data), false);
+          setSuccessData({title: `${data.id} saved successfully`})
+        }
       }
       if (
         selected &&
@@ -307,7 +302,7 @@ export default function NodeToolbarComponent({
     return () => {
       document.removeEventListener("keydown", onKeyDown);
     };
-  }, []);
+  }, [isSaved]);
 
   return (
     <>