diff --git a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx index 01d55b10318..6e10d81777e 100644 --- a/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx +++ b/src/renderer/src/components/new-workspace/NewWorkspaceComposerProjectSection.tsx @@ -159,6 +159,7 @@ export function NewWorkspaceComposerProjectSection({ cloudRepoValue={cloudOnly?.picked?.fullName ?? null} onCloudRepoSelected={cloudOnly?.pick} onMoreCloudAccess={cloudOnly?.moreAccess} + onShowMoreCloudRepos={cloudOnly?.showMore ?? null} placeholder={ projectPlaceholder ?? t('auto.components.NewWorkspaceComposerCard.dccd26d4e4', 'Choose project') diff --git a/src/renderer/src/components/new-workspace/ProjectCombobox.tsx b/src/renderer/src/components/new-workspace/ProjectCombobox.tsx index a972f0d688c..33ae17272fe 100644 --- a/src/renderer/src/components/new-workspace/ProjectCombobox.tsx +++ b/src/renderer/src/components/new-workspace/ProjectCombobox.tsx @@ -19,6 +19,7 @@ import type { OrcaCloudGitHubRepository } from '@/lib/orca-cloud/use-orca-cloud- import { CLOUD_REPO_KEY_PREFIX, CLOUD_REPO_MORE_KEY, + CLOUD_REPO_SHOW_MORE_KEY, cloudRepoKey, filterCloudRepos, ProjectComboboxCloudSection @@ -40,6 +41,8 @@ type ProjectComboboxProps = { cloudRepoValue?: string | null onCloudRepoSelected?: (fullName: string) => void onMoreCloudAccess?: () => void + /** Present while GitHub has more repositories than are listed. */ + onShowMoreCloudRepos?: (() => void) | null } const ADD_PROJECT_KEY = 'add-project' @@ -59,7 +62,8 @@ export default function ProjectCombobox({ cloudRepos = null, cloudRepoValue = null, onCloudRepoSelected, - onMoreCloudAccess + onMoreCloudAccess, + onShowMoreCloudRepos = null }: ProjectComboboxProps): React.JSX.Element { const t = useTranslate() const [tooltipOpen, setTooltipOpen] = useState(false) @@ -76,10 +80,11 @@ export default function ProjectCombobox({ ...(cloudRepos ? filterCloudRepos(cloudRepos, query).map((repo) => cloudRepoKey(repo.fullName)) : []), + ...(cloudRepos && onShowMoreCloudRepos ? [CLOUD_REPO_SHOW_MORE_KEY] : []), ...(cloudRepos && onMoreCloudAccess ? [CLOUD_REPO_MORE_KEY] : []), ...(onAddProject ? [ADD_PROJECT_KEY] : []) ], - [cloudRepos, onAddProject, onMoreCloudAccess, options, recentIds] + [cloudRepos, onAddProject, onMoreCloudAccess, onShowMoreCloudRepos, options, recentIds] ) const { query, @@ -123,6 +128,11 @@ export default function ProjectCombobox({ if (key === null) { return } + if (key === CLOUD_REPO_SHOW_MORE_KEY) { + // Keep the list open: the next page appends in place. + onShowMoreCloudRepos?.() + return + } close() if (key === ADD_PROJECT_KEY) { onAddProject?.() @@ -139,7 +149,15 @@ export default function ProjectCombobox({ onValueChange(key) onValueSelected?.(key) }, - [close, onAddProject, onCloudRepoSelected, onMoreCloudAccess, onValueChange, onValueSelected] + [ + close, + onAddProject, + onCloudRepoSelected, + onMoreCloudAccess, + onShowMoreCloudRepos, + onValueChange, + onValueSelected + ] ) const handleKeyDown = useCallback( @@ -358,6 +376,7 @@ export default function ProjectCombobox({ onArm={arm} onCommit={commit} showMoreAccess={Boolean(onMoreCloudAccess)} + showMoreRepos={Boolean(onShowMoreCloudRepos)} /> ) : null} diff --git a/src/renderer/src/components/new-workspace/ProjectComboboxCloudSection.tsx b/src/renderer/src/components/new-workspace/ProjectComboboxCloudSection.tsx index 60789fc1246..c1f234a570b 100644 --- a/src/renderer/src/components/new-workspace/ProjectComboboxCloudSection.tsx +++ b/src/renderer/src/components/new-workspace/ProjectComboboxCloudSection.tsx @@ -2,13 +2,14 @@ // Cloud can reach with no clone on this computer, plus a way to give it access to more. Shown only // while Orca Cloud is the Run on target. import React from 'react' -import { Check, Github, Plus } from 'lucide-react' +import { Check, ChevronDown, Github, Plus } from 'lucide-react' import { cn } from '@/lib/utils' import { useTranslate } from '@/i18n/use-translate' import type { OrcaCloudGitHubRepository } from '@/lib/orca-cloud/use-orca-cloud-github-repositories' export const CLOUD_REPO_KEY_PREFIX = 'github:' export const CLOUD_REPO_MORE_KEY = 'github-more-access' +export const CLOUD_REPO_SHOW_MORE_KEY = 'github-show-more' export function cloudRepoKey(fullName: string): string { return `${CLOUD_REPO_KEY_PREFIX}${fullName}` @@ -30,7 +31,8 @@ export function ProjectComboboxCloudSection({ armedId, onArm, onCommit, - showMoreAccess + showMoreAccess, + showMoreRepos = false }: { repos: readonly OrcaCloudGitHubRepository[] value: string | null @@ -39,6 +41,8 @@ export function ProjectComboboxCloudSection({ onArm: (key: string) => void onCommit: (key: string) => void showMoreAccess: boolean + /** GitHub has more pages than are listed. */ + showMoreRepos?: boolean }): React.JSX.Element | null { const t = useTranslate() if (repos.length === 0 && !showMoreAccess) { @@ -65,11 +69,17 @@ export function ProjectComboboxCloudSection({ ) return (
-