Merge branch 'main' into glary/fix-browser-test-billing-types

Author: DrJKL

browser_tests/fixtures/data/cloudWorkspace.ts

@@ -74,6 +74,8 @@ const TEAM_MAX_SEATS = 30
 
 export const TEAM_BILLING_STATUS = {
   is_active: true,
+  max_seats: 30,
+  occupied_seats: DEFAULT_TEAM_MEMBERS.length,
   subscription_status: 'active',
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',
@@ -91,6 +93,8 @@ export const ENDED_STANDARD_BILLING_STATUS = {
   billing_status: 'inactive',
   has_funds: true,
   is_active: false,
+  max_seats: 30,
+  occupied_seats: DEFAULT_TEAM_MEMBERS.length,
   plan_slug: 'standard-monthly',
   subscription_duration: 'MONTHLY',
   subscription_status: 'ended',

browser_tests/tests/billingFacadeConsumers.spec.ts

@@ -41,6 +41,8 @@ const toWorkspaceStatus = (
   s: CloudSubscriptionStatusResponse
 ): BillingStatusResponse => ({
   is_active: s.is_active ?? false,
+  max_seats: 1,
+  occupied_seats: 1,
   subscription_tier: s.subscription_tier ?? undefined,
   subscription_duration: s.subscription_duration ?? undefined,
   renewal_date: s.renewal_date ?? undefined,

browser_tests/tests/currentUserPopoverCredits.spec.ts

@@ -60,6 +60,8 @@ const mockSubscriptionStatus: CloudSubscriptionStatusResponse = {
 // visible (free tier would swap it for "Upgrade to add credits").
 const mockBillingStatus: BillingStatusResponse = {
   is_active: true,
+  max_seats: 1,
+  occupied_seats: 1,
   subscription_status: 'canceled',
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',

browser_tests/tests/dialogs/creditsTile.spec.ts

@@ -62,6 +62,8 @@ const DEFAULT_BALANCE = { amount: 6000, monthly: 5000, prepaid: 1000 }
 
 const mockBillingStatus: BillingStatusResponse = {
   is_active: true,
+  max_seats: 1,
+  occupied_seats: 1,
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY',
   renewal_date: '2099-02-20T12:00:00Z',

browser_tests/tests/dialogs/pricingTableDeepLink.spec.ts

@@ -88,6 +88,8 @@ const STANDARD_ANNUAL_PLAN = {
 
 const ACTIVE_TEAM_STATUS = {
   is_active: true,
+  max_seats: 50,
+  occupied_seats: 1,
   subscription_status: 'active',
   subscription_tier: 'TEAM',
   subscription_duration: 'ANNUAL',
@@ -106,6 +108,8 @@ const ACTIVE_TEAM_STATUS = {
 
 const ACTIVE_STANDARD_STATUS = {
   is_active: true,
+  max_seats: 1,
+  occupied_seats: 1,
   subscription_status: 'active',
   subscription_tier: 'STANDARD',
   subscription_duration: 'ANNUAL',

browser_tests/tests/subgraph/subgraphPromotionDom.spec.ts

@@ -165,5 +165,29 @@ test.describe(
         })
       }
     )
+
+    test('Can add DOMWidget directly onto node', async ({ comfyPage }) => {
+      const ksampler = await comfyPage.vueNodes.getFixtureByTitle('KSampler')
+      await comfyPage.contextMenu.openForVueNode(ksampler.header)
+      await comfyPage.contextMenu.clickMenuItem('Convert to Subgraph')
+
+      expect(
+        await comfyPage.page.evaluate(() => {
+          const subgraphNode = graph?.nodes.find(
+            (n) => n.title === 'New Subgraph'
+          )
+          if (!subgraphNode) throw new Error('Failed to find subgraph node')
+
+          const el = document.createElement('div')
+          el.dataset.testid = 'custom-node-widget'
+          subgraphNode.addDOMWidget('testwidget', 'testwidget', el)
+          return !!subgraphNode.widgets?.find((w) => w.type === 'testwidget')
+        }),
+        'widget exists on node'
+      ).toBeTruthy()
+      await expect(
+        comfyPage.page.getByTestId('custom-node-widget')
+      ).toBeAttached()
+    })
   }
 )

src/composables/billing/types.ts

@@ -95,6 +95,10 @@ export interface BillingState {
   teamCreditStops: ComputedRef<TeamCreditStops | null>
   /** The team's currently-subscribed credit stop; null for personal/legacy. */
   currentTeamCreditStop: ComputedRef<CurrentTeamCreditStop | null>
+  /** Effective member limit for the current workspace; zero is unlimited. */
+  maxSeats: ComputedRef<number | null>
+  /** Seats occupied in the current workspace. */
+  occupiedSeats: ComputedRef<number | null>
   isLoading: Ref<boolean>
   error: Ref<string | null>
   canAccessSubscriptionFeatures: ComputedRef<boolean>

src/composables/billing/useBillingContext.test.ts

@@ -13,6 +13,8 @@ import { useBillingContext } from './useBillingContext'
 
 const DEFAULT_BILLING_STATUS: BillingStatusResponse = {
   is_active: true,
+  max_seats: 73,
+  occupied_seats: 72,
   has_funds: true,
   subscription_tier: 'PRO',
   subscription_duration: 'MONTHLY'
@@ -51,7 +53,7 @@ const {
       has_funds: true,
       subscription_tier: 'PRO',
       subscription_duration: 'MONTHLY'
-    } as BillingStatusResponse
+    } as Partial<BillingStatusResponse>
   }
 }))
 
@@ -177,7 +179,9 @@ vi.mock('@/platform/cloud/subscription/composables/useBillingPlans', () => ({
 
 vi.mock('@/platform/workspace/api/workspaceApi', () => ({
   workspaceApi: {
-    getBillingStatus: vi.fn(() => Promise.resolve(mockBillingStatus.value)),
+    getBillingStatus: vi.fn(() =>
+      Promise.resolve({ ...DEFAULT_BILLING_STATUS, ...mockBillingStatus.value })
+    ),
     getBillingBalance: vi.fn().mockResolvedValue({
       amount_micros: 10000000,
       currency: 'usd'

src/composables/billing/useBillingContext.ts

@@ -138,6 +138,11 @@ function useBillingContextInternal(): BillingContext {
     toValue(activeContext.value.currentTeamCreditStop)
   )
 
+  const maxSeats = computed(() => toValue(activeContext.value.maxSeats))
+  const occupiedSeats = computed(() =>
+    toValue(activeContext.value.occupiedSeats)
+  )
+
   const canAccessSubscriptionFeatures = computed(() =>
     toValue(activeContext.value.canAccessSubscriptionFeatures)
   )
@@ -343,6 +348,8 @@ function useBillingContextInternal(): BillingContext {
     currentPlanSlug,
     teamCreditStops,
     currentTeamCreditStop,
+    maxSeats,
+    occupiedSeats,
     isLoading,
     error,
     isActiveSubscription,

src/composables/billing/useLegacyBilling.ts

@@ -49,6 +49,8 @@ export function useLegacyBilling(): BillingState & BillingActions {
     () => legacyCanAccessSubscriptionFeatures.value
   )
   const isFreeTier = computed(() => subscriptionTier.value === 'FREE')
+  const maxSeats = computed(() => null)
+  const occupiedSeats = computed(() => null)
 
   const subscription = computed<SubscriptionInfo | null>(() => {
     if (!legacyCanAccessSubscriptionFeatures.value && !subscriptionTier.value) {
@@ -209,6 +211,8 @@ export function useLegacyBilling(): BillingState & BillingActions {
     currentPlanSlug,
     teamCreditStops,
     currentTeamCreditStop,
+    maxSeats,
+    occupiedSeats,
     isLoading,
     error,
     canAccessSubscriptionFeatures,