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
164 changes: 164 additions & 0 deletions browser_tests/tests/dialogs/managerDialog.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,170 @@ test.describe('ManagerDialog', { tag: '@ui' }, () => {
})
})

test.describe('Failed next page', () => {
const PAGED_PACKS: RegistryNodePack[] = Array.from(
{ length: 65 },
(_, index) => ({
id: `paged-pack-${index}`,
name: `Paged Pack ${index}`,
description: 'Pack used to fill two result pages',
downloads: 1000 - index,
status: 'NodeStatusActive',
publisher: { id: 'paged-publisher', name: 'Paged Publisher' },
latest_version: { version: '1.0.0', status: 'NodeVersionStatusActive' },
repository: `https://github.com/test/paged-pack-${index}`
})
)
const PAGE_SIZE = 64
const LAST_FIRST_PAGE_PACK = `Paged Pack ${PAGE_SIZE - 1}`
const SECOND_PAGE_PACK = `Paged Pack ${PAGE_SIZE}`

const packsOnPage = (pageNumber: number) =>
PAGED_PACKS.slice(pageNumber * PAGE_SIZE, (pageNumber + 1) * PAGE_SIZE)

let secondPageRequests = 0

test.beforeEach(async ({ comfyPage }) => {
secondPageRequests = 0
const respondWithPage = async (
route: Parameters<Parameters<ComfyPage['page']['route']>[1]>[0],
pageNumber: number,
body: () => object
) => {
if (pageNumber === 1 && secondPageRequests++ === 0) {
await route.fulfill({ status: 503, json: {} })
return
}
await route.fulfill({ json: body() })
}
for (const pattern of ['**/*.algolia.net/**', '**/*.algolianet.com/**']) {
await comfyPage.page.route(pattern, (route) => {
const { requests } = route.request().postDataJSON() as {
requests: { page?: number }[]
}
const pageNumber = requests[0]?.page ?? 0
return respondWithPage(route, pageNumber, () => ({
results: requests.map((_, index) => ({
hits:
index === 0
? packsOnPage(pageNumber).map((pack) => ({
objectID: pack.id,
id: pack.id,
name: pack.name,
description: pack.description,
total_install: pack.downloads,
status: pack.status,
publisher_id: 'paged-publisher',
latest_version: '1.0.0',
latest_version_status: 'NodeVersionStatusActive',
repository_url: pack.repository
}))
: [],
nbHits: PAGED_PACKS.length,
page: pageNumber,
nbPages: 2,
hitsPerPage: PAGE_SIZE
}))
}))
})
}
await comfyPage.page.route(
(url) =>
url.hostname === 'api.comfy.org' &&
(url.pathname === '/nodes' || url.pathname === '/nodes/search'),
(route) => {
const registryPage = Number(
new URL(route.request().url()).searchParams.get('page') ?? '1'
)
return respondWithPage(route, registryPage - 1, () => ({
total: PAGED_PACKS.length,
nodes: packsOnPage(registryPage - 1),
page: registryPage,
limit: PAGE_SIZE,
totalPages: 2
}))
}
)
await comfyPage.page.route(
(url) =>
url.hostname === 'api.comfy.org' &&
url.pathname.startsWith('/nodes/paged-pack-'),
(route) => {
const { pathname } = new URL(route.request().url())
if (pathname.endsWith('/comfy-nodes')) {
return route.fulfill({
json: {
comfy_nodes: [],
totalNumberOfPages: 0
} satisfies RegistryOperations['ListComfyNodes']['responses'][200]['content']['application/json']
})
}
const id = pathname.split('/')[2]
return route.fulfill({
json: PAGED_PACKS.find((pack) => pack.id === id)
})
}
)
})

const scrollToEnd = (grid: Locator) =>
grid.evaluate((element) => {
element.scrollTop = element.scrollHeight
})

test('keeps the loaded packs, scroll and selection and loads the page again on retry', async ({
comfyPage
}) => {
await openManagerDialog(comfyPage)
const dialog = comfyPage.page.getByRole('dialog')
const grid = dialog.locator('#results-grid')
await expect(
dialog.getByText('Paged Pack 0', { exact: true })
).toBeVisible()

await test.step('scroll to the end of the first page', async () => {
await scrollToEnd(grid)
await expect(
dialog.getByText(LAST_FIRST_PAGE_PACK, { exact: true })
).toBeVisible()
})

const failureNotice = dialog.getByRole('alert').filter({
hasText: "Couldn't load more results."
})
await expect(failureNotice).toBeVisible()
await expect(
dialog.getByText('Error connecting to the Comfy Node Registry.')
).toBeHidden()

await dialog.getByText(LAST_FIRST_PAGE_PACK, { exact: true }).click()
const infoPanel = dialog.getByRole('complementary')
await expect(
infoPanel.getByText(LAST_FIRST_PAGE_PACK, { exact: true })
).toBeVisible()
const scrollTopBeforeRetry = await grid.evaluate(
(element) => element.scrollTop
)
expect(scrollTopBeforeRetry).toBeGreaterThan(0)

await failureNotice.getByRole('button', { name: 'Retry' }).click()

await expect(failureNotice).toBeHidden()
await expect(
infoPanel.getByText(LAST_FIRST_PAGE_PACK, { exact: true })
).toBeVisible()
expect(
await grid.evaluate((element) => element.scrollTop)
).toBeGreaterThanOrEqual(scrollTopBeforeRetry)
await expect.poll(() => secondPageRequests).toBe(2)

await scrollToEnd(grid)
await expect(
dialog.getByText(SECOND_PAGE_PACK, { exact: true })
).toBeVisible()
})
})

test('Search mode can be switched between packs and nodes', async ({
comfyPage
}) => {
Expand Down
1 change: 1 addition & 0 deletions src/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,7 @@
"totalNodes": "Total Nodes",
"discoverCommunityContent": "Discover community-made Node Packs, Extensions, and more...",
"errorConnecting": "Error connecting to the Comfy Node Registry.",
"loadMoreFailed": "Couldn't load more results.",
"noResultsFound": "No results found matching your search.",
"tryDifferentSearch": "Please try a different search query.",
"emptyState": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,22 @@ const BaseModalLayoutStub = defineComponent({
}
})

const LOAD_MORE = 'Scroll to the end'

const VirtualGridStub = defineComponent({
props: { items: { type: Array as PropType<NodePack[]>, required: true } },
props: {
items: { type: Array as PropType<NodePack[]>, required: true },
onLoadMore: { type: Function as PropType<() => unknown>, required: true }
},
setup(props) {
return () =>
h(
'ul',
props.items.map((pack) => h('li', pack.name))
)
h('div', [
h(
'ul',
props.items.map((pack) => h('li', pack.name))
),
h('button', { onClick: () => props.onLoadMore() }, LOAD_MORE)
])
}
})

Expand Down Expand Up @@ -607,6 +615,147 @@ describe('ManagerDialog failed search', () => {
})
})

describe('ManagerDialog failed next page', () => {
const FIRST_PACK: NodePack = { id: 'gguf-1', name: 'GGUF One' }
const SECOND_PACK: NodePack = { id: 'gguf-2', name: 'GGUF Two' }

async function renderUntilSecondPageFails(tab?: ManagerTab) {
vi.mocked(useRegistrySearchGateway().searchPacks)
.mockResolvedValueOnce(succeeded([FIRST_PACK], false, true))
.mockResolvedValueOnce(failed('search unavailable'))
const { user } = renderDialog(tab)
await settleSearch()
await user.click(screen.getByRole('button', { name: LOAD_MORE }))
await settleSearch()
return user
}

it('keeps the loaded packs and offers a retry below them', async () => {
await renderUntilSecondPageFails()

expect(screen.getByText('GGUF One')).toBeInTheDocument()
expect(screen.getByRole('alert')).toHaveTextContent(
enMessages.manager.loadMoreFailed
)
expect(
screen.queryByText(enMessages.manager.errorConnecting)
).not.toBeInTheDocument()
})

it('offers a retry instead of an empty state when the tab filters out every loaded pack', async () => {
vi.mocked(
useComfyManagerService().listInstalledPacks
).mockResolvedValueOnce({
'gguf-1': { cnr_id: 'gguf-1', ver: '1.0.0', enabled: true }
})

await renderUntilSecondPageFails(ManagerTab.NotInstalled)

expect(screen.queryByText('GGUF One')).not.toBeInTheDocument()
expect(screen.getByRole('alert')).toHaveTextContent(
enMessages.manager.loadMoreFailed
)
expect(
screen.getByRole('button', { name: enMessages.g.retry })
).toBeInTheDocument()
})

it('keeps the grid instead of an empty state while a retry loads on a tab that filters out every loaded pack', async () => {
vi.mocked(
useComfyManagerService().listInstalledPacks
).mockResolvedValueOnce({
'gguf-1': { cnr_id: 'gguf-1', ver: '1.0.0', enabled: true }
})
const user = await renderUntilSecondPageFails(ManagerTab.NotInstalled)
vi.mocked(useRegistrySearchGateway().searchPacks).mockReturnValueOnce(
new Promise(() => {})
)

await user.click(screen.getByRole('button', { name: enMessages.g.retry }))
await settleSearch()

expect(screen.getByRole('button', { name: LOAD_MORE })).toBeInTheDocument()
})

it('holds the legacy-manager tip while the failed page may hold the match', async () => {
useManagerState().isNewManagerUI = computed(() => true)
vi.mocked(
useComfyManagerService().listInstalledPacks
).mockResolvedValueOnce({
'gguf-1': { cnr_id: 'gguf-1', ver: '1.0.0', enabled: true }
})
vi.mocked(useRegistrySearchGateway().searchPacks).mockImplementation(
async (_query, { pageNumber }) =>
pageNumber === 0
? succeeded([FIRST_PACK], false, true)
: failed('search unavailable')
)
const { user, searchBox } = renderDialog(ManagerTab.NotInstalled)

await user.type(searchBox, 'comfyui-manager')
await settleSearch()
await user.click(screen.getByRole('button', { name: LOAD_MORE }))
await settleSearch()

expect(screen.getByRole('alert')).toHaveTextContent(
enMessages.manager.loadMoreFailed
)
expect(screen.queryByText(TIP, { exact: false })).not.toBeInTheDocument()
})

it('returns focus to Retry when the retried page fails again', async () => {
const user = await renderUntilSecondPageFails()
vi.mocked(useRegistrySearchGateway().searchPacks).mockResolvedValueOnce(
failed('search unavailable')
)

await user.click(screen.getByRole('button', { name: enMessages.g.retry }))
await settleSearch()

expect(
screen.getByRole('button', { name: enMessages.g.retry })
).toHaveFocus()
})

it('leaves focus where the user moved it while the retry loaded', async () => {
const user = await renderUntilSecondPageFails()
let failRetry: () => void = () => {}
vi.mocked(useRegistrySearchGateway().searchPacks).mockReturnValueOnce(
new Promise((resolve) => {
failRetry = () => resolve(failed('search unavailable'))
})
)

await user.click(screen.getByRole('button', { name: enMessages.g.retry }))
const searchBox = screen.getByRole('combobox')
searchBox.focus()
failRetry()
await settleSearch()

expect(searchBox).toHaveFocus()
})

it('appends the failed page below the loaded packs when retried', async () => {
const user = await renderUntilSecondPageFails()
vi.mocked(useRegistrySearchGateway().searchPacks).mockResolvedValueOnce(
succeeded([SECOND_PACK], false)
)

await user.click(screen.getByRole('button', { name: enMessages.g.retry }))
await settleSearch()

expect(screen.getAllByRole('listitem').map((li) => li.textContent)).toEqual(
['GGUF One', 'GGUF Two']
)
expect(screen.queryByRole('alert')).not.toBeInTheDocument()
expect(
vi
.mocked(useRegistrySearchGateway().searchPacks)
.mock.calls.map(([, params]) => params.pageNumber)
).toEqual([0, 1, 1])
})
})

describe('ManagerDialog search analytics tags', () => {
const searchedTags = () =>
vi
Expand Down
Loading
Loading