Skip to content

Commit a4c8745

Browse files
feat(projects): new projects can be published to any ready host (#17860)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 9b40d37 commit a4c8745

13 files changed

Lines changed: 257 additions & 67 deletions

File tree

‎apps/mobile/src/features/projects/AddProjectScreen.tsx‎

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ import {
1515
getCloneDestinationPath,
1616
getCloneDirectoryName,
1717
getDefaultCloneUrl,
18-
getNewProjectGitHubRepository,
19-
getNewProjectGitHubTarget,
2018
getNewProjectPathPreview,
19+
getNewProjectPublishTarget,
20+
getNewProjectPublishTargets,
21+
getNewProjectRepository,
2122
normalizePastedCloneUrl,
2223
parseAddProjectRemoteSource,
2324
resolveAddProjectPath,
@@ -995,9 +996,12 @@ export function AddProjectNewScreen(props: { readonly environmentId?: string | s
995996
input: {},
996997
}),
997998
);
998-
const githubTarget = getNewProjectGitHubTarget(discoveryState.data);
999+
const publishTargets = getNewProjectPublishTargets(discoveryState.data);
9991000
const [name, setName] = useState("");
1000-
const [publishesToGitHub, setPublishesToGitHub] = useState(false);
1001+
const [publishes, setPublishes] = useState(false);
1002+
// Null takes the first ready host, GitHub when it is ready.
1003+
const [publishKind, setPublishKind] = useState<SourceControlProviderKind | null>(null);
1004+
const publishTarget = getNewProjectPublishTarget(publishTargets, publishKind);
10011005
const [isSubmitting, setIsSubmitting] = useState(false);
10021006
const [error, setError] = useState<string | null>(null);
10031007
const trimmedName = name.trim();
@@ -1066,19 +1070,19 @@ export function AddProjectNewScreen(props: { readonly environmentId?: string | s
10661070
if (commitError !== undefined) {
10671071
Alert.alert("Created without a first commit", commitError);
10681072
}
1069-
if (publishesToGitHub && githubTarget !== null) {
1073+
if (publishes && publishTarget !== null) {
10701074
void publishRepository({
10711075
environmentId: environment.environmentId,
10721076
input: {
10731077
cwd: workspaceRoot,
1074-
provider: SourceControlProviderKind.make("github"),
1075-
repository: getNewProjectGitHubRepository(githubTarget, workspaceRoot),
1078+
provider: publishTarget.definition.kind,
1079+
repository: getNewProjectRepository(publishTarget, workspaceRoot),
10761080
visibility: "private",
10771081
},
10781082
}).then((publishResult) => {
10791083
if (AsyncResult.isFailure(publishResult)) {
10801084
Alert.alert(
1081-
"Could not create the GitHub repository",
1085+
`Could not create the ${publishTarget.definition.label} repository`,
10821086
errorMessage(Cause.squash(publishResult.cause)),
10831087
);
10841088
}
@@ -1133,32 +1137,63 @@ export function AddProjectNewScreen(props: { readonly environmentId?: string | s
11331137
</Text>
11341138
) : null}
11351139
{machineRows}
1136-
{githubTarget !== null ? (
1140+
{publishTarget !== null ? (
11371141
<ListSection>
11381142
<ListRow
1139-
title="Create private repository on GitHub"
1143+
title={`Create private repository on ${publishTarget.definition.label}`}
11401144
subtitle={
11411145
trimmedName.length > 0 && pathPreview !== null
1142-
? getNewProjectGitHubRepository(githubTarget, pathPreview)
1143-
: githubTarget.account
1146+
? getNewProjectRepository(publishTarget, pathPreview)
1147+
: publishTarget.owner
11441148
}
11451149
icon={
11461150
<SourceControlIcon
1147-
kind={sourceControlClients.get("github").icon}
1151+
kind={publishTarget.definition.icon}
11481152
size={Platform.OS === "android" ? 24 : 18}
11491153
colorClassName="accent-icon"
11501154
/>
11511155
}
11521156
isFirst
11531157
right={
11541158
<ThemedSwitch
1155-
accessibilityLabel="Create private repository on GitHub"
1156-
value={publishesToGitHub}
1157-
onValueChange={setPublishesToGitHub}
1159+
accessibilityLabel={`Create private repository on ${publishTarget.definition.label}`}
1160+
value={publishes}
1161+
onValueChange={setPublishes}
11581162
/>
11591163
}
1160-
onPress={() => setPublishesToGitHub((publishes) => !publishes)}
1164+
onPress={() => setPublishes((current) => !current)}
11611165
/>
1166+
{publishes && publishTargets.length > 1
1167+
? publishTargets.map((target) => {
1168+
const selected = target.definition.kind === publishTarget.definition.kind;
1169+
return (
1170+
<ListRow
1171+
key={target.definition.kind}
1172+
title={target.definition.label}
1173+
icon={
1174+
<SourceControlIcon
1175+
kind={target.definition.icon}
1176+
size={Platform.OS === "android" ? 24 : 17}
1177+
colorClassName="accent-icon"
1178+
/>
1179+
}
1180+
selected={selected}
1181+
disabled={isSubmitting}
1182+
right={
1183+
selected ? (
1184+
<SymbolView
1185+
name="checkmark"
1186+
size={Platform.OS === "android" ? 20 : 14}
1187+
tintColorClassName="accent-icon"
1188+
type="monochrome"
1189+
/>
1190+
) : null
1191+
}
1192+
onPress={() => setPublishKind(target.definition.kind)}
1193+
/>
1194+
);
1195+
})
1196+
: null}
11621197
</ListSection>
11631198
) : null}
11641199
<PrimaryActionButton

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 97 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -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";
199200
import { sourceControlIcon } from "~/sourceControlPresentation";
200201
import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
201202
import { Checkbox } from "./ui/checkbox";
@@ -221,6 +222,7 @@ import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindin
221222
import { CommandDialog, CommandDialogPopup, CommandFooterAction } from "./ui/command";
222223
import { Button } from "./ui/button";
223224
import { Kbd, KbdGroup } from "./ui/kbd";
225+
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "./ui/select";
224226
import { stackedThreadToast, toastManager } from "./ui/toast";
225227
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
226228
import { ComposerHandleContext, useComposerHandleContext } from "../composerHandleContext";
@@ -280,6 +282,14 @@ function remoteProjectSourceIcon(source: AddProjectRemoteSource, className: stri
280282
return <Icon className={className} />;
281283
}
282284

285+
function sourceControlHostIcon(
286+
definition: NewProjectPublishTarget["definition"],
287+
className: string,
288+
): ReactNode {
289+
const Icon = sourceControlIcon(definition);
290+
return <Icon className={className} />;
291+
}
292+
283293
function projectFaviconIcon(project: Project): ReactNode {
284294
return <ProjectFavicon project={project} className={ITEM_ICON_CLASS} />;
285295
}
@@ -762,7 +772,11 @@ function OpenCommandPaletteDialog(props: {
762772
/** Machine of the Add project sources view under this step; null from the palette root. */
763773
readonly sourcesEnvironmentId: EnvironmentId | null;
764774
} | null>(null);
765-
const [newProjectPublishesToGitHub, setNewProjectPublishesToGitHub] = useState(false);
775+
const [newProjectPublishes, setNewProjectPublishes] = useState(false);
776+
// The host picked beside the publish toggle; null takes the first ready host, GitHub when ready.
777+
const [newProjectPublishKind, setNewProjectPublishKind] =
778+
useState<SourceControlProviderKind | null>(null);
779+
const [newProjectHostPickerOpen, setNewProjectHostPickerOpen] = useState(false);
766780
const [isCreatingNewProject, setIsCreatingNewProject] = useState(false);
767781
// State lags a render behind, so a repeated Enter could start a second create.
768782
const newProjectSubmittingRef = useRef(false);
@@ -1482,7 +1496,8 @@ function OpenCommandPaletteDialog(props: {
14821496
setAddProjectEnvironmentId(environmentId);
14831497
setAddProjectCloneFlow(null);
14841498
setNewProjectFlow({ environmentId, sourcesEnvironmentId });
1485-
setNewProjectPublishesToGitHub(false);
1499+
setNewProjectPublishes(false);
1500+
setNewProjectPublishKind(null);
14861501
pushPaletteView({
14871502
addonIcon: <FolderGit2Icon className={ADDON_ICON_CLASS} />,
14881503
groups: [],
@@ -2417,8 +2432,12 @@ function OpenCommandPaletteDialog(props: {
24172432
],
24182433
);
24192434

2420-
const newProjectGitHubTarget =
2421-
newProjectFlow === null ? null : getNewProjectGitHubTarget(sourceControlDiscovery.data ?? null);
2435+
const newProjectPublishTargets =
2436+
newProjectFlow === null ? [] : getNewProjectPublishTargets(sourceControlDiscovery.data ?? null);
2437+
const newProjectPublishTarget = getNewProjectPublishTarget(
2438+
newProjectPublishTargets,
2439+
newProjectPublishKind,
2440+
);
24222441
const newProjectName = query.trim();
24232442
const canSubmitNewProject =
24242443
newProjectFlow !== null &&
@@ -2436,7 +2455,7 @@ function OpenCommandPaletteDialog(props: {
24362455
const created = await createNewProject({
24372456
environmentId: newProjectFlow.environmentId,
24382457
name: newProjectName,
2439-
github: newProjectPublishesToGitHub ? newProjectGitHubTarget : null,
2458+
publishTo: newProjectPublishes ? newProjectPublishTarget : null,
24402459
});
24412460
if (created) setOpen(false);
24422461
} finally {
@@ -2742,7 +2761,7 @@ function OpenCommandPaletteDialog(props: {
27422761
const newProjectsRoot = newProjectFlow ? newProjectsRootFor(newProjectFlow.environmentId) : null;
27432762
const newProjectPathPreview =
27442763
newProjectsRoot === null ? null : getNewProjectPathPreview(newProjectsRoot, newProjectName);
2745-
const newProjectGitHubToggleValue = "new-project:github";
2764+
const newProjectPublishToggleValue = "new-project:publish";
27462765
// The name step's way out to folders and clones, for the selected machine.
27472766
// It replaces the name step (and a sources view for another machine under
27482767
// it), so Back returns to wherever New project was opened from.
@@ -2829,7 +2848,7 @@ function OpenCommandPaletteDialog(props: {
28292848
],
28302849
};
28312850
const newProjectOptionGroups: CommandPaletteView["groups"] =
2832-
newProjectGitHubTarget === null || newProjectPathPreview === null
2851+
newProjectPublishTarget === null || newProjectPathPreview === null
28332852
? []
28342853
: [
28352854
{
@@ -2838,22 +2857,81 @@ function OpenCommandPaletteDialog(props: {
28382857
items: [
28392858
{
28402859
kind: "action",
2841-
value: newProjectGitHubToggleValue,
2860+
value: newProjectPublishToggleValue,
28422861
searchTerms: [],
2843-
title: "Create private repository on GitHub",
2862+
title:
2863+
newProjectPublishTargets.length > 1
2864+
? "Create private repository"
2865+
: `Create private repository on ${newProjectPublishTarget.definition.label}`,
28442866
description:
28452867
newProjectName.length > 0
2846-
? getNewProjectGitHubRepository(newProjectGitHubTarget, newProjectPathPreview)
2847-
: (newProjectGitHubTarget.account ?? "Your GitHub account"),
2848-
icon: <GitHubIcon className={ITEM_ICON_CLASS} />,
2868+
? getNewProjectRepository(newProjectPublishTarget, newProjectPathPreview)
2869+
: (newProjectPublishTarget.owner ??
2870+
`Your ${newProjectPublishTarget.definition.label} account`),
2871+
icon: sourceControlHostIcon(newProjectPublishTarget.definition, ITEM_ICON_CLASS),
28492872
titleTrailingContent: (
2850-
<span className="pointer-events-none ms-auto flex">
2851-
<Checkbox checked={newProjectPublishesToGitHub} tabIndex={-1} aria-hidden />
2873+
<span className="ms-auto flex items-center gap-2">
2874+
{newProjectPublishTargets.length > 1 ? (
2875+
// The row toggles on click, so the picker keeps its clicks to itself. The
2876+
// row also cancels pointerdown to keep focus in the input, which drops the
2877+
// mousedown Select opens on, so the picker opens on click instead.
2878+
<span
2879+
className="flex"
2880+
onClick={(event) => {
2881+
event.stopPropagation();
2882+
// React bubbles the popup's clicks here through its portal; only the
2883+
// trigger opens the picker.
2884+
if (!event.currentTarget.contains(event.target as Node)) return;
2885+
if (!isCreatingNewProject) setNewProjectHostPickerOpen(true);
2886+
}}
2887+
>
2888+
<Select
2889+
disabled={isCreatingNewProject}
2890+
open={newProjectHostPickerOpen}
2891+
onOpenChange={setNewProjectHostPickerOpen}
2892+
value={newProjectPublishTarget.definition.kind}
2893+
onValueChange={(kind) => {
2894+
if (kind !== null) setNewProjectPublishKind(kind);
2895+
}}
2896+
>
2897+
<SelectTrigger
2898+
size="xs"
2899+
variant="ghost"
2900+
aria-label="Host for the new repository"
2901+
>
2902+
<SelectValue>
2903+
{(kind: SourceControlProviderKind) =>
2904+
sourceControlClients.get(kind).label
2905+
}
2906+
</SelectValue>
2907+
</SelectTrigger>
2908+
<SelectPopup align="end" alignItemWithTrigger={false}>
2909+
{newProjectPublishTargets.map((target) => (
2910+
<SelectItem
2911+
key={target.definition.kind}
2912+
hideIndicator
2913+
value={target.definition.kind}
2914+
>
2915+
<span className="inline-flex items-center gap-1.5">
2916+
{sourceControlHostIcon(target.definition, "size-3.5")}
2917+
{target.definition.label}
2918+
</span>
2919+
</SelectItem>
2920+
))}
2921+
</SelectPopup>
2922+
</Select>
2923+
</span>
2924+
) : null}
2925+
<span className="pointer-events-none flex">
2926+
<Checkbox checked={newProjectPublishes} tabIndex={-1} aria-hidden />
2927+
</span>
28522928
</span>
28532929
),
2930+
// The create in flight keeps the choice it started with.
2931+
...(isCreatingNewProject ? { disabled: true } : {}),
28542932
keepOpen: true,
28552933
run: async () => {
2856-
setNewProjectPublishesToGitHub((publishes) => !publishes);
2934+
setNewProjectPublishes((publishes) => !publishes);
28572935
},
28582936
},
28592937
],
@@ -3327,7 +3405,7 @@ function OpenCommandPaletteDialog(props: {
33273405
newProjectFlow !== null
33283406
? highlightedItemValue === null
33293407
? "Create"
3330-
: highlightedItemValue === newProjectGitHubToggleValue
3408+
: highlightedItemValue === newProjectPublishToggleValue
33313409
? "Toggle"
33323410
: "Select"
33333411
: addProjectCloneFlow?.step === "repository"

‎apps/web/src/components/ui/checkbox.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
1414
data-slot="checkbox"
1515
{...props}
1616
>
17-
{/* Leave a contrasting inner gap inside the 2px focus outline. */}
17+
{/* Leave a contrasting inner gap inside the 2px focus outline. The glyphs name their color so
18+
rows that mute stray icons, such as list items, leave the indicator's color alone. */}
1819
<CheckboxPrimitive.Indicator
1920
className="-inset-px absolute flex items-center justify-center rounded-[.25rem] text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground in-[[data-slot=checkbox]:focus-visible]:inset-shadow-[0_0_0_3px_var(--background)] in-[[data-slot=checkbox]:focus-visible]:outline-2 in-[[data-slot=checkbox]:focus-visible]:outline-solid in-[[data-slot=checkbox]:focus-visible]:-outline-offset-2 in-[[data-slot=checkbox]:focus-visible]:outline-inherit"
2021
data-slot="checkbox-indicator"
2122
render={(props, state) => (
2223
<span {...props}>
2324
{state.indeterminate ? (
2425
<svg
25-
className="size-3.5 sm:size-3"
26+
className="size-3.5 text-current sm:size-3"
2627
fill="none"
2728
height="24"
2829
stroke="currentColor"
@@ -37,7 +38,7 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
3738
</svg>
3839
) : (
3940
<svg
40-
className="size-3.5 sm:size-3"
41+
className="size-3.5 text-current sm:size-3"
4142
fill="none"
4243
height="24"
4344
stroke="currentColor"

0 commit comments

Comments
 (0)