Skip to content

style(models): variant label as a pill badge — launch backup if distinct thumbnails slip - #17387

Closed
comfydesigner wants to merge 2 commits into
comfydesigner/models-catalogue-sizingfrom
comfydesigner/models-variant-badge
Closed

comfydesigner wants to merge 2 commits into
comfydesigner/models-catalogue-sizingfrom
comfydesigner/models-variant-badge

Conversation

@comfydesigner

@comfydesigner comfydesigner commented Sep 10, 2026 •

Copy link
Copy Markdown
Contributor

Backup for launch — if distinct per-variant thumbnails land in time, close this unmerged. It exists so we aren't choosing between the ribbon and nothing on launch day.

Ben's diagonal ribbon solves a real problem: variant families share a thumbnail and the name difference is easy to miss. This keeps the mechanism (thumbnailLabel, same data, same tests) and changes the clothing — and, since the first draft of this description, the clothing changed again in review with Alex:

ribbon pill (as shipped)
artwork covered 160px diagonal + overflow ~70×28px corner, and it slides away while the card is hovered or focused
colours yellow on ink warm-white on the dropdown surface with a hairline border — subtler, since the label is a tiebreaker, not a CTA
position upper-right sash top-right on hub cards; bottom-left on grid cards, next to the model name it disambiguates
label sizing 3 font steps by length one size, hugs content

The hide-on-hover is deliberate: the label's job is done once you're comparing the artwork. MODELS_LOCAL_PREVIEW.md now describes the pill rather than the retired ribbon.

Stacked on #17381 (base: comfydesigner/models-catalogue-sizing) to keep the chain linear — no content dependency on it.

@coderabbitai

coderabbitai Bot commented Sep 10, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: a485da0d-1476-4c99-9e4c-bda7e7b8acbd

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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

@github-actions

github-actions Bot commented Sep 10, 2026 •

Copy link
Copy Markdown
Contributor

🌐 Website E2E

Tip

All tests passed.

Status ✅ Passed
Report View Report

📦 Bundle Size

⏳ Size data collection in progress…

🔗 Website Preview

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

Matches production — what ships if we release right now.

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

Last updated: 2026-09-13T18:11:14Z for ff74a00

@github-actions github-actions Bot added the risk:high PR risk grade (advisory shadow check; grader-owned) label Sep 10, 2026
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch 4 times, most recently from 2bd7b10 to 41e89e9 Compare September 11, 2026 01:28
@comfydesigner
comfydesigner marked this pull request as ready for review September 11, 2026 01:41
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch 2 times, most recently from 8abd83b to 3edc802 Compare September 11, 2026 01:48
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch from 3edc802 to 60f061b Compare September 11, 2026 04:55
@benjcooley
benjcooley force-pushed the comfydesigner/models-catalogue-sizing branch from 39b4715 to f9820d0 Compare September 11, 2026 07:47
@benjcooley
benjcooley force-pushed the comfydesigner/models-variant-badge branch from 60f061b to 7779cb9 Compare September 11, 2026 07:53
@codecov

codecov Bot commented Sep 11, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@                          Coverage Diff                           @@
##           comfydesigner/models-catalogue-sizing   #17387   +/-   ##
======================================================================
  Coverage                                  82.48%   82.48%           
======================================================================
  Files                                       2690     2690           
  Lines                                     135504   135504           
  Branches                                   35534    35534           
======================================================================
  Hits                                      111770   111770           
  Misses                                     22812    22812           
  Partials                                     922      922           
Flag Coverage Δ
website-unit 72.24% <ø> (ø)

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

Files with missing lines Coverage Δ
...site/src/components/workshop/WorkshopModelCard.vue 96.22% <ø> (ø)
🚀 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.

@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.

Review

This review was generated by Claude and may be wrong. If a comment is invalid, reply saying why.

One-file restyle of the shared-thumbnail variant label (4+/6-). There are no crash or data risks. The data-testid and content are unchanged, the tokens (bg-site-dropdown, text-primary-warm-white) exist in global.css, and the zod max(12) cap keeps a hugging pill from colliding with HubTypeBadge at the narrowest card widths. No new tests are needed for a pure style change.

The main problem: the description doesn't describe the diff. "Same yellow-on-ink, same corner" is not what ships (warm-white on dark purple, and the corner changes between hub and grid cards), and the new hide-on-hover/focus behavior isn't mentioned. The before/after table is what design will sign off on, so it needs to match.

Severity Count
BLOCKER 0
SHOULD FIX 2
TRIVIAL 2

Not inline (outside the diff):

  • TRIVIAL: apps/website/MODELS_LOCAL_PREVIEW.md § "Shared-thumbnail ribbons" still documents the diagonal upper-right ribbon, the 16/12/9px size steps, the 800 weight and the fixed 40px stripe. All of it is wrong after this merges. The test title keeps incomplete status alongside the ribbon in WorkshopModelCard.test.ts is stale too.

'bg-site-dropdown pointer-events-none absolute z-10 rounded-xl border border-white/10 px-3 py-2 text-sm leading-none font-bold whitespace-nowrap text-primary-warm-white shadow-sm transition-all duration-500 select-none group-hover:opacity-0 group-focus-visible:opacity-0',
providerBadge
? 'top-3 right-3 group-hover:translate-x-1 group-hover:-translate-y-1'
: 'bottom-3 left-3 group-hover:-translate-x-1 group-hover:translate-y-1'

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.

TRIVIAL — the label now sits bottom-left on grid cards, so ModelSupport's placement conditional (L71–78) is stale. Its thumbnailLabel ? … 'top-3 left-3' branch only existed to avoid the top-right ribbon. It can become thumbnailLabel && providerBadge ? 'top-12 left-3' : 'top-3 right-3'.

Also on hub cards: top-3 right-3 doesn't line up with HubTypeBadge's top-4 left-4 in the opposite corner.

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.

Still open after c6c3edc. The conditional is unchanged. Non-blocking, fine to leave for a follow-up.

@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.

Approving: no blockers. Before merge, please fix the two SHOULD FIX items from the earlier review: make the description match the shipped colors and placement (or restore bg-brand text-page), and confirm hide-on-hover/focus is intentional. Then update the stale ribbon section in MODELS_LOCAL_PREVIEW.md.

@comfydesigner
comfydesigner force-pushed the comfydesigner/models-catalogue-sizing branch from f9820d0 to ff15274 Compare September 11, 2026 17:13
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch from 7779cb9 to 60f061b Compare September 11, 2026 17:13
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-catalogue-sizing branch from ff15274 to f9820d0 Compare September 11, 2026 17:16
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch from 60f061b to 7779cb9 Compare September 11, 2026 17:16

@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.

Re-review of c6c3edc (docs and test title only; no component changes).

  • Description mismatch: resolved. The table now describes the shipped colors, per-surface placement and hover behavior.
  • Hide on hover/focus: resolved. Documented as deliberate.
  • Stale ribbon docs and test title: fixed.
  • TRIVIAL: the stale ModelSupport conditional is still there. Non-blocking.
Severity Open
BLOCKER 0
SHOULD FIX 0
TRIVIAL 1

@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch from c6c3edc to 6b09059 Compare September 11, 2026 19:54
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-catalogue-sizing branch from e8cb859 to 3cd8742 Compare September 11, 2026 21:34
@comfydesigner
comfydesigner force-pushed the comfydesigner/models-variant-badge branch from 6b09059 to ff74a00 Compare September 11, 2026 21:34
@benjcooley benjcooley added the cursor-review Trigger multi-model Cursor agent review on this PR label Sep 13, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔍 Cursor Review — Consolidated panel

Triggered by @benjcooley.

Found 3 finding(s).

Severity Count
🟢 Low 2
⚪ Nit 1

Panel: 8/8 reviewers contributed findings.

: thumbnailLabel.length > 6
? 'text-xs'
: 'text-base'
'bg-site-dropdown pointer-events-none absolute z-10 rounded-xl border border-white/10 px-3 py-2 text-sm leading-none font-bold whitespace-nowrap text-primary-warm-white shadow-sm transition-all duration-500 select-none group-hover:opacity-0 group-focus-visible:opacity-0',

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Low — The pill now fades out on group-focus-visible as well as group-hover while staying aria-hidden="true", so the only differentiator between two models sharing an identical thumbnail is unavailable to keyboard users at the moment they focus a card, and never announced to assistive tech; the old always-visible ribbon had no such gap. Keyboard focus obscures no artwork, so consider limiting the fade to group-hover (and/or dropping aria-hidden) — this also avoids sticky :hover on touch browsers leaving the label hidden after a tap. Raised by 2 of 8 reviewers (claude-opus-5-thinking-max adversarial, claude-opus-5-thinking-max edge-case).

'bg-site-dropdown pointer-events-none absolute z-10 rounded-xl border border-white/10 px-3 py-2 text-sm leading-none font-bold whitespace-nowrap text-primary-warm-white shadow-sm transition-all duration-500 select-none group-hover:opacity-0 group-focus-visible:opacity-0',
providerBadge
? 'top-3 right-3 group-hover:translate-x-1 group-hover:-translate-y-1'
: 'bottom-3 left-3 group-hover:-translate-x-1 group-hover:translate-y-1'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🟢 Low — The ModelSupport placement branch earlier in this file (around lines 70-79) exists to dodge the old top-right ribbon: with thumbnailLabel set and providerBadge false it shifts the Incomplete badge from top-3 right-3 to top-3 left-3. The label now sits bottom-3 left-3 in that case, leaving the top-right corner free, so within one grid the Incomplete badge lands top-left or top-right depending only on whether a model happens to share artwork; also re-check the providerBadge true path, where the label itself now occupies top-3 right-3. Raised by 1 of 8 reviewers (claude-opus-5-thinking-max edge-case).

: 'text-base'
'bg-site-dropdown pointer-events-none absolute z-10 rounded-xl border border-white/10 px-3 py-2 text-sm leading-none font-bold whitespace-nowrap text-primary-warm-white shadow-sm transition-all duration-500 select-none group-hover:opacity-0 group-focus-visible:opacity-0',
providerBadge
? 'top-3 right-3 group-hover:translate-x-1 group-hover:-translate-y-1'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚪ Nit — The translate classes are wired only to group-hover while the fade is wired to both group-hover and group-focus-visible, so a focused card fades the pill in place instead of sliding it. That contradicts the MODELS_LOCAL_PREVIEW.md wording added in this PR ("slides away while the card is hovered or focused"); add matching group-focus-visible:translate-* classes or reword the doc. Raised by 4 of 8 reviewers (gpt-5.6-sol-max edge-case, claude-opus-5-thinking-max edge-case, gemini-3.1-pro edge-case, kimi-k3-max edge-case).

benjcooley added a commit that referenced this pull request Sep 13, 2026
## Summary

Combines the reviewed Models catalogue and account/checkout work from
Alex Tov and Mar on top of the performance fixes already merged in
#17604.

- carries Mar's current production UX passes from #17569 and #17582,
plus the production port of her catalogue design in #17379
- adds Alex's catalogue sizing, variant labels, provider documentation
links, account/workspace menu, real credit gate, and Stripe checkout
flow
- resolves the cumulative review findings across the source PRs,
including session and credit race handling, checkout URL validation,
paid-run navigation protection, mobile sheet behavior, featured
ordering, and catalogue regressions
- keeps the retired `/workshop` routes out of builds and uses `/models`
as the released surface

## Source PRs

This PR supersedes #17379, #17381, #17387, #17394, #17408, #17452,
#17569, and #17582. It also includes the applicable substrate from
closed #17400.

The branch preserves the original source commits and authors: 33 commits
by @comfydesigner and 20 commits by @mariana953, followed by one
cumulative review-fix commit.

## Verification

- repository pre-commit pipeline: lint, root typecheck, and website
typecheck pass
- website typecheck: 0 errors
- focused Models/account/checkout regression tests: 198 passing
- Models Playwright suite: 19/19 desktop and 1/1 mobile
- feature-enabled static build: passes and emits the Models catalogue;
retired Workshop pages are removed
- feature-disabled static build: passes with no Models catalogue on the
regular homepage
- three independent adversarial review passes completed; no code
findings remain

The complete website unit run reached 4,587 passing tests. Its sole
failure was the existing load-sensitive `VideoMaskScene` timer test,
which passed immediately in isolation (5/5); CI is the final clean-room
run.

## External preview dependency

The frontend checkout flow is complete, but Cloud non-production
currently rejects the actual preview hostname format
(`comfy-website-preview-pr-<number>.vercel.app`) in
`TOPUP_CHECKOUT_RETURN_HOSTS`. Cloud must add that exact bounded
preview-host pattern before Stripe return can be exercised from a Vercel
preview. This does not require a broader `*.vercel.app` allowlist.

---------

Co-authored-by: Mariana Martinho <mariana@comfy.org>
Co-authored-by: comfydesigner <alextov@comfy.org>
@benjcooley

Copy link
Copy Markdown
Collaborator

Superseded by #17614, which combined this reviewed work with the rest of the Alex Tov and Mar Models stack and has now merged to main. The remaining post-merge review repairs are tracked in #17616.

@benjcooley benjcooley closed this Sep 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cursor-review Trigger multi-model Cursor agent review on this PR 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