Skip to content

fix(hub): source merged-mode search from the server #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RonenMars wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(hub): source merged-mode search from the server #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 2 deletions app/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,18 @@ export default function ProjectsHub() {
.map((s) => ({ kind: 'session' as const, ms: lastActivityMs(s), item: s }))
.sort((a, b) => b.ms - a.ms)

const convs = conversations
// While a search is active, take conversations from the server rather than
// from the paged set: /api/search matches message bodies, so it finds
// conversations that were never paged in. Filtering the loaded pages alone
// makes anything past the current page unfindable.
const convSource = debouncedConvSearch ? (convSearchData?.conversations ?? []) : conversations

const convs = convSource
.map((c) => ({ kind: 'conversation' as const, ms: Date.parse(c.lastActivity) || 0, item: c }))
.sort((a, b) => b.ms - a.ms)

return [...liveSessions, ...idleSessions, ...convs]
}, [visibleSessions, conversations])
}, [visibleSessions, conversations, debouncedConvSearch, convSearchData])

// FAB
// When the user is drilled into a directory in TreeView, the drill store
Expand Down
Loading