From 7d04a98f683efab51d84d3d667a60045c42b157c Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Sat, 6 Jan 2024 14:39:57 -0300
Subject: [PATCH] Fixed button inside button on sidebar

---
 src/frontend/src/contexts/authContext.tsx     |  4 +--
 src/frontend/src/modals/exportModal/index.tsx |  2 +-
 .../extraSidebarComponent/index.tsx           | 36 +++++++++++++------
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/frontend/src/contexts/authContext.tsx b/src/frontend/src/contexts/authContext.tsx
index ee2a0c35c..e00ac93b6 100644
--- a/src/frontend/src/contexts/authContext.tsx
+++ b/src/frontend/src/contexts/authContext.tsx
@@ -34,8 +34,8 @@ export function AuthProvider({ children }): React.ReactElement {
     cookies.get("refresh_tkn_lflw")
   );
   const [isAuthenticated, setIsAuthenticated] = useState<boolean>(
-    cookies.get("refresh_tkn_lflw") && cookies.get("access_tkn_lflw")
-  );
+    !!cookies.get("refresh_tkn_lflw") && !!cookies.get("access_tkn_lflw")
+    );
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
   const [userData, setUserData] = useState<Users | null>(null);
   const [autoLogin, setAutoLogin] = useState<boolean>(false);
diff --git a/src/frontend/src/modals/exportModal/index.tsx b/src/frontend/src/modals/exportModal/index.tsx
index 358f5225c..658e523fb 100644
--- a/src/frontend/src/modals/exportModal/index.tsx
+++ b/src/frontend/src/modals/exportModal/index.tsx
@@ -26,7 +26,7 @@ const ExportModal = forwardRef(
 
     return (
       <BaseModal size="smaller-h-full" open={open} setOpen={setOpen}>
-        <BaseModal.Trigger>{props.children}</BaseModal.Trigger>
+        <BaseModal.Trigger asChild>{props.children}</BaseModal.Trigger>
         <BaseModal.Header description={EXPORT_DIALOG_SUBTITLE}>
           <span className="pr-2">Export</span>
           <IconComponent
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
index 6f53cbd02..4dedd8a1b 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
@@ -1,5 +1,5 @@
 import { cloneDeep } from "lodash";
-import { useContext, useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import ShadTooltip from "../../../../components/ShadTooltipComponent";
 import IconComponent from "../../../../components/genericIconComponent";
 import { Input } from "../../../../components/ui/input";
@@ -9,7 +9,9 @@ import ExportModal from "../../../../modals/exportModal";
 import ShareModal from "../../../../modals/shareModal";
 import useAlertStore from "../../../../stores/alertStore";
 import useFlowStore from "../../../../stores/flowStore";
+import useFlowsManagerStore from "../../../../stores/flowsManagerStore";
 import { useStoreStore } from "../../../../stores/storeStore";
+import { useTypesStore } from "../../../../stores/typesStore";
 import { APIClassType, APIObjectType } from "../../../../types/api";
 import {
   nodeColors,
@@ -23,8 +25,6 @@ import {
 } from "../../../../utils/utils";
 import DisclosureComponent from "../DisclosureComponent";
 import SidebarDraggableComponent from "./sideBarDraggableComponent";
-import { useTypesStore } from "../../../../stores/typesStore";
-import useFlowsManagerStore from "../../../../stores/flowsManagerStore";
 
 export default function ExtraSidebar(): JSX.Element {
   const data = useTypesStore((state) => state.data);
@@ -229,11 +229,9 @@ export default function ExtraSidebar(): JSX.Element {
   const ExportMemo = useMemo(
     () => (
       <ExportModal>
-        <ShadTooltip content="Export" side="top">
-          <button className={classNames("extra-side-bar-buttons")}>
-            <IconComponent name="FileDown" className="side-bar-button-size" />
-          </button>
-        </ShadTooltip>
+        <button className={classNames("extra-side-bar-buttons")}>
+          <IconComponent name="FileDown" className="side-bar-button-size" />
+        </button>
       </ExportModal>
     ),
     []
@@ -274,7 +272,15 @@ export default function ExtraSidebar(): JSX.Element {
             </button>
           </ShadTooltip>
         </div>
-        {(!hasApiKey || !validApiKey) && ExportMemo}
+        {(!hasApiKey || !validApiKey) && (
+          <ShadTooltip
+            content="Export"
+            side="top"
+            styleClasses="cursor-default"
+          >
+            <div className="side-bar-button">{ExportMemo}</div>
+          </ShadTooltip>
+        )}
         <ShadTooltip content={"Code"} side="top">
           <div className="side-bar-button">
             {currentFlow && currentFlow.data && (
@@ -305,7 +311,17 @@ export default function ExtraSidebar(): JSX.Element {
                   (isPending ? "" : "button-disable")
                 }
                 onClick={(event) => {
-                  saveFlow({...currentFlow, data: {nodes, edges, viewport: reactFlowInstance?.getViewport()!} }, true);
+                  saveFlow(
+                    {
+                      ...currentFlow,
+                      data: {
+                        nodes,
+                        edges,
+                        viewport: reactFlowInstance?.getViewport()!,
+                      },
+                    },
+                    true
+                  );
                 }}
               >
                 <IconComponent