Skip to content

fix(ui): avoid double slash in item selection URL #65

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
SaKaNa-Y wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ui): avoid double slash in item selection URL #65

Show file tree
Hide file tree
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
18 changes: 18 additions & 0 deletions tests/e2e/ui.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ test.describe('ui mode smoke', () => {
expect(errors).toEqual([])
})

test('clicking an item updates the URL to /N (no double slash)', async ({ page }) => {
const errors = captureErrors(page)
await page.goto(`${BASE}/`)
await expect(page.locator('[data-testid="navbar"]')).toBeVisible({ timeout: 10_000 })

const row = page.locator('[data-testid="item-row"]').first()
await expect(row).toBeVisible({ timeout: 10_000 })
const number = await row.getAttribute('data-item-number')

await row.click()
// Regression: UI-mode selection must produce `/N`, never `//N` (which
// vue-router can't match — see useSelectedItemSync.buildBase).
await expect(page).toHaveURL(`${BASE}/${number}`)
// The selected row is still mounted (view not torn down by a bad redirect).
await expect(page.locator(`[data-testid="item-row"][data-item-number="${number}"]`)).toBeVisible()
expect(errors).toEqual([])
})

test('Cmd+K opens the command palette and filters by query', async ({ page }) => {
const errors = captureErrors(page)
await page.goto(`${BASE}/`)
Expand Down
6 changes: 3 additions & 3 deletions ui/composables/useSelectedItemSync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export function useSelectedItemSync(projectId: MaybeRefOrGetter<string>, initial
function buildBase(id: string): string {
const mode = hub.capabilities.value?.mode
if (mode !== 'hub')
return '/'
return ''
const project = hub.projects.value.find(p => p.id === id)
return project ? `/${project.repo}` : '/'
return project ? `/${project.repo}` : ''
}

// Apply the URL number on mount/route change.
Expand All @@ -50,7 +50,7 @@ export function useSelectedItemSync(projectId: MaybeRefOrGetter<string>, initial
if (!id)
return
const base = buildBase(id)
const target = number == null ? base : `${base}/${number}`
const target = number == null ? (base || '/') : `${base}/${number}`
if (route.path === target)
return
router.replace(target).catch(() => {})
Expand Down