From c34810b161273e6fac3650b2564494ee9235cced Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Sat, 6 Jan 2024 12:22:30 -0300
Subject: [PATCH] Fixed Confirmation Modal ref

---
 .../src/components/floatComponent/index.tsx   |  2 +-
 .../src/components/intComponent/index.tsx     |  4 ++--
 .../src/modals/ConfirmationModal/index.tsx    | 23 ++++++++++++-------
 src/frontend/src/modals/baseModal/index.tsx   |  1 +
 src/frontend/src/modals/shareModal/index.tsx  |  3 ---
 src/frontend/src/pages/AdminPage/index.tsx    | 18 ++++++---------
 .../components/nodeToolbarComponent/index.tsx |  4 ----
 src/frontend/src/types/components/index.ts    |  9 ++++----
 8 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/frontend/src/components/floatComponent/index.tsx b/src/frontend/src/components/floatComponent/index.tsx
index 9716da83c..a4ebf1ae9 100644
--- a/src/frontend/src/components/floatComponent/index.tsx
+++ b/src/frontend/src/components/floatComponent/index.tsx
@@ -48,7 +48,7 @@ export default function FloatComponent({
           onChange(event.target.value);
         }}
         onKeyDown={(e) => {
-          handleKeyDown(e, value, "0");
+          handleKeyDown(e, value, "");
         }}
       />
     </div>
diff --git a/src/frontend/src/components/intComponent/index.tsx b/src/frontend/src/components/intComponent/index.tsx
index d9d3504ae..25ac37369 100644
--- a/src/frontend/src/components/intComponent/index.tsx
+++ b/src/frontend/src/components/intComponent/index.tsx
@@ -25,11 +25,11 @@ export default function IntComponent({
         id={id}
         onKeyDown={(event) => {
           handleOnlyIntegerInput(event);
-          handleKeyDown(event, value, "0");
+          handleKeyDown(event, value, "");
         }}
         type="number"
         step="1"
-        min={min}
+        min={0}
         onInput={(event: React.ChangeEvent<HTMLInputElement>) => {
           if (Number(event.target.value) < min) {
             event.target.value = min.toString();
diff --git a/src/frontend/src/modals/ConfirmationModal/index.tsx b/src/frontend/src/modals/ConfirmationModal/index.tsx
index 11d711912..e5b8c629f 100644
--- a/src/frontend/src/modals/ConfirmationModal/index.tsx
+++ b/src/frontend/src/modals/ConfirmationModal/index.tsx
@@ -1,29 +1,29 @@
 import React, { useEffect, useState } from "react";
 import ShadTooltip from "../../components/ShadTooltipComponent";
 import { Button } from "../../components/ui/button";
-import { ConfirmationModalType, ContentProps } from "../../types/components";
+import { ConfirmationModalType, ContentProps, TriggerProps } from "../../types/components";
 import { nodeIconsLucide } from "../../utils/styleUtils";
 import BaseModal from "../baseModal";
 
 const Content: React.FC<ContentProps> = ({ children }) => {
   return <div className="h-full w-full">{children}</div>;
 };
-const Trigger: React.FC<ContentProps> = ({
+const Trigger: React.FC<TriggerProps> = ({
   children,
-  tolltipContent,
+  tooltipContent,
   side,
+  asChild,
 }) => {
-  return tolltipContent ? (
-    <ShadTooltip side={side} content={tolltipContent}>
+  return asChild ? children : (tooltipContent ? (
+    <ShadTooltip side={side} content={tooltipContent}>
       <div className="h-full w-full">{children}</div>
     </ShadTooltip>
   ) : (
     <div className="h-full w-full">{children}</div>
-  );
+  ));
 };
 function ConfirmationModal({
   title,
-  asChild,
   titleHeader,
   modalContentTitle,
   cancelText,
@@ -49,6 +49,7 @@ function ConfirmationModal({
   useEffect(() => {
     if (onClose) onClose!(modalOpen);
   }, [modalOpen]);
+
   const triggerChild = React.Children.toArray(children).find(
     (child) => (child as React.ReactElement).type === Trigger
   );
@@ -58,7 +59,13 @@ function ConfirmationModal({
 
   return (
     <BaseModal size={size} open={modalOpen} setOpen={setModalOpen}>
-      <BaseModal.Trigger asChild={asChild}>{triggerChild}</BaseModal.Trigger>
+      <>
+        {triggerChild && (
+          <BaseModal.Trigger>
+            {triggerChild}
+          </BaseModal.Trigger>
+        )}
+      </>
       <BaseModal.Header description={titleHeader ?? null}>
         <span className="pr-2">{title}</span>
         <Icon
diff --git a/src/frontend/src/modals/baseModal/index.tsx b/src/frontend/src/modals/baseModal/index.tsx
index 1ed338183..860551be9 100644
--- a/src/frontend/src/modals/baseModal/index.tsx
+++ b/src/frontend/src/modals/baseModal/index.tsx
@@ -28,6 +28,7 @@ const Trigger: React.FC<TriggerProps> = ({ children, asChild, disable }) => {
     <DialogTrigger
       className={asChild ? "" : "w-full"}
       hidden={children ? false : true}
+      disabled={disable}
       asChild={asChild}
     >
       {children}
diff --git a/src/frontend/src/modals/shareModal/index.tsx b/src/frontend/src/modals/shareModal/index.tsx
index 8a8f864af..438b1247c 100644
--- a/src/frontend/src/modals/shareModal/index.tsx
+++ b/src/frontend/src/modals/shareModal/index.tsx
@@ -182,9 +182,6 @@ export default function ShareModal({
               Warning: This action cannot be undone.
             </span>
           </ConfirmationModal.Content>
-          <ConfirmationModal.Trigger>
-            <></>
-          </ConfirmationModal.Trigger>
         </ConfirmationModal>
       </>
     );
diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index 71cca7bd7..15f7c2a6a 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -308,7 +308,6 @@ export default function AdminPage() {
                           </TableCell>
                           <TableCell className="relative left-1 truncate py-2 text-align-last-left">
                             <ConfirmationModal
-                              asChild
                               title="Edit"
                               titleHeader={`${user.username}`}
                               modalContentTitle="Attention!"
@@ -331,7 +330,7 @@ export default function AdminPage() {
                                   you are making to this user?
                                 </span>
                               </ConfirmationModal.Content>
-                              <ConfirmationModal.Trigger>
+                              <ConfirmationModal.Trigger asChild>
                                 <div className="flex w-fit">
                                   <Checkbox
                                     id="is_active"
@@ -343,7 +342,6 @@ export default function AdminPage() {
                           </TableCell>
                           <TableCell className="relative left-1 truncate py-2 text-align-last-left">
                             <ConfirmationModal
-                              asChild
                               title="Edit"
                               titleHeader={`${user.username}`}
                               modalContentTitle="Attention!"
@@ -366,7 +364,7 @@ export default function AdminPage() {
                                   you are making to this user?
                                 </span>
                               </ConfirmationModal.Content>
-                              <ConfirmationModal.Trigger>
+                              <ConfirmationModal.Trigger asChild>
                                 <div className="flex w-fit">
                                   <Checkbox
                                     id="is_superuser"
@@ -431,13 +429,11 @@ export default function AdminPage() {
                                     This action cannot be undone.
                                   </span>
                                 </ConfirmationModal.Content>
-                                <ConfirmationModal.Trigger>
-                                  <ShadTooltip content="Delete" side="top">
-                                    <IconComponent
-                                      name="Trash2"
-                                      className="ml-2 h-4 w-4 cursor-pointer"
-                                    />
-                                  </ShadTooltip>
+                                <ConfirmationModal.Trigger tooltipContent="Delete">
+                                  <IconComponent
+                                    name="Trash2"
+                                    className="ml-2 h-4 w-4 cursor-pointer"
+                                  />
                                 </ConfirmationModal.Trigger>
                               </ConfirmationModal>
                             </div>
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 15b602808..97aaca9f3 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -295,7 +295,6 @@ export default function NodeToolbarComponent({
           </Select>
 
           <ConfirmationModal
-            asChild
             open={showOverrideModal}
             title={`Replace`}
             cancelText="Create New"
@@ -315,9 +314,6 @@ export default function NodeToolbarComponent({
                 to replace it with the current or create a new one?
               </span>
             </ConfirmationModal.Content>
-            <ConfirmationModal.Trigger>
-              <></>
-            </ConfirmationModal.Trigger>
           </ConfirmationModal>
           <EditNodeModal
             data={data}
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 94c0f8e5e..9b849ac6f 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -263,12 +263,14 @@ export type LoadingComponentProps = {
 
 export type ContentProps = {
   children: ReactNode;
-  tolltipContent?: ReactNode;
-  side?: "top" | "right" | "bottom" | "left";
+  
 };
 export type HeaderProps = { children: ReactNode; description: string };
 export type TriggerProps = {
   children: ReactNode;
+  tooltipContent?: ReactNode;
+  side?: "top" | "right" | "bottom" | "left";
+  asChild?: boolean;
 };
 
 export interface languageMap {
@@ -300,7 +302,6 @@ export type ConfirmationModalType = {
   onCancel?: () => void;
   title: string;
   titleHeader?: string;
-  asChild?: boolean;
   destructive?: boolean;
   modalContentTitle?: string;
   cancelText: string;
@@ -308,7 +309,7 @@ export type ConfirmationModalType = {
   children: [
     React.ReactElement<ContentProps>,
     React.ReactElement<TriggerProps>
-  ];
+  ] | React.ReactElement<ContentProps>;
   icon: string;
   data?: any;
   index?: number;