diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerFooter.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerFooter.tsx index c041625c6e2..af036a8453d 100644 --- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerFooter.tsx +++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerFooter.tsx @@ -1,3 +1,4 @@ +import { ORCA_CLOUD_NEEDS_REPO_ID } from './run-on/cloud-start-view' import React from 'react' import { LoaderCircle } from 'lucide-react' import { Button } from '@/components/ui/button' @@ -16,6 +17,7 @@ type NewWorkspaceComposerFooterProps = Pick< | 'createDisabled' | 'creating' | 'primaryActionLabel' + | 'cloudStart' > & { submitShortcutModifierLabel: string } @@ -29,9 +31,16 @@ export function NewWorkspaceComposerFooter({ createDisabled, creating, primaryActionLabel, - submitShortcutModifierLabel + submitShortcutModifierLabel, + cloudStart = null }: NewWorkspaceComposerFooterProps): React.JSX.Element { const t = useTranslate() + // RR-c1: why Create waits (a folder project on Orca Cloud), on hover and for screen readers. + const needsRepo = Boolean(cloudStart?.needsGitHubRepo) + const needsRepoReason = t( + 'components.newWorkspace.cloudOnly.needsRepository', + 'Orca Cloud needs a GitHub repository.' + ) return ( <> {createError ? ( @@ -68,19 +77,21 @@ export function NewWorkspaceComposerFooter({ ) : null} - + + + ) diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx index af4282225d3..8116a57ad27 100644 --- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx +++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx @@ -1,3 +1,4 @@ +import { OrcaCloudNeedsRepoLine } from './run-on/OrcaCloudNeedsRepoLine' import { OrcaCloudWallLine } from './run-on/OrcaCloudWallLine' import React from 'react' import { FolderPlus, LoaderCircle, PlugZap } from 'lucide-react' @@ -101,6 +102,8 @@ export function NewWorkspaceComposerProjectSection({ ? cloudStart?.cloudOnly : undefined const t = useTranslate() + // RR-c1: "Choose repository" opens the Project picker at its GitHub repositories. + const [repoPickerSignal, setRepoPickerSignal] = React.useState(0) return (
{/* One row, two equal columns: Project | Run on. Picking a target never changes the rows @@ -165,11 +168,18 @@ export function NewWorkspaceComposerProjectSection({ triggerClassName="h-9 w-full border-input text-sm focus-visible:border-focus-ring focus-visible:ring-1 focus-visible:ring-focus-ring" invalid={Boolean(projectError)} describedBy={projectDescriptionId} + openSignal={repoPickerSignal} /> {projectError ? (

{projectError}

+ ) : cloudStart?.needsGitHubRepo ? ( + setRepoPickerSignal((signal) => signal + 1)} + onAddRepository={onAddProject} + /> ) : projectOptions.length === 0 ? (

{emptyProjectMessage ?? diff --git a/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.fixture.tsx b/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.fixture.tsx new file mode 100644 index 00000000000..8d15d466d2f --- /dev/null +++ b/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.fixture.tsx @@ -0,0 +1,28 @@ +import { defineFixture } from '../../../component-fixtures/component-fixture' +import { OrcaCloudNeedsRepoLine } from './OrcaCloudNeedsRepoLine' + +// Under Project (half the composer, ~230px): Orca Cloud on a plain folder. +function Column({ children }: { children: React.ReactNode }): React.JSX.Element { + return

{children}
+} + +export const withGitHubRepositories = defineFixture({ + width: 260, + render: () => ( + + {}} onAddRepository={() => {}} /> + + ) +}) +export const noGitHubRepositories = defineFixture({ + width: 260, + render: () => ( + + {}} + onAddRepository={() => {}} + /> + + ) +}) diff --git a/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.tsx b/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.tsx new file mode 100644 index 00000000000..9e931968302 --- /dev/null +++ b/src/renderer/src/components/new-workspace/run-on/OrcaCloudNeedsRepoLine.tsx @@ -0,0 +1,49 @@ +import React from 'react' +import { Button } from '@/components/ui/button' +import { useTranslate } from '@/i18n/use-translate' +import { ORCA_CLOUD_NEEDS_REPO_ID } from './cloud-start-view' + +/** + * RR-c1 (design-squad): Orca Cloud is selected but the project is a plain folder. Nothing switches + * on its own; this line says why Create waits and offers the one way forward: choose a GitHub + * repository (the Project picker opens at them), or add one when there are none. + */ +export function OrcaCloudNeedsRepoLine({ + hasRepos, + onChooseRepository, + onAddRepository +}: { + hasRepos: boolean + onChooseRepository: () => void + onAddRepository: () => void +}): React.JSX.Element { + const t = useTranslate() + return ( +
+

+ {t( + 'components.newWorkspace.cloudOnly.needsRepository', + 'Orca Cloud needs a GitHub repository.' + )} +

+ {/* statusAction pads its label by px-1; -mx-1 keeps the text flush with the line above. */} +
+ +
+
+ ) +} diff --git a/src/renderer/src/components/new-workspace/run-on/cloud-start-view.ts b/src/renderer/src/components/new-workspace/run-on/cloud-start-view.ts index 7cbc7610a17..325b9914645 100644 --- a/src/renderer/src/components/new-workspace/run-on/cloud-start-view.ts +++ b/src/renderer/src/components/new-workspace/run-on/cloud-start-view.ts @@ -13,8 +13,28 @@ export type CloudStartView = { folderProject?: boolean /** JA-21b (flagged): Orca Cloud is selected and a billing wall applies; Create waits for the fix. */ wall?: OrcaCloudWallNotice | null + /** + * RR-c1: Orca Cloud is selected but the project is a plain folder. Both selections stay; one line + * under Project says so and Create waits for a GitHub repository. `hasRepos`: any to choose from. + */ + needsGitHubRepo?: { hasRepos: boolean } | null } +/** RR-c1: Orca Cloud on a plain folder, with no GitHub repository picked yet: Create waits. */ +export function orcaCloudNeedsGitHubRepo(args: { + cloudSelected: boolean + folderProject: boolean + pickedRepo: boolean + repoCount: number +}): { hasRepos: boolean } | null { + return args.cloudSelected && args.folderProject && !args.pickedRepo + ? { hasRepos: args.repoCount > 0 } + : null +} + +/** The line under Project that explains why Create waits; Create's aria-describedby points here. */ +export const ORCA_CLOUD_NEEDS_REPO_ID = 'orca-cloud-needs-github-repo' + export function prefersReducedMotion(): boolean { return ( typeof window !== 'undefined' && diff --git a/src/renderer/src/components/new-workspace/run-on/orca-cloud-needs-repo.test.tsx b/src/renderer/src/components/new-workspace/run-on/orca-cloud-needs-repo.test.tsx new file mode 100644 index 00000000000..4ef5b782843 --- /dev/null +++ b/src/renderer/src/components/new-workspace/run-on/orca-cloud-needs-repo.test.tsx @@ -0,0 +1,52 @@ +// @vitest-environment happy-dom +import { cleanup, render } from '@testing-library/react' +import { afterEach, describe, expect, it, vi } from 'vitest' +import { NewWorkspaceComposerFooter } from '../NewWorkspaceComposerFooter' +import { + ORCA_CLOUD_NEEDS_REPO_ID, + orcaCloudNeedsGitHubRepo, + type CloudStartView +} from './cloud-start-view' + +afterEach(() => { + cleanup() +}) + +describe('Orca Cloud on a plain-folder project (RR-c1)', () => { + it('waits for a GitHub repository only while Orca Cloud is on a folder with none picked', () => { + const base = { cloudSelected: true, folderProject: true, pickedRepo: false, repoCount: 3 } + expect(orcaCloudNeedsGitHubRepo(base)).toEqual({ hasRepos: true }) + expect(orcaCloudNeedsGitHubRepo({ ...base, repoCount: 0 })).toEqual({ hasRepos: false }) + // Picking a GitHub repository resolves it; a git project or This computer never needs it. + expect(orcaCloudNeedsGitHubRepo({ ...base, pickedRepo: true })).toBeNull() + expect(orcaCloudNeedsGitHubRepo({ ...base, folderProject: false })).toBeNull() + expect(orcaCloudNeedsGitHubRepo({ ...base, cloudSelected: false })).toBeNull() + }) + + it('Create is disabled and says why, so it never fails after a click', () => { + const onCreate = vi.fn() + const cloudStart: CloudStartView = { + onSelectOrcaCloud: () => {}, + onUserPick: () => {}, + needsGitHubRepo: { hasRepos: true } + } + const { getByRole } = render( + + ) + const button = getByRole('button', { name: /Create workspace/ }) + expect(button).toHaveProperty('disabled', true) + expect(button.getAttribute('aria-describedby')).toBe(ORCA_CLOUD_NEEDS_REPO_ID) + expect(button.parentElement?.getAttribute('title')).toBe( + 'Orca Cloud needs a GitHub repository.' + ) + button.click() + expect(onCreate).not.toHaveBeenCalled() + }) +}) diff --git a/src/renderer/src/components/new-workspace/run-on/use-cloud-start-composer.ts b/src/renderer/src/components/new-workspace/run-on/use-cloud-start-composer.ts index 29a9452548e..31d3473905e 100644 --- a/src/renderer/src/components/new-workspace/run-on/use-cloud-start-composer.ts +++ b/src/renderer/src/components/new-workspace/run-on/use-cloud-start-composer.ts @@ -26,7 +26,7 @@ import { useSwitchTeamSteps } from '../cloud-setup/use-cloud-setup-tracker' import { cloudSetupRequired } from '../../orca-cloud-setup/cloud-setup-page-model' import { useRunOnDefault } from './use-run-on-default' import { useCloudOnlyCreate, useCloudOnlyRepo } from './use-cloud-only-repo' -import type { CloudStartView } from './cloud-start-view' +import { orcaCloudNeedsGitHubRepo, type CloudStartView } from './cloud-start-view' import { showCloudAgentNotStartedToast } from '@/lib/orca-cloud/cloud-agent-not-started-toast' import { orcaCloudWallNotice, useRunOnPreflightEnabled } from '@/lib/orca-cloud/run-on-preflight' import { isOrcaCloudAccountAgent } from '../../../../../shared/orca-cloud-agents/orca-cloud-agents-wire' @@ -222,9 +222,15 @@ export function useCloudStartComposer({ onUserPick: markTouched, cloudOnly, folderProject: cloudOnly.folderProject, - wall + wall, + needsGitHubRepo: orcaCloudNeedsGitHubRepo({ + cloudSelected, + folderProject: cloudOnly.folderProject, + pickedRepo: cloudOnly.picked !== null, + repoCount: cloudOnly.repos?.length ?? 0 + }) }, - [cloudOnly, markTouched, onSelectOrcaCloud, segment, wall] + [cloudOnly, cloudSelected, markTouched, onSelectOrcaCloud, segment, wall] ) if (!view || !cloudSelected) { return { view, onPrimary: null, recordCreated } diff --git a/src/renderer/src/components/new-workspace/run-on/use-composer-cloud-start.ts b/src/renderer/src/components/new-workspace/run-on/use-composer-cloud-start.ts index 35791322f6b..cd75a691f5d 100644 --- a/src/renderer/src/components/new-workspace/run-on/use-composer-cloud-start.ts +++ b/src/renderer/src/components/new-workspace/run-on/use-composer-cloud-start.ts @@ -72,7 +72,9 @@ export function useComposerCloudStart({ cloudStart, // Local and Orca Cloud share one button: same label, same rules for when it's enabled. // JA-21b: a billing wall on the selected Orca Cloud holds Create until it's fixed. - primaryCreateDisabled: createDisabled || Boolean(cloudStart.view?.wall), + // RR-c1: a folder project on Orca Cloud waits for a GitHub repository; Create never fails after. + primaryCreateDisabled: + createDisabled || Boolean(cloudStart.view?.wall) || Boolean(cloudStart.view?.needsGitHubRepo), onPrimary: cloudStart.onPrimary ?? runCreate } } diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 09c899cc785..a893118aadb 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -23298,6 +23298,9 @@ "askForPlan": "Ask for a Team plan" }, "cloudOnly": { + "needsRepository": "Orca Cloud needs a GitHub repository.", + "chooseRepository": "Choose repository", + "addRepository": "Add a GitHub repository", "heading": "On GitHub · Orca Cloud only", "detail": "Orca Cloud clones it. No copy on this computer needed.", "moreAccess": "Give Orca Cloud access to more repositories…",