mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-03-19 22:53:08 +00:00
Fix concurrency limits and remote branch fetching issues (#788)
* Changes from fix/bug-fixes * feat: Refactor worktree iteration and improve error logging across services * feat: Extract URL/port patterns to module level and fix abort condition * fix: Improve IPv6 loopback handling, select component layout, and terminal UI * feat: Add thinking level defaults and adjust list row padding * Update apps/ui/src/store/app-store.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * feat: Add worktree-aware terminal creation and split options, fix npm security issues from audit * feat: Add tracked remote detection to pull dialog flow * feat: Add merge state tracking to git operations * feat: Improve merge detection and add post-merge action preferences * Update apps/ui/src/components/views/board-view/dialogs/git-pull-dialog.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update apps/ui/src/components/views/board-view/dialogs/git-pull-dialog.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * fix: Pass merge detection info to stash reapplication and handle merge state consistently * fix: Call onPulled callback in merge handlers and add validation checks --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
@@ -163,13 +163,22 @@ export function useBoardDragDrop({
|
||||
|
||||
let targetStatus: ColumnId | null = null;
|
||||
|
||||
// Normalize the over ID: strip 'column-header-' prefix if the card was dropped
|
||||
// directly onto the column header droppable zone (e.g. 'column-header-backlog' → 'backlog')
|
||||
const effectiveOverId = overId.startsWith('column-header-')
|
||||
? overId.replace('column-header-', '')
|
||||
: overId;
|
||||
|
||||
// Check if we dropped on a column
|
||||
const column = COLUMNS.find((c) => c.id === overId);
|
||||
const column = COLUMNS.find((c) => c.id === effectiveOverId);
|
||||
if (column) {
|
||||
targetStatus = column.id;
|
||||
} else if (effectiveOverId.startsWith('pipeline_')) {
|
||||
// Pipeline step column (not in static COLUMNS list)
|
||||
targetStatus = effectiveOverId as ColumnId;
|
||||
} else {
|
||||
// Dropped on another feature - find its column
|
||||
const overFeature = features.find((f) => f.id === overId);
|
||||
const overFeature = features.find((f) => f.id === effectiveOverId);
|
||||
if (overFeature) {
|
||||
targetStatus = overFeature.status;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user