Penguinjanator
diff --git a/‎browser_tests/fixtures/workspaceSwitcherFixture.ts‎
Lines changed: 14 additions & 0 deletions b/‎browser_tests/fixtures/workspaceSwitcherFixture.ts‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎browser_tests/tests/workspace/localWorkspaceSwitcher.spec.ts‎
Lines changed: 95 additions & 0 deletions b/‎browser_tests/tests/workspace/localWorkspaceSwitcher.spec.ts‎
Lines changed: 95 additions & 0 deletions
diff --git a/‎browser_tests/tests/workspaceSwitcher.spec.ts‎
Lines changed: 3 additions & 0 deletions b/‎browser_tests/tests/workspaceSwitcher.spec.ts‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/components/topbar/CurrentUserButton.test.ts‎
Lines changed: 21 additions & 0 deletions b/‎src/components/topbar/CurrentUserButton.test.ts‎
Lines changed: 21 additions & 0 deletions
diff --git a/‎src/components/topbar/CurrentUserButton.vue‎
Lines changed: 5 additions & 2 deletions b/‎src/components/topbar/CurrentUserButton.vue‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎src/components/topbar/CurrentUserPopoverLegacy.test.ts‎
Lines changed: 110 additions & 2 deletions b/‎src/components/topbar/CurrentUserPopoverLegacy.test.ts‎
Lines changed: 110 additions & 2 deletions
@@ -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)
   }
 
@@ -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')
+  })
+})
@@ -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()
 
@@ -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()
+  })
 })
@@ -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(() => {
 
@@ -1,3 +1,4 @@
+import { createTestingPinia } from '@pinia/testing'
 import { render, screen } from '@testing-library/vue'
 import userEvent from '@testing-library/user-event'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -68,6 +69,7 @@ const mockTier = ref<SubscriptionInfo['tier']>('CREATOR')
 const mockSubscription = ref<SubscriptionInfo | null>(makeSubscription())
 const mockBalance = ref<BalanceInfo | null>(null)
 const mockIsLoading = ref(false)
+const mockIsTeamPlan = ref(false)
 
 vi.mock('@/composables/billing/useBillingContext', () => ({
   useBillingContext: vi.fn(() => ({
@@ -76,6 +78,7 @@ vi.mock('@/composables/billing/useBillingContext', () => ({
     subscription: mockSubscription,
     balance: mockBalance,
     isLoading: mockIsLoading,
+    isTeamPlan: mockIsTeamPlan,
     fetchBalance: mockFetchBalance
   }))
 }))
@@ -121,7 +124,7 @@ describe('CurrentUserPopoverLegacy', () => {
     mockIsLoading.value = false
   })
 
-  function renderComponent() {
+  function renderComponent(teamWorkspaceState?: Record<string, unknown>) {
     const i18n = createI18n({
       legacy: false,
       locale: 'en',
@@ -132,7 +135,15 @@ describe('CurrentUserPopoverLegacy', () => {
 
     render(CurrentUserPopoverLegacy, {
       global: {
-        plugins: [i18n],
+        plugins: [
+          i18n,
+          createTestingPinia({
+            createSpy: vi.fn,
+            initialState: teamWorkspaceState
+              ? { teamWorkspace: teamWorkspaceState }
+              : {}
+          })
+        ],
         stubs: {
           Divider: true
         }
@@ -382,4 +393,101 @@ describe('CurrentUserPopoverLegacy', () => {
       expect(screen.getByText('0')).toBeInTheDocument()
     })
   })
+  describe('workspace selector (non-cloud)', () => {
+    const workspace = (overrides: Record<string, unknown>) => ({
+      isSubscribed: false,
+      subscriptionPlan: null,
+      subscriptionTier: null,
+      members: [],
+      pendingInvites: [],
+      ...overrides
+    })
+
+    const readyWorkspaceState = {
+      initState: 'ready',
+      activeWorkspaceId: 'ws-personal',
+      isFetchingWorkspaces: false,
+      workspaces: [
+        workspace({
+          id: 'ws-personal',
+          name: 'Personal Workspace',
+          type: 'personal',
+          role: 'owner'
+        }),
+        workspace({
+          id: 'ws-team',
+          name: 'Team Comfy',
+          type: 'team',
+          role: 'member'
+        })
+      ]
+    }
+
+    it('stays hidden while the workspace store is not hydrated', () => {
+      renderComponent()
+
+      expect(screen.queryByTestId('workspace-switcher-trigger')).toBeNull()
+    })
+
+    it.for(['ready', 'error'])(
+      'stays hidden when workspace initialization is %s without workspaces',
+      (initState) => {
+        renderComponent({
+          initState,
+          activeWorkspaceId: null,
+          isFetchingWorkspaces: false,
+          workspaces: []
+        })
+
+        expect(screen.queryByTestId('workspace-switcher-trigger')).toBeNull()
+      }
+    )
+
+    it('shows the trigger and opens the switcher once the store is ready', async () => {
+      const { user } = renderComponent(readyWorkspaceState)
+
+      const trigger = screen.getByTestId('workspace-switcher-trigger')
+      expect(trigger).toHaveAttribute('aria-expanded', 'false')
+      expect(trigger).toHaveAttribute('aria-haspopup', 'menu')
+      expect(trigger).toHaveAttribute(
+        'aria-controls',
+        'workspace-switcher-panel'
+      )
+      expect(screen.queryByTestId('workspace-switcher-panel')).toBeNull()
+
+      await user.click(trigger)
+
+      const panel = screen.getByTestId('workspace-switcher-panel')
+      expect(panel).toBeInTheDocument()
+      expect(panel).toHaveAttribute('id', 'workspace-switcher-panel')
+      expect(panel).toHaveAttribute('role', 'menu')
+      expect(trigger).toHaveAttribute('aria-expanded', 'true')
+    })
+
+    it('closes the switcher on Escape or a click elsewhere', async () => {
+      const { user } = renderComponent(readyWorkspaceState)
+      const trigger = screen.getByTestId('workspace-switcher-trigger')
+
+      await user.click(trigger)
+      await user.keyboard('{Escape}')
+      expect(screen.queryByTestId('workspace-switcher-panel')).toBeNull()
+
+      await user.click(trigger)
+      await user.click(screen.getByText('Test User'))
+      expect(screen.queryByTestId('workspace-switcher-panel')).toBeNull()
+    })
+
+    it('keeps credits visible but hides top-up for workspace members', () => {
+      mockCanAccessSubscriptionFeatures.value = false
+      renderComponent({
+        ...readyWorkspaceState,
+        activeWorkspaceId: 'ws-team'
+      })
+
+      expect(screen.getByTestId('manage-plan-menu-item')).toHaveTextContent(
+        enMessages.credits.credits
+      )
+      expect(screen.queryByTestId('add-credits-button')).toBeNull()
+    })
+  })
 })
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`@show="onPopoverShow"`
`50`	`50`	`>`
`51`	`51`	`<CurrentUserPopoverWorkspace`
`52`		`- v-if="isCloud"`
	`52`	`+ v-if="showWorkspacePopover"`
`53`	`53`	`ref="workspacePopoverContent"`
`54`	`54`	`:account-actions-only="initState !== 'ready'"`
`55`	`55`	`@close="closePopover"`
`@@ -101,7 +101,10 @@ const showWorkspaceSkeleton = computed(`
`101`	`101`	`() => isCloud && initState.value === 'loading'`
`102`	`102`	`)`
`103`	`103`	`const showWorkspaceIcon = computed(`
`104`		`- () => isCloud && initState.value === 'ready' && !isInPersonalWorkspace.value`
	`104`	`+ () => initState.value === 'ready' && !isInPersonalWorkspace.value`
	`105`	`+)`
	`106`	`+const showWorkspacePopover = computed(`
	`107`	`+ () => isCloud \|\| initState.value === 'ready'`
`105`	`108`	`)`
`106`	`109`
`107`	`110`	`const workspaceName = computed(() => {`