Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@
/apps/website/src/config/workshop-balance.ts @dante01yoon @Comfy-Org/comfy_website_devs @Comfy-Org/comfy-standard-approver
/apps/website/src/config/workshop-credits.ts @dante01yoon @Comfy-Org/comfy_website_devs @Comfy-Org/comfy-standard-approver

# Workspace members and billing gates - see ADR-API-SERVER-FACTS-0042.
/src/platform/workspace/ @dante01yoon @Comfy-Org/comfy_frontend_devs

/src/workbench/extensions/agent/ @Comfy-Org/comfy-standard-approver @Comfy-Org/comfy_frontend_devs @Comfy-Org/agent_devs
/src/extensions/core/agentPanel.ts @Comfy-Org/comfy-standard-approver @Comfy-Org/comfy_frontend_devs @Comfy-Org/agent_devs
/src/extensions/core/agentPanel.test.ts @Comfy-Org/comfy-standard-approver @Comfy-Org/comfy_frontend_devs @Comfy-Org/agent_devs
Expand Down
143 changes: 142 additions & 1 deletion src/platform/workspace/composables/useMembersPanel.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import type {
WorkspaceMember
} from '@/platform/workspace/stores/teamWorkspaceStore'
import { useTeamWorkspaceStore } from '@/platform/workspace/stores/teamWorkspaceStore'
import { describeServerFactGate } from '@/utils/__tests__/serverFactGate'

import {
filterBySearch,
Expand Down Expand Up @@ -279,6 +280,7 @@ let workspaceStore: ReturnType<typeof useTeamWorkspaceStore> & {
let workspaceType: 'personal' | 'team' = 'personal'
let workspaceMembers: WorkspaceMember[] = []
let workspacePendingInvites: WorkspacePendingInvite[] = []
let workspaceMembersLoaded = true

function updateWorkspaceStore() {
workspaceStore.workspaces = [
Expand All @@ -294,7 +296,7 @@ function updateWorkspaceStore() {
subscriptionTier: workspaceType === 'team' ? 'PRO' : 'FREE',
members: workspaceMembers,
pendingInvites: workspacePendingInvites,
membersLoaded: true,
membersLoaded: workspaceMembersLoaded,
pendingInvitesLoaded: true
}
]
Expand Down Expand Up @@ -416,6 +418,7 @@ describe('useMembersPanel', () => {
workspaceType = 'personal'
workspaceMembers = []
workspacePendingInvites = []
workspaceMembersLoaded = true
updateWorkspaceStore()
vi.mocked(useFeatureFlags().flags).memberCreditLimitsEnabled = true
mockMaxSeats.value = 73
Expand Down Expand Up @@ -1409,4 +1412,142 @@ describe('useMembersPanel', () => {
).not.toHaveBeenCalled()
})
})

function setCapability(
name: 'canInviteMembers' | 'canManageMembers' | 'canChangeSeats',
value: boolean
) {
useBillingCapabilities()[name] = computed(() => value)
}

function flipCapability(
name: 'canInviteMembers' | 'canManageMembers' | 'canChangeSeats'
) {
setCapability(name, !useBillingCapabilities()[name].value)
}

function endPlan() {
mockSubscriptionStatus.value = 'ended'
mockCanAccessSubscriptionFeatures.value = false
}

const planAndRolePerturbations = [
{ name: 'an ended plan', apply: endPlan },
{
name: 'an Enterprise tier',
apply: () => {
mockSubscription.value = { tier: 'ENTERPRISE', isCancelled: false }
}
},
{
name: 'an ended Enterprise plan with one seat',
apply: () => {
endPlan()
mockSubscription.value = { tier: 'ENTERPRISE', isCancelled: false }
mockMaxSeats.value = 1
}
},
{
name: 'one seat',
apply: () => {
mockMaxSeats.value = 1
}
},
{
name: 'a personal plan',
apply: () => {
mockIsTeamPlan.value = false
}
},
{
name: 'a scheduled cancellation',
apply: () => {
mockSubscriptionStatus.value = 'canceled'
mockSubscription.value = { tier: 'PRO', isCancelled: true }
}
},
{
name: 'no subscription management',
apply: () => {
mockPermissions.value = {
...mockPermissions.value,
canManageSubscription: false
}
}
},
{
name: 'the member role',
apply: () => {
mockWorkspaceRole.value = 'member'
}
},
{
name: 'a flipped can_change_seats',
apply: () => flipCapability('canChangeSeats')
}
]

describeServerFactGate({
name: 'Invite (can_invite_members)',
fact: { set: (value) => setCapability('canInviteMembers', value) },
perturbations: [
...planAndRolePerturbations,
{
name: 'a flipped can_manage_members',
apply: () => flipCapability('canManageMembers')
}
],
mount: setup,
read: (panel) => ({
showInviteButton: panel.showInviteButton.value,
isInviteDisabled: panel.isInviteDisabled.value,
canInviteMembers: panel.permissions.value.canInviteMembers
})
})

describeServerFactGate({
name: 'Member management (can_manage_members)',
fact: { set: (value) => setCapability('canManageMembers', value) },
perturbations: [
...planAndRolePerturbations,
{
name: 'a flipped can_invite_members',
apply: () => flipCapability('canInviteMembers')
}
],
mount: setup,
read: (panel) => ({
canManageMembers: panel.permissions.value.canManageMembers,
canViewPendingInvites: panel.permissions.value.canViewPendingInvites,
showPendingTab: panel.uiConfig.value.showPendingTab,
hasMemberActions: panel.memberMenuItems(createMember()).length > 0
})
})

describeServerFactGate({
name: 'Roster visibility (members response)',
fact: {
set: (loaded) => {
workspaceMembersLoaded = loaded
workspaceType = 'team'
mockMembers.value = [createMember(), createMember({ id: 'member-2' })]
}
},
perturbations: [
...planAndRolePerturbations,
{
name: 'a flipped can_manage_members',
apply: () => flipCapability('canManageMembers')
},
{
name: 'a flipped can_invite_members',
apply: () => flipCapability('canInviteMembers')
}
],
mount: setup,
read: (panel) => ({
canViewOtherMembers: panel.permissions.value.canViewOtherMembers,
showMembersList: panel.uiConfig.value.showMembersList
})
})
})
53 changes: 53 additions & 0 deletions src/utils/__tests__/serverFactGate.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { describe, expect, it } from 'vitest'

interface Perturbation {
name: string
apply(): void
}

interface ServerFactGate<T> {
name: string
fact: { set(value: boolean): void }
perturbations: readonly Perturbation[]
mount(): Promise<T> | T
read(subject: T): unknown
}

const FACT_VALUES = [true, false] as const

/**
* Orthogonality check for ADR-API-SERVER-FACTS-0042: a gate renders one
* server fact. Every perturbation of a non-fact input must leave `read()`
* unchanged for either fact value, and flipping the fact must change it.
*/
export function describeServerFactGate<T>({
name,
fact,
perturbations,
mount,
read
}: ServerFactGate<T>) {
async function readWith(value: boolean, perturbation?: Perturbation) {
perturbation?.apply()
fact.set(value)
return read(await mount())
}

describe(`${name} renders one server fact`, () => {
const cases = FACT_VALUES.flatMap((value) =>
perturbations.map((perturbation) => ({ value, perturbation }))
)

it.for(cases)(
'ignores $perturbation.name when the fact is $value',
async ({ value, perturbation }) => {
const baseline = await readWith(value)
expect(await readWith(value, perturbation)).toEqual(baseline)
}
)

it('changes when the fact flips', async () => {
expect(await readWith(true)).not.toEqual(await readWith(false))
})
})
}
Loading