@@ -10,9 +10,11 @@ import {
1010 getCloneDestinationPath ,
1111 getCloneDirectoryName ,
1212 getDefaultCloneUrl ,
13- getNewProjectGitHubRepository ,
14- getNewProjectGitHubTarget ,
1513 getNewProjectPathPreview ,
14+ getNewProjectPublishTarget ,
15+ getNewProjectPublishTargets ,
16+ getNewProjectRepository ,
17+ type NewProjectPublishTarget ,
1618 normalizePastedCloneUrl ,
1719 addProjectRemoteSourceLabel ,
1820 addProjectRemoteSourcePathHint ,
@@ -195,7 +197,6 @@ import {
195197 CommandPaletteVirtualizedResults ,
196198 scrollCommandPaletteRowIntoView ,
197199} from "./CommandPaletteResults" ;
198- import { GitHubIcon } from "./Icons" ;
199200import { sourceControlIcon } from "~/sourceControlPresentation" ;
200201import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon" ;
201202import { Checkbox } from "./ui/checkbox" ;
@@ -221,6 +222,7 @@ import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindin
221222import { CommandDialog , CommandDialogPopup , CommandFooterAction } from "./ui/command" ;
222223import { Button } from "./ui/button" ;
223224import { Kbd , KbdGroup } from "./ui/kbd" ;
225+ import { Select , SelectItem , SelectPopup , SelectTrigger , SelectValue } from "./ui/select" ;
224226import { stackedThreadToast , toastManager } from "./ui/toast" ;
225227import { Tooltip , TooltipPopup , TooltipTrigger } from "./ui/tooltip" ;
226228import { ComposerHandleContext , useComposerHandleContext } from "../composerHandleContext" ;
@@ -280,6 +282,11 @@ function remoteProjectSourceIcon(source: AddProjectRemoteSource, className: stri
280282 return < Icon className = { className } /> ;
281283}
282284
285+ function newProjectPublishIcon ( target : NewProjectPublishTarget ) : ReactNode {
286+ const Icon = sourceControlIcon ( target . definition ) ;
287+ return < Icon className = { ITEM_ICON_CLASS } /> ;
288+ }
289+
283290function projectFaviconIcon ( project : Project ) : ReactNode {
284291 return < ProjectFavicon project = { project } className = { ITEM_ICON_CLASS } /> ;
285292}
@@ -762,7 +769,10 @@ function OpenCommandPaletteDialog(props: {
762769 /** Machine of the Add project sources view under this step; null from the palette root. */
763770 readonly sourcesEnvironmentId : EnvironmentId | null ;
764771 } | null > ( null ) ;
765- const [ newProjectPublishesToGitHub , setNewProjectPublishesToGitHub ] = useState ( false ) ;
772+ const [ newProjectPublishes , setNewProjectPublishes ] = useState ( false ) ;
773+ // The host picked beside the publish toggle; null takes the first ready host, GitHub when ready.
774+ const [ newProjectPublishKind , setNewProjectPublishKind ] =
775+ useState < SourceControlProviderKind | null > ( null ) ;
766776 const [ isCreatingNewProject , setIsCreatingNewProject ] = useState ( false ) ;
767777 // State lags a render behind, so a repeated Enter could start a second create.
768778 const newProjectSubmittingRef = useRef ( false ) ;
@@ -1482,7 +1492,8 @@ function OpenCommandPaletteDialog(props: {
14821492 setAddProjectEnvironmentId ( environmentId ) ;
14831493 setAddProjectCloneFlow ( null ) ;
14841494 setNewProjectFlow ( { environmentId, sourcesEnvironmentId } ) ;
1485- setNewProjectPublishesToGitHub ( false ) ;
1495+ setNewProjectPublishes ( false ) ;
1496+ setNewProjectPublishKind ( null ) ;
14861497 pushPaletteView ( {
14871498 addonIcon : < FolderGit2Icon className = { ADDON_ICON_CLASS } /> ,
14881499 groups : [ ] ,
@@ -2417,8 +2428,12 @@ function OpenCommandPaletteDialog(props: {
24172428 ] ,
24182429 ) ;
24192430
2420- const newProjectGitHubTarget =
2421- newProjectFlow === null ? null : getNewProjectGitHubTarget ( sourceControlDiscovery . data ?? null ) ;
2431+ const newProjectPublishTargets =
2432+ newProjectFlow === null ? [ ] : getNewProjectPublishTargets ( sourceControlDiscovery . data ?? null ) ;
2433+ const newProjectPublishTarget = getNewProjectPublishTarget (
2434+ newProjectPublishTargets ,
2435+ newProjectPublishKind ,
2436+ ) ;
24222437 const newProjectName = query . trim ( ) ;
24232438 const canSubmitNewProject =
24242439 newProjectFlow !== null &&
@@ -2436,7 +2451,7 @@ function OpenCommandPaletteDialog(props: {
24362451 const created = await createNewProject ( {
24372452 environmentId : newProjectFlow . environmentId ,
24382453 name : newProjectName ,
2439- github : newProjectPublishesToGitHub ? newProjectGitHubTarget : null ,
2454+ publishTo : newProjectPublishes ? newProjectPublishTarget : null ,
24402455 } ) ;
24412456 if ( created ) setOpen ( false ) ;
24422457 } finally {
@@ -2742,7 +2757,7 @@ function OpenCommandPaletteDialog(props: {
27422757 const newProjectsRoot = newProjectFlow ? newProjectsRootFor ( newProjectFlow . environmentId ) : null ;
27432758 const newProjectPathPreview =
27442759 newProjectsRoot === null ? null : getNewProjectPathPreview ( newProjectsRoot , newProjectName ) ;
2745- const newProjectGitHubToggleValue = "new-project:github " ;
2760+ const newProjectPublishToggleValue = "new-project:publish " ;
27462761 // The name step's way out to folders and clones, for the selected machine.
27472762 // It replaces the name step (and a sources view for another machine under
27482763 // it), so Back returns to wherever New project was opened from.
@@ -2829,7 +2844,7 @@ function OpenCommandPaletteDialog(props: {
28292844 ] ,
28302845 } ;
28312846 const newProjectOptionGroups : CommandPaletteView [ "groups" ] =
2832- newProjectGitHubTarget === null || newProjectPathPreview === null
2847+ newProjectPublishTarget === null || newProjectPathPreview === null
28332848 ? [ ]
28342849 : [
28352850 {
@@ -2838,22 +2853,66 @@ function OpenCommandPaletteDialog(props: {
28382853 items : [
28392854 {
28402855 kind : "action" ,
2841- value : newProjectGitHubToggleValue ,
2856+ value : newProjectPublishToggleValue ,
28422857 searchTerms : [ ] ,
2843- title : "Create private repository on GitHub" ,
2858+ title :
2859+ newProjectPublishTargets . length > 1
2860+ ? "Create private repository"
2861+ : `Create private repository on ${ newProjectPublishTarget . definition . label } ` ,
28442862 description :
28452863 newProjectName . length > 0
2846- ? getNewProjectGitHubRepository ( newProjectGitHubTarget , newProjectPathPreview )
2847- : ( newProjectGitHubTarget . account ?? "Your GitHub account" ) ,
2848- icon : < GitHubIcon className = { ITEM_ICON_CLASS } /> ,
2864+ ? getNewProjectRepository ( newProjectPublishTarget , newProjectPathPreview )
2865+ : ( newProjectPublishTarget . owner ??
2866+ `Your ${ newProjectPublishTarget . definition . label } account` ) ,
2867+ icon : newProjectPublishIcon ( newProjectPublishTarget ) ,
28492868 titleTrailingContent : (
2850- < span className = "pointer-events-none ms-auto flex" >
2851- < Checkbox checked = { newProjectPublishesToGitHub } tabIndex = { - 1 } aria-hidden />
2869+ < span className = "ms-auto flex items-center gap-2" >
2870+ { newProjectPublishTargets . length > 1 ? (
2871+ // The row toggles on click, so the picker keeps its clicks to itself.
2872+ < span
2873+ className = "flex"
2874+ onClick = { ( event ) => event . stopPropagation ( ) }
2875+ onMouseDown = { ( event ) => event . stopPropagation ( ) }
2876+ >
2877+ < Select
2878+ value = { newProjectPublishTarget . definition . kind }
2879+ onValueChange = { ( kind ) => {
2880+ if ( kind !== null ) setNewProjectPublishKind ( kind ) ;
2881+ } }
2882+ >
2883+ < SelectTrigger
2884+ size = "xs"
2885+ variant = "ghost"
2886+ aria-label = "Host for the new repository"
2887+ >
2888+ < SelectValue >
2889+ { ( kind : SourceControlProviderKind ) =>
2890+ sourceControlClients . get ( kind ) . label
2891+ }
2892+ </ SelectValue >
2893+ </ SelectTrigger >
2894+ < SelectPopup align = "end" alignItemWithTrigger = { false } >
2895+ { newProjectPublishTargets . map ( ( target ) => (
2896+ < SelectItem
2897+ key = { target . definition . kind }
2898+ hideIndicator
2899+ value = { target . definition . kind }
2900+ >
2901+ { target . definition . label }
2902+ </ SelectItem >
2903+ ) ) }
2904+ </ SelectPopup >
2905+ </ Select >
2906+ </ span >
2907+ ) : null }
2908+ < span className = "pointer-events-none flex" >
2909+ < Checkbox checked = { newProjectPublishes } tabIndex = { - 1 } aria-hidden />
2910+ </ span >
28522911 </ span >
28532912 ) ,
28542913 keepOpen : true ,
28552914 run : async ( ) => {
2856- setNewProjectPublishesToGitHub ( ( publishes ) => ! publishes ) ;
2915+ setNewProjectPublishes ( ( publishes ) => ! publishes ) ;
28572916 } ,
28582917 } ,
28592918 ] ,
@@ -3327,7 +3386,7 @@ function OpenCommandPaletteDialog(props: {
33273386 newProjectFlow !== null
33283387 ? highlightedItemValue === null
33293388 ? "Create"
3330- : highlightedItemValue === newProjectGitHubToggleValue
3389+ : highlightedItemValue === newProjectPublishToggleValue
33313390 ? "Toggle"
33323391 : "Select"
33333392 : addProjectCloneFlow ?. step === "repository"
0 commit comments