fix(merge): resolve KanbanBoard conflicts favoring develop
Main branch had outdated KanbanBoard code with broken references to undefined variables (setShowArchived, archivedCount). Resolved by keeping develop's version which has proper i18n support and correct ViewStateContext usage.
This commit is contained in:
@@ -127,6 +127,7 @@ export function App() {
|
||||
const [settingsInitialProjectSection, setSettingsInitialProjectSection] = useState<ProjectSettingsSection | undefined>(undefined);
|
||||
const [activeView, setActiveView] = useState<SidebarView>('kanban');
|
||||
const [isOnboardingWizardOpen, setIsOnboardingWizardOpen] = useState(false);
|
||||
const [isRefreshingTasks, setIsRefreshingTasks] = useState(false);
|
||||
|
||||
// Initialize dialog state
|
||||
const [showInitDialog, setShowInitDialog] = useState(false);
|
||||
@@ -441,6 +442,17 @@ export function App() {
|
||||
setSelectedTask(task);
|
||||
};
|
||||
|
||||
const handleRefreshTasks = async () => {
|
||||
const currentProjectId = activeProjectId || selectedProjectId;
|
||||
if (!currentProjectId) return;
|
||||
setIsRefreshingTasks(true);
|
||||
try {
|
||||
await loadTasks(currentProjectId);
|
||||
} finally {
|
||||
setIsRefreshingTasks(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleCloseTaskDetail = () => {
|
||||
setSelectedTask(null);
|
||||
};
|
||||
@@ -715,6 +727,8 @@ export function App() {
|
||||
tasks={tasks}
|
||||
onTaskClick={handleTaskClick}
|
||||
onNewTaskClick={() => setIsNewTaskDialogOpen(true)}
|
||||
onRefresh={handleRefreshTasks}
|
||||
isRefreshing={isRefreshingTasks}
|
||||
/>
|
||||
)}
|
||||
{/* TerminalGrid is always mounted but hidden when not active to preserve terminal state */}
|
||||
|
||||
@@ -19,7 +19,7 @@ import {
|
||||
sortableKeyboardCoordinates,
|
||||
verticalListSortingStrategy
|
||||
} from '@dnd-kit/sortable';
|
||||
import { Plus, Inbox, Loader2, Eye, CheckCircle2, Archive } from 'lucide-react';
|
||||
import { Plus, Inbox, Loader2, Eye, CheckCircle2, Archive, RefreshCw } from 'lucide-react';
|
||||
import { ScrollArea } from './ui/scroll-area';
|
||||
import { Button } from './ui/button';
|
||||
import { TaskCard } from './TaskCard';
|
||||
@@ -33,6 +33,8 @@ interface KanbanBoardProps {
|
||||
tasks: Task[];
|
||||
onTaskClick: (task: Task) => void;
|
||||
onNewTaskClick?: () => void;
|
||||
onRefresh?: () => void;
|
||||
isRefreshing?: boolean;
|
||||
}
|
||||
|
||||
interface DroppableColumnProps {
|
||||
|
||||
Reference in New Issue
Block a user