Merge remote-tracking branch 'origin/main' into benjcooley/matrix-detection-proof

Author: benjcooley

apps/website/e2e/seedance.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import { externalLinks, getRoutes } from '../src/config/routes'
+import { getRoutes } from '../src/config/routes'
 import { creatorReviews } from '../src/data/creatorReviews'
 import { seedancePage } from '../src/data/seedance'
 import { t } from '../src/i18n/translations'
@@ -20,7 +20,10 @@ const HERO_PRIMARY_CTA: ModelLaunchCta | undefined =
 if (!HERO_PRIMARY_CTA)
   throw new Error('seedancePage must configure a hero primary CTA')
 const SEEDANCE_RUN: string = HERO_PRIMARY_CTA.href
-const CLOUD_WORKFLOWS_HUB = externalLinks.workflows
+// The hub's Seedance family page, which lists the shipped 2.5 workflows. The
+// CTA used to open the hub root, leaving the reader to find the model they had
+// just read about.
+const SEEDANCE_HUB_PAGE: string = seedancePage.hero.secondaryCta?.href ?? ''
 const PROMPT_CTA = t('seedance.hero.promptCta', 'en')
 const COPY_PROMPT = t('modelLaunch.copyPrompt', 'en')
 // `faq` is optional on the template (Wan Animate 2 ships without one), but
@@ -106,7 +109,9 @@ test.describe('Seedance 2.5 page — link targets', () => {
     await expect(primary).toHaveAttribute('href', /video_wan2_2/)
   })
 
-  test('the hero run CTA opens the same Cloud workflow', async ({ page }) => {
+  test('the hero CTAs open Cloud to run and the hub to browse', async ({
+    page
+  }) => {
     const hero = page.locator('section').filter({
       has: page.getByRole('heading', { level: 1, name: HERO_TITLE })
     })
@@ -116,7 +121,10 @@ test.describe('Seedance 2.5 page — link targets', () => {
 
     await expect(
       hero.getByRole('link', { name: t('seedance.hero.secondaryCta', 'en') })
-    ).toHaveAttribute('href', CLOUD_WORKFLOWS_HUB)
+    ).toHaveAttribute('href', SEEDANCE_HUB_PAGE)
+    await expect(
+      hero.getByRole('link', { name: t('seedance.hero.secondaryCta', 'en') })
+    ).toHaveAttribute('href', /\/workflows\/model\/seedance$/)
   })
 
   test('renders one step card per configured step', async ({ page }) => {

apps/website/src/data/seedance.test.ts

@@ -30,6 +30,34 @@ function pageCopy(locale: Locale): { label: string; text: string }[] {
   ]
 }
 
+describe('seedance 2.5 workflow links', () => {
+  it('sends "try workflows" to the Seedance family page, not the hub root', () => {
+    // The hub root makes the reader search for the model they just read about.
+    // The family page lists the shipped 2.5 workflows, which is what the launch
+    // playbook asks the page to link, and matches what /ltx-2.5 already does.
+    expect(seedancePage.hero.secondaryCta?.href).toBe(
+      'https://comfy.org/workflows/model/seedance'
+    )
+  })
+
+  it('keeps the run CTAs on Cloud, which is a separate deliberate choice', () => {
+    // Reference-to-video on Cloud is the "run it" path chosen for this launch;
+    // linking the hub instead would undo that, so it is pinned here.
+    expect(seedancePage.hero.primaryCta?.href).toContain(
+      'cloud.comfy.org/?template=api_seedance2_5_r2v'
+    )
+  })
+
+  it('keeps the draft CTA on a template that costs nothing to run', () => {
+    // The step above this CTA promises "zero credits" in both locales, so it
+    // has to open a Cloud template that is not an `api_` one; those bill per
+    // render.
+    expect(seedancePage.steps?.primaryCta?.href).toMatch(
+      /cloud\.comfy\.org\/\?template=(?!api_)/
+    )
+  })
+})
+
 describe('seedance 2.5 landing copy', () => {
   // Offenders are collected rather than asserted one by one so a failure names
   // every surface that has to change.

apps/website/src/data/seedance.ts

@@ -10,7 +10,12 @@ import { externalLinks } from '../config/routes'
 // section points at Wan 2.2 instead, which is open source and costs nothing.
 const seedanceLinks = {
   cloudRun: 'https://cloud.comfy.org/?template=api_seedance2_5_r2v',
-  freeDraft: 'https://cloud.comfy.org/?template=video_wan2_2_14B_t2v'
+  freeDraft: 'https://cloud.comfy.org/?template=video_wan2_2_14B_t2v',
+  // The hub's Seedance family page, which lists the shipped 2.5 workflows
+  // (text to video, reference to video, first-last frame and the rest). The
+  // "try workflows" CTA pointed at the hub root, which makes the reader find
+  // them, the same fix /ltx-2.5 already carries.
+  hubModel: `${externalLinks.workflows}/model/seedance`
 } as const
 
 // Seedance 2.5 renders, encoded to the site's web video profile (VP9 webm,
@@ -196,7 +201,7 @@ export const seedancePage: ModelLaunchPage = {
     },
     secondaryCta: {
       labelKey: 'seedance.hero.secondaryCta',
-      href: externalLinks.workflows,
+      href: seedanceLinks.hubModel,
       target: '_blank'
     }
   },

browser_tests/fixtures/workspaceSwitcherFixture.ts

@@ -1,6 +1,11 @@
 import type { WorkspaceTokenResponse } from '@/platform/workspace/stores/workspaceAuthStore'
 
 import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
+import {
+  EMPTY_BILLING_BALANCE,
+  EMPTY_BILLING_PLANS,
+  ENDED_STANDARD_BILLING_STATUS
+} from '@e2e/fixtures/data/cloudWorkspace'
 import {
   WORKSPACE_SWITCHER_REMOTE_CONFIG,
   WORKSPACE_SWITCHER_WORKSPACES
@@ -51,6 +56,15 @@ export const workspaceSwitcherTest = comfyPageFixture.extend({
     await page.route('**/api/auth/session', (route) =>
       route.fulfill({ status: 204 })
     )
+    await page.route('**/api/billing/status', (route) =>
+      route.fulfill(jsonRoute(ENDED_STANDARD_BILLING_STATUS))
+    )
+    await page.route('**/api/billing/balance', (route) =>
+      route.fulfill(jsonRoute(EMPTY_BILLING_BALANCE))
+    )
+    await page.route('**/api/billing/plans', (route) =>
+      route.fulfill(jsonRoute(EMPTY_BILLING_PLANS))
+    )
 
     await use(page)
   }

browser_tests/tests/workspace/localWorkspaceSwitcher.spec.ts

@@ -0,0 +1,95 @@
+import { expect } from '@playwright/test'
+
+import {
+  PERSONAL_WORKSPACE_NAME,
+  TEAM_WORKSPACE_NAME
+} from '@e2e/fixtures/data/workspaceSwitcher'
+import { workspaceSwitcherTest as test } from '@e2e/fixtures/workspaceSwitcherFixture'
+
+test.describe('Local workspace switcher', { tag: '@auth' }, () => {
+  test.describe.configure({ timeout: 60_000 })
+
+  test('switches the active workspace without reloading or losing the workflow', async ({
+    comfyPage
+  }) => {
+    const page = comfyPage.page
+    const localOrigin = new URL(page.url()).origin
+    const billingRequestUrls: string[] = []
+    const localBillingRequestUrls: string[] = []
+    const billingAuthorizationHeaders: string[] = []
+    let tokenRequestBody: unknown
+
+    page.on('request', (request) => {
+      if (!request.url().includes('/api/billing/')) return
+      billingRequestUrls.push(request.url())
+      billingAuthorizationHeaders.push(request.headers().authorization ?? '')
+      if (new URL(request.url()).origin === localOrigin) {
+        localBillingRequestUrls.push(request.url())
+      }
+    })
+    page.on('request', (request) => {
+      if (
+        request.method() === 'POST' &&
+        request.url().endsWith('/api/auth/token')
+      ) {
+        tokenRequestBody = request.postDataJSON()
+      }
+    })
+
+    await comfyPage.settings.setSetting('Comfy.UseNewMenu', 'Top')
+    await comfyPage.settings.setSetting(
+      'Comfy.Workflow.WorkflowTabsPosition',
+      'Topbar'
+    )
+    const workflowName = `local-workspace-${Date.now().toString(36)}`
+    await comfyPage.menu.topbar.saveWorkflow(workflowName)
+    await page.evaluate(() => {
+      document.body.dataset.workspaceSwitchDocument = 'original'
+    })
+
+    await page.getByRole('button', { name: 'Current user' }).click()
+    await expect(page.getByTestId('workspace-switcher-trigger')).toContainText(
+      PERSONAL_WORKSPACE_NAME
+    )
+    await page.getByTestId('workspace-switcher-trigger').click()
+
+    const panel = page.getByTestId('workspace-switcher-panel')
+    await expect(panel.getByText(PERSONAL_WORKSPACE_NAME)).toBeVisible()
+    await expect(panel.getByText(TEAM_WORKSPACE_NAME)).toBeVisible()
+    await expect(panel.getByText('Owner')).toHaveCount(2)
+    await expect(panel.getByText('Member')).toHaveCount(1)
+    const scopeCaption = panel.getByText(
+      'Workspaces only affect which credits you use.'
+    )
+    await expect(scopeCaption).toBeVisible()
+    await scopeCaption.locator('..').locator('.pi-info-circle').hover()
+    await expect(page.getByRole('tooltip')).toHaveText(
+      'Runs that use partner nodes spend credits from this workspace. Unlike on Cloud, every workspace saves to your usual output folder.'
+    )
+
+    await panel.getByText(TEAM_WORKSPACE_NAME, { exact: true }).click()
+
+    await expect(page.getByTestId('workspace-switcher-trigger')).toContainText(
+      TEAM_WORKSPACE_NAME
+    )
+    await expect.poll(() => billingRequestUrls.length).toBeGreaterThan(0)
+    expect(tokenRequestBody).toEqual({ workspace_id: 'ws-team' })
+    expect(billingRequestUrls).toEqual(
+      expect.arrayContaining([
+        expect.stringMatching(
+          /^https:\/\/testcloud\.comfy\.org\/api\/billing\//
+        )
+      ])
+    )
+    expect(localBillingRequestUrls).toEqual([])
+    await expect
+      .poll(() => billingAuthorizationHeaders)
+      .toContain('Bearer mock-workspace-token-ws-team')
+    await expect
+      .poll(() => comfyPage.menu.topbar.getTabNames())
+      .toContain(workflowName)
+    expect(
+      await page.evaluate(() => document.body.dataset.workspaceSwitchDocument)
+    ).toBe('original')
+  })
+})

browser_tests/tests/workspaceSwitcher.spec.ts

@@ -42,6 +42,9 @@ test.describe('Workspace switcher', { tag: '@cloud' }, () => {
 
     const panel = page.getByTestId('workspace-switcher-panel')
     await expect(panel).toBeVisible()
+    await expect(
+      panel.getByText('Workspaces only affect which credits you use.')
+    ).toHaveCount(0)
 
     const profileMenu = page.locator('.current-user-popover')
     const panelBox = await panel.boundingBox()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.52.2",
+  "version": "1.52.3",
   "private": true,
   "description": "Official front-end implementation of ComfyUI",
   "homepage": "https://comfy.org",

src/components/topbar/CurrentUserButton.test.ts

@@ -217,4 +217,25 @@ describe('CurrentUserButton', () => {
     expect(screen.getByText('WorkspaceProfilePic')).toBeInTheDocument()
     expect(screen.queryByText('Avatar')).not.toBeInTheDocument()
   })
+
+  it('shows WorkspaceProfilePic for an active local team workspace', () => {
+    mockTeamWorkspaceStore.initState.value = 'ready'
+    mockTeamWorkspaceStore.isInPersonalWorkspace.value = false
+    mockTeamWorkspaceStore.workspaceName.value = 'My Team'
+
+    renderComponent()
+
+    expect(screen.getByText('WorkspaceProfilePic')).toBeInTheDocument()
+    expect(screen.queryByText('Avatar')).not.toBeInTheDocument()
+  })
+
+  it('shows workspace actions after local workspace initialization', async () => {
+    mockTeamWorkspaceStore.initState.value = 'ready'
+    const { user } = renderComponent()
+
+    await user.click(screen.getByRole('button', { name: 'Current user' }))
+
+    expect(screen.getByText('Workspace Popover Content')).toBeInTheDocument()
+    expect(screen.queryByText('Popover Content')).not.toBeInTheDocument()
+  })
 })

src/components/topbar/CurrentUserButton.vue

@@ -49,7 +49,7 @@
       @show="onPopoverShow"
     >
       <CurrentUserPopoverWorkspace
-        v-if="isCloud"
+        v-if="showWorkspacePopover"
         ref="workspacePopoverContent"
         :account-actions-only="initState !== 'ready'"
         @close="closePopover"
@@ -101,7 +101,10 @@ const showWorkspaceSkeleton = computed(
   () => isCloud && initState.value === 'loading'
 )
 const showWorkspaceIcon = computed(
-  () => isCloud && initState.value === 'ready' && !isInPersonalWorkspace.value
+  () => initState.value === 'ready' && !isInPersonalWorkspace.value
+)
+const showWorkspacePopover = computed(
+  () => isCloud || initState.value === 'ready'
 )
 
 const workspaceName = computed(() => {