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
52 changes: 0 additions & 52 deletions apps/web/src/components/Sidebar.logic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
resolveAdjacentThreadId,
reduceSidebarProjectScopeMenuState,
getFallbackThreadIdAfterDelete,
getVisibleThreadsForProject,
getProjectSortTimestamp,
hasUnseenCompletion,
isContextMenuPointerDown,
Expand Down Expand Up @@ -1362,57 +1361,6 @@ describe("resolveProjectStatusIndicator", () => {
});
});

describe("getVisibleThreadsForProject", () => {
it("includes the active thread even when it falls below the folded preview", () => {
const threads = Array.from({ length: 8 }, (_, index) =>
makeThread({
id: ThreadId.make(`thread-${index + 1}`),
title: `Thread ${index + 1}`,
}),
);

const result = getVisibleThreadsForProject({
threads,
activeThreadId: ThreadId.make("thread-8"),
isThreadListExpanded: false,
previewLimit: 6,
});

expect(result.hasHiddenThreads).toBe(true);
expect(result.visibleThreads.map((thread) => thread.id)).toEqual([
ThreadId.make("thread-1"),
ThreadId.make("thread-2"),
ThreadId.make("thread-3"),
ThreadId.make("thread-4"),
ThreadId.make("thread-5"),
ThreadId.make("thread-6"),
ThreadId.make("thread-8"),
]);
expect(result.hiddenThreads.map((thread) => thread.id)).toEqual([ThreadId.make("thread-7")]);
});

it("returns all threads when the list is expanded", () => {
const threads = Array.from({ length: 8 }, (_, index) =>
makeThread({
id: ThreadId.make(`thread-${index + 1}`),
}),
);

const result = getVisibleThreadsForProject({
threads,
activeThreadId: ThreadId.make("thread-8"),
isThreadListExpanded: true,
previewLimit: 6,
});

expect(result.hasHiddenThreads).toBe(true);
expect(result.visibleThreads.map((thread) => thread.id)).toEqual(
threads.map((thread) => thread.id),
);
expect(result.hiddenThreads).toEqual([]);
});
});

function makeProject(overrides: Partial<Project> = {}): Project {
const { defaultModelSelection, ...rest } = overrides;
return {
Expand Down
48 changes: 0 additions & 48 deletions apps/web/src/components/Sidebar.logic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -838,54 +838,6 @@ export function resolveProjectStatusIndicator(
return highestPriorityStatus;
}

export function getVisibleThreadsForProject<T extends Pick<Thread, "id">>(input: {
threads: readonly T[];
activeThreadId: T["id"] | undefined;
isThreadListExpanded: boolean;
previewLimit: number;
}): {
hasHiddenThreads: boolean;
visibleThreads: T[];
hiddenThreads: T[];
} {
const { activeThreadId, isThreadListExpanded, previewLimit, threads } = input;
const hasHiddenThreads = threads.length > previewLimit;

if (!hasHiddenThreads || isThreadListExpanded) {
return {
hasHiddenThreads,
hiddenThreads: [],
visibleThreads: [...threads],
};
}

const previewThreads = threads.slice(0, previewLimit);
if (!activeThreadId || previewThreads.some((thread) => thread.id === activeThreadId)) {
return {
hasHiddenThreads: true,
hiddenThreads: threads.slice(previewLimit),
visibleThreads: previewThreads,
};
}

const activeThread = threads.find((thread) => thread.id === activeThreadId);
if (!activeThread) {
return {
hasHiddenThreads: true,
hiddenThreads: threads.slice(previewLimit),
visibleThreads: previewThreads,
};
}

const visibleThreadIds = new Set([...previewThreads, activeThread].map((thread) => thread.id));

return {
hasHiddenThreads: true,
hiddenThreads: threads.filter((thread) => !visibleThreadIds.has(thread.id)),
visibleThreads: threads.filter((thread) => visibleThreadIds.has(thread.id)),
};
}

export function getFallbackThreadIdAfterDelete<
T extends Pick<Thread, "id" | "projectId" | "createdAt" | "updatedAt"> & ThreadSortInput,
>(input: {
Expand Down
Loading