From 2baadf60d1e3cad3c5c9078cabd4034be5b97bb6 Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Mon, 11 Aug 2025 13:44:22 -0700
Subject: [PATCH 1/2] Fix UI folder row issue with multiple onClick events
 triggered before the redirect occurs

---
 .../SecretOverviewFolderRow.tsx                    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
index f8023f705..0cf62e1d6 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
@@ -1,3 +1,4 @@
+import { useState } from "react";
 import { faCheck, faFolder, faPencil, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { twMerge } from "tailwind-merge";
@@ -23,8 +24,19 @@ export const SecretOverviewFolderRow = ({
   onToggleFolderEdit,
   onClick
 }: Props) => {
+  const [isClicking, setIsClicking] = useState(false);
+  const handleClick = () => {
+    if (isClicking) return;
+
+    setIsClicking(true);
+    try {
+      onClick(folderName);
+    } finally {
+      setTimeout(() => setIsClicking(false), 1000);
+    }
+  };
   return (
-    <Tr isHoverable isSelectable className="group" onClick={() => onClick(folderName)}>
+    <Tr isHoverable isSelectable className="group" onClick={handleClick}>
       <Td className="sticky left-0 z-10 border-0 bg-mineshaft-800 bg-clip-padding p-0 group-hover:bg-mineshaft-700">
         <div className="flex items-center space-x-5 border-r border-mineshaft-600 px-5 py-2.5">
           <div className="text-yellow-700">

From fd4cdc27695624740bb26cd3ee16ac099a5aef3d Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Mon, 11 Aug 2025 14:41:05 -0700
Subject: [PATCH 2/2] Remove unnecessary try catch

---
 .../SecretOverviewFolderRow/SecretOverviewFolderRow.tsx    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
index 0cf62e1d6..a969edea8 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx
@@ -29,11 +29,8 @@ export const SecretOverviewFolderRow = ({
     if (isClicking) return;
 
     setIsClicking(true);
-    try {
-      onClick(folderName);
-    } finally {
-      setTimeout(() => setIsClicking(false), 1000);
-    }
+    onClick(folderName);
+    setTimeout(() => setIsClicking(false), 1000);
   };
   return (
     <Tr isHoverable isSelectable className="group" onClick={handleClick}>