Skip to content

feat(website): move the catalogue tabs down beside the controls - #18862

Merged
benjcooley merged 8 commits into
mainfrom
mariana/v2-catalogue-controls
Sep 25, 2026
Merged

benjcooley merged 8 commits into
mainfrom
mariana/v2-catalogue-controls

Conversation

@mariana953

@mariana953 mariana953 commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

Summary

The Models / Workflows / Apps tabs move out of the hero and into the sticky bar that already holds the search and the order, at its left — the first visible step of the V2 catalogue design.

Second of three. Stacked on #18857, which made the hero take resolved copy so it could give its eyebrow line back.

Changes

  • What:
    • WorkshopModelsGrid.vue and WorkflowCatalogue.vue take a tabs slot at the start of their sticky bar, and both bars now carry data-testid="workshop-toolbar".
    • ModelsCatalogue.vue stops rendering CatalogueTabs in the hero's #eyebrow slot and in its own body, and passes them into each half's bar instead. Apps has no list of its own, so it gets a bar carrying only the tabs.
    • The hero's eyebrow line renders again, since nothing replaces it now. That matches the design, where the hero keeps its eyebrow and the tabs sit below.
  • Breaking: none.
  • Dependencies: none.

Review Focus

Apps would have become a dead end. It is a "coming soon" panel with no toolbar, so putting the tabs only inside the two halves that have one would have left no way back. It carries the same bar for the tabs alone.

Two of the three v-if="workflows.length" guards were dead and are gone. activeTab is workflows.value.length ? selectedTab.value : 'models', so the workflows and apps halves are unreachable when there are no workflows; only the models half can render with none. Keeping all three pushed the template past the fallow cognitive threshold, which is what surfaced it.

Not in this PR, though the design has them: the shorter (compact) banner and the outcome rows. The model filter on the workflows half is the next PR in the stack. The prototype's whole browse stack is about 1,800 lines; taking it in one go would not be reviewable. This is the piece that changes where things sit.

Tests: a table over the three halves asserting the tabs render inside workshop-toolbar and not inside workshop-hero. Removing the slot from either half turns it red. 492 tests pass across src/components/workshop/; eslint, oxlint --type-aware, typecheck:website, knip and fallow audit are clean.

Screenshots (if applicable)

Captured from a local build of this branch — the preview on this PR is the place to judge it.

Models tabs at the left of the bar, then search, Filter, Most popular
Workflows same bar, with the workflows search and order
Apps the bar carries the tabs alone, above the panel

…back link

The three pieces of the catalogue shell each knew one section's copy. The
hero read its own translation keys, the banner took models and projected
them itself, and the back link could only return to /models.

They now take what they show: resolved copy, a FeaturedSlide, and the
listing to return to. The slide shape stays with the banner so a
catalogue holding no models can render it without pulling the model
catalogue in behind it; modelSlides builds one from a WorkshopModel and
is imported only where models are.

No visible change: same copy, same layout, same media on both pages.
The tabs sat in the hero's eyebrow, above the heading, announcing the
page. They belong with the search and the order that act on the list, so
they move into the sticky bar those already share, at its left.

Apps has no list of its own, so it carries the bar for the tabs alone;
without it there is no way back out of that half. The hero's eyebrow
line shows again, which is what the design asks for.

The guard on the tabs stays only where it decides anything: reaching the
workflows or apps half means workflows exist, since the active tab falls
back to models while there are none.
@vercel

vercel Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments
Project Deployment Actions Updated
billing-web Ignored Ignored Sep 25, 2026 3:31pm UTC
billing-web-test Skipped Skipped Sep 25, 2026 3:31pm UTC

Request Review

@coderabbitai

coderabbitai Bot commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: Comfy-Org/ComfyUI_frontend/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 717f3d6b-9425-48c2-bca8-0b7fec1f3e64

📥 Commits

Reviewing files that changed from the base of the PR and between 22f7d6a and 36b3c92.

📒 Files selected for processing (14)
  • apps/website/e2e/workshop-workflows.spec.ts
  • apps/website/src/components/hub/HubBrowse.vue
  • apps/website/src/components/workshop/CatalogueBackLink.test.ts
  • apps/website/src/components/workshop/CatalogueBackLink.vue
  • apps/website/src/components/workshop/CatalogueTabs.vue
  • apps/website/src/components/workshop/FeaturedBanner.test.ts
  • apps/website/src/components/workshop/FeaturedBanner.vue
  • apps/website/src/components/workshop/ModelsCatalogue.test.ts
  • apps/website/src/components/workshop/ModelsCatalogue.vue
  • apps/website/src/components/workshop/WorkflowCatalogue.vue
  • apps/website/src/components/workshop/WorkshopHero.test.ts
  • apps/website/src/components/workshop/WorkshopHero.vue
  • apps/website/src/components/workshop/WorkshopModelsGrid.vue
  • apps/website/src/lib/workshop/featured-slides.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The workshop catalogue now uses explicit featured-slide data, places its tabs beside catalogue controls, and passes resolved text and catalogue URLs to shared components. Tests cover slide rendering, tab focus, back-link URLs, and toolbar visibility at selected viewport widths.

Changes

Workshop catalogue

Layer / File(s) Summary
Featured slide data flow
apps/website/src/lib/workshop/featured-slides.ts, apps/website/src/components/workshop/FeaturedBanner.vue, apps/website/src/components/workshop/FeaturedBanner.test.ts, apps/website/src/components/workshop/WorkshopModelsGrid.vue, apps/website/src/components/workshop/WorkflowCatalogue.vue
modelSlides maps workshop models to localized slide records. FeaturedBanner renders the supplied records, and both catalogue views pass the generated slides. Tests cover empty and single-slide cases, media, links, and existing banner interactions.
Hero text and catalogue return link
apps/website/src/components/workshop/WorkshopHero.vue, apps/website/src/components/workshop/WorkshopHero.test.ts, apps/website/src/components/hub/HubBrowse.vue, apps/website/src/components/workshop/CatalogueBackLink.vue, apps/website/src/components/workshop/CatalogueBackLink.test.ts
WorkshopHero renders supplied eyebrow, heading, and subtitle text. CatalogueBackLink accepts a catalogue URL and fallback label, and adds a remembered shelf as the useCase parameter while retaining existing URL components.
Catalogue tabs and toolbar layout
apps/website/src/components/workshop/CatalogueTabs.vue, apps/website/src/components/workshop/ModelsCatalogue.vue, apps/website/src/components/workshop/ModelsCatalogue.test.ts, apps/website/src/components/workshop/WorkshopModelsGrid.vue, apps/website/src/components/workshop/WorkflowCatalogue.vue, apps/website/e2e/workshop-workflows.spec.ts
Tabs appear in catalogue toolbars instead of the hero. Tab changes restore focus to the selected tab when focus was inside the tabs. Tests check tab placement, keyboard focus, and toolbar visibility at widths of 640, 700, and 768 pixels.

Priority: ➖ Normal

Estimated code review effort: 3 (Moderate) | ~20 minutes

Change: Feature

Merge Risk: ⚪ Minimal · up to 36b3c

The catalogue changes are mergeable after normal checks; no outstanding issue is established.

Security Architecture Review

Security architecture risk: 🔵 Low · up to 36b3c

Current featured-banner callers still use model-derived slides, and the return link remains on the website. No newly reachable security issue was established. URL restrictions and coverage of other potential callers remain uncertain.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

  • inferred — The relevant exposure is website visitors following featured links or loading featured media. The evidence identifies model-derived production slides, not a new path by which an attacker can supply arbitrary slides.

Trust Boundaries and Controls

  • observed — The catalogue URL schema does not constrain URL origin or protocol, and the banner’s new slide contract does not add such a constraint. For the return link, URL construction emits only pathname, query and hash, while stored shelf values are validated and consumed before reuse.

Hardening Proposals

  • proposed — Define and enforce an approved origin and protocol policy for featured navigation and media URLs at the data boundary, particularly before additional slide producers adopt the new contract.
🚥 Pre-merge checks | ✅ 7
✅ Passed checks (7 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely describes the primary change: moving catalogue tabs beside the controls.
Description check ✅ Passed The description includes the required Summary, Changes, Review Focus, and Screenshots sections. It explains the tab relocation, affected components, breaking changes, dependencies, design decisions, t…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
End-To-End Regression Coverage For Fixes ✅ Passed PASS: The PR contains bug-fix commit subjects, but all listed changes are exclusively under apps/website (including apps/website/e2e/). The custom check explicitly excludes website-only changes fr…
Website End-To-End Regression Coverage ✅ Passed The PR changes website runtime behavior by moving catalogue tabs and changing tab focus and navigation behavior. It also updates apps/website/e2e/workshop-workflows.spec.ts with Playwright viewport …
Adr Compliance For Entity/Litegraph Changes ✅ Passed The changed-file list contains only files under apps/website. It contains no files under src/lib/litegraph/, src/ecs/, or other graph-entity paths. The ADR-LAYOUT and ADR-ECS checks therefore do not a…
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

🌐 Website E2E

Tip

All tests passed.

Status ✅ Passed
Report View Report

🧩 Custom Nodes Ecosystem Matrix: 🟡 Withheld — could not measure

Executes the frontend JS of every registry pack that ships any, against this change, in both renderers. The eight ecosystem-matrix shard checks are a harness self-test; the pack verdict is matrix-verdict.

This candidate changes nothing the matrix measures, so every expensive stage was skipped.

Reproduce locally
# build one shard's fixture, then run it
python3 scripts/registry-census/build_matrix.py --shard 1/4
MATRIX_RENDERER=vue MATRIX_VUE=1 \
  npx vitest run --config vitest.matrix.config.mts

Full docs: scripts/registry-census/README.md

📦 Bundle Size

⏳ Size data collection in progress…

🌾 Fallow: ✅ Passed

Fallow audits the diff for duplication, complexity and dead code. It gates on new findings only, so when the audit completes, a red is something this PR introduced or moved — never inherited backlog. A red can also mean the audit itself did not finish; the details below say which happened.

No new findings in the changed files.

Reproduce locally
# the base the gate compared against
npx fallow audit --root . --quiet --format json \
  --changed-since 6919c12e2e185346ffbd5352213f22b9bb506ea5

Full docs: ADR-DEVEX-LINT-0015

🔗 Website Preview

Website Preview: https://comfy-website-preview-pr-18862.vercel.app

Models is built and gated by PostHog (workshop-enabled), using staging Cloud.

This commit: https://website-frontend-55lcsap2p-comfyui.vercel.app

Last updated: 2026-09-25T15:33:47Z for 36b3c92

@codecov

codecov Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 97.50000% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...s/website/src/components/workshop/WorkshopHero.vue 50.00% 0 Missing and 1 partial ⚠️
@@            Coverage Diff             @@
##             main   #18862      +/-   ##
==========================================
- Coverage   83.94%   83.92%   -0.02%     
==========================================
  Files        3063     3029      -34     
  Lines      151677   150949     -728     
  Branches    41195    39108    -2087     
==========================================
- Hits       127325   126691     -634     
+ Misses      22920    22874      -46     
+ Partials     1432     1384      -48     
Flag Coverage Δ
billing-web-unit ?
website-unit 76.90% <97.50%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
apps/website/src/components/hub/HubBrowse.vue 85.91% <ø> (ø)
...site/src/components/workshop/CatalogueBackLink.vue 100.00% <100.00%> (ø)
.../website/src/components/workshop/CatalogueTabs.vue 100.00% <100.00%> (ø)
...website/src/components/workshop/FeaturedBanner.vue 100.00% <100.00%> (ø)
...ebsite/src/components/workshop/ModelsCatalogue.vue 98.24% <100.00%> (+2.09%) ⬆️
...site/src/components/workshop/WorkflowCatalogue.vue 90.47% <100.00%> (ø)
...ite/src/components/workshop/WorkshopModelsGrid.vue 88.63% <100.00%> (+0.13%) ⬆️
apps/website/src/lib/workshop/featured-slides.ts 100.00% <100.00%> (ø)
...s/website/src/components/workshop/WorkshopHero.vue 75.00% <50.00%> (-12.50%) ⬇️

... and 41 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions github-actions Bot added the risk:high PR risk grade (advisory shadow check; grader-owned) label Sep 25, 2026
The back link appended the shelf behind a second question mark, so a
listing that already carried a query lost it. The featured banner read
its media url during setup, before the template's guard, so a catalogue
with nothing to feature threw.

@benjcooley benjcooley left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👨‍💻 BILL — SHOULD FIX: two regressions at 3c95df3a; please address before merging.

  1. Switching catalogue tabs by keyboard removes the focused control and drops focus to the page body.
  2. At 640–768px wide, the Models toolbar clips the Filter/Sort controls offscreen.

Both reproduced on the production build and compared against #18857, where they pass. Keep Mar's placement/design; these need focus preservation and responsive fitting, not a restyle. The existing tests miss both cases.

Production build, 80 focused unit tests and 18 existing desktop/mobile browser tests passed, including model validation/run submission, Cloud workflow recovery/download/cancellation, disabled flags and /models/ bundle budgets. Independent keyboard-sort probe passed; the two regression probes failed as described. Findings sent to FE-2736; branch unchanged.

Severity Count
BLOCKER 0
SHOULD FIX 2
TRIVIAL 0

@vercel
vercel Bot temporarily deployed to Preview – billing-web-test September 25, 2026 15:14 Inactive
benjcooley
benjcooley previously approved these changes Sep 25, 2026

@benjcooley benjcooley left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👨‍💻 BILL — accepted at 67e4804405.

Both SHOULD FIX items are fixed. Independently reproduced keyboard focus restoration through all six tab-switch directions, including a deliberately delayed WorkflowCatalogue chunk; first render does not take focus. The original overflow probe now passes at 320, 390, 639, 640, 700, 768 and 1024px, and the new viewport assertions pass. Mar's presentation is preserved.

Fresh production build, 64 focused unit tests and 24 browser tests passed. These include the original reproductions, keyboard sorting, model validation/submission, Cloud workflow recovery/download/cancellation, flag-off behavior and /models/ JavaScript budgets. No new actionable findings. Branch unchanged.

CI is still finishing; approval is for this exact head, with normal merge-queue checks still required.

Severity Remaining
BLOCKER 0
SHOULD FIX 0
TRIVIAL 0

@vercel
vercel Bot temporarily deployed to Preview – billing-web-test September 25, 2026 15:31 Inactive
Base automatically changed from mariana/v2-shared-shell to main September 25, 2026 15:34
@benjcooley
benjcooley dismissed their stale review September 25, 2026 15:34

The base branch was changed.

@mariana953
mariana953 requested review from a team and dante01yoon as code owners September 25, 2026 15:34
@mariana953
mariana953 requested a review from a team September 25, 2026 15:34

@benjcooley benjcooley left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👨‍💻 BILL — accepted at 36b3c92c66.

The inherited Workflows tablet overflow is fixed. The regression now covers both catalogue halves at 640, 700 and 768px, and the earlier tab-focus fix remains intact.

Verified locally on a fresh production build: 493 component unit tests and 25 focused browser checks passed. An independent probe waited for fonts to load: Sort's right edge is 616 / 676 / 744px at viewport widths 640 / 700 / 768px, respectively. All requested controls fit.

No remaining review findings. Source branch unchanged. CI is still finishing; normal required checks must pass before merging.

Severity Count
BLOCKER 0
SHOULD FIX 0
TRIVIAL 0

@benjcooley
benjcooley added this pull request to the merge queue Sep 25, 2026
Merged via the queue into main with commit 306cc57 Sep 25, 2026
85 checks passed
@benjcooley
benjcooley deleted the mariana/v2-catalogue-controls branch September 25, 2026 16:03
VoXoXoX pushed a commit to VoXoXoX/ComfyUI_frontend that referenced this pull request Sep 25, 2026
…fy-Org#18868)

## Summary

An outcome is reached through the model it runs on as often as through
the task it performs. The workflows half's filter gains a second group
listing those models, the way the V2 design's browse toolbar does.

Third of the V2 stack. Stacked on
[Comfy-Org#18862](Comfy-Org#18862),
which is stacked on
[Comfy-Org#18857](Comfy-Org#18857).

## Changes

- **What**:
- `WorkshopFilterMenu.vue` takes an optional `modelOptions` and a
`models` v-model, and adds a second facet group when the caller has one.
`FacetSheet` already switched between groups and counted them, so the
sheet, its per-group search, the applied count and Clear all needed no
change.
- `WorkflowCatalogue.vue` builds those options from the models each
outcome stands on, with a count each, sorted by how many workflows use
them. The choice narrows the list, reads back from `?model=`, and Clear
all drops it with the categories.
- **Breaking**: none.
- **Dependencies**: none.

## Review Focus

**Why in the filter rather than beside it**: the 30 launch workflows
name 19 distinct models, 12 of them used once. A row of chips would be
mostly ones. Inside the sheet they sit behind one control with a count,
as the categories already do.

**A workflow can stand on several models** (`Connect two images with
motion` runs on Wan 2.2 and SeedVR2), so the match is "any of the
chosen", not "all".

**Choosing a model leaves the outcome rows** for the flat result grid,
the same way a category or a search does — the rows are a browse state,
and a filtered list is not browsing.

## Tests

Component: choosing a model narrows the list and Clear all restores it;
choosing two keeps every outcome that stands on either, so an
intersection in place of the union fails; a shared URL restores a model
the catalogue lists and drops one it does not. Reverting the filter
turns these red, and removing `models.value = []` from Clear all turns
the first one red.

Browser (`e2e/workshop-workflows.spec.ts`): one case counts the outcomes
at each step — 30 while browsing, 7 for LTX-2.3, 9 with SeedVR2 added,
30 again after Clear all, and 7 from `?type=workflows&model=LTX-2.3`.
Rebuilding with the predicate changed to require every selected model
takes the union assertion from 9 to 0.

497 component tests pass across `src/components/workshop/`, and all 12
tests in that spec pass against a production preview; `eslint
apps/website`, `oxlint --type-aware`, `typecheck:website` and `fallow
audit` are clean.

## Screenshots (if applicable)

Captured from a local build of this branch — the preview on this PR is
the place to judge it.

| | |
| --- | --- |
| Filter → Model | the group lists the 19 models with a count each,
LTX-2.3 leading at 7 |
| One chosen | the 7 LTX-2.3 outcomes, the Filter control carrying a 1 |

---------

Co-authored-by: benjcooley <benjcooley@gmail.com>

This branch was previously deployed

1 inactive deployment
Preview – billing-web-test — 36b3c92c Deployed Sep 25, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk:high PR risk grade (advisory shadow check; grader-owned)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants