feat: implement folder management and drag-and-drop functionality for accounts, enhancing organization and user experience
This commit is contained in:
Julien Froidefond
@@ -1,22 +1,61 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import {
|
||||
DndContext,
|
||||
DragEndEvent,
|
||||
DragOverlay,
|
||||
DragStartEvent,
|
||||
PointerSensor,
|
||||
useSensor,
|
||||
useSensors,
|
||||
closestCenter,
|
||||
useDroppable,
|
||||
} from "@dnd-kit/core";
|
||||
import { PageLayout, LoadingState, PageHeader } from "@/components/layout";
|
||||
import {
|
||||
AccountCard,
|
||||
AccountEditDialog,
|
||||
AccountBulkActions,
|
||||
} from "@/components/accounts";
|
||||
import {
|
||||
FolderEditDialog,
|
||||
} from "@/components/folders";
|
||||
import { useBankingData } from "@/lib/hooks";
|
||||
import { updateAccount, deleteAccount } from "@/lib/store-db";
|
||||
import { updateAccount, deleteAccount, addFolder, updateFolder, deleteFolder } from "@/lib/store-db";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { Building2, Folder } from "lucide-react";
|
||||
import type { Account } from "@/lib/types";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Building2, Folder, Plus, List, LayoutGrid } from "lucide-react";
|
||||
import type { Account, Folder as FolderType } from "@/lib/types";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { getAccountBalance } from "@/lib/account-utils";
|
||||
|
||||
// Composant wrapper pour les zones de drop des dossiers
|
||||
function FolderDropZone({
|
||||
folderId,
|
||||
children,
|
||||
}: {
|
||||
folderId: string;
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
const { setNodeRef, isOver } = useDroppable({
|
||||
id: `folder-${folderId}`,
|
||||
});
|
||||
|
||||
return (
|
||||
<div
|
||||
ref={setNodeRef}
|
||||
className={cn(
|
||||
isOver && "ring-2 ring-primary ring-offset-2 rounded-lg p-2"
|
||||
)}
|
||||
>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default function AccountsPage() {
|
||||
const { data, isLoading, refresh } = useBankingData();
|
||||
const { data, isLoading, refresh, refreshSilent, update } = useBankingData();
|
||||
const [editingAccount, setEditingAccount] = useState<Account | null>(null);
|
||||
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||
const [selectedAccounts, setSelectedAccounts] = useState<Set<string>>(
|
||||
@@ -30,6 +69,25 @@ export default function AccountsPage() {
|
||||
initialBalance: 0,
|
||||
});
|
||||
|
||||
// Folder management state
|
||||
const [isFolderDialogOpen, setIsFolderDialogOpen] = useState(false);
|
||||
const [editingFolder, setEditingFolder] = useState<FolderType | null>(null);
|
||||
const [folderFormData, setFolderFormData] = useState({
|
||||
name: "",
|
||||
parentId: "folder-root" as string | null,
|
||||
color: "#6366f1",
|
||||
});
|
||||
const [activeId, setActiveId] = useState<string | null>(null);
|
||||
const [isCompactView, setIsCompactView] = useState(false);
|
||||
|
||||
const sensors = useSensors(
|
||||
useSensor(PointerSensor, {
|
||||
activationConstraint: {
|
||||
distance: 8,
|
||||
},
|
||||
})
|
||||
);
|
||||
|
||||
if (isLoading || !data) {
|
||||
return <LoadingState />;
|
||||
}
|
||||
@@ -125,6 +183,134 @@ export default function AccountsPage() {
|
||||
setSelectedAccounts(newSelected);
|
||||
};
|
||||
|
||||
// Folder management handlers
|
||||
const handleNewFolder = () => {
|
||||
setEditingFolder(null);
|
||||
setFolderFormData({ name: "", parentId: "folder-root", color: "#6366f1" });
|
||||
setIsFolderDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleEditFolder = (folder: FolderType) => {
|
||||
setEditingFolder(folder);
|
||||
setFolderFormData({
|
||||
name: folder.name,
|
||||
parentId: folder.parentId || "folder-root",
|
||||
color: folder.color,
|
||||
});
|
||||
setIsFolderDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleSaveFolder = async () => {
|
||||
const parentId =
|
||||
folderFormData.parentId === "folder-root" ? null : folderFormData.parentId;
|
||||
|
||||
try {
|
||||
if (editingFolder) {
|
||||
await updateFolder({
|
||||
...editingFolder,
|
||||
name: folderFormData.name,
|
||||
parentId,
|
||||
color: folderFormData.color,
|
||||
});
|
||||
} else {
|
||||
await addFolder({
|
||||
name: folderFormData.name,
|
||||
parentId,
|
||||
color: folderFormData.color,
|
||||
icon: "folder",
|
||||
});
|
||||
}
|
||||
refresh();
|
||||
setIsFolderDialogOpen(false);
|
||||
} catch (error) {
|
||||
console.error("Error saving folder:", error);
|
||||
alert("Erreur lors de la sauvegarde du dossier");
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeleteFolder = async (folderId: string) => {
|
||||
if (
|
||||
!confirm(
|
||||
"Supprimer ce dossier ? Les comptes seront déplacés à la racine."
|
||||
)
|
||||
)
|
||||
return;
|
||||
|
||||
try {
|
||||
await deleteFolder(folderId);
|
||||
refresh();
|
||||
} catch (error) {
|
||||
console.error("Error deleting folder:", error);
|
||||
alert("Erreur lors de la suppression du dossier");
|
||||
}
|
||||
};
|
||||
|
||||
// Drag and drop handlers
|
||||
const handleDragStart = (event: DragStartEvent) => {
|
||||
setActiveId(event.active.id as string);
|
||||
};
|
||||
|
||||
const handleDragEnd = async (event: DragEndEvent) => {
|
||||
const { active, over } = event;
|
||||
setActiveId(null);
|
||||
|
||||
if (!over || active.id === over.id || !data) return;
|
||||
|
||||
const activeId = active.id as string;
|
||||
const overId = over.id as string;
|
||||
|
||||
// Déplacer un compte vers un dossier
|
||||
if (activeId.startsWith("account-")) {
|
||||
const accountId = activeId.replace("account-", "");
|
||||
let targetFolderId: string | null = null;
|
||||
|
||||
if (overId.startsWith("folder-")) {
|
||||
const folderId = overId.replace("folder-", "");
|
||||
targetFolderId = folderId === "root" ? null : folderId;
|
||||
} else if (overId.startsWith("account-")) {
|
||||
// Déplacer vers le dossier du compte cible
|
||||
const targetAccountId = overId.replace("account-", "");
|
||||
const targetAccount = data.accounts.find((a) => a.id === targetAccountId);
|
||||
if (targetAccount) {
|
||||
targetFolderId = targetAccount.folderId;
|
||||
}
|
||||
}
|
||||
|
||||
if (targetFolderId !== undefined) {
|
||||
const account = data.accounts.find((a) => a.id === accountId);
|
||||
if (!account) return;
|
||||
|
||||
// Sauvegarder l'état précédent pour rollback en cas d'erreur
|
||||
const previousData = data;
|
||||
|
||||
// Optimistic update : mettre à jour immédiatement l'interface
|
||||
const updatedAccount = {
|
||||
...account,
|
||||
folderId: targetFolderId,
|
||||
};
|
||||
const updatedAccounts = data.accounts.map((a) =>
|
||||
a.id === accountId ? updatedAccount : a
|
||||
);
|
||||
update({
|
||||
...data,
|
||||
accounts: updatedAccounts,
|
||||
});
|
||||
|
||||
// Faire la requête en arrière-plan
|
||||
try {
|
||||
await updateAccount(updatedAccount);
|
||||
// Refresh silencieux pour synchroniser avec le serveur sans loader
|
||||
refreshSilent();
|
||||
} catch (error) {
|
||||
console.error("Error moving account:", error);
|
||||
// Rollback en cas d'erreur
|
||||
update(previousData);
|
||||
alert("Erreur lors du déplacement du compte");
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const getTransactionCount = (accountId: string) => {
|
||||
return data.transactions.filter((t) => t.accountId === accountId).length;
|
||||
@@ -157,7 +343,27 @@ export default function AccountsPage() {
|
||||
<PageLayout>
|
||||
<PageHeader
|
||||
title="Comptes"
|
||||
description="Gérez vos comptes bancaires"
|
||||
description="Gérez vos comptes bancaires et leur organisation"
|
||||
actions={
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
variant="outline"
|
||||
size="icon"
|
||||
onClick={() => setIsCompactView(!isCompactView)}
|
||||
title={isCompactView ? "Vue détaillée" : "Vue compacte"}
|
||||
>
|
||||
{isCompactView ? (
|
||||
<LayoutGrid className="w-4 h-4" />
|
||||
) : (
|
||||
<List className="w-4 h-4" />
|
||||
)}
|
||||
</Button>
|
||||
<Button onClick={handleNewFolder}>
|
||||
<Plus className="w-4 h-4 mr-2" />
|
||||
Nouveau dossier
|
||||
</Button>
|
||||
</div>
|
||||
}
|
||||
rightContent={
|
||||
<div className="text-right">
|
||||
<p className="text-sm text-muted-foreground">Solde total</p>
|
||||
@@ -190,122 +396,178 @@ export default function AccountsPage() {
|
||||
selectedCount={selectedAccounts.size}
|
||||
onDelete={handleBulkDelete}
|
||||
/>
|
||||
<div className="space-y-6">
|
||||
{/* Afficher d'abord les comptes sans dossier */}
|
||||
{accountsByFolder["no-folder"] &&
|
||||
accountsByFolder["no-folder"].length > 0 && (
|
||||
<div>
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<Folder className="w-5 h-5 text-muted-foreground" />
|
||||
<h2 className="text-lg font-semibold">Sans dossier</h2>
|
||||
<span className="text-sm text-muted-foreground">
|
||||
({accountsByFolder["no-folder"].length})
|
||||
</span>
|
||||
<span
|
||||
className={cn(
|
||||
"text-sm font-semibold tabular-nums ml-auto",
|
||||
accountsByFolder["no-folder"].reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
) >= 0
|
||||
? "text-emerald-600"
|
||||
: "text-red-600",
|
||||
)}
|
||||
>
|
||||
{formatCurrency(
|
||||
accountsByFolder["no-folder"].reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
),
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||
{accountsByFolder["no-folder"].map((account) => {
|
||||
const folder = data.folders.find(
|
||||
(f) => f.id === account.folderId,
|
||||
);
|
||||
|
||||
return (
|
||||
<AccountCard
|
||||
key={account.id}
|
||||
account={account}
|
||||
folder={folder}
|
||||
transactionCount={getTransactionCount(account.id)}
|
||||
onEdit={handleEdit}
|
||||
onDelete={handleDelete}
|
||||
formatCurrency={formatCurrency}
|
||||
isSelected={selectedAccounts.has(account.id)}
|
||||
onSelect={toggleSelectAccount}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Afficher les comptes groupés par folder */}
|
||||
{rootFolders.map((folder) => {
|
||||
const folderAccounts = accountsByFolder[folder.id] || [];
|
||||
if (folderAccounts.length === 0) return null;
|
||||
|
||||
const folderBalance = folderAccounts.reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
);
|
||||
|
||||
return (
|
||||
<div key={folder.id}>
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<div
|
||||
className="w-5 h-5 rounded flex items-center justify-center"
|
||||
style={{ backgroundColor: `${folder.color}20` }}
|
||||
>
|
||||
<Folder
|
||||
className="w-4 h-4"
|
||||
style={{ color: folder.color }}
|
||||
/>
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
collisionDetection={closestCenter}
|
||||
onDragStart={handleDragStart}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<div className="space-y-6">
|
||||
{/* Afficher d'abord les comptes sans dossier */}
|
||||
{accountsByFolder["no-folder"] &&
|
||||
accountsByFolder["no-folder"].length > 0 && (
|
||||
<FolderDropZone folderId="root">
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<Folder className="w-5 h-5 text-muted-foreground" />
|
||||
<h2 className="text-lg font-semibold">Sans dossier</h2>
|
||||
<span className="text-sm text-muted-foreground">
|
||||
({accountsByFolder["no-folder"].length})
|
||||
</span>
|
||||
<span
|
||||
className={cn(
|
||||
"text-sm font-semibold tabular-nums ml-auto",
|
||||
accountsByFolder["no-folder"].reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
) >= 0
|
||||
? "text-emerald-600"
|
||||
: "text-red-600",
|
||||
)}
|
||||
>
|
||||
{formatCurrency(
|
||||
accountsByFolder["no-folder"].reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
),
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
<h2 className="text-lg font-semibold">{folder.name}</h2>
|
||||
<span className="text-sm text-muted-foreground">
|
||||
({folderAccounts.length})
|
||||
</span>
|
||||
<span
|
||||
className={cn(
|
||||
"text-sm font-semibold tabular-nums ml-auto",
|
||||
folderBalance >= 0
|
||||
? "text-emerald-600"
|
||||
: "text-red-600",
|
||||
)}
|
||||
>
|
||||
{formatCurrency(folderBalance)}
|
||||
</span>
|
||||
</div>
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||
{folderAccounts.map((account) => {
|
||||
const accountFolder = data.folders.find(
|
||||
(f) => f.id === account.folderId,
|
||||
);
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||
{accountsByFolder["no-folder"].map((account) => {
|
||||
const folder = data.folders.find(
|
||||
(f) => f.id === account.folderId,
|
||||
);
|
||||
|
||||
return (
|
||||
<AccountCard
|
||||
key={account.id}
|
||||
account={account}
|
||||
folder={accountFolder}
|
||||
transactionCount={getTransactionCount(account.id)}
|
||||
onEdit={handleEdit}
|
||||
onDelete={handleDelete}
|
||||
formatCurrency={formatCurrency}
|
||||
isSelected={selectedAccounts.has(account.id)}
|
||||
onSelect={toggleSelectAccount}
|
||||
return (
|
||||
<AccountCard
|
||||
key={account.id}
|
||||
account={account}
|
||||
folder={folder}
|
||||
transactionCount={getTransactionCount(account.id)}
|
||||
onEdit={handleEdit}
|
||||
onDelete={handleDelete}
|
||||
formatCurrency={formatCurrency}
|
||||
isSelected={selectedAccounts.has(account.id)}
|
||||
onSelect={toggleSelectAccount}
|
||||
draggableId={`account-${account.id}`}
|
||||
compact={isCompactView}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</FolderDropZone>
|
||||
)}
|
||||
|
||||
{/* Afficher les comptes groupés par folder */}
|
||||
{rootFolders.map((folder) => {
|
||||
const folderAccounts = accountsByFolder[folder.id] || [];
|
||||
const folderBalance = folderAccounts.reduce(
|
||||
(sum, a) => sum + getAccountBalance(a),
|
||||
0,
|
||||
);
|
||||
|
||||
return (
|
||||
<FolderDropZone key={folder.id} folderId={folder.id}>
|
||||
<div className="flex items-center gap-2 mb-4">
|
||||
<div
|
||||
className="w-5 h-5 rounded flex items-center justify-center"
|
||||
style={{ backgroundColor: `${folder.color}20` }}
|
||||
>
|
||||
<Folder
|
||||
className="w-4 h-4"
|
||||
style={{ color: folder.color }}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
<h2 className="text-lg font-semibold">{folder.name}</h2>
|
||||
<span className="text-sm text-muted-foreground">
|
||||
({folderAccounts.length})
|
||||
</span>
|
||||
{folderAccounts.length > 0 && (
|
||||
<span
|
||||
className={cn(
|
||||
"text-sm font-semibold tabular-nums",
|
||||
folderBalance >= 0
|
||||
? "text-emerald-600"
|
||||
: "text-red-600",
|
||||
)}
|
||||
>
|
||||
{formatCurrency(folderBalance)}
|
||||
</span>
|
||||
)}
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => handleEditFolder(folder)}
|
||||
className="ml-auto"
|
||||
>
|
||||
Modifier
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => handleDeleteFolder(folder.id)}
|
||||
className="text-destructive hover:text-destructive"
|
||||
>
|
||||
Supprimer
|
||||
</Button>
|
||||
</div>
|
||||
{folderAccounts.length > 0 ? (
|
||||
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
|
||||
{folderAccounts.map((account) => {
|
||||
const accountFolder = data.folders.find(
|
||||
(f) => f.id === account.folderId,
|
||||
);
|
||||
|
||||
return (
|
||||
<AccountCard
|
||||
key={account.id}
|
||||
account={account}
|
||||
folder={accountFolder}
|
||||
transactionCount={getTransactionCount(account.id)}
|
||||
onEdit={handleEdit}
|
||||
onDelete={handleDelete}
|
||||
formatCurrency={formatCurrency}
|
||||
isSelected={selectedAccounts.has(account.id)}
|
||||
onSelect={toggleSelectAccount}
|
||||
draggableId={`account-${account.id}`}
|
||||
compact={isCompactView}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
<Card>
|
||||
<CardContent className="flex flex-col items-center justify-center py-8">
|
||||
<Folder className="w-12 h-12 text-muted-foreground mb-2" />
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Aucun compte dans ce dossier
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
Glissez-déposez un compte ici pour l'ajouter
|
||||
</p>
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
</FolderDropZone>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<DragOverlay>
|
||||
{activeId ? (
|
||||
<div className="opacity-50">
|
||||
{activeId.startsWith("account-") ? (
|
||||
<Card>
|
||||
<CardContent className="p-4">
|
||||
{data.accounts.find(
|
||||
(a) => a.id === activeId.replace("account-", "")
|
||||
)?.name || ""}
|
||||
</CardContent>
|
||||
</Card>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
) : null}
|
||||
</DragOverlay>
|
||||
</DndContext>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -317,6 +579,16 @@ export default function AccountsPage() {
|
||||
folders={data.folders}
|
||||
onSave={handleSave}
|
||||
/>
|
||||
|
||||
<FolderEditDialog
|
||||
open={isFolderDialogOpen}
|
||||
onOpenChange={setIsFolderDialogOpen}
|
||||
editingFolder={editingFolder}
|
||||
formData={folderFormData}
|
||||
onFormDataChange={setFolderFormData}
|
||||
folders={data.folders}
|
||||
onSave={handleSaveFolder}
|
||||
/>
|
||||
</PageLayout>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,338 +0,0 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import {
|
||||
DndContext,
|
||||
DragEndEvent,
|
||||
DragOverlay,
|
||||
DragStartEvent,
|
||||
PointerSensor,
|
||||
useSensor,
|
||||
useSensors,
|
||||
closestCenter,
|
||||
} from "@dnd-kit/core";
|
||||
import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
|
||||
import { PageLayout, LoadingState, PageHeader } from "@/components/layout";
|
||||
import {
|
||||
FolderTreeItem,
|
||||
FolderEditDialog,
|
||||
AccountFolderDialog,
|
||||
} from "@/components/folders";
|
||||
import { useBankingData } from "@/lib/hooks";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Plus } from "lucide-react";
|
||||
import {
|
||||
addFolder,
|
||||
updateFolder,
|
||||
deleteFolder,
|
||||
updateAccount,
|
||||
} from "@/lib/store-db";
|
||||
import type { Folder as FolderType, Account } from "@/lib/types";
|
||||
|
||||
export default function FoldersPage() {
|
||||
const { data, isLoading, refresh } = useBankingData();
|
||||
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||
const [editingFolder, setEditingFolder] = useState<FolderType | null>(null);
|
||||
const [formData, setFormData] = useState({
|
||||
name: "",
|
||||
parentId: "folder-root" as string | null,
|
||||
color: "#6366f1",
|
||||
});
|
||||
const [activeId, setActiveId] = useState<string | null>(null);
|
||||
|
||||
// Account editing state
|
||||
const [isAccountDialogOpen, setIsAccountDialogOpen] = useState(false);
|
||||
const [editingAccount, setEditingAccount] = useState<Account | null>(null);
|
||||
const [accountFormData, setAccountFormData] = useState({
|
||||
name: "",
|
||||
type: "CHECKING" as Account["type"],
|
||||
folderId: "folder-root",
|
||||
});
|
||||
|
||||
const sensors = useSensors(
|
||||
useSensor(PointerSensor, {
|
||||
activationConstraint: {
|
||||
distance: 8,
|
||||
},
|
||||
})
|
||||
);
|
||||
|
||||
if (isLoading || !data) {
|
||||
return <LoadingState />;
|
||||
}
|
||||
|
||||
const formatCurrency = (amount: number) => {
|
||||
return new Intl.NumberFormat("fr-FR", {
|
||||
style: "currency",
|
||||
currency: "EUR",
|
||||
}).format(amount);
|
||||
};
|
||||
|
||||
const rootFolders = data.folders.filter((f) => f.parentId === null);
|
||||
|
||||
const handleNewFolder = () => {
|
||||
setEditingFolder(null);
|
||||
setFormData({ name: "", parentId: "folder-root", color: "#6366f1" });
|
||||
setIsDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleEdit = (folder: FolderType) => {
|
||||
setEditingFolder(folder);
|
||||
setFormData({
|
||||
name: folder.name,
|
||||
parentId: folder.parentId || "folder-root",
|
||||
color: folder.color,
|
||||
});
|
||||
setIsDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleSave = async () => {
|
||||
const parentId =
|
||||
formData.parentId === "folder-root" ? null : formData.parentId;
|
||||
|
||||
try {
|
||||
if (editingFolder) {
|
||||
await updateFolder({
|
||||
...editingFolder,
|
||||
name: formData.name,
|
||||
parentId,
|
||||
color: formData.color,
|
||||
});
|
||||
} else {
|
||||
await addFolder({
|
||||
name: formData.name,
|
||||
parentId,
|
||||
color: formData.color,
|
||||
icon: "folder",
|
||||
});
|
||||
}
|
||||
refresh();
|
||||
setIsDialogOpen(false);
|
||||
} catch (error) {
|
||||
console.error("Error saving folder:", error);
|
||||
alert("Erreur lors de la sauvegarde du dossier");
|
||||
}
|
||||
};
|
||||
|
||||
const handleDelete = async (folderId: string) => {
|
||||
if (
|
||||
!confirm(
|
||||
"Supprimer ce dossier ? Les comptes seront déplacés à la racine."
|
||||
)
|
||||
)
|
||||
return;
|
||||
|
||||
try {
|
||||
await deleteFolder(folderId);
|
||||
refresh();
|
||||
} catch (error) {
|
||||
console.error("Error deleting folder:", error);
|
||||
alert("Erreur lors de la suppression du dossier");
|
||||
}
|
||||
};
|
||||
|
||||
const handleEditAccount = (account: Account) => {
|
||||
setEditingAccount(account);
|
||||
setAccountFormData({
|
||||
name: account.name,
|
||||
type: account.type,
|
||||
folderId: account.folderId || "folder-root",
|
||||
});
|
||||
setIsAccountDialogOpen(true);
|
||||
};
|
||||
|
||||
const handleSaveAccount = async () => {
|
||||
if (!editingAccount) return;
|
||||
|
||||
try {
|
||||
await updateAccount({
|
||||
...editingAccount,
|
||||
name: accountFormData.name,
|
||||
type: accountFormData.type,
|
||||
folderId:
|
||||
accountFormData.folderId === "folder-root"
|
||||
? null
|
||||
: accountFormData.folderId,
|
||||
});
|
||||
refresh();
|
||||
setIsAccountDialogOpen(false);
|
||||
setEditingAccount(null);
|
||||
} catch (error) {
|
||||
console.error("Error updating account:", error);
|
||||
alert("Erreur lors de la mise à jour du compte");
|
||||
}
|
||||
};
|
||||
|
||||
const handleDragStart = (event: DragStartEvent) => {
|
||||
setActiveId(event.active.id as string);
|
||||
};
|
||||
|
||||
const handleDragEnd = async (event: DragEndEvent) => {
|
||||
const { active, over } = event;
|
||||
setActiveId(null);
|
||||
|
||||
if (!over || active.id === over.id) return;
|
||||
|
||||
const activeId = active.id as string;
|
||||
const overId = over.id as string;
|
||||
|
||||
// Déplacer un compte vers un dossier
|
||||
if (activeId.startsWith("account-")) {
|
||||
const accountId = activeId.replace("account-", "");
|
||||
let targetFolderId: string | null = null;
|
||||
|
||||
if (overId.startsWith("folder-")) {
|
||||
const folderId = overId.replace("folder-", "");
|
||||
targetFolderId = folderId === "folder-root" ? null : folderId;
|
||||
} else if (overId.startsWith("account-")) {
|
||||
// Déplacer vers le dossier du compte cible
|
||||
const targetAccountId = overId.replace("account-", "");
|
||||
const targetAccount = data.accounts.find((a) => a.id === targetAccountId);
|
||||
if (targetAccount) {
|
||||
targetFolderId = targetAccount.folderId;
|
||||
}
|
||||
}
|
||||
|
||||
if (targetFolderId !== undefined) {
|
||||
try {
|
||||
const account = data.accounts.find((a) => a.id === accountId);
|
||||
if (account) {
|
||||
await updateAccount({
|
||||
...account,
|
||||
folderId: targetFolderId,
|
||||
});
|
||||
refresh();
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error moving account:", error);
|
||||
alert("Erreur lors du déplacement du compte");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Déplacer un dossier vers un autre dossier (changer le parent)
|
||||
if (activeId.startsWith("folder-") && overId.startsWith("folder-")) {
|
||||
const folderId = activeId.replace("folder-", "");
|
||||
const targetFolderId = overId.replace("folder-", "");
|
||||
|
||||
// Empêcher de déplacer un dossier dans lui-même ou ses enfants
|
||||
const folder = data.folders.find((f) => f.id === folderId);
|
||||
if (!folder) return;
|
||||
|
||||
const isDescendant = (parentId: string, childId: string): boolean => {
|
||||
const child = data.folders.find((f) => f.id === childId);
|
||||
if (!child || !child.parentId) return false;
|
||||
if (child.parentId === parentId) return true;
|
||||
return isDescendant(parentId, child.parentId);
|
||||
};
|
||||
|
||||
if (folderId === targetFolderId || isDescendant(folderId, targetFolderId)) {
|
||||
return; // Ne pas permettre de déplacer un dossier dans lui-même ou ses descendants
|
||||
}
|
||||
|
||||
try {
|
||||
const newParentId = targetFolderId === "folder-root" ? null : targetFolderId;
|
||||
await updateFolder({
|
||||
...folder,
|
||||
parentId: newParentId,
|
||||
});
|
||||
refresh();
|
||||
} catch (error) {
|
||||
console.error("Error moving folder:", error);
|
||||
alert("Erreur lors du déplacement du dossier");
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<PageLayout>
|
||||
<PageHeader
|
||||
title="Organisation"
|
||||
description="Organisez vos comptes en dossiers"
|
||||
actions={
|
||||
<Button onClick={handleNewFolder}>
|
||||
<Plus className="w-4 h-4 mr-2" />
|
||||
Nouveau dossier
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
|
||||
<Card>
|
||||
<CardHeader>
|
||||
<CardTitle>Arborescence des comptes</CardTitle>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<DndContext
|
||||
sensors={sensors}
|
||||
collisionDetection={closestCenter}
|
||||
onDragStart={handleDragStart}
|
||||
onDragEnd={handleDragEnd}
|
||||
>
|
||||
<SortableContext
|
||||
items={[
|
||||
...rootFolders.map((f) => `folder-${f.id}`),
|
||||
...data.accounts.map((a) => `account-${a.id}`),
|
||||
]}
|
||||
strategy={verticalListSortingStrategy}
|
||||
>
|
||||
<div className="space-y-1">
|
||||
{rootFolders.map((folder) => (
|
||||
<FolderTreeItem
|
||||
key={folder.id}
|
||||
folder={folder}
|
||||
accounts={data.accounts}
|
||||
allFolders={data.folders}
|
||||
level={0}
|
||||
onEdit={handleEdit}
|
||||
onDelete={handleDelete}
|
||||
onEditAccount={handleEditAccount}
|
||||
formatCurrency={formatCurrency}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
</SortableContext>
|
||||
<DragOverlay>
|
||||
{activeId ? (
|
||||
<div className="opacity-50">
|
||||
{activeId.startsWith("account-") ? (
|
||||
<div className="p-2 bg-muted rounded">
|
||||
{data.accounts.find(
|
||||
(a) => a.id === activeId.replace("account-", "")
|
||||
)?.name || ""}
|
||||
</div>
|
||||
) : (
|
||||
<div className="p-2 bg-muted rounded">
|
||||
{data.folders.find(
|
||||
(f) => f.id === activeId.replace("folder-", "")
|
||||
)?.name || ""}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
) : null}
|
||||
</DragOverlay>
|
||||
</DndContext>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
||||
<FolderEditDialog
|
||||
open={isDialogOpen}
|
||||
onOpenChange={setIsDialogOpen}
|
||||
editingFolder={editingFolder}
|
||||
formData={formData}
|
||||
onFormDataChange={setFormData}
|
||||
folders={data.folders}
|
||||
onSave={handleSave}
|
||||
/>
|
||||
|
||||
<AccountFolderDialog
|
||||
open={isAccountDialogOpen}
|
||||
onOpenChange={setIsAccountDialogOpen}
|
||||
formData={accountFormData}
|
||||
onFormDataChange={setAccountFormData}
|
||||
folders={data.folders}
|
||||
onSave={handleSaveAccount}
|
||||
/>
|
||||
</PageLayout>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user