Skip to content

fix(web): reuse the selected project in worktree settings #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
donnes merged 1 commit into from
Sep 26, 2026
Merged

fix(web): reuse the selected project in worktree settings #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/web/src/components/settings/StorageSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ export function StorageSettingsPanel() {

return (
<SettingsPageContainer>
<WorktreeManager />
{/* Remount per project so a stale error or delete dialog never carries over. */}
<WorktreeManager key={"group" in scope ? scope.group.projectKey : null} />
<SettingsSection id="storage-worktrees" title="Worktrees">
{isProjectScope && (
<SettingsRow
Expand Down
37 changes: 4 additions & 33 deletions apps/web/src/components/settings/WorktreeManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ function CreateWorktreeDialog({
}

export function WorktreeManager() {
const { scope, groups, selectScope, connectedEnvironments } = useSettingsScope();
const { scope, connectedEnvironments } = useSettingsScope();
const [selectedMemberKey, setSelectedMemberKey] = useState<string | null>(null);
const [creating, setCreating] = useState(false);
const [deleting, setDeleting] = useState<WorktreeDeletionTarget | null>(null);
Expand Down Expand Up @@ -231,38 +231,7 @@ export function WorktreeManager() {
return (
<SettingsSection id="storage-manage-worktrees" title="Manage worktrees">
<div className="flex flex-col gap-4 p-4">
<p className="text-sm text-muted-foreground">
Create and remove additional worktrees for a project.
</p>
<div className="flex flex-wrap items-center gap-2">
<Select
value={projectKey}
onValueChange={(value) => {
if (typeof value === "string") {
selectScope({ project: value });
setSelectedMemberKey(null);
setError(null);
setDeleting(null);
}
}}
>
<SelectTrigger size="sm" aria-label="Project">
<SelectValue>
{scope.kind === "project" || scope.kind === "checkout"
? scope.group.displayName
: "Choose project"}
</SelectValue>
</SelectTrigger>
<SelectPopup>
<SelectGroup>
{groups.map((group) => (
<SelectItem key={group.projectKey} value={group.projectKey}>
{group.displayName}
</SelectItem>
))}
</SelectGroup>
</SelectPopup>
</Select>
{connectedMembers.length > 1 && (
<Select
value={member?.physicalProjectKey ?? null}
Expand Down Expand Up @@ -322,7 +291,9 @@ export function WorktreeManager() {
</p>
)}
{!projectKey ? (
<p className="text-sm text-muted-foreground">Choose a project to manage its worktrees.</p>
<p className="text-sm text-muted-foreground">
Choose a project above to manage its worktrees.
</p>
) : !member ? (
<p className="text-sm text-muted-foreground">
Connect an environment with this project to manage its worktrees.
Expand Down
Loading