Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions frontend/src/lib/features/collections/CollectionList.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -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({
Expand Down Expand Up @@ -347,7 +342,6 @@
{item}
{column}
{workspace}
{collectionId}
canEdit={workspacePermissions.canEdit(item.workspace_id)}
{statuses}
{statusCategories}
Expand Down
13 changes: 4 additions & 9 deletions frontend/src/lib/features/collections/CollectionMap.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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}"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@
{item}
{column}
{workspace}
{collectionId}
canEdit={workspacePermissions.canEdit(item.workspace_id)}
{statuses}
{statusCategories}
Expand Down
1 change: 0 additions & 1 deletion frontend/src/lib/features/collections/Collections.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
Expand Down
9 changes: 0 additions & 9 deletions frontend/src/lib/features/collections/ListCellRenderer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -29,7 +28,6 @@
item,
column,
workspace,
collectionId = null,
canEdit = true,
statuses = [],
statusCategories = [],
Expand Down Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
milestones = [],
iterations = [],
projects = [],
collectionId = null,
includeWorkspace = false,
canEdit = false,
actionItems = null,
Expand Down Expand Up @@ -96,7 +95,6 @@
{item}
column={column}
workspace={getWorkspace(item)}
{collectionId}
canEdit={canEditItem()}
{statuses}
{statusCategories}
Expand Down
Loading