From a7187ff723c63112b2d3f97d8129dad6b16b1df5 Mon Sep 17 00:00:00 2001
From: igorrCarvalho <igorsilvabhz6@gmail.com>
Date: Sat, 8 Jun 2024 20:17:53 -0300
Subject: [PATCH] Fix: using space in shortcuts table break the app

---
 .../components/nodeToolbarComponent/index.tsx | 12 +++++-----
 .../EditShortcutButton/index.tsx              |  7 ++++--
 .../pages/ShortcutsPage/index.tsx             | 24 ++++++++++---------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 100565583..c183112c6 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -46,8 +46,8 @@ export default function NodeToolbarComponent({
   setShowState,
   onCloseAdvancedModal,
   isOutdated,
-  openWDoubleClick,
-  setOpenWDoubleClick,
+  //  openWDoubleClick,
+  //  setOpenWDoubleClick,
 }: nodeToolbarPropsType): JSX.Element {
   const nodeLength = Object.keys(data.node!.template).filter(
     (templateField) =>
@@ -206,9 +206,9 @@ export default function NodeToolbarComponent({
     createFlowComponent(cloneDeep(data), version),
   );
 
-  useEffect(() => {
-    if (openWDoubleClick) setShowModalAdvanced(true);
-  }, [openWDoubleClick, setOpenWDoubleClick]);
+  //  useEffect(() => {
+  //    if (openWDoubleClick) setShowModalAdvanced(true);
+  //  }, [openWDoubleClick, setOpenWDoubleClick]);
 
   const openInNewTab = (url) => {
     window.open(url, "_blank", "noreferrer");
@@ -697,7 +697,7 @@ export default function NodeToolbarComponent({
           </ConfirmationModal>
           {showModalAdvanced && (
             <EditNodeModal
-              setOpenWDoubleClick={setOpenWDoubleClick}
+              //              setOpenWDoubleClick={setOpenWDoubleClick}
               data={data}
               nodeLength={nodeLength}
               open={showModalAdvanced}
diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx
index 42287457e..3ed84195d 100644
--- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/EditShortcutButton/index.tsx
@@ -40,8 +40,6 @@ export default function EditShortcutButton({
   const unavaliableShortcuts = useShortcutsStore(
     (state) => state.unavailableShortcuts,
   );
-  const a = useShortcutsStore((state) => state.advanced);
-  console.log(a);
   const setErrorData = useAlertStore((state) => state.setErrorData);
 
   function canEditCombination(newCombination: string): boolean {
@@ -138,6 +136,11 @@ export default function EditShortcutButton({
       if (e.key?.toLowerCase() === "meta") {
         fixedKey = "Cmd";
       }
+      if (e.key?.toLowerCase() === " ") {
+        fixedKey = "Space";
+      }
+      if (shortcutInitialValue?.toUpperCase().includes(fixedKey.toUpperCase()))
+        return;
       setKey((oldKey) =>
         getFixedCombination({ oldKey: oldKey!, key: fixedKey }),
       );
diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
index d22b7d41b..d26c13c18 100644
--- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
@@ -68,17 +68,19 @@ export default function ShortcutsPage() {
         <div>
           <div className="align-end mb-4 flex w-full justify-end">
             <div className="justify center flex items-center">
-              <EditShortcutButton
-                disable={selectedRows.length === 0}
-                defaultCombination={combinationToEdit[0]?.shortcut}
-                shortcut={selectedRows}
-                defaultShortcuts={shortcuts}
-                open={open}
-                setOpen={setOpen}
-                setSelected={setSelectedRows}
-              >
-                <div style={{ display: "none" }} />
-              </EditShortcutButton>
+              {open && (
+                <EditShortcutButton
+                  disable={selectedRows.length === 0}
+                  defaultCombination={combinationToEdit[0]?.shortcut}
+                  shortcut={selectedRows}
+                  defaultShortcuts={shortcuts}
+                  open={open}
+                  setOpen={setOpen}
+                  setSelected={setSelectedRows}
+                >
+                  <div style={{ display: "none" }} />
+                </EditShortcutButton>
+              )}
               <Button
                 variant="primary"
                 className="ml-3"