Skip to content

feat: in-app delete for journal trades + account purge #4

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
ghwmelite-dotcom merged 1 commit into from
Jul 1, 2026
Merged

feat: in-app delete for journal trades + account purge #4

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
76 changes: 67 additions & 9 deletions apps/web/src/pages/AccountsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,28 +604,53 @@ function DeleteConfirmModal({
account: Account | null;
}) {
const deleteAccount = useAccountsStore((s) => s.deleteAccount);
const purgeAccount = useAccountsStore((s) => s.purgeAccount);
const [isDeleting, setIsDeleting] = useState(false);
const [isPurging, setIsPurging] = useState(false);
const [purgeMode, setPurgeMode] = useState(false);
const [confirmText, setConfirmText] = useState('');
const [error, setError] = useState<string | null>(null);

const close = () => {
setPurgeMode(false);
setConfirmText('');
setError(null);
onClose();
};

const handleDelete = async () => {
const handleDeactivate = async () => {
if (!account) return;
setIsDeleting(true);
await deleteAccount(account.id);
setIsDeleting(false);
onClose();
close();
};

const handlePurge = async () => {
if (!account) return;
if (confirmText.trim() !== account.alias) {
setError(`Type the account name "${account.alias}" exactly to confirm.`);
return;
}
setError(null);
setIsPurging(true);
const ok = await purgeAccount(account.id);
setIsPurging(false);
if (ok) close();
else setError('Could not permanently delete. Please try again.');
};

if (!account) return null;

return (
<Modal open={open} onClose={onClose} title="Delete Account">
<Modal open={open} onClose={close} title="Delete Account">
<div className="space-y-5">
<div className="flex items-start gap-3 rounded-2xl border border-neon-red/30 bg-neon-red/5 p-4">
<AlertTriangle size={18} className="text-neon-red mt-0.5 shrink-0" />
<div className="text-sm text-slate-300">
<p>
Are you sure you want to delete{' '}
<span className="font-semibold text-white">{account.alias}</span>? This action
cannot be undone.
Deactivate <span className="font-semibold text-white">{account.alias}</span>? It stops
trading and is removed from your list; its data is retained.
</p>
{account.role === 'master' && (
<p className="mt-2 text-neon-red">
Expand All @@ -636,14 +661,47 @@ function DeleteConfirmModal({
</div>

<div className="flex gap-3">
<Button variant="secondary" className="flex-1" onClick={onClose}>
<Button variant="secondary" className="flex-1" onClick={close}>
Cancel
</Button>
<Button variant="danger" className="flex-1" isLoading={isDeleting} onClick={handleDelete}>
<Button variant="danger" className="flex-1" isLoading={isDeleting} onClick={handleDeactivate}>
<Trash2 size={14} />
Delete
Deactivate
</Button>
</div>

<div className="border-t border-terminal-border/50 pt-4">
{!purgeMode ? (
<button
type="button"
onClick={() => setPurgeMode(true)}
className="text-xs text-terminal-muted transition-colors hover:text-neon-red focus-ring rounded"
>
Or permanently erase this account and all its data&hellip;
</button>
) : (
<div className="space-y-3">
<p className="text-sm text-slate-300">
<span className="font-semibold text-neon-red">Permanent delete.</span> This erases the
account and <strong>all</strong> its data &mdash; journal trades, signals, executions,
symbol mappings and settings. It cannot be undone or restored.
</p>
<p className="text-sm text-slate-300">
Type <span className="font-mono-nums text-neon-red">{account.alias}</span> to confirm:
</p>
<Input
value={confirmText}
onChange={(e) => setConfirmText(e.target.value)}
placeholder={account.alias}
/>
{error && <p className="text-xs text-neon-red">{error}</p>}
<Button variant="danger" className="w-full" isLoading={isPurging} onClick={handlePurge}>
<Trash2 size={14} />
Permanently delete everything
</Button>
</div>
)}
</div>
</div>
</Modal>
);
Expand Down
217 changes: 207 additions & 10 deletions apps/web/src/pages/JournalPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { useEffect, useRef, useCallback } from 'react';
import { useEffect, useRef, useCallback, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { BookOpen } from 'lucide-react';
import { BookOpen, Trash2, AlertTriangle } from 'lucide-react';
import { useAccountsStore } from '@/stores/accounts';
import { useJournalStore, type JournalFilters } from '@/stores/journal';
import { EquityCurve } from '@/components/journal/EquityCurve';
import { TradeFilters } from '@/components/journal/TradeFilters';
import { Select } from '@/components/ui/Select';
import { Button } from '@/components/ui/Button';
import { Input } from '@/components/ui/Input';
import { Modal } from '@/components/ui/Modal';

/* ------------------------------------------------------------------ */
/* Formatting helpers */
Expand Down Expand Up @@ -73,7 +76,7 @@ function SkeletonRow({ delay = 0 }: { delay?: number }) {
className="border-b border-terminal-border/50 animate-fade-in-up"
style={{ animationDelay: `${delay}ms` }}
>
{Array.from({ length: 8 }).map((_, j) => (
{Array.from({ length: 9 }).map((_, j) => (
<td key={j} className="px-3 py-3">
<div className="skeleton h-4 w-16 rounded" />
</td>
Expand Down Expand Up @@ -105,13 +108,28 @@ export function JournalPage() {
fetchAll,
fetchTrades,
fetchMoreTrades,
deleteTrade,
} = useJournalStore();

const [deleteOpen, setDeleteOpen] = useState(false);

const setSelectedAccountId = useCallback(
(id: string) => useJournalStore.setState({ selectedAccountId: id }),
[],
);

const selectedAccount = accounts.find((a) => a.id === selectedAccountId);

const handleDeleteRow = useCallback(
async (dealTicket: number) => {
if (!selectedAccountId) return;
if (!window.confirm('Delete this trade from your journal? This cannot be undone.')) return;
await deleteTrade(selectedAccountId, dealTicket);
fetchAll(selectedAccountId);
},
[selectedAccountId, deleteTrade, fetchAll],
);

// Infinite scroll sentinel
const sentinelRef = useRef<HTMLDivElement>(null);
const loadingMoreRef = useRef(false);
Expand Down Expand Up @@ -189,13 +207,26 @@ export function JournalPage() {
<h1 className="text-3xl font-black tracking-tight text-white font-display">
Trade Journal
</h1>
<div className="w-64">
<Select
label="Account"
options={accountOptions}
value={selectedAccountId ?? ''}
onChange={(e) => setSelectedAccountId(e.target.value)}
/>
<div className="flex items-end gap-2">
<div className="w-64">
<Select
label="Account"
options={accountOptions}
value={selectedAccountId ?? ''}
onChange={(e) => setSelectedAccountId(e.target.value)}
/>
</div>
{selectedAccountId && (
<Button
variant="danger"
size="md"
onClick={() => setDeleteOpen(true)}
title="Delete journal trades for this account"
>
<Trash2 className="h-4 w-4" />
Delete
</Button>
)}
</div>
</div>

Expand Down Expand Up @@ -425,6 +456,7 @@ export function JournalPage() {
<Th align="right">Profit</Th>
<Th align="right">Pips</Th>
<Th align="right">Duration</Th>
<Th align="right"><span className="sr-only">Actions</span></Th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -484,6 +516,19 @@ export function JournalPage() {
<td className="px-3 py-2.5 text-right font-mono-nums text-terminal-muted text-xs">
{formatDuration(trade.duration_seconds)}
</td>
<td className="px-3 py-2.5 text-right">
<button
onClick={(e) => {
e.stopPropagation();
handleDeleteRow(trade.deal_ticket);
}}
className="rounded p-1 text-terminal-muted transition-colors hover:text-neon-red focus-ring"
title="Delete trade"
aria-label="Delete trade"
>
<Trash2 size={14} />
</button>
</td>
</tr>
);
})}
Expand All @@ -502,6 +547,16 @@ export function JournalPage() {
</div>
)}
</section>

<DeleteJournalModal
open={deleteOpen}
onClose={() => setDeleteOpen(false)}
accountId={selectedAccountId}
accountAlias={selectedAccount?.alias ?? ''}
onDeleted={() => {
if (selectedAccountId) fetchAll(selectedAccountId);
}}
/>
</div>
);
}
Expand All @@ -510,6 +565,148 @@ export function JournalPage() {
/* Sub-components */
/* ------------------------------------------------------------------ */

function DeleteJournalModal({
open,
onClose,
accountId,
accountAlias,
onDeleted,
}: {
open: boolean;
onClose: () => void;
accountId: string | null;
accountAlias: string;
onDeleted: () => void;
}) {
const deleteTrades = useJournalStore((s) => s.deleteTrades);
const [mode, setMode] = useState<'date' | 'all'>('date');
const [beforeDate, setBeforeDate] = useState('');
const [confirmText, setConfirmText] = useState('');
const [busy, setBusy] = useState(false);
const [error, setError] = useState<string | null>(null);
const [result, setResult] = useState<string | null>(null);

const close = () => {
setMode('date');
setBeforeDate('');
setConfirmText('');
setError(null);
setResult(null);
setBusy(false);
onClose();
};

const handleDelete = async () => {
if (!accountId) return;
setError(null);
let filters: JournalFilters | undefined;
if (mode === 'date') {
if (!beforeDate) {
setError('Pick a cutoff date first.');
return;
}
const cutoff = Math.floor(new Date(`${beforeDate}T00:00:00Z`).getTime() / 1000);
filters = { to: cutoff - 1 };
} else {
if (confirmText.trim() !== accountAlias) {
setError(`Type the account name "${accountAlias}" exactly to confirm.`);
return;
}
filters = undefined;
}
setBusy(true);
const deleted = await deleteTrades(accountId, filters);
setBusy(false);
if (deleted === null) {
setError('Delete failed. Please try again.');
return;
}
setResult(`Deleted ${deleted} trade${deleted === 1 ? '' : 's'}.`);
onDeleted();
};

return (
<Modal open={open} onClose={close} title="Delete journal trades">
{result ? (
<div className="space-y-5">
<div className="rounded-2xl border border-neon-green/30 bg-neon-green/5 p-4 text-sm text-slate-200">
{result}
</div>
<Button variant="secondary" className="w-full" onClick={close}>
Done
</Button>
</div>
) : (
<div className="space-y-5">
<div className="flex gap-2">
<button
type="button"
onClick={() => setMode('date')}
className={`flex-1 rounded-lg px-3 py-2 text-xs font-medium transition-colors ${
mode === 'date' ? 'bg-neon-cyan/15 text-neon-cyan' : 'text-terminal-muted hover:text-slate-200'
}`}
>
Before a date
</button>
<button
type="button"
onClick={() => setMode('all')}
className={`flex-1 rounded-lg px-3 py-2 text-xs font-medium transition-colors ${
mode === 'all' ? 'bg-neon-red/15 text-neon-red' : 'text-terminal-muted hover:text-slate-200'
}`}
>
Clear entire journal
</button>
</div>

{mode === 'date' ? (
<div className="space-y-2">
<p className="text-sm text-slate-300">
Permanently delete every trade dated <strong>before</strong> this day:
</p>
<Input type="date" value={beforeDate} onChange={(e) => setBeforeDate(e.target.value)} />
<p className="text-xs text-terminal-muted">
Cutoff is interpreted in UTC. Example: pick <span className="font-mono-nums">2026-06-01</span> to remove
everything before June 2026.
</p>
</div>
) : (
<div className="space-y-3">
<div className="flex items-start gap-3 rounded-2xl border border-neon-red/30 bg-neon-red/5 p-4">
<AlertTriangle size={18} className="mt-0.5 shrink-0 text-neon-red" />
<p className="text-sm text-slate-300">
This permanently deletes <strong>every</strong> trade for{' '}
<span className="font-semibold text-white">{accountAlias}</span>. This cannot be undone.
</p>
</div>
<p className="text-sm text-slate-300">
Type <span className="font-mono-nums text-neon-red">{accountAlias}</span> to confirm:
</p>
<Input
value={confirmText}
onChange={(e) => setConfirmText(e.target.value)}
placeholder={accountAlias}
/>
</div>
)}

{error && <p className="text-xs text-neon-red">{error}</p>}

<div className="flex gap-3">
<Button variant="secondary" className="flex-1" onClick={close}>
Cancel
</Button>
<Button variant="danger" className="flex-1" isLoading={busy} onClick={handleDelete}>
<Trash2 size={14} />
Delete
</Button>
</div>
</div>
)}
</Modal>
);
}

function MiniStat({
label,
value,
Expand Down
Loading
Loading