diff --git a/src/platform/settings/composables/useSettingUI.test.ts b/src/platform/settings/composables/useSettingUI.test.ts index b0d88343b0b..fc592556889 100644 --- a/src/platform/settings/composables/useSettingUI.test.ts +++ b/src/platform/settings/composables/useSettingUI.test.ts @@ -10,6 +10,8 @@ import { createI18n } from 'vue-i18n' import { useCurrentUser } from '@/composables/auth/useCurrentUser' import { useSettingStore } from '@/platform/settings/settingStore' import type { SettingTreeNode } from '@/platform/settings/composables/useSettingSearch' +import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities' +import { receiveServerFact } from '@/platform/serverFacts/serverFact' import { useWorkspaceUI } from '@/platform/workspace/composables/useWorkspaceUI' import { useSettingUI as useSettingUIComposable } from './useSettingUI' @@ -49,6 +51,7 @@ vi.mock(import('@/platform/distribution/types'), () => ({ })) vi.mock(import('@/platform/workspace/composables/useWorkspaceUI')) +vi.mock(import('@/platform/billing/composables/useBillingCapabilities')) interface MockSettingParams { id: string @@ -271,6 +274,23 @@ describe('useSettingUI', () => { expect(findPanelByKey('workspace-allowlist')).toBeNull() }) + it('shows Members off Cloud when the server says the actor can manage them', () => { + env.state.isCloud = false + vi.mocked(useBillingCapabilities()).canManageMembers = computed(() => + receiveServerFact('can_manage_members', true) + ) + + const { navGroups } = useSettingUI() + const workspaceItems = navGroups.value + .find((group) => group.title === 'Workspace') + ?.items.map(({ id, label }) => ({ id, label })) + + expect(workspaceItems).toEqual([ + { id: 'workspace', label: 'PlanCredits' }, + { id: 'workspace-members', label: 'Members' } + ]) + }) + it('mounts the Billing tab on local when unified billing settings is on', () => { env.state.isCloud = false const flags = vi.mocked(useFeatureFlags().flags) diff --git a/src/platform/settings/composables/useSettingUI.ts b/src/platform/settings/composables/useSettingUI.ts index 394a6f93bf6..92e706c50b6 100644 --- a/src/platform/settings/composables/useSettingUI.ts +++ b/src/platform/settings/composables/useSettingUI.ts @@ -5,6 +5,8 @@ import { useI18n } from 'vue-i18n' import { useCurrentUser } from '@/composables/auth/useCurrentUser' import { useFeatureFlags } from '@/composables/useFeatureFlags' import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags' +import { useBillingCapabilities } from '@/platform/billing/composables/useBillingCapabilities' +import { pendingServerFact } from '@/platform/serverFacts/pendingServerFact' import { isCloud, isDesktop } from '@/platform/distribution/types' import { getSettingInfo, @@ -53,6 +55,7 @@ export function useSettingUI( ) { const { t } = useI18n() const { isLoggedIn } = useCurrentUser() + const { canManageMembers } = useBillingCapabilities() const settingStore = useSettingStore() const activeCategory = ref(null) @@ -212,7 +215,13 @@ export function useSettingUI( const planPanel = flags.unifiedBillingSettingsEnabled ? billingPanel : planCreditsPanel - const workspacePanels = isCloud ? [planPanel, membersPanel] : [planPanel] + const canViewMembers = pendingServerFact( + 'BE-24066', + isCloud || canManageMembers.value + ) + const workspacePanels = canViewMembers + ? [planPanel, membersPanel] + : [planPanel] return shouldShowWorkspaceAllowlist.value ? [...workspacePanels, allowlistPanel] : workspacePanels