From d68fd599c5a565358852c0468ac428979ea41b6c Mon Sep 17 00:00:00 2001
From: Juan Mardikain <developermardikian@gmail.com>
Date: Thu, 16 Jul 2026 21:56:58 -0700
Subject: [PATCH] fix: make Subtopics modal tree items link to their topic
 entity

---
 apps/web/partials/space-page/subtopics-tree-view.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/web/partials/space-page/subtopics-tree-view.tsx b/apps/web/partials/space-page/subtopics-tree-view.tsx
index 040aafc48..9a4b752ec 100644
--- a/apps/web/partials/space-page/subtopics-tree-view.tsx
+++ b/apps/web/partials/space-page/subtopics-tree-view.tsx
@@ -97,6 +97,7 @@ export function SubtopicsTreeView({ spaceId, rootEntityId, onAddSubtopic, onNavi
           isRoot
           defaultExpanded
           onAddSubtopic={onAddSubtopic}
+          onNavigate={onNavigate}
         />
       </div>
     </>
@@ -172,6 +173,7 @@ function SubtopicTreeNode({
   relationId,
   defaultExpanded = false,
   onAddSubtopic,
+  onNavigate,
 }: {
   entityId: string;
   name: string;
@@ -185,6 +187,7 @@ function SubtopicTreeNode({
   relationId?: string;
   defaultExpanded?: boolean;
   onAddSubtopic: (target: AddSubtopicTarget) => void;
+  onNavigate?: () => void;
 }) {
   const [expanded, setExpanded] = React.useState(defaultExpanded);
   const [menuOpen, setMenuOpen] = React.useState(false);
@@ -244,7 +247,13 @@ function SubtopicTreeNode({
           </span>
         </button>
 
-        <span className="min-w-0 flex-1 truncate text-button text-current">{name}</span>
+        <Link
+          href={NavUtils.toEntity(spaceId, entityId)}
+          onClick={() => onNavigate?.()}
+          className="min-w-0 flex-1 truncate text-button text-current hover:underline"
+        >
+          {name}
+        </Link>
 
         {canEdit && (
           <Menu
@@ -303,6 +312,7 @@ function SubtopicTreeNode({
                 parentName={name}
                 relationId={child.relationId}
                 onAddSubtopic={onAddSubtopic}
+                onNavigate={onNavigate}
               />
             ))}
         </div>