Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,44 @@ describe('WorkflowCatalogue analytics', () => {
])
})

it('reports a capability the visitor removes but not the one a shared link sets', async () => {
const user = userEvent.setup()
render(WorkflowCatalogue, {
props: {
models: [{ ...models[0], capabilities: ['Upscale'] }],
initialSearch: '?capability=Upscale',
serverPage: {
mode: 'cursor',
page: 1,
pageSize: 24,
count: 1,
hasPrevious: false,
hasNext: false
},
serverFacets: { categories: [], models: [] }
}
})
const remove = await screen.findByRole('button', {
name: 'Remove Upscale'
})
vi.advanceTimersByTime(SEARCH_SETTLE_MS)
expect(captureWorkshopEvent).not.toHaveBeenCalled()

await user.click(remove)

expect(events('hub_filter_changed')).toEqual([
{
name: 'hub_filter_changed',
properties: {
surface: 'workflows',
filter: 'capability',
value: 'all',
previous_value: 'Upscale'
}
}
])
})

it('reports a workflow opened from the featured banner', async () => {
const user = userEvent.setup()
const highlighted = models.map((model) => ({
Expand Down
117 changes: 117 additions & 0 deletions apps/website/src/components/workshop/WorkflowCatalogue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,4 +278,121 @@ describe('workflow catalogue ordering and shared links', () => {
'/models/workflows/connect/'
])
})

it('ignores capability on the static list and keeps the other filters', async () => {
history.replaceState(
null,
'',
'/hub/workflows/?capability=Upscale&model=SeedVR2'
)
render(WorkflowCatalogue, {
props: {
models: [
{ ...models[0], capabilities: ['Upscale'] },
...models.slice(1)
]
}
})
await waitFor(() =>
expect(screen.getByTestId('workshop-filter-chips')).toHaveTextContent(
'SeedVR2'
)
)
expect(screen.getByTestId('workshop-filter-chips')).not.toHaveTextContent(
'Upscale'
)
expect(visibleOutcomes()).toEqual([
'/models/workflows/connect/',
'/models/workflows/restore/'
])
})
})

describe('workflow catalogue capability address on the server-filtered list', () => {
const serverPage = {
mode: 'cursor' as const,
page: 1,
pageSize: 24,
count: 2,
hasPrevious: false,
hasNext: false
}
const serverFacets = { categories: [], models: [] }

it('opens the capability and search from the address as results, and keeps both in sync', async () => {
const user = userEvent.setup()
const { emitted } = render(WorkflowCatalogue, {
props: {
models: [models[1], models[2]],
initialSearch: '?q=flux&capability=Image+Edit',
serverPage,
serverFacets
}
})
await waitFor(() =>
expect(screen.getByTestId('workshop-filter-chips')).toHaveTextContent(
'Image Edit'
)
)
expect(screen.getByRole('searchbox')).toHaveValue('flux')
expect(screen.getByTestId('workflow-search-results')).toBeInTheDocument()

await user.click(screen.getByTestId('workshop-sort'))
await user.click(screen.getByTestId('sort-name'))
await waitFor(() =>
expect(emitted('search').at(-1)).toEqual([
'q=flux&capability=Image+Edit&sort=name'
])
)

await user.click(screen.getByRole('button', { name: 'Remove Image Edit' }))
await waitFor(() =>
expect(emitted('search').at(-1)).toEqual(['q=flux&sort=name'])
)
})

it('trims, drops blank and merges repeated capabilities from the address', async () => {
const user = userEvent.setup()
const { emitted } = render(WorkflowCatalogue, {
props: {
models: [models[1]],
initialSearch: '?capability=+&capability=+b+&capability=b',
serverPage,
serverFacets
}
})
await waitFor(() =>
expect(screen.getAllByRole('button', { name: /^Remove / })).toHaveLength(
1
)
)
expect(screen.getByRole('button', { name: 'Remove b' })).toBeInTheDocument()

await user.click(screen.getByTestId('workshop-sort'))
await user.click(screen.getByTestId('sort-name'))
await waitFor(() =>
expect(emitted('search').at(-1)).toEqual(['capability=b&sort=name'])
)
})

it('shows the empty result for a capability the server does not know, and clears it', async () => {
const user = userEvent.setup()
const { emitted } = render(WorkflowCatalogue, {
props: {
models: [],
initialSearch: '?capability=Not+A+Capability',
serverPage: { ...serverPage, count: 0 },
serverFacets
}
})
expect(
await screen.findByText('No workflows match your search and filters.')
).toBeInTheDocument()
expect(screen.getByTestId('workshop-filter-chips')).toHaveTextContent(
'Not A Capability'
)

await user.click(screen.getByRole('button', { name: 'Clear' }))
await waitFor(() => expect(emitted('search').at(-1)).toEqual(['']))
})
})
60 changes: 44 additions & 16 deletions apps/website/src/components/workshop/WorkflowCatalogue.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import type {
WorkflowWorkshopModel,
WorkshopModel
} from '@/config/models-catalogue'
import { sortWorkshopModels } from '@/config/models-catalogue'
import {
addressCapabilities,
catalogueAddress,
sortWorkshopModels
} from '@/config/models-catalogue'
import { searchWorkshopModels } from '@/config/models-search'
import type {
CatalogListPages,
Expand Down Expand Up @@ -65,6 +69,7 @@ const { t } = translationsFor(locale)
const query = ref('')
const selected = ref<string[]>([])
const runsOn = ref<string[]>([])
const capabilities = ref<string[]>([])
const sort = ref<SortOrder>('popular')
const filterMenu =
useTemplateRef<ComponentExposed<typeof WorkshopFilterMenu>>('filterMenu')
Expand All @@ -85,6 +90,7 @@ const { submitSearch, quietly } = useHubCatalogueTracking('workflows', {
filters: [
['category', () => selected.value],
['model', () => runsOn.value],
['capability', () => capabilities.value],
['sort', () => sort.value]
]
})
Expand Down Expand Up @@ -123,9 +129,21 @@ function readAddress(search: string, preserveQuery = false) {
? serverFacets.models.some((model) => model.value === name)
: models.some((model) => model.models?.includes(name))
)
capabilities.value = serverPage ? addressCapabilities(params) : []
if (serverPage)
sort.value = params.get('sort') === 'name' ? 'name' : 'popular'
}
function filterAddress() {
return catalogueAddress(initialSearch ?? location.search, {
query: query.value,
sort: sort.value,
filters: {
category: selected.value,
model: runsOn.value,
capability: capabilities.value
}
})
}
let searchReady = false
let requestedQuery: string | undefined
let searchTimer: ReturnType<typeof setTimeout> | undefined
Expand All @@ -150,19 +168,12 @@ watch(
}
)
watch(
[query, selected, runsOn, sort],
[query, selected, runsOn, capabilities, sort],
() => {
if (!serverPage || !searchReady) return
clearTimeout(searchTimer)
searchTimer = setTimeout(() => {
const params = new URLSearchParams(initialSearch ?? location.search)
for (const key of ['q', 'category', 'model', 'sort', 'p', 'cursor'])
params.delete(key)
if (query.value) params.set('q', query.value)
for (const value of selected.value) params.append('category', value)
for (const value of runsOn.value) params.append('model', value)
if (sort.value !== 'popular') params.set('sort', sort.value)
const search = params.toString()
const search = filterAddress()
const current = new URLSearchParams(initialSearch ?? location.search)
current.delete('p')
current.delete('cursor')
Expand Down Expand Up @@ -231,11 +242,19 @@ const modelOptions = computed(() => {
const matchingCategories = computed(() =>
rows.value.flatMap((category) =>
!selected.value.length || selected.value.includes(category.id)
? category.models.filter(
(model) =>
!runsOn.value.length ||
model.models?.some((name) => runsOn.value.includes(name))
)
? category.models
.filter(
(model) =>
!runsOn.value.length ||
model.models?.some((name) => runsOn.value.includes(name))
)
.filter(
(model) =>
!capabilities.value.length ||
model.capabilities.some((value) =>
capabilities.value.includes(value)
)
)
: []
)
)
Expand All @@ -256,6 +275,7 @@ const browsing = computed(
!query.value.trim() &&
!selected.value.length &&
!runsOn.value.length &&
!capabilities.value.length &&
!browseAll.value
)
const featured = computed(() =>
Expand All @@ -279,6 +299,10 @@ const chips = computed<FilterChip[]>(() => [
modelOptions.value.find((option) => option.value === name)?.label ??
name
})
})),
...capabilities.value.map((value) => ({
key: `capability:${value}`,
label: value
}))
])

Expand All @@ -287,12 +311,16 @@ function removeChip(key: string) {
const value = rest.join(':')
if (kind === 'use')
selected.value = selected.value.filter((id) => id !== value)
else runsOn.value = runsOn.value.filter((name) => name !== value)
else if (kind === 'capability')
capabilities.value = capabilities.value.filter((name) => name !== value)
else if (kind === 'model')
runsOn.value = runsOn.value.filter((name) => name !== value)
}

function clearFilters() {
selected.value = []
runsOn.value = []
capabilities.value = []
}

function clear() {
Expand Down
37 changes: 11 additions & 26 deletions apps/website/src/components/workshop/WorkshopModelsGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import type {
import {
parseCatalogSearch,
USE_CASES,
catalogueAddress,
countByUseCase,
sortOrdersFor,
sortWorkshopModels
Expand Down Expand Up @@ -237,22 +238,16 @@ watch(
if (!serverPage || !scrollReady) return
clearTimeout(searchTimer)
searchTimer = setTimeout(() => {
const params = new URLSearchParams(initialSearch ?? location.search)
for (const key of [
'q',
'useCase',
'modality',
'provider',
'capability',
'sort',
'p',
'cursor'
])
params.delete(key)
if (query.value) params.set('q', query.value)
appendSelectedFilters(params)
if (sort.value !== 'popular') params.set('sort', sort.value)
const search = params.toString()
const search = catalogueAddress(initialSearch ?? location.search, {
query: query.value,
sort: sort.value,
filters: {
useCase: selectedUseCases.value,
modality: legacyModalities.value,
provider: legacyProviders.value,
capability: legacyCapabilities.value
}
})
const current = new URLSearchParams(initialSearch ?? location.search)
current.delete('p')
current.delete('cursor')
Expand All @@ -264,16 +259,6 @@ watch(
},
{ deep: true }
)
function appendSelectedFilters(params: URLSearchParams) {
const filters = {
useCase: selectedUseCases.value,
modality: legacyModalities.value,
provider: legacyProviders.value,
capability: legacyCapabilities.value
}
for (const [key, values] of Object.entries(filters))
for (const value of values) params.append(key, value)
}
onBeforeUnmount(() => clearTimeout(searchTimer))
watch(inSection, (value) => emit('section', value), { immediate: true })
// Inside a category the tabs give up the row, and the search takes it.
Expand Down
Loading
Loading