fix(ui): use custom ConfirmDialog for deletions to prevent input blocking on Windows (#282)
This commit is contained in:
committed by
GitHub
Unverified
parent
828cae0186
commit
5049709c5d
@@ -2,7 +2,7 @@
|
||||
* Channels Page
|
||||
* Manage messaging channel connections with configuration UI
|
||||
*/
|
||||
import { useState, useEffect, useCallback } from 'react';
|
||||
import { useState, useEffect, useCallback, useRef } from 'react';
|
||||
import {
|
||||
Plus,
|
||||
Radio,
|
||||
@@ -28,6 +28,7 @@ import { Label } from '@/components/ui/label';
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
|
||||
import { Separator } from '@/components/ui/separator';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { ConfirmDialog } from '@/components/ui/confirm-dialog';
|
||||
import { useChannelsStore } from '@/stores/channels';
|
||||
import { useGatewayStore } from '@/stores/gateway';
|
||||
import { StatusBadge, type Status } from '@/components/common/StatusBadge';
|
||||
@@ -53,6 +54,7 @@ export function Channels() {
|
||||
const [showAddDialog, setShowAddDialog] = useState(false);
|
||||
const [selectedChannelType, setSelectedChannelType] = useState<ChannelType | null>(null);
|
||||
const [configuredTypes, setConfiguredTypes] = useState<string[]>([]);
|
||||
const [channelToDelete, setChannelToDelete] = useState<{ id: string } | null>(null);
|
||||
|
||||
// Fetch channels on mount
|
||||
useEffect(() => {
|
||||
@@ -204,11 +206,7 @@ export function Channels() {
|
||||
<ChannelCard
|
||||
key={channel.id}
|
||||
channel={channel}
|
||||
onDelete={() => {
|
||||
if (confirm(t('deleteConfirm'))) {
|
||||
deleteChannel(channel.id);
|
||||
}
|
||||
}}
|
||||
onDelete={() => setChannelToDelete({ id: channel.id })}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
@@ -281,6 +279,22 @@ export function Channels() {
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
<ConfirmDialog
|
||||
open={!!channelToDelete}
|
||||
title={t('common.confirm', 'Confirm')}
|
||||
message={t('deleteConfirm')}
|
||||
confirmLabel={t('common.delete', 'Delete')}
|
||||
cancelLabel={t('common.cancel', 'Cancel')}
|
||||
variant="destructive"
|
||||
onConfirm={async () => {
|
||||
if (channelToDelete) {
|
||||
await deleteChannel(channelToDelete.id);
|
||||
setChannelToDelete(null);
|
||||
}
|
||||
}}
|
||||
onCancel={() => setChannelToDelete(null)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -350,6 +364,7 @@ function AddChannelDialog({ selectedType, onSelectType, onClose, onChannelAdded
|
||||
const [validating, setValidating] = useState(false);
|
||||
const [loadingConfig, setLoadingConfig] = useState(false);
|
||||
const [isExistingConfig, setIsExistingConfig] = useState(false);
|
||||
const firstInputRef = useRef<HTMLInputElement>(null);
|
||||
const [validationResult, setValidationResult] = useState<{
|
||||
valid: boolean;
|
||||
errors: string[];
|
||||
@@ -403,6 +418,13 @@ function AddChannelDialog({ selectedType, onSelectType, onClose, onChannelAdded
|
||||
return () => { cancelled = true; };
|
||||
}, [selectedType]);
|
||||
|
||||
// Focus first input when form is ready (avoids Windows focus loss after native dialogs)
|
||||
useEffect(() => {
|
||||
if (selectedType && !loadingConfig && firstInputRef.current) {
|
||||
firstInputRef.current.focus();
|
||||
}
|
||||
}, [selectedType, loadingConfig]);
|
||||
|
||||
// Listen for WhatsApp QR events
|
||||
useEffect(() => {
|
||||
if (selectedType !== 'whatsapp') return;
|
||||
@@ -753,6 +775,7 @@ function AddChannelDialog({ selectedType, onSelectType, onClose, onChannelAdded
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="name">{t('dialog.channelName')}</Label>
|
||||
<Input
|
||||
ref={firstInputRef}
|
||||
id="name"
|
||||
placeholder={t('dialog.channelNamePlaceholder', { name: meta?.name })}
|
||||
value={channelName}
|
||||
|
||||
@@ -89,6 +89,13 @@ export function ChatInput({ onSend, onStop, disabled = false, sending = false }:
|
||||
}
|
||||
}, [input]);
|
||||
|
||||
// Focus textarea on mount (avoids Windows focus loss after session delete + native dialog)
|
||||
useEffect(() => {
|
||||
if (!disabled && textareaRef.current) {
|
||||
textareaRef.current.focus();
|
||||
}
|
||||
}, []);
|
||||
|
||||
// ── File staging via native dialog ─────────────────────────────
|
||||
|
||||
const pickFiles = useCallback(async () => {
|
||||
|
||||
@@ -28,6 +28,7 @@ import { Switch } from '@/components/ui/switch';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
import { ConfirmDialog } from '@/components/ui/confirm-dialog';
|
||||
import { useCronStore } from '@/stores/cron';
|
||||
import { useGatewayStore } from '@/stores/gateway';
|
||||
import { LoadingSpinner } from '@/components/common/LoadingSpinner';
|
||||
@@ -318,9 +319,7 @@ function CronJobCard({ job, onToggle, onEdit, onDelete, onTrigger }: CronJobCard
|
||||
};
|
||||
|
||||
const handleDelete = () => {
|
||||
if (confirm(t('card.deleteConfirm'))) {
|
||||
onDelete();
|
||||
}
|
||||
onDelete();
|
||||
};
|
||||
|
||||
return (
|
||||
@@ -442,6 +441,7 @@ export function Cron() {
|
||||
const gatewayStatus = useGatewayStore((state) => state.status);
|
||||
const [showDialog, setShowDialog] = useState(false);
|
||||
const [editingJob, setEditingJob] = useState<CronJob | undefined>();
|
||||
const [jobToDelete, setJobToDelete] = useState<{ id: string } | null>(null);
|
||||
|
||||
const isGatewayRunning = gatewayStatus.state === 'running';
|
||||
|
||||
@@ -474,14 +474,7 @@ export function Cron() {
|
||||
}
|
||||
}, [toggleJob, t]);
|
||||
|
||||
const handleDelete = useCallback(async (id: string) => {
|
||||
try {
|
||||
await deleteJob(id);
|
||||
toast.success(t('toast.deleted'));
|
||||
} catch {
|
||||
toast.error(t('toast.failedDelete'));
|
||||
}
|
||||
}, [deleteJob, t]);
|
||||
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
@@ -629,7 +622,7 @@ export function Cron() {
|
||||
setEditingJob(job);
|
||||
setShowDialog(true);
|
||||
}}
|
||||
onDelete={() => handleDelete(job.id)}
|
||||
onDelete={() => setJobToDelete({ id: job.id })}
|
||||
onTrigger={() => triggerJob(job.id)}
|
||||
/>
|
||||
))}
|
||||
@@ -647,6 +640,23 @@ export function Cron() {
|
||||
onSave={handleSave}
|
||||
/>
|
||||
)}
|
||||
|
||||
<ConfirmDialog
|
||||
open={!!jobToDelete}
|
||||
title={t('common.confirm', 'Confirm')}
|
||||
message={t('card.deleteConfirm')}
|
||||
confirmLabel={t('common.delete', 'Delete')}
|
||||
cancelLabel={t('common.cancel', 'Cancel')}
|
||||
variant="destructive"
|
||||
onConfirm={async () => {
|
||||
if (jobToDelete) {
|
||||
await deleteJob(jobToDelete.id);
|
||||
setJobToDelete(null);
|
||||
toast.success(t('toast.deleted'));
|
||||
}
|
||||
}}
|
||||
onCancel={() => setJobToDelete(null)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user