feat: wire up DeleteIdentityDialog with S2S deletion modes and scope
Update the dialog to support three deletion modes (leave/soft/full), scope selector with disabled "Select instances..." option, loading state during deletion, and per-instance error handling via toasts.
This commit is contained in:
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
|
|||||||
import type { InstanceInfoResponse, FederationRegistryEntry } from '@backspace/shared';
|
import type { InstanceInfoResponse, FederationRegistryEntry } from '@backspace/shared';
|
||||||
import { useInstanceStore, DifferentPasswordError } from '../../stores/instanceStore';
|
import { useInstanceStore, DifferentPasswordError } from '../../stores/instanceStore';
|
||||||
import { useAuthStore } from '../../stores/authStore';
|
import { useAuthStore } from '../../stores/authStore';
|
||||||
|
import { useUIStore } from '../../stores/uiStore';
|
||||||
import { isElectron } from '../../platform/platform';
|
import { isElectron } from '../../platform/platform';
|
||||||
import { ConfirmDialog } from '../ui/ConfirmDialog';
|
import { ConfirmDialog } from '../ui/ConfirmDialog';
|
||||||
|
|
||||||
@@ -410,7 +411,7 @@ function RegistryFilterBar({
|
|||||||
|
|
||||||
// ─── DeleteIdentityDialog ───────────────────────────────────────────────────
|
// ─── DeleteIdentityDialog ───────────────────────────────────────────────────
|
||||||
|
|
||||||
type DeletionMode = 'leave' | 'nuke' | 'evaporate';
|
type DeletionMode = 'leave' | 'soft' | 'full';
|
||||||
type DeletionScope = 'this' | 'select' | 'all';
|
type DeletionScope = 'this' | 'select' | 'all';
|
||||||
|
|
||||||
function DeleteIdentityDialog({
|
function DeleteIdentityDialog({
|
||||||
@@ -423,19 +424,77 @@ function DeleteIdentityDialog({
|
|||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
}) {
|
}) {
|
||||||
const deleteIdentity = useInstanceStore((s) => s.deleteIdentity);
|
const deleteIdentity = useInstanceStore((s) => s.deleteIdentity);
|
||||||
|
const registry = useInstanceStore((s) => s.registry);
|
||||||
const [mode, setMode] = useState<DeletionMode>('leave');
|
const [mode, setMode] = useState<DeletionMode>('leave');
|
||||||
const [scope, setScope] = useState<DeletionScope>('this');
|
const [scope, setScope] = useState<DeletionScope>('this');
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
|
||||||
const handleConfirm = () => {
|
const handleConfirm = async () => {
|
||||||
deleteIdentity([origin]);
|
// Resolve target origins based on scope
|
||||||
|
let targetOrigins: string[];
|
||||||
|
if (scope === 'all') {
|
||||||
|
targetOrigins = Array.from(registry.keys());
|
||||||
|
} else {
|
||||||
|
targetOrigins = [origin];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (targetOrigins.length === 0) {
|
||||||
onClose();
|
onClose();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mode !== 'leave') {
|
||||||
|
setLoading(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await deleteIdentity(targetOrigins, mode);
|
||||||
|
|
||||||
|
// Check results
|
||||||
|
const failed = Object.entries(results).filter(([, r]) => !r.success);
|
||||||
|
if (failed.length === 0) {
|
||||||
|
useUIStore.getState().addToast(
|
||||||
|
mode === 'leave'
|
||||||
|
? 'Disconnected successfully'
|
||||||
|
: targetOrigins.length === 1
|
||||||
|
? 'Identity deleted successfully'
|
||||||
|
: `Identity deleted on ${targetOrigins.length} instances`,
|
||||||
|
'success',
|
||||||
|
3000,
|
||||||
|
);
|
||||||
|
onClose();
|
||||||
|
} else {
|
||||||
|
for (const [failOrigin, result] of failed) {
|
||||||
|
let host: string;
|
||||||
|
try { host = new URL(failOrigin).hostname; } catch { host = failOrigin; }
|
||||||
|
if (result.error === 'owns_spaces') {
|
||||||
|
useUIStore.getState().addToast(
|
||||||
|
`${host}: Transfer space ownership first`,
|
||||||
|
'warning',
|
||||||
|
5000,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
useUIStore.getState().addToast(
|
||||||
|
`${host}: ${result.error || 'Failed'}`,
|
||||||
|
'warning',
|
||||||
|
5000,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Close if some succeeded, keep open if all failed
|
||||||
|
const succeeded = Object.values(results).filter(r => r.success).length;
|
||||||
|
if (succeeded > 0) {
|
||||||
|
onClose();
|
||||||
|
} else {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return ReactDOM.createPortal(
|
return ReactDOM.createPortal(
|
||||||
<div className="fixed inset-0 z-[10000] flex items-center justify-center animate-fade-in">
|
<div className="fixed inset-0 z-[10000] flex items-center justify-center animate-fade-in">
|
||||||
<div
|
<div
|
||||||
className="absolute inset-0 bg-black/50"
|
className="absolute inset-0 bg-black/50"
|
||||||
onClick={onClose}
|
onClick={loading ? undefined : onClose}
|
||||||
/>
|
/>
|
||||||
<div className="relative max-w-md w-full mx-4 glass-modal rounded-xl p-6 animate-slide-up">
|
<div className="relative max-w-md w-full mx-4 glass-modal rounded-xl p-6 animate-slide-up">
|
||||||
<h3 className="text-base font-semibold text-txt-primary mb-1">Delete Identity</h3>
|
<h3 className="text-base font-semibold text-txt-primary mb-1">Delete Identity</h3>
|
||||||
@@ -449,45 +508,54 @@ function DeleteIdentityDialog({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setMode('leave')}
|
onClick={() => setMode('leave')}
|
||||||
|
disabled={loading}
|
||||||
className={`w-full text-left p-3 rounded-lg border transition-colors ${
|
className={`w-full text-left p-3 rounded-lg border transition-colors ${
|
||||||
mode === 'leave'
|
mode === 'leave'
|
||||||
? 'bg-white/[0.03] border-white/[0.08]'
|
? 'bg-white/[0.03] border-white/[0.08]'
|
||||||
: 'bg-transparent border-white/[0.04] hover:border-white/[0.06]'
|
: 'bg-transparent border-white/[0.04] hover:border-white/[0.06]'
|
||||||
}`}
|
} disabled:opacity-50`}
|
||||||
>
|
>
|
||||||
<div className="text-sm font-medium text-txt-primary">Leave quietly</div>
|
<div className="text-sm font-medium text-txt-primary">Leave quietly</div>
|
||||||
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
||||||
Remove the connection. Your messages and data remain on the remote instance.
|
Disconnect from this instance. Your account and all data remain.
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{/* Nuke everything */}
|
{/* Delete User (soft) */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setMode('nuke')}
|
onClick={() => setMode('soft')}
|
||||||
|
disabled={loading}
|
||||||
className={`w-full text-left p-3 rounded-lg border transition-colors ${
|
className={`w-full text-left p-3 rounded-lg border transition-colors ${
|
||||||
mode === 'nuke'
|
mode === 'soft'
|
||||||
|
? 'bg-white/[0.03] border-white/[0.08]'
|
||||||
|
: 'bg-transparent border-white/[0.04] hover:border-white/[0.06]'
|
||||||
|
} disabled:opacity-50`}
|
||||||
|
>
|
||||||
|
<div className="text-sm font-medium text-txt-primary">Delete User</div>
|
||||||
|
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
||||||
|
Delete your account. Your messages stay visible as ‘Deleted User’.
|
||||||
|
</div>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
{/* Nuke everything (full) */}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setMode('full')}
|
||||||
|
disabled={loading}
|
||||||
|
className={`w-full text-left p-3 rounded-lg border transition-colors ${
|
||||||
|
mode === 'full'
|
||||||
? 'bg-accent-rose/[0.04] border-accent-rose/20'
|
? 'bg-accent-rose/[0.04] border-accent-rose/20'
|
||||||
: 'bg-transparent border-white/[0.04] hover:border-white/[0.06]'
|
: 'bg-transparent border-white/[0.04] hover:border-white/[0.06]'
|
||||||
}`}
|
} disabled:opacity-50`}
|
||||||
>
|
>
|
||||||
<div className={`text-sm font-medium ${mode === 'nuke' ? 'text-txt-danger' : 'text-txt-primary'}`}>
|
<div className={`text-sm font-medium ${mode === 'full' ? 'text-txt-danger' : 'text-txt-primary'}`}>
|
||||||
Nuke everything
|
Nuke everything
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
||||||
Delete your account and all associated data on the remote instance.
|
Delete your account and purge all private data (DMs, reactions). Space messages remain as ‘Deleted User’.
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{/* Evaporate (coming soon) */}
|
|
||||||
<div
|
|
||||||
className="w-full text-left p-3 rounded-lg border border-dashed border-white/[0.04] opacity-40 cursor-not-allowed"
|
|
||||||
>
|
|
||||||
<div className="text-sm font-medium text-txt-primary">Evaporate</div>
|
|
||||||
<div className="text-[11px] text-txt-tertiary mt-0.5">
|
|
||||||
Gradually fade your presence — coming soon.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Scope selector */}
|
{/* Scope selector */}
|
||||||
@@ -495,16 +563,20 @@ function DeleteIdentityDialog({
|
|||||||
<div className="text-[10px] font-semibold text-txt-tertiary uppercase tracking-wider mb-2">Scope</div>
|
<div className="text-[10px] font-semibold text-txt-tertiary uppercase tracking-wider mb-2">Scope</div>
|
||||||
<div className="flex gap-1.5">
|
<div className="flex gap-1.5">
|
||||||
{([
|
{([
|
||||||
{ key: 'this' as DeletionScope, label: 'This instance only' },
|
{ key: 'this' as DeletionScope, label: 'This instance only', disabled: false },
|
||||||
{ key: 'select' as DeletionScope, label: 'Select instances...' },
|
{ key: 'select' as DeletionScope, label: 'Select instances...', disabled: true },
|
||||||
{ key: 'all' as DeletionScope, label: 'All remote instances' },
|
{ key: 'all' as DeletionScope, label: 'All remote instances', disabled: false },
|
||||||
]).map((opt) => (
|
]).map((opt) => (
|
||||||
<button
|
<button
|
||||||
key={opt.key}
|
key={opt.key}
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setScope(opt.key)}
|
onClick={() => !opt.disabled && setScope(opt.key)}
|
||||||
|
disabled={opt.disabled || loading}
|
||||||
|
title={opt.disabled ? 'Coming soon' : undefined}
|
||||||
className={`flex-1 px-2 py-1.5 text-[11px] font-medium rounded transition-colors ${
|
className={`flex-1 px-2 py-1.5 text-[11px] font-medium rounded transition-colors ${
|
||||||
scope === opt.key
|
opt.disabled
|
||||||
|
? 'bg-white/[0.02] text-txt-tertiary/40 cursor-not-allowed'
|
||||||
|
: scope === opt.key
|
||||||
? 'bg-accent-lavender/15 text-accent-lavender'
|
? 'bg-accent-lavender/15 text-accent-lavender'
|
||||||
: 'bg-white/[0.04] text-txt-tertiary hover:text-txt-secondary'
|
: 'bg-white/[0.04] text-txt-tertiary hover:text-txt-secondary'
|
||||||
}`}
|
}`}
|
||||||
@@ -519,15 +591,17 @@ function DeleteIdentityDialog({
|
|||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<button
|
<button
|
||||||
onClick={onClose}
|
onClick={onClose}
|
||||||
className="flex-1 py-2.5 text-sm font-medium text-txt-secondary bg-interactive-hover hover:bg-interactive-selected rounded-lg transition-colors"
|
disabled={loading}
|
||||||
|
className="flex-1 py-2.5 text-sm font-medium text-txt-secondary bg-interactive-hover hover:bg-interactive-selected rounded-lg transition-colors disabled:opacity-50"
|
||||||
>
|
>
|
||||||
Cancel
|
Cancel
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={handleConfirm}
|
onClick={handleConfirm}
|
||||||
className="flex-1 py-2.5 bg-accent-rose hover:bg-accent-rose/80 text-white text-sm font-medium rounded-lg transition-colors"
|
disabled={loading}
|
||||||
|
className="flex-1 py-2.5 bg-accent-rose hover:bg-accent-rose/80 text-white text-sm font-medium rounded-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
>
|
>
|
||||||
Delete Identity
|
{loading ? 'Deleting...' : mode === 'leave' ? 'Disconnect' : 'Delete Identity'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user