Skip to content

fix: branch deletion in template copies by querying database directly #2956

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: branch deletion in template copies by querying database directly #2956

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
26 changes: 13 additions & 13 deletions ...web/client/src/app/project/[id]/_components/left-panel/branches-tab/branch-management.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const BranchManagement = observer(({ branch }: BranchManagementProps) =>
const [isForking, setIsForking] = useState(false);
const [isDeleting, setIsDeleting] = useState(false);
const isActiveBranch = editorEngine.branches.activeBranch.id === branch.id;
const isOnlyBranch = editorEngine.branches.allBranches.length === 1;
// We'll check this dynamically in handleDelete to ensure accuracy

const handleClose = () => {
editorEngine.state.branchTab = null;
Expand Down Expand Up @@ -72,14 +72,18 @@ export const BranchManagement = observer(({ branch }: BranchManagementProps) =>
try {
setIsDeleting(true);

// Check if this is the last branch by querying the database directly
const remainingBranches = await api.branch.getByProjectId.query({
projectId: editorEngine.projectId
});

if (remainingBranches.length <= 1) {
throw new Error('Cannot delete the last remaining branch');
}

// If this is the active branch, switch to a different one first
if (isActiveBranch) {
const allBranches = editorEngine.branches.allBranches;
const otherBranches = allBranches.filter(b => b.id !== branch.id);

if (otherBranches.length === 0) {
throw new Error('Cannot delete the last remaining branch');
}
const otherBranches = remainingBranches.filter(b => b.id !== branch.id);

// Find the default branch, or use the first available branch
const targetBranch = otherBranches.find(b => b.isDefault) || otherBranches[0];
Expand Down Expand Up @@ -192,12 +196,8 @@ export const BranchManagement = observer(({ branch }: BranchManagementProps) =>
variant="destructive"
className="w-full"
onClick={handleDelete}
disabled={isDeleting || isOnlyBranch}
title={
isOnlyBranch
? "Cannot delete the last remaining branch"
: "Delete branch"
}
disabled={isDeleting}
title="Delete branch"
>
{isDeleting ? (
<div className="flex items-center gap-2">
Expand Down