From 5d1ea033f8186417214e447acd5afded99a800fd Mon Sep 17 00:00:00 2001
From: Daniel Raab <daniel@draab.at>
Date: Tue, 13 Oct 2026 08:58:41 +0200
Subject: [PATCH] feat(frontend): change item navigation to use itemModalStore
 for opening items

---
 .../lib/features/collections/CollectionList.svelte  | 10 ++--------
 .../lib/features/collections/CollectionMap.svelte   | 13 ++++---------
 .../lib/features/collections/CollectionTree.svelte  |  1 -
 .../src/lib/features/collections/Collections.svelte |  1 -
 .../features/collections/ListCellRenderer.svelte    |  9 ---------
 .../features/collections/WorkItemListTable.svelte   |  2 --
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/frontend/src/lib/features/collections/CollectionList.svelte b/frontend/src/lib/features/collections/CollectionList.svelte
index 3b562c86a..65405386f 100644
--- a/frontend/src/lib/features/collections/CollectionList.svelte
+++ b/frontend/src/lib/features/collections/CollectionList.svelte
@@ -2,7 +2,6 @@
   import { useEventListener } from 'runed';
   import { t } from '../../stores/i18n.svelte.js';
   import { errorToast } from '../../stores/toasts.svelte.js';
-  import { navigate } from '../../router.js';
   import { applyCollectionItem, collectionStore, refreshCollectionDeltas, reloadCollection } from '../../stores/collectionContext.js';
   import { useCollectionEventStream } from '../../composables/useCollectionEventStream.svelte.js';
   import { createDeleteItemHandler, createItemActionsBuilder } from '../../utils/workItemTableHelpers.js';
@@ -13,7 +12,7 @@
   } from '../../utils/workItemListColumns.js';
   import { useGradientStyles } from '../../stores/workspaceGradient.svelte.js';
   import { workspacePermissions } from '../../stores/workspacePermissions.svelte.js';
-  import { collectionEditorOptions, collectionFieldLinks, workspaceDataStore } from '../../stores/index.js';
+  import { collectionEditorOptions, collectionFieldLinks, itemModalStore, workspaceDataStore } from '../../stores/index.js';
   import { MoreHorizontal, ArrowUp, ArrowDown, ArrowUpDown } from '@lucide/svelte';
   import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
   import SearchInput from '../../components/SearchInput.svelte';
@@ -213,11 +212,7 @@
   });
 
   function viewItem(item) {
-    const wsId = workspaceId || item.workspace_id;
-    const url = collectionId && workspaceId
-      ? `/workspaces/${workspaceId}/collections/${collectionId}/items/${item.id}`
-      : `/workspaces/${wsId}/items/${item.id}`;
-    navigate(url);
+    itemModalStore.open(item.id, item.workspace_id ?? workspaceId);
   }
 
   const deleteItem = createDeleteItemHandler({
@@ -347,7 +342,6 @@
                             {item}
                             {column}
                             {workspace}
-                            {collectionId}
                             canEdit={workspacePermissions.canEdit(item.workspace_id)}
                             {statuses}
                             {statusCategories}
diff --git a/frontend/src/lib/features/collections/CollectionMap.svelte b/frontend/src/lib/features/collections/CollectionMap.svelte
index 0c77e4546..dd5ea7b41 100644
--- a/frontend/src/lib/features/collections/CollectionMap.svelte
+++ b/frontend/src/lib/features/collections/CollectionMap.svelte
@@ -2,11 +2,10 @@
   import { onMount, untrack } from 'svelte';
   import { useEventListener } from 'runed';
   import { api } from '../../api.js';
-  import { navigate } from '../../router.js';
   import { t } from '../../stores/i18n.svelte.js';
   import { getCollection, checkItemVisibility } from '../collections/collectionService.js';
   import { collectionStore, refreshCollectionDeltas, reloadCollection } from '../../stores/collectionContext.js';
-  import { workspaceDataStore, workspacesStore, capabilitiesStore } from '../../stores/index.js';
+  import { workspaceDataStore, workspacesStore, capabilitiesStore, itemModalStore } from '../../stores/index.js';
   import { useGradientStyles, loadWorkspaceGradient } from '../../stores/workspaceGradient.svelte.js';
   import { Plus, ChevronDown, ChevronRight, Home, MapPin, Settings } from '@lucide/svelte';
   import ItemTypeIcon from '../../components/ItemTypeIcon.svelte';
@@ -440,12 +439,8 @@
     return itemTypes.find(type => type.id === itemTypeId);
   }
 
-  function navigateToItem(item) {
-    const wsId = workspaceId || item.workspace_id;
-    const url = collectionId && workspaceId
-      ? `/workspaces/${workspaceId}/collections/${collectionId}/items/${item.id}`
-      : `/workspaces/${wsId}/items/${item.id}`;
-    navigate(url);
+  function openItem(item) {
+    itemModalStore.open(item.id, item.workspace_id ?? workspaceId);
   }
 
   function getPriorityColor(priority) {
@@ -802,7 +797,7 @@
             <!-- Title -->
             <button
               data-testid="map-backbone-item-{backboneItem.id}"
-              onclick={() => navigateToItem(backboneItem)}
+              onclick={() => openItem(backboneItem)}
               class="text-sm mb-2 leading-snug text-left w-full line-clamp-2 transition-colors"
               style="{styles.glassTextStyle}"
             >
diff --git a/frontend/src/lib/features/collections/CollectionTree.svelte b/frontend/src/lib/features/collections/CollectionTree.svelte
index 243626b9c..2ff7d2359 100644
--- a/frontend/src/lib/features/collections/CollectionTree.svelte
+++ b/frontend/src/lib/features/collections/CollectionTree.svelte
@@ -648,7 +648,6 @@
                       {item}
                       {column}
                       {workspace}
-                      {collectionId}
                       canEdit={workspacePermissions.canEdit(item.workspace_id)}
                       {statuses}
                       {statusCategories}
diff --git a/frontend/src/lib/features/collections/Collections.svelte b/frontend/src/lib/features/collections/Collections.svelte
index e82381444..abc4d8e37 100644
--- a/frontend/src/lib/features/collections/Collections.svelte
+++ b/frontend/src/lib/features/collections/Collections.svelte
@@ -528,7 +528,6 @@
         statuses={listStatuses.length > 0 ? listStatuses : allStatuses}
         statusCategories={listStatusCategories.length > 0 ? listStatusCategories : statusCategories}
         priorities={listPriorities.length > 0 ? listPriorities : allPriorities}
-        collectionId={null}
         canEdit={false}
         testId="collection-search-results-table"
         emptyMessage={t('collections.noWorkItemsFound')}
diff --git a/frontend/src/lib/features/collections/ListCellRenderer.svelte b/frontend/src/lib/features/collections/ListCellRenderer.svelte
index b2694acfd..46c872915 100644
--- a/frontend/src/lib/features/collections/ListCellRenderer.svelte
+++ b/frontend/src/lib/features/collections/ListCellRenderer.svelte
@@ -2,7 +2,6 @@
   import { t } from '../../stores/i18n.svelte.js';
   import { collectionEditorOptions } from '../../stores/collectionEditorOptions.svelte.js';
   import { collectionFieldLinks } from '../../stores/collectionFieldLinks.svelte.js';
-  import { itemModalStore } from '../../stores/itemModalStore.svelte.js';
   import { api } from '../../api.js';
   import { updateCustomFieldValue } from '../../utils/customFieldValueUpdates.js';
   import InlineFieldEditor from '../../editors/InlineFieldEditor.svelte';
@@ -29,7 +28,6 @@
     item,
     column,
     workspace,
-    collectionId = null,
     canEdit = true,
     statuses = [],
     statusCategories = [],
@@ -124,13 +122,6 @@
         {item}
         {workspace}
         dataTestid={`list-cell-key-${item.id}`}
-        href={collectionId && workspace
-          ? `/workspaces/${workspace.id}/collections/${collectionId}/items/${item.id}`
-          : `/workspaces/${workspace?.id || item.workspace_id}/items/${item.id}`}
-        onClick={(event) => {
-          event.preventDefault();
-          itemModalStore.open(item.id, item.workspace_id ?? workspace?.id ?? null);
-        }}
       />
     </div>
 
diff --git a/frontend/src/lib/features/collections/WorkItemListTable.svelte b/frontend/src/lib/features/collections/WorkItemListTable.svelte
index 1adceadab..5bd4528ae 100644
--- a/frontend/src/lib/features/collections/WorkItemListTable.svelte
+++ b/frontend/src/lib/features/collections/WorkItemListTable.svelte
@@ -18,7 +18,6 @@
     milestones = [],
     iterations = [],
     projects = [],
-    collectionId = null,
     includeWorkspace = false,
     canEdit = false,
     actionItems = null,
@@ -96,7 +95,6 @@
         {item}
         column={column}
         workspace={getWorkspace(item)}
-        {collectionId}
         canEdit={canEditItem()}
         {statuses}
         {statusCategories}