From 611824875dc9c65fa7ceecf4ab4efca3fef854f2 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Wed, 14 Oct 2026 23:04:45 +0000 Subject: [PATCH] feat(website): search and a popular row on the Hub home The Hub home opened on the three doors alone. Add a search box above them that answers across apps, workflows and models, and a popular row underneath so the page is never empty. Typing puts the doors away and shows what matches, with a count per kind linking into each catalogue; clearing brings the doors back. All of it stays behind the Hub home flag. --- .../src/components/workshop/ExploreFinder.vue | 31 +++++ .../components/workshop/ExploreHome.test.ts | 51 +++++++ .../src/components/workshop/ExploreHome.vue | 86 +++++++++++- .../components/workshop/ExploreKindTag.vue | 59 +++++++++ .../workshop/ExploreResultCard.test.ts | 116 ++++++++++++++++ .../components/workshop/ExploreResultCard.vue | 95 +++++++++++++ .../components/workshop/ExploreResults.vue | 125 ++++++++++++++++++ .../workshop/ExploreResultsHeading.vue | 67 ++++++++++ apps/website/src/lib/hub/model-logos.ts | 2 + .../src/lib/workshop/explore-search.test.ts | 91 +++++++++++++ .../src/lib/workshop/explore-search.ts | 71 ++++++++++ apps/website/src/locales/en/main.json | 48 ++++--- apps/website/src/locales/zh-CN/main.json | 48 ++++--- 13 files changed, 856 insertions(+), 34 deletions(-) create mode 100644 apps/website/src/components/workshop/ExploreFinder.vue create mode 100644 apps/website/src/components/workshop/ExploreHome.test.ts create mode 100644 apps/website/src/components/workshop/ExploreKindTag.vue create mode 100644 apps/website/src/components/workshop/ExploreResultCard.test.ts create mode 100644 apps/website/src/components/workshop/ExploreResultCard.vue create mode 100644 apps/website/src/components/workshop/ExploreResults.vue create mode 100644 apps/website/src/components/workshop/ExploreResultsHeading.vue create mode 100644 apps/website/src/lib/workshop/explore-search.test.ts create mode 100644 apps/website/src/lib/workshop/explore-search.ts diff --git a/apps/website/src/components/workshop/ExploreFinder.vue b/apps/website/src/components/workshop/ExploreFinder.vue new file mode 100644 index 00000000000..6e143dc42d7 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreFinder.vue @@ -0,0 +1,31 @@ + + + diff --git a/apps/website/src/components/workshop/ExploreHome.test.ts b/apps/website/src/components/workshop/ExploreHome.test.ts new file mode 100644 index 00000000000..a85a58e60df --- /dev/null +++ b/apps/website/src/components/workshop/ExploreHome.test.ts @@ -0,0 +1,51 @@ +import userEvent from '@testing-library/user-event' +import { render, screen, waitFor, within } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' + +import { workshopModels } from '@/config/workshop-browse-content' +import ExploreHome from './ExploreHome.vue' + +const renderHome = () => + render(ExploreHome, { props: { models: workshopModels, appsShown: true } }) + +const resultNames = () => + within(screen.getByTestId('explore-results')) + .getAllByRole('link') + .map((link) => link.textContent.trim()) + +describe('Hub home', () => { + it('opens on the doors and the popular row', () => { + renderHome() + + expect(screen.getByTestId('explore-doors')).toBeTruthy() + expect(resultNames().length).toBeGreaterThan(0) + }) + + it('answers a search with what matches it, and puts the doors away', async () => { + renderHome() + + await userEvent + .setup() + .type(screen.getByTestId('explore-search'), 'upscale') + + await waitFor(() => + expect(screen.queryByTestId('explore-doors')).toBeNull() + ) + const names = resultNames().join(' ').toLowerCase() + expect(names).toContain('upscale') + }) + + it('brings the doors back when the search is cleared', async () => { + renderHome() + const user = userEvent.setup() + const box = screen.getByTestId('explore-search') + + await user.type(box, 'upscale') + await waitFor(() => + expect(screen.queryByTestId('explore-doors')).toBeNull() + ) + await user.clear(box) + + expect(await screen.findByTestId('explore-doors')).toBeTruthy() + }) +}) diff --git a/apps/website/src/components/workshop/ExploreHome.vue b/apps/website/src/components/workshop/ExploreHome.vue index b52c189dc86..699f455de8c 100644 --- a/apps/website/src/components/workshop/ExploreHome.vue +++ b/apps/website/src/components/workshop/ExploreHome.vue @@ -1,17 +1,26 @@ diff --git a/apps/website/src/components/workshop/ExploreKindTag.vue b/apps/website/src/components/workshop/ExploreKindTag.vue new file mode 100644 index 00000000000..76ae6ce5448 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreKindTag.vue @@ -0,0 +1,59 @@ + + + diff --git a/apps/website/src/components/workshop/ExploreResultCard.test.ts b/apps/website/src/components/workshop/ExploreResultCard.test.ts new file mode 100644 index 00000000000..044f1a9f5d9 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreResultCard.test.ts @@ -0,0 +1,116 @@ +import { render, screen, within } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' + +import ExploreResultCard from './ExploreResultCard.vue' + +const still = { + name: 'Relight', + thumbnail: { url: '/still.jpg', kind: 'image' } +} as const + +describe('ExploreResultCard', () => { + it.for([ + { art: 'a still', model: still, images: ['/still.jpg'] }, + { art: 'nothing', model: undefined, images: [] } + ] as const)( + 'reads as its name and its pills with $art', + ({ model, images }) => { + render(ExploreResultCard, { + props: { + href: '/hub/workflows/relight/', + kind: 'workflow', + name: 'Relight', + pills: ['Edit images'], + model + } + }) + + expect(screen.getByRole('link')).toHaveTextContent( + /^\s*Workflow\s*Relight\s*Edit images\s*$/ + ) + expect( + screen.queryAllByAltText('').map((img) => img.getAttribute('src')) + ).toEqual(images) + } + ) + + it('marks its kind top left and its maker top right over the artwork', () => { + render(ExploreResultCard, { + props: { + href: '/hub/models/beeble/', + kind: 'model', + name: 'Beeble SwitchX', + model: still, + source: 'Beeble', + logo: '/logos/beeble.svg', + pills: ['Edit images'] + } + }) + + const artwork = within(screen.getByTestId('explore-artwork')) + const meta = within(screen.getByTestId('explore-meta')) + expect(artwork.getByTestId('explore-kind')).toHaveTextContent('Model') + expect(artwork.getByTestId('explore-kind')).toHaveClass('top-4', 'left-4') + expect(artwork.getByTestId('explore-source')).toHaveTextContent('Beeble') + expect(artwork.getByTestId('explore-source')).toHaveClass( + 'top-4', + 'right-4' + ) + expect(artwork.getByTestId('model-card-provider-logo')).toHaveStyle({ + maskImage: 'url(/logos/beeble.svg)' + }) + expect( + within(meta.getByTestId('explore-pills')) + .getAllByText(/./) + .map((pill) => pill.textContent.trim()) + ).toEqual(['Edit images']) + expect(screen.getByRole('link')).toHaveTextContent( + /^\s*Model\s*Beeble\s*Beeble SwitchX\s*Edit images\s*$/ + ) + }) + + it('names the maker over the artwork when it has no logo', () => { + render(ExploreResultCard, { + props: { kind: 'workflow', name: 'Relight', source: 'Nobody', pills: [] } + }) + + expect(screen.getByTestId('explore-source')).toHaveTextContent('Nobody') + expect(screen.queryByTestId('model-card-provider-logo')).toBeNull() + }) + + it('shows the kind as an icon and keeps its name for screen readers', () => { + render(ExploreResultCard, { + props: { kind: 'model', name: 'Beeble SwitchX', model: still, pills: [] } + }) + + expect(screen.getByText('Model')).toHaveClass('sr-only') + }) + + it.for([ + { + href: '/hub/apps/cinematic-studio/', + newTab: true, + links: 1, + target: '_blank' + }, + { + href: '/hub/workflows/relight/', + newTab: false, + links: 1, + target: undefined + }, + { href: undefined, newTab: true, links: 0, target: undefined } + ])( + 'opens an app in a tab of its own, and nothing for one still coming ($href)', + ({ href, newTab, links, target }) => { + render(ExploreResultCard, { + props: { href, newTab, kind: 'app', name: 'Relight', pills: [] } + }) + + expect(screen.queryAllByRole('link')).toHaveLength(links) + expect( + screen.getByTestId('explore-result').getAttribute('target') ?? undefined + ).toBe(target) + } + ) +}) diff --git a/apps/website/src/components/workshop/ExploreResultCard.vue b/apps/website/src/components/workshop/ExploreResultCard.vue new file mode 100644 index 00000000000..9a7d56f4f43 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreResultCard.vue @@ -0,0 +1,95 @@ + + + diff --git a/apps/website/src/components/workshop/ExploreResults.vue b/apps/website/src/components/workshop/ExploreResults.vue new file mode 100644 index 00000000000..96e89beec51 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreResults.vue @@ -0,0 +1,125 @@ + + + diff --git a/apps/website/src/components/workshop/ExploreResultsHeading.vue b/apps/website/src/components/workshop/ExploreResultsHeading.vue new file mode 100644 index 00000000000..79b6b3836e6 --- /dev/null +++ b/apps/website/src/components/workshop/ExploreResultsHeading.vue @@ -0,0 +1,67 @@ + + + diff --git a/apps/website/src/lib/hub/model-logos.ts b/apps/website/src/lib/hub/model-logos.ts index 2b14f42da0b..f56a6a57eab 100644 --- a/apps/website/src/lib/hub/model-logos.ts +++ b/apps/website/src/lib/hub/model-logos.ts @@ -43,6 +43,8 @@ const MODEL_TO_LOGO: Record = { Sonilo: 'sonilo' } +export const COMFY_LOGO_PATH = '/icons/logomark.svg' + function escapeRegex(value: string): string { return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') } diff --git a/apps/website/src/lib/workshop/explore-search.test.ts b/apps/website/src/lib/workshop/explore-search.test.ts new file mode 100644 index 00000000000..1658cd0c2b1 --- /dev/null +++ b/apps/website/src/lib/workshop/explore-search.test.ts @@ -0,0 +1,91 @@ +import { describe, expect, it } from 'vitest' + +import type { + WorkflowWorkshopModel, + WorkshopModel +} from '@/config/models-catalogue' +import type { CatalogueApp } from './catalogue-apps' +import { exploreRow, searchExplore } from './explore-search' + +const workflow = (name: string, summary = ''): WorkflowWorkshopModel => ({ + type: 'CLOUD', + workflowId: name, + slug: `workflows/${name}`, + name, + href: `/hub/workflows/${name}/`, + workflowCount: 0, + capabilities: [], + summary +}) + +const model = ( + name: string, + capabilities: readonly string[] = [] +): WorkshopModel => ({ + routerId: `lab/${name}`, + slug: name, + name, + href: `/hub/models/${name}/`, + workflowCount: 0, + capabilities +}) + +const app = ( + name: string, + task: string, + href = '/hub/apps/' +): CatalogueApp => ({ + key: name, + name, + task, + href +}) + +const catalogue = { + apps: [ + app('Cinematic Studio', 'Direct every shot', '/hub/apps/cinematic-studio/'), + app('Relight', 'Point the light where you want it.') + ], + workflows: [ + workflow('Match lighting', 'Relight a portrait from a reference.'), + workflow('Upscale a video', 'Sharper footage.') + ], + models: [ + model('Switch Video', ['relighting']), + model('Relight Pro'), + model('Painter', ['text-to-image']) + ] +} + +describe('searchExplore', () => { + it('finds every kind a query names, by name, capability or summary', () => { + const found = searchExplore(catalogue, ' Relight ') + + expect(found.apps.map(({ name }) => name)).toEqual(['Relight']) + expect(found.workflows.map(({ name }) => name)).toEqual(['Match lighting']) + expect(found.models.map(({ name }) => name)).toEqual([ + 'Relight Pro', + 'Switch Video' + ]) + }) + + it('finds nothing for a query nothing names', () => { + expect(searchExplore(catalogue, 'sprite')).toEqual({ + apps: [], + workflows: [], + models: [] + }) + }) +}) + +describe('exploreRow', () => { + it('lists workflows, then apps, then models, up to the limit', () => { + const found = searchExplore(catalogue, 'relight') + + expect( + exploreRow(found, 3).map((entry) => + entry.kind === 'app' ? `app:${entry.app.name}` : entry.model.slug + ) + ).toEqual(['workflows/Match lighting', 'app:Relight', 'Relight Pro']) + }) +}) diff --git a/apps/website/src/lib/workshop/explore-search.ts b/apps/website/src/lib/workshop/explore-search.ts new file mode 100644 index 00000000000..7d1ae2fbcbf --- /dev/null +++ b/apps/website/src/lib/workshop/explore-search.ts @@ -0,0 +1,71 @@ +import type { + WorkflowWorkshopModel, + WorkshopModel +} from '@/config/models-catalogue' +import { filterWorkshopModels } from '@/config/models-catalogue' +import type { CatalogueApp } from './catalogue-apps' + +export type ExploreKind = 'model' | 'workflow' | 'app' + +export type ExploreEntry = + | { readonly kind: 'app'; readonly app: CatalogueApp } + | { readonly kind: 'workflow' | 'model'; readonly model: WorkshopModel } + +export interface ExploreCount { + readonly kind: 'models' | 'workflows' | 'apps' + readonly count: number + /** That kind's own page, narrowed to the query where it can be. */ + readonly href: string +} + +export interface ExploreMatches { + readonly apps: readonly CatalogueApp[] + readonly workflows: readonly WorkflowWorkshopModel[] + readonly models: readonly WorkshopModel[] +} + +function namedFirst( + list: readonly T[], + needle: string +): T[] { + const leads = (item: T) => item.name.toLowerCase().startsWith(needle) + return [...list].sort((a, b) => Number(leads(b)) - Number(leads(a))) +} + +/** + * Everything in the Hub a query finds: a model or workflow by what the + * catalogue search reads (name, provider, use case, capabilities) or by its + * summary, an app by its name or what it does. Names that start with the + * query lead each kind. + */ +export function searchExplore( + catalogue: ExploreMatches, + query: string +): ExploreMatches { + const needle = query.trim().toLowerCase() + const matches = (model: WorkshopModel) => + filterWorkshopModels([model], { query: needle }).length > 0 || + (model.summary ?? '').toLowerCase().includes(needle) + return { + apps: namedFirst( + catalogue.apps.filter((app) => + `${app.name} ${app.task}`.toLowerCase().includes(needle) + ), + needle + ), + workflows: namedFirst(catalogue.workflows.filter(matches), needle), + models: namedFirst(catalogue.models.filter(matches), needle) + } +} + +/** One row of results: workflows, then apps, then models, up to `limit`. */ +export function exploreRow( + matches: ExploreMatches, + limit: number +): ExploreEntry[] { + return [ + ...matches.workflows.map((model) => ({ kind: 'workflow' as const, model })), + ...matches.apps.map((app) => ({ kind: 'app' as const, app })), + ...matches.models.map((model) => ({ kind: 'model' as const, model })) + ].slice(0, limit) +} diff --git a/apps/website/src/locales/en/main.json b/apps/website/src/locales/en/main.json index 80624eb9ec4..d6900e78443 100644 --- a/apps/website/src/locales/en/main.json +++ b/apps/website/src/locales/en/main.json @@ -665,27 +665,43 @@ }, "cinematic": {}, "explore": { - "subtitle": "Pick an app, remix a workflow or call a model.", - "doors": "Browse by format", - "modelsIntent": "Run or call any model", - "modelsTitle": "Models", - "modelsHint": "Call the latest models from your code. Try them here first.", - "workflowsIntent": "Download and remix", - "workflowsHint": "Open the graph and change any step.", - "appsIntent": "Make it in one click", + "appOpen": "Open", + "appSoon": "Soon", "appsHint": "Upload, click, done. No nodes, no setup.", - "doorModelRun": "Run", + "appsIntent": "Make it in one click", + "clear": "Clear search", + "countApps": "{count} app | {count} apps", + "countModels": "{count} model | {count} models", + "countWorkflows": "{count} workflow | {count} workflows", + "doorAppControlFocal": "Focal length", + "doorAppControlRotation": "Rotation", + "doorAppGenerate": "Generate", + "doorApps": "Apps", "doorModelPromptLake": "Alpine lake at blue hour", "doorModelPromptRowboat": "Rowboat on a tropical lagoon", - "doorWorkflows": "Workflows", - "doorWorkflowStep": "Relight", + "doorModelRun": "Run", "doorWorkflowLight": "light", - "doorWorkflowStrength": "strength", "doorWorkflowSave": "Save Image", - "doorApps": "Apps", - "doorAppGenerate": "Generate", - "doorAppControlFocal": "Focal length", - "doorAppControlRotation": "Rotation" + "doorWorkflowStep": "Relight", + "doorWorkflowStrength": "strength", + "doorWorkflows": "Workflows", + "doors": "Browse by format", + "empty": "Nothing matches yet.", + "kindApp": "App", + "kindModel": "Model", + "kinds": "Results by kind", + "modelsHint": "Call the latest models from your code. Try them here first.", + "modelsIntent": "Run or call any model", + "modelsTitle": "Models", + "popularTitle": "Popular", + "resultsFor": "Results for “{query}”", + "searchLabel": "Search the Hub", + "searchPlaceholder": "Try “relight”, “upscale” or a model name", + "subtitle": "Pick an app, remix a workflow or call a model.", + "useCasesTitle": "Browse by what you want to make", + "workflowPill": "Workflow", + "workflowsHint": "Open the graph and change any step.", + "workflowsIntent": "Download and remix" } }, "auth": { diff --git a/apps/website/src/locales/zh-CN/main.json b/apps/website/src/locales/zh-CN/main.json index 94b4a1772e0..5eea1598c1d 100644 --- a/apps/website/src/locales/zh-CN/main.json +++ b/apps/website/src/locales/zh-CN/main.json @@ -5151,27 +5151,43 @@ "zoomReset": "重置" }, "explore": { - "subtitle": "挑一个应用,改编一个工作流,或调用一个模型。", - "doors": "按类型浏览", - "modelsIntent": "运行或调用任意模型", - "modelsTitle": "模型", - "modelsHint": "在代码中调用最新模型,也可以先在这里试用。", - "workflowsIntent": "下载并二次创作", - "workflowsHint": "打开节点图,修改任意步骤。", - "appsIntent": "一键生成", + "appOpen": "打开", + "appSoon": "即将推出", "appsHint": "上传,点击,完成。无需节点,无需配置。", - "doorModelRun": "运行", + "appsIntent": "一键生成", + "clear": "清除搜索", + "countApps": "{count} 个应用 | {count} 个应用", + "countModels": "{count} 个模型 | {count} 个模型", + "countWorkflows": "{count} 个工作流 | {count} 个工作流", + "doorAppControlFocal": "焦距", + "doorAppControlRotation": "旋转", + "doorAppGenerate": "生成", + "doorApps": "应用", "doorModelPromptLake": "蓝调时刻的高山湖泊", "doorModelPromptRowboat": "热带泻湖上的小划艇", - "doorWorkflows": "工作流", - "doorWorkflowStep": "重新打光", + "doorModelRun": "运行", "doorWorkflowLight": "光线", - "doorWorkflowStrength": "强度", "doorWorkflowSave": "Save Image", - "doorApps": "应用", - "doorAppGenerate": "生成", - "doorAppControlFocal": "焦距", - "doorAppControlRotation": "旋转" + "doorWorkflowStep": "重新打光", + "doorWorkflowStrength": "强度", + "doorWorkflows": "工作流", + "doors": "按类型浏览", + "empty": "暂时没有匹配的结果。", + "kindApp": "应用", + "kindModel": "模型", + "kinds": "按类型查看结果", + "modelsHint": "在代码中调用最新模型,也可以先在这里试用。", + "modelsIntent": "运行或调用任意模型", + "modelsTitle": "模型", + "popularTitle": "热门", + "resultsFor": "“{query}”的结果", + "searchLabel": "搜索 Hub", + "searchPlaceholder": "试试“relight”、“upscale”或模型名称", + "subtitle": "挑一个应用,改编一个工作流,或调用一个模型。", + "useCasesTitle": "按你想创作的内容浏览", + "workflowPill": "工作流", + "workflowsHint": "打开节点图,修改任意步骤。", + "workflowsIntent": "下载并二次创作" } } }