mirror of
https://github.com/stablyai/orca.git
synced 2026-11-17 03:15:01 +00:00
fix(settings): drop the Team and Enterprise settings pages; Account gets one "Team & admin" row to the web console
After #738 both pages were a single "Manage in browser" card. Team and admin now have no desktop page: Settings › Account shows one row, "Team & admin", that opens the console home through the single-use ticket, beside the existing Plan & billing row. The account menu keeps Team and Plan & billing (both open the console). Searching for members, SSO, the audit log or Enterprise lands on the Account row. The 'cloud-team' and 'cloud-enterprise' settings targets, their search entries and their strings are removed; nothing else linked to them.
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
import { defineFixture } from '../../../../component-fixtures/component-fixture'
|
||||
import { AccountTeamAdminRowView } from './AccountTeamAdminRow'
|
||||
|
||||
const noop = (): void => {}
|
||||
|
||||
/** The row as it sits under the identity in Settings, Account: one way into the web console. */
|
||||
function row(frameWidth: number, busy = false) {
|
||||
return defineFixture({
|
||||
width: frameWidth,
|
||||
render: () => (
|
||||
<div className="bg-background px-8 py-6">
|
||||
<AccountTeamAdminRowView busy={busy} onOpen={noop} />
|
||||
</div>
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
export const idle = row(760)
|
||||
|
||||
/** A narrow settings pane: the button wraps under the text. */
|
||||
export const narrow = row(420)
|
||||
|
||||
/** Asking auth for the single-use code: the button holds still and ignores a second press. */
|
||||
export const opening = row(760, true)
|
||||
@@ -0,0 +1,64 @@
|
||||
// Account › "Team & admin": the one desktop entry to team, billing and admin settings, which live
|
||||
// in the Orca Cloud web console. It opens the console home signed in with a single-use ticket.
|
||||
import { useState } from 'react'
|
||||
import { ExternalLink, Users } from 'lucide-react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { ACCOUNT_TEAM_ADMIN_ANCHOR } from '@/hooks/settings-navigation-orca-cloud-sections'
|
||||
import { useTranslate } from '@/i18n/use-translate'
|
||||
import { openCloudConsole } from '@/lib/orca-cloud/open-cloud-console'
|
||||
|
||||
export function AccountTeamAdminRowView({
|
||||
busy,
|
||||
onOpen
|
||||
}: {
|
||||
busy: boolean
|
||||
onOpen: () => void
|
||||
}): React.JSX.Element {
|
||||
const t = useTranslate()
|
||||
return (
|
||||
<div
|
||||
id={ACCOUNT_TEAM_ADMIN_ANCHOR}
|
||||
className="flex scroll-mt-4 flex-wrap items-center gap-4 border-t border-border/60 pt-5"
|
||||
>
|
||||
<div className="flex size-11 shrink-0 items-center justify-center rounded-full bg-muted text-foreground">
|
||||
<Users className="size-5" />
|
||||
</div>
|
||||
<div className="min-w-0 flex-1 space-y-1">
|
||||
<p className="text-sm font-medium">
|
||||
{t('settings.cloudConsole.teamAdmin.title', 'Team & admin')}
|
||||
</p>
|
||||
<p className="text-xs leading-5 text-muted-foreground">
|
||||
{t(
|
||||
'settings.cloudConsole.teamAdmin.description',
|
||||
'Manage members, billing, single sign-on and the audit log in your browser.'
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
{/* A plain button, no "Copy link": the page opens signed in with a single-use code. */}
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
aria-disabled={busy || undefined}
|
||||
onClick={busy ? undefined : onOpen}
|
||||
>
|
||||
{t('settings.cloudConsole.manageInBrowser', 'Manage in browser')}
|
||||
<ExternalLink />
|
||||
</Button>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
/** Mount only while signed in to Orca Cloud. */
|
||||
export function AccountTeamAdminRow(): React.JSX.Element {
|
||||
const [busy, setBusy] = useState(false)
|
||||
return (
|
||||
<AccountTeamAdminRowView
|
||||
busy={busy}
|
||||
onOpen={() => {
|
||||
setBusy(true)
|
||||
void openCloudConsole('home').finally(() => setBusy(false))
|
||||
}}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import { OrcaProfileSignOutConfirmDialog } from '../../../orca-profiles/OrcaProf
|
||||
import { OrcaSignInButton, OrcaSignInWaitNotice } from '../../../OrcaSignInProgress'
|
||||
import { useOrcaCloudApiAvailable } from '@/hooks/useOrcaCloudApiAvailability'
|
||||
import { AccountMfaRow } from './AccountMfaRow'
|
||||
import { AccountTeamAdminRow } from './AccountTeamAdminRow'
|
||||
import { GitHubIdentityRow } from './GitHubIdentityRow'
|
||||
import type { OrcaProfileReconnectReason } from '../../../../../../shared/orca-profile-reconnect-reason'
|
||||
|
||||
@@ -152,8 +153,11 @@ export function OrcaAccountSettingsPane(): React.JSX.Element {
|
||||
{/* Their own second factor: status, and a link to the account page that manages it. */}
|
||||
{connected && cloudAvailable ? <AccountMfaRow /> : null}
|
||||
|
||||
{/* JA-16: with Orca Cloud the page is identity + Sign out only; plan, team and agents have
|
||||
their own entries in the Orca Cloud group right beside it. */}
|
||||
{/* Team, billing and admin are managed in the web console; this row is the way there. */}
|
||||
{connected && cloudAvailable ? <AccountTeamAdminRow /> : null}
|
||||
|
||||
{/* JA-16: with Orca Cloud the page is identity + Sign out (and the console row); agents and
|
||||
the rest of Orca Cloud have their own entries in the group right beside it. */}
|
||||
{cloudAvailable ? null : (
|
||||
<div className="space-y-4 border-t border-border/60 pt-5">
|
||||
<SettingsGroupHeader
|
||||
|
||||
@@ -47,8 +47,6 @@ const SETTINGS_NAV_TARGETS = [
|
||||
'automations',
|
||||
'orca-account',
|
||||
'cloud-billing',
|
||||
'cloud-team',
|
||||
'cloud-enterprise',
|
||||
'cloud-workspaces',
|
||||
'cloud-secrets',
|
||||
'cloud-environments',
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// The Settings rows that stand in for team, billing and Enterprise management, which live in the
|
||||
// Orca Cloud web console. The desktop keeps only read-only status (the plan and its health, a
|
||||
// failed payment) so the person knows when to go there.
|
||||
// The Settings row that stands in for billing management, which lives in the Orca Cloud web
|
||||
// console; team and admin are one row on the Account page (AccountTeamAdminRow). The desktop keeps
|
||||
// only read-only status (the plan and its health, a failed payment) so the person knows when to go.
|
||||
import { useTranslate } from '@/i18n/use-translate'
|
||||
import { openCloudConsole } from '@/lib/orca-cloud/open-cloud-console'
|
||||
import { PaymentIssueNotice } from '../../billing/PaymentIssueNotice'
|
||||
@@ -39,31 +39,3 @@ export function PlanBillingConsoleLink(): React.JSX.Element {
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export function TeamConsoleLink(): React.JSX.Element {
|
||||
const t = useTranslate()
|
||||
return (
|
||||
<CloudConsoleLinkRow
|
||||
section="team"
|
||||
label={t('settings.cloudConsole.team.title', 'Members and invites')}
|
||||
description={t(
|
||||
'settings.cloudConsole.team.description',
|
||||
'Invite teammates, change roles, remove members, or create a team.'
|
||||
)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export function EnterpriseConsoleLink(): React.JSX.Element {
|
||||
const t = useTranslate()
|
||||
return (
|
||||
<CloudConsoleLinkRow
|
||||
section="enterprise"
|
||||
label={t('settings.cloudConsole.enterprise.title', 'Enterprise')}
|
||||
description={t(
|
||||
'settings.cloudConsole.enterprise.description',
|
||||
'Single sign-on, verified domains, directory sync, required two-factor and the audit log.'
|
||||
)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -172,7 +172,11 @@ export const signedOut = defineFixture({
|
||||
width: 784,
|
||||
store: { orcaProfileAuthStatus: SIGNED_OUT },
|
||||
render: () => (
|
||||
<Page id="cloud-team" title="Team" description="Share one Orca Cloud plan with your teammates.">
|
||||
<Page
|
||||
id="cloud-mcp"
|
||||
title="MCP servers"
|
||||
description="MCP servers from Claude and Codex on this computer, synced to your cloud workspaces."
|
||||
>
|
||||
<OrcaCloudSignedOutNotice />
|
||||
</Page>
|
||||
)
|
||||
|
||||
@@ -3,7 +3,6 @@ import { CircleUserRound } from 'lucide-react'
|
||||
import { InlineError } from '@/components/ui/inline-error'
|
||||
import { Skeleton } from '@/components/ui/skeleton'
|
||||
import { useOrcaAccountKey } from '@/hooks/use-orca-account-key'
|
||||
import { activeTeamRole } from '@/lib/orca-cloud/active-team-role'
|
||||
import { useOrcaProfileAuthStatusRefresh } from '@/hooks/use-orca-profile-auth-status-refresh'
|
||||
import { useTranslate } from '@/i18n/use-translate'
|
||||
import { useAppStore } from '@/store'
|
||||
@@ -20,8 +19,6 @@ import { OrcaCloudMcpServersPane } from './OrcaCloudMcpServersPane'
|
||||
import { OrcaCloudLocalCommandsPane } from './OrcaCloudLocalCommandsPane'
|
||||
import { OrcaCloudSkillsPane } from './cloud-skills/OrcaCloudSkillsPane'
|
||||
import { TeamWorkspacesSettings } from '../cloud-workspaces/TeamWorkspacesSettings'
|
||||
import { canManageMembers } from '../../billing/team/team-roles'
|
||||
import { EnterpriseConsoleLink, TeamConsoleLink } from './OrcaCloudConsoleLinks'
|
||||
|
||||
type OrcaCloudAccount = {
|
||||
orgId: string | null
|
||||
@@ -116,24 +113,6 @@ export function OrcaCloudWorkspacesPane(): React.JSX.Element {
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Settings › Enterprise (owners and admins; the nav hides it otherwise): single sign-on, domains,
|
||||
* directory sync, the MFA policy and the audit log are managed in the web console.
|
||||
*/
|
||||
export function OrcaCloudEnterprisePane(): React.JSX.Element {
|
||||
return <OrcaCloudAccountGate>{() => <EnterpriseConsoleLinkForAdmins />}</OrcaCloudAccountGate>
|
||||
}
|
||||
|
||||
function EnterpriseConsoleLinkForAdmins(): React.JSX.Element | null {
|
||||
const role = activeTeamRole(useAppStore((s) => s.orcaProfileAuthStatus))
|
||||
return role !== null && canManageMembers(role) ? <EnterpriseConsoleLink /> : null
|
||||
}
|
||||
|
||||
/** Settings › Team: members, invites and roles are managed in the web console. */
|
||||
export function OrcaCloudTeamPane(): React.JSX.Element {
|
||||
return <OrcaCloudAccountGate>{() => <TeamConsoleLink />}</OrcaCloudAccountGate>
|
||||
}
|
||||
|
||||
export function OrcaCloudSecretsPane(): React.JSX.Element {
|
||||
return (
|
||||
<OrcaCloudAccountGate>
|
||||
|
||||
@@ -19,35 +19,21 @@ export const getOrcaCloudBillingSearchEntries = createLocalizedCatalog(() => [
|
||||
}
|
||||
])
|
||||
|
||||
export const getOrcaCloudTeamSearchEntries = createLocalizedCatalog(() => [
|
||||
/** Account › "Team & admin": the web console's team, billing and admin pages. */
|
||||
export const getOrcaCloudTeamAdminSearchEntries = createLocalizedCatalog(() => [
|
||||
{
|
||||
title: translate('auto.components.billing.team.title', 'Team'),
|
||||
title: translate('settings.cloudConsole.teamAdmin.title', 'Team & admin'),
|
||||
description: translate(
|
||||
'settings.orcaCloud.team.searchDescription',
|
||||
'Members, invites and seats for your Orca Cloud team.'
|
||||
'settings.cloudConsole.teamAdmin.description',
|
||||
'Manage members, billing, single sign-on and the audit log in your browser.'
|
||||
),
|
||||
keywords: [
|
||||
...translateSearchKeyword('settings.orcaCloud.team.keywordMembers', 'members'),
|
||||
...translateSearchKeyword('settings.orcaCloud.team.keywordInvite', 'invite'),
|
||||
...translateSearchKeyword('settings.orcaCloud.team.keywordSeats', 'seats')
|
||||
]
|
||||
}
|
||||
])
|
||||
|
||||
export const getOrcaCloudEnterpriseSearchEntries = createLocalizedCatalog(() => [
|
||||
{
|
||||
title: translate('settings.enterprise.title', 'Enterprise'),
|
||||
description: translate(
|
||||
'settings.enterprise.searchDescription',
|
||||
'Single sign-on and directory sync, and the audit log of changes across your team.'
|
||||
),
|
||||
keywords: [
|
||||
...translateSearchKeyword('settings.enterprise.keywordAudit', 'audit log'),
|
||||
...translateSearchKeyword('settings.enterprise.keywordActivity', 'activity'),
|
||||
...translateSearchKeyword('settings.enterprise.keywordSso', 'sso'),
|
||||
...translateSearchKeyword('settings.enterprise.keywordSaml', 'saml'),
|
||||
...translateSearchKeyword('settings.enterprise.keywordScim', 'scim'),
|
||||
...translateSearchKeyword('settings.enterprise.keywordCompliance', 'compliance')
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordTeam', 'team'),
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordMembers', 'members'),
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordInvite', 'invite'),
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordSso', 'sso'),
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordAudit', 'audit log'),
|
||||
...translateSearchKeyword('settings.cloudConsole.teamAdmin.keywordEnterprise', 'enterprise')
|
||||
]
|
||||
}
|
||||
])
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import {
|
||||
OrcaCloudEnterprisePane,
|
||||
OrcaCloudEnvironmentsPane,
|
||||
OrcaCloudLocalCommandsSettingsPane,
|
||||
OrcaCloudMcpPane,
|
||||
OrcaCloudSecretsPane,
|
||||
OrcaCloudSkillsSyncPane,
|
||||
OrcaCloudTeamPane,
|
||||
OrcaCloudWorkspacesPane
|
||||
} from '../orca-cloud/OrcaCloudSettingsPanes'
|
||||
import { SettingsSection } from '../section-layout/SettingsSection'
|
||||
@@ -26,10 +24,8 @@ export function renderOrcaCloudSettingsSections(
|
||||
}
|
||||
// Titles and descriptions come from the nav metadata so the pane and the sidebar never disagree.
|
||||
const sections: { id: string; pane: React.JSX.Element; navOnly?: boolean }[] = [
|
||||
{ id: 'cloud-team', pane: <OrcaCloudTeamPane /> },
|
||||
// Listed in the nav for team owners and admins only; without the entry there is no page.
|
||||
{ id: 'cloud-workspaces', pane: <OrcaCloudWorkspacesPane />, navOnly: true },
|
||||
{ id: 'cloud-enterprise', pane: <OrcaCloudEnterprisePane />, navOnly: true },
|
||||
{ id: 'cloud-secrets', pane: <OrcaCloudSecretsPane /> },
|
||||
{ id: 'cloud-skills', pane: <OrcaCloudSkillsSyncPane /> },
|
||||
{ id: 'cloud-environments', pane: <OrcaCloudEnvironmentsPane /> },
|
||||
|
||||
@@ -15,7 +15,7 @@ export type SettingsNavigationBuildOptions = {
|
||||
isLinearConnected: boolean
|
||||
/** Orca Cloud programmatic access (API keys, routines): only builds with a control plane. */
|
||||
isOrcaCloudApiAvailable?: boolean
|
||||
/** Owner or admin of the active Orca team: Settings › Enterprise is theirs alone. */
|
||||
/** Owner or admin of the active Orca team: Settings › Cloud workspaces is theirs alone. */
|
||||
isOrcaTeamAdmin?: boolean
|
||||
repos: readonly Repo[]
|
||||
projectGrouping?: ProjectGroupingModel
|
||||
|
||||
@@ -10,7 +10,8 @@ import {
|
||||
resolveAccountBillingTarget,
|
||||
labelAccountBilling,
|
||||
hasOrcaBillingAccount,
|
||||
ACCOUNT_BILLING_PLAN_ANCHOR
|
||||
ACCOUNT_BILLING_PLAN_ANCHOR,
|
||||
ACCOUNT_TEAM_ADMIN_ANCHOR
|
||||
} from './settings-navigation-orca-cloud-sections'
|
||||
|
||||
function options(patch: Partial<SettingsNavigationBuildOptions>): SettingsNavigationBuildOptions {
|
||||
@@ -36,7 +37,6 @@ describe('Orca Cloud settings group', () => {
|
||||
const sections = buildOrcaCloudSettingsSections(options({}))
|
||||
expect(sections.map((section) => section.id)).toEqual([
|
||||
'cloud-billing',
|
||||
'cloud-team',
|
||||
'cloud-secrets',
|
||||
'cloud-skills',
|
||||
'cloud-environments',
|
||||
@@ -53,32 +53,23 @@ describe('Orca Cloud settings group', () => {
|
||||
expect(new Set(sections.map((section) => section.group))).toEqual(new Set(['orca-cloud']))
|
||||
})
|
||||
|
||||
it('adds Workspaces then Enterprise after Team for a team owner or admin only', () => {
|
||||
it('adds Workspaces for a team owner or admin only; team and admin have no page', () => {
|
||||
const ids = (patch: Parameters<typeof options>[0]) =>
|
||||
buildOrcaCloudSettingsSections(options(patch)).map((section) => section.id)
|
||||
expect(ids({})).not.toContain('cloud-enterprise')
|
||||
expect(ids({ isOrcaTeamAdmin: false })).not.toContain('cloud-enterprise')
|
||||
// HOME-1: the team's workspace list is an admin management view, never a member page.
|
||||
expect(ids({})).not.toContain('cloud-workspaces')
|
||||
expect(ids({ isOrcaTeamAdmin: false })).not.toContain('cloud-workspaces')
|
||||
const admin = ids({ isOrcaTeamAdmin: true })
|
||||
expect(admin.slice(0, 5)).toEqual([
|
||||
'cloud-billing',
|
||||
'cloud-team',
|
||||
'cloud-workspaces',
|
||||
'cloud-enterprise',
|
||||
'cloud-secrets'
|
||||
])
|
||||
const section = buildOrcaCloudSettingsSections(options({ isOrcaTeamAdmin: true })).find(
|
||||
(entry) => entry.id === 'cloud-enterprise'
|
||||
)!
|
||||
expect(section).toMatchObject({ title: 'Enterprise', group: 'orca-cloud' })
|
||||
// The audit log is found by searching for it; it no longer lives under Orca API keys.
|
||||
expect(admin.slice(0, 3)).toEqual(['cloud-billing', 'cloud-workspaces', 'cloud-secrets'])
|
||||
// Team, Enterprise and the audit log are managed in the web console (Account › Team & admin).
|
||||
for (const patch of [{}, { isOrcaTeamAdmin: true }]) {
|
||||
expect(ids(patch)).not.toContain('cloud-team')
|
||||
expect(ids(patch)).not.toContain('cloud-enterprise')
|
||||
}
|
||||
const keywords = (id: string) =>
|
||||
buildOrcaCloudSettingsSections(options({ isOrcaTeamAdmin: true }))
|
||||
.find((entry) => entry.id === id)!
|
||||
.searchEntries.flatMap((entry) => entry.keywords ?? [])
|
||||
expect(keywords('cloud-enterprise')).toContain('audit log')
|
||||
expect(keywords('cloud-workspaces')).toContain('cloud workspaces')
|
||||
expect(keywords('cloud-api-keys')).not.toContain('audit log')
|
||||
// Never without a control plane, whatever the role.
|
||||
@@ -123,7 +114,7 @@ describe('one Orca Cloud group (JA-16)', () => {
|
||||
nav('orca-account', 'setup'),
|
||||
nav('general', 'setup'),
|
||||
nav('cloud-billing', 'orca-cloud'),
|
||||
nav('cloud-team', 'orca-cloud'),
|
||||
nav('cloud-secrets', 'orca-cloud'),
|
||||
nav('automations', 'workflows')
|
||||
]
|
||||
|
||||
@@ -134,7 +125,7 @@ describe('one Orca Cloud group (JA-16)', () => {
|
||||
'capabilities:accounts',
|
||||
'setup:general',
|
||||
'orca-cloud:orca-account',
|
||||
'orca-cloud:cloud-team',
|
||||
'orca-cloud:cloud-secrets',
|
||||
'workflows:automations'
|
||||
])
|
||||
expect(out.find((section) => section.id === 'orca-account')?.title).toBe('Account & billing')
|
||||
@@ -151,7 +142,7 @@ describe('one Orca Cloud group (JA-16)', () => {
|
||||
const account = gatherOrcaCloudSettingsGroup(withEntries, options({})).find(
|
||||
(section) => section.id === 'orca-account'
|
||||
)
|
||||
expect(account?.searchEntries).toEqual([
|
||||
expect(account?.searchEntries.slice(0, 2)).toEqual([
|
||||
{ title: 'Orca account' },
|
||||
{
|
||||
title: 'Plan & billing',
|
||||
@@ -161,6 +152,19 @@ describe('one Orca Cloud group (JA-16)', () => {
|
||||
])
|
||||
})
|
||||
|
||||
it('finds members, single sign-on and the audit log on the Account page\'s Team & admin row', () => {
|
||||
const account = gatherOrcaCloudSettingsGroup(all, options({})).find(
|
||||
(section) => section.id === 'orca-account'
|
||||
)
|
||||
const teamAdmin = account?.searchEntries.filter(
|
||||
(entry) => entry.targetSectionId === ACCOUNT_TEAM_ADMIN_ANCHOR
|
||||
)
|
||||
expect(teamAdmin?.map((entry) => entry.title)).toEqual(['Team & admin'])
|
||||
expect(teamAdmin?.[0]?.keywords).toEqual(
|
||||
expect.arrayContaining(['members', 'sso', 'audit log', 'enterprise'])
|
||||
)
|
||||
})
|
||||
|
||||
it('is "Account" with no billing to show, and leaves the upstream account alone', () => {
|
||||
const gathered = gatherOrcaCloudSettingsGroup(all, options({}))
|
||||
const label = (sections: SettingsNavSection[]) =>
|
||||
@@ -192,8 +196,8 @@ describe('one Orca Cloud group (JA-16)', () => {
|
||||
expect(resolveAccountBillingTarget({ pane: 'cloud-billing' }, false)).toEqual({
|
||||
pane: 'cloud-billing'
|
||||
})
|
||||
expect(resolveAccountBillingTarget({ pane: 'cloud-team' }, true)).toEqual({
|
||||
pane: 'cloud-team'
|
||||
expect(resolveAccountBillingTarget({ pane: 'cloud-secrets' }, true)).toEqual({
|
||||
pane: 'cloud-secrets'
|
||||
})
|
||||
})
|
||||
|
||||
@@ -210,7 +214,7 @@ describe('isOrcaCloudSettingsSectionId', () => {
|
||||
const { isOrcaCloudSettingsSectionId } =
|
||||
await import('./settings-navigation-orca-cloud-sections')
|
||||
expect(isOrcaCloudSettingsSectionId('cloud-billing')).toBe(true)
|
||||
expect(isOrcaCloudSettingsSectionId('cloud-team')).toBe(true)
|
||||
expect(isOrcaCloudSettingsSectionId('cloud-secrets')).toBe(true)
|
||||
expect(isOrcaCloudSettingsSectionId('orca-account')).toBe(true)
|
||||
expect(isOrcaCloudSettingsSectionId('general')).toBe(false)
|
||||
expect(isOrcaCloudSettingsSectionId('terminal')).toBe(false)
|
||||
|
||||
@@ -4,13 +4,12 @@ import {
|
||||
} from '@/components/settings/cloud-api/cloud-api-search'
|
||||
import {
|
||||
getOrcaCloudBillingSearchEntries,
|
||||
getOrcaCloudEnterpriseSearchEntries,
|
||||
getOrcaCloudEnvironmentsSearchEntries,
|
||||
getOrcaCloudLocalCommandsSearchEntries,
|
||||
getOrcaCloudMcpSearchEntries,
|
||||
getOrcaCloudSkillsSearchEntries,
|
||||
getOrcaCloudSecretsSearchEntries,
|
||||
getOrcaCloudTeamSearchEntries,
|
||||
getOrcaCloudTeamAdminSearchEntries,
|
||||
getOrcaCloudWorkspacesSearchEntries
|
||||
} from '@/components/settings/orca-cloud/orca-cloud-settings-search'
|
||||
import { translate } from '@/i18n/i18n'
|
||||
@@ -24,13 +23,11 @@ import {
|
||||
BookOpenText,
|
||||
Boxes,
|
||||
Cloud,
|
||||
Building2,
|
||||
CreditCard,
|
||||
KeySquare,
|
||||
LockKeyhole,
|
||||
Plug,
|
||||
SquareTerminal,
|
||||
Users,
|
||||
Workflow
|
||||
} from 'lucide-react'
|
||||
import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
|
||||
@@ -57,18 +54,9 @@ export function buildOrcaCloudSettingsSections(
|
||||
searchEntries: getOrcaCloudBillingSearchEntries(),
|
||||
group
|
||||
},
|
||||
{
|
||||
id: 'cloud-team',
|
||||
title: t('auto.components.billing.team.title', 'Team'),
|
||||
description: t(
|
||||
'auto.components.billing.team.createHint',
|
||||
'Share one Orca Cloud plan with your teammates.'
|
||||
),
|
||||
icon: Users,
|
||||
searchEntries: getOrcaCloudTeamSearchEntries(),
|
||||
group
|
||||
},
|
||||
// Team owners and admins only; members and personal accounts never see the entry.
|
||||
// Team owners and admins only; members and personal accounts never see the entry. Team,
|
||||
// billing and admin (single sign-on, audit log) are managed in the web console, reached from
|
||||
// the Account page's "Team & admin" row; the desktop has no page for them.
|
||||
...(isOrcaTeamAdmin
|
||||
? [
|
||||
{
|
||||
@@ -81,17 +69,6 @@ export function buildOrcaCloudSettingsSections(
|
||||
icon: Cloud,
|
||||
searchEntries: getOrcaCloudWorkspacesSearchEntries(),
|
||||
group
|
||||
},
|
||||
{
|
||||
id: 'cloud-enterprise',
|
||||
title: t('settings.enterprise.title', 'Enterprise'),
|
||||
description: t(
|
||||
'settings.enterprise.description',
|
||||
'Single sign-on, sign-in policies and the audit log for your team.'
|
||||
),
|
||||
icon: Building2,
|
||||
searchEntries: getOrcaCloudEnterpriseSearchEntries(),
|
||||
group
|
||||
}
|
||||
]
|
||||
: []),
|
||||
@@ -190,12 +167,16 @@ const ORCA_CLOUD_LEAD_IDS: readonly string[] = ['orca-account']
|
||||
/** Where Plan & billing lives inside the combined Account + Billing page (scroll anchor). */
|
||||
export const ACCOUNT_BILLING_PLAN_ANCHOR = 'orca-account-plan-billing'
|
||||
|
||||
/** The Account page's "Team & admin" row, which opens the web console (scroll anchor). */
|
||||
export const ACCOUNT_TEAM_ADMIN_ANCHOR = 'orca-account-team-admin'
|
||||
|
||||
/**
|
||||
* JA-16: in Orca Cloud builds the Orca account leads the one Orca Cloud group instead of sitting in
|
||||
* Set up. Agent accounts stays in AI capabilities: it covers this computer and hosts as much as
|
||||
* Orca Cloud, and its Orca Cloud part is deep-linked from every cloud entry point.
|
||||
* Neil: the account and Plan & billing are one page, "Account + Billing" (account on top). Billing's
|
||||
* search entries move onto it and land on its Plan & billing part.
|
||||
* search entries move onto it and land on its Plan & billing part. Searching for members, single
|
||||
* sign-on or the audit log lands on its "Team & admin" row, which opens the web console.
|
||||
*/
|
||||
export function gatherOrcaCloudSettingsGroup(
|
||||
sections: readonly SettingsNavSection[],
|
||||
@@ -209,6 +190,10 @@ export function gatherOrcaCloudSettingsGroup(
|
||||
...entry,
|
||||
targetSectionId: ACCOUNT_BILLING_PLAN_ANCHOR
|
||||
}))
|
||||
const teamAdminEntries = getOrcaCloudTeamAdminSearchEntries().map((entry) => ({
|
||||
...entry,
|
||||
targetSectionId: ACCOUNT_TEAM_ADMIN_ANCHOR
|
||||
}))
|
||||
const leadIds = ORCA_CLOUD_LEAD_IDS
|
||||
const leads = leadIds
|
||||
.map((id) => sections.find((section) => section.id === id))
|
||||
@@ -222,7 +207,7 @@ export function gatherOrcaCloudSettingsGroup(
|
||||
'settings.accountBilling.description',
|
||||
'Your Orca account, plan, sandbox hours and payment.'
|
||||
),
|
||||
searchEntries: [...section.searchEntries, ...billingEntries]
|
||||
searchEntries: [...section.searchEntries, ...billingEntries, ...teamAdminEntries]
|
||||
}))
|
||||
const rest = sections.filter(
|
||||
(section) => !leadIds.includes(section.id) && section.id !== 'cloud-billing'
|
||||
|
||||
@@ -1422,12 +1422,6 @@
|
||||
"reconnectTitle": "Sign in again",
|
||||
"body": "Orca Cloud settings belong to your Orca account. Sign in to manage them."
|
||||
},
|
||||
"team": {
|
||||
"searchDescription": "Members, invites and seats for your Orca Cloud team.",
|
||||
"keywordMembers": "members",
|
||||
"keywordInvite": "invite",
|
||||
"keywordSeats": "seats"
|
||||
},
|
||||
"billing": {
|
||||
"searchDescription": "Your Orca Cloud plan, sandbox hours, overage and payment.",
|
||||
"keywordPlan": "plan",
|
||||
@@ -1478,17 +1472,6 @@
|
||||
"accountOnly": "Account",
|
||||
"accountOnlyDescription": "Your Orca account and what’s included with it."
|
||||
},
|
||||
"enterprise": {
|
||||
"title": "Enterprise",
|
||||
"searchDescription": "Single sign-on and directory sync, and the audit log of changes across your team.",
|
||||
"keywordAudit": "audit log",
|
||||
"keywordActivity": "activity",
|
||||
"keywordSso": "sso",
|
||||
"keywordSaml": "saml",
|
||||
"keywordScim": "scim",
|
||||
"keywordCompliance": "compliance",
|
||||
"description": "Single sign-on, sign-in policies and the audit log for your team."
|
||||
},
|
||||
"teamWorkspaces": {
|
||||
"search": "Search workspaces",
|
||||
"searchPlaceholder": "Search name, repository, person, W-number…",
|
||||
@@ -1523,15 +1506,17 @@
|
||||
"billing": {
|
||||
"description": "Change your plan, see sandbox hours and invoices, and update payment."
|
||||
},
|
||||
"team": {
|
||||
"title": "Members and invites",
|
||||
"description": "Invite teammates, change roles, remove members, or create a team."
|
||||
},
|
||||
"enterprise": {
|
||||
"title": "Enterprise",
|
||||
"description": "Single sign-on, verified domains, directory sync, required two-factor and the audit log."
|
||||
},
|
||||
"openFailed": "Couldn’t open the browser. Try again."
|
||||
"openFailed": "Couldn’t open the browser. Try again.",
|
||||
"teamAdmin": {
|
||||
"title": "Team & admin",
|
||||
"description": "Manage members, billing, single sign-on and the audit log in your browser.",
|
||||
"keywordTeam": "team",
|
||||
"keywordMembers": "members",
|
||||
"keywordInvite": "invite",
|
||||
"keywordSso": "sso",
|
||||
"keywordAudit": "audit log",
|
||||
"keywordEnterprise": "enterprise"
|
||||
}
|
||||
}
|
||||
},
|
||||
"menu": {
|
||||
@@ -21121,12 +21106,10 @@
|
||||
"updatePayment": "Update payment method",
|
||||
"team": {
|
||||
"menuItem": "Team",
|
||||
"title": "Team",
|
||||
"you": "(you)",
|
||||
"roleOwner": "Owner",
|
||||
"roleAdmin": "Admin",
|
||||
"roleMember": "Member",
|
||||
"createHint": "Share one Orca Cloud plan with your teammates."
|
||||
"roleMember": "Member"
|
||||
},
|
||||
"comparePlans": "Compare plans",
|
||||
"capLabel2": "Monthly spend cap",
|
||||
|
||||
@@ -22,7 +22,7 @@ export function activeTeamRole(
|
||||
return raw === 'owner' || raw === 'admin' ? raw : 'member'
|
||||
}
|
||||
|
||||
/** Owner or admin of the active team: who sees Settings › Enterprise. */
|
||||
/** Owner or admin of the active team: who sees Settings › Cloud workspaces. */
|
||||
export function isActiveTeamAdmin(status: OrcaProfileAuthStatus | null | undefined): boolean {
|
||||
const role = activeTeamRole(status)
|
||||
return role === 'owner' || role === 'admin'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// "Manage in browser": team, billing and Enterprise settings live in the Orca Cloud web console.
|
||||
// "Manage in browser": team, billing and admin settings live in the Orca Cloud web console.
|
||||
// Main asks auth for a single-use login code and opens the page in the system browser; without a
|
||||
// code the browser asks the person to sign in, so a failed request still opens the page.
|
||||
import { toast } from 'sonner'
|
||||
|
||||
Reference in New Issue
Block a user