diff --git a/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.fixture.tsx b/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.fixture.tsx new file mode 100644 index 00000000000..62ef7b2be25 --- /dev/null +++ b/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.fixture.tsx @@ -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: () => ( +
+ +
+ ) + }) +} + +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) diff --git a/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.tsx b/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.tsx new file mode 100644 index 00000000000..2d8177ecfd3 --- /dev/null +++ b/src/renderer/src/components/settings/accounts/orca/AccountTeamAdminRow.tsx @@ -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 ( +
+
+ +
+
+

+ {t('settings.cloudConsole.teamAdmin.title', 'Team & admin')} +

+

+ {t( + 'settings.cloudConsole.teamAdmin.description', + 'Manage members, billing, single sign-on and the audit log in your browser.' + )} +

+
+ {/* A plain button, no "Copy link": the page opens signed in with a single-use code. */} + +
+ ) +} + +/** Mount only while signed in to Orca Cloud. */ +export function AccountTeamAdminRow(): React.JSX.Element { + const [busy, setBusy] = useState(false) + return ( + { + setBusy(true) + void openCloudConsole('home').finally(() => setBusy(false)) + }} + /> + ) +} diff --git a/src/renderer/src/components/settings/accounts/orca/OrcaAccountSettingsPane.tsx b/src/renderer/src/components/settings/accounts/orca/OrcaAccountSettingsPane.tsx index 7e43cc32fe2..72203908527 100644 --- a/src/renderer/src/components/settings/accounts/orca/OrcaAccountSettingsPane.tsx +++ b/src/renderer/src/components/settings/accounts/orca/OrcaAccountSettingsPane.tsx @@ -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 ? : 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 ? : 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 : (
) } - -export function TeamConsoleLink(): React.JSX.Element { - const t = useTranslate() - return ( - - ) -} - -export function EnterpriseConsoleLink(): React.JSX.Element { - const t = useTranslate() - return ( - - ) -} diff --git a/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettings.fixture.tsx b/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettings.fixture.tsx index 9e889f84a9c..a39cece8abd 100644 --- a/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettings.fixture.tsx +++ b/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettings.fixture.tsx @@ -172,7 +172,11 @@ export const signedOut = defineFixture({ width: 784, store: { orcaProfileAuthStatus: SIGNED_OUT }, render: () => ( - + ) diff --git a/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettingsPanes.tsx b/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettingsPanes.tsx index 7be4e8410bb..26b7b15a1cd 100644 --- a/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettingsPanes.tsx +++ b/src/renderer/src/components/settings/orca-cloud/OrcaCloudSettingsPanes.tsx @@ -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 {() => } -} - -function EnterpriseConsoleLinkForAdmins(): React.JSX.Element | null { - const role = activeTeamRole(useAppStore((s) => s.orcaProfileAuthStatus)) - return role !== null && canManageMembers(role) ? : null -} - -/** Settings › Team: members, invites and roles are managed in the web console. */ -export function OrcaCloudTeamPane(): React.JSX.Element { - return {() => } -} - export function OrcaCloudSecretsPane(): React.JSX.Element { return ( diff --git a/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts b/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts index 50864bf5d17..83d63a58aaa 100644 --- a/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts +++ b/src/renderer/src/components/settings/orca-cloud/orca-cloud-settings-search.ts @@ -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') ] } ]) diff --git a/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx b/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx index 41c3662a46e..d1f273f9254 100644 --- a/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx +++ b/src/renderer/src/components/settings/page/settings-orca-cloud-section-renderers.tsx @@ -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: }, // Listed in the nav for team owners and admins only; without the entry there is no page. { id: 'cloud-workspaces', pane: , navOnly: true }, - { id: 'cloud-enterprise', pane: , navOnly: true }, { id: 'cloud-secrets', pane: }, { id: 'cloud-skills', pane: }, { id: 'cloud-environments', pane: }, diff --git a/src/renderer/src/hooks/settings-navigation-build-options.ts b/src/renderer/src/hooks/settings-navigation-build-options.ts index 9f6cca5f58a..77a8f30874e 100644 --- a/src/renderer/src/hooks/settings-navigation-build-options.ts +++ b/src/renderer/src/hooks/settings-navigation-build-options.ts @@ -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 diff --git a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts index f9a9578b03d..d29359cb991 100644 --- a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts +++ b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.test.ts @@ -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 { @@ -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[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) diff --git a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts index eb2f6d13cbb..96b5c12d34a 100644 --- a/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts +++ b/src/renderer/src/hooks/settings-navigation-orca-cloud-sections.ts @@ -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' diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index e1320ec3953..17b883b14b7 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -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", diff --git a/src/renderer/src/lib/orca-cloud/active-team-role.ts b/src/renderer/src/lib/orca-cloud/active-team-role.ts index aff67dc620b..b77609ea3b1 100644 --- a/src/renderer/src/lib/orca-cloud/active-team-role.ts +++ b/src/renderer/src/lib/orca-cloud/active-team-role.ts @@ -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' diff --git a/src/renderer/src/lib/orca-cloud/open-cloud-console.ts b/src/renderer/src/lib/orca-cloud/open-cloud-console.ts index 63ba3dbf136..93bf39ec804 100644 --- a/src/renderer/src/lib/orca-cloud/open-cloud-console.ts +++ b/src/renderer/src/lib/orca-cloud/open-cloud-console.ts @@ -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'