Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 364
fix(web): prevent stalled code search result navigation#1574
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.
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93 packages/web/src/app/(app)/search/components/searchResultsPanel/fileMatch.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import { cleanup, createEvent, fireEvent, render, screen } from '@testing-library/react'; | ||
| import { afterEach, describe, expect, it, vi } from 'vitest'; | ||
| import { FileMatch } from './fileMatch'; | ||
| vi.mock('next/link', () => ({ | ||
| default: ({ children, href, prefetch, ...props }: React.AnchorHTMLAttributes<HTMLAnchorElement> & { prefetch?: boolean }) => ( | ||
| <a {...props} href="#test-target" data-href={href} data-prefetch={String(prefetch)}> | ||
| {children} | ||
| </a> | ||
| ), | ||
| })); | ||
| vi.mock('@/app/(app)/components/lightweightCodeHighlighter', () => ({ | ||
| LightweightCodeHighlighter: ({ children }: { children: React.ReactNode }) => <>{children}</>, | ||
| })); | ||
| const file = { | ||
| fileName: { | ||
| text: 'src/index.ts', | ||
| matchRanges: [], | ||
| }, | ||
| webUrl: '', | ||
| repository: 'github.com/sourcebot-dev/sourcebot', | ||
| repositoryId: 1, | ||
| language: 'TypeScript', | ||
| branches: ['main'], | ||
| chunks: [], | ||
| }; | ||
| const match = { | ||
| content: 'const result = true;', | ||
| contentStart: { | ||
| byteOffset: 0, | ||
| lineNumber: 10, | ||
| column: 1, | ||
| }, | ||
| matchRanges: [{ | ||
| start: { | ||
| byteOffset: 6, | ||
| lineNumber: 10, | ||
| column: 7, | ||
| }, | ||
| end: { | ||
| byteOffset: 12, | ||
| lineNumber: 10, | ||
| column: 13, | ||
| }, | ||
| }], | ||
| }; | ||
| afterEach(() => { | ||
| cleanup(); | ||
| }); | ||
| describe('FileMatch', () => { | ||
| it('disables prefetching and preserves ordinary link clicks', () => { | ||
| const onOpenPreview = vi.fn(); | ||
| render(<FileMatch file={file} match={match} onOpenPreview={onOpenPreview} />); | ||
| const link = screen.getByRole('link'); | ||
| expect(link.getAttribute('data-prefetch')).toBe('false'); | ||
| fireEvent.click(link); | ||
| expect(onOpenPreview).not.toHaveBeenCalled(); | ||
| }); | ||
| it.each([ | ||
| ['Cmd', { metaKey: true }], | ||
| ['Ctrl', { ctrlKey: true }], | ||
| ])('opens the preview and cancels navigation for %s-click', (_modifier, eventInit) => { | ||
| const onOpenPreview = vi.fn(); | ||
| render(<FileMatch file={file} match={match} onOpenPreview={onOpenPreview} />); | ||
| const link = screen.getByRole('link'); | ||
| const clickEvent = createEvent.click(link, eventInit); | ||
| fireEvent(link, clickEvent); | ||
| expect(clickEvent.defaultPrevented).toBe(true); | ||
| expect(onOpenPreview).toHaveBeenCalledOnce(); | ||
| }); | ||
| it('supports modifier-plus-Enter for keyboard users', () => { | ||
| const onOpenPreview = vi.fn(); | ||
| render(<FileMatch file={file} match={match} onOpenPreview={onOpenPreview} />); | ||
| const link = screen.getByRole('link'); | ||
| const keyDownEvent = createEvent.keyDown(link, { key: 'Enter', metaKey: true }); | ||
| fireEvent(link, keyDownEvent); | ||
| expect(keyDownEvent.defaultPrevented).toBe(true); | ||
| expect(onOpenPreview).toHaveBeenCalledOnce(); | ||
| }); | ||
| }); | ||
21 changes: 20 additions & 1 deletion
21 packages/web/src/app/(app)/search/components/searchResultsPanel/fileMatch.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletion
8 packages/web/src/app/(app)/search/components/searchResultsPanel/fileMatchContainer.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.