diff --git a/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.fixture.tsx b/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.fixture.tsx index c15ef236a87..ffc3e27ca16 100644 --- a/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.fixture.tsx +++ b/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.fixture.tsx @@ -9,11 +9,11 @@ const { addProjectMenu } = withCloudAddProjectEntry( noop ) -/** PROJ-MENU part 2: the Add project menu with "From GitHub (Orca Cloud)…" as its last entry. */ +/** PROJ-MENU part 2: the Add project menu with an "Orca Cloud" group with "Add a GitHub repository…". */ export const addProjectMenuWithCloud = defineFixture({ width: 520, render: () => ( -
+
{ {result.addProjectMenu?.extraItems?.(closeMenus)} ) - fireEvent.click(screen.getByRole('menuitem', { name: 'From GitHub (Orca Cloud)…' })) + expect(screen.getByText('Orca Cloud')).toBeTruthy() + fireEvent.click(screen.getByRole('menuitem', { name: 'Add a GitHub repository…' })) expect(closeMenus).toHaveBeenCalledOnce() expect(more).toHaveBeenCalledOnce() expect(closeMenus.mock.invocationCallOrder[0]).toBeLessThan(more.mock.invocationCallOrder[0]) diff --git a/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.tsx b/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.tsx index 563fda58909..2c90a3fde5f 100644 --- a/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.tsx +++ b/src/renderer/src/components/new-workspace/ProjectComboboxCloudAddProjectEntry.tsx @@ -1,20 +1,31 @@ // PROJ-MENU part 2: "Give Orca Cloud access to more repositories" moves out of the project list into -// the Add project menu, as one more way to add a project: "From GitHub (Orca Cloud)…". +// the Add project menu, in its own "Orca Cloud" group: "Add a GitHub repository…". import React from 'react' import { Github } from 'lucide-react' -import { DropdownMenuItem } from '@/components/ui/dropdown-menu' +import { DropdownMenuItem, DropdownMenuSeparator } from '@/components/ui/dropdown-menu' import { useTranslate } from '@/i18n/use-translate' import type { ProjectComboboxAddProjectMenu } from './ProjectComboboxAddProjectOption' function FromGitHubItem({ onSelect }: { onSelect: () => void }): React.JSX.Element { const t = useTranslate() return ( - - - - {t('components.newWorkspace.cloudOnly.fromGitHub', 'From GitHub (Orca Cloud)…')} - - + <> + {/* Its own group: the header's host picker doesn't apply to Orca Cloud. */} + +
+ {t('components.newWorkspace.cloudOnly.menuGroup', 'Orca Cloud')} +
+ + + {/* The same words as the composer's link, so both ways in read the same. */} + + {t('components.newWorkspace.cloudOnly.addRepositoryMenu', 'Add a GitHub repository…')} + + + ) } diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 7765cc2ac08..f29439d0139 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -23900,7 +23900,8 @@ "rowPrivate": "{{repo}}, private, cloud only", "rowPublic": "{{repo}}, cloud only", "privateLabel": "Private", - "fromGitHub": "From GitHub (Orca Cloud)…" + "menuGroup": "Orca Cloud", + "addRepositoryMenu": "Add a GitHub repository…" }, "agentLabel": "Agent" },