refactor(transcription): replace window.confirm with ConfirmService in TranscriptionBlock
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,7 +1,10 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { m } from '$lib/paraglide/messages.js';
|
import { m } from '$lib/paraglide/messages.js';
|
||||||
|
import { getConfirmService } from '$lib/services/confirm.svelte.js';
|
||||||
import CommentThread from './CommentThread.svelte';
|
import CommentThread from './CommentThread.svelte';
|
||||||
|
|
||||||
|
const { confirm } = getConfirmService();
|
||||||
|
|
||||||
type SaveState = 'idle' | 'saving' | 'saved' | 'fading' | 'error';
|
type SaveState = 'idle' | 'saving' | 'saved' | 'fading' | 'error';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -90,10 +93,12 @@ function handleInput(event: Event) {
|
|||||||
onTextChange(target.value);
|
onTextChange(target.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleDelete() {
|
async function handleDelete() {
|
||||||
if (confirm(m.transcription_block_delete_confirm())) {
|
const confirmed = await confirm({
|
||||||
onDeleteClick();
|
title: m.transcription_block_delete_confirm(),
|
||||||
}
|
destructive: true
|
||||||
|
});
|
||||||
|
if (confirmed) onDeleteClick();
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleTextareaMouseUp() {
|
function handleTextareaMouseUp() {
|
||||||
|
|||||||
@@ -1,25 +1,32 @@
|
|||||||
import { describe, it, expect, vi, afterEach } from 'vitest';
|
import { describe, it, expect, vi, afterEach } from 'vitest';
|
||||||
import { cleanup, render } from 'vitest-browser-svelte';
|
import { cleanup, render } from 'vitest-browser-svelte';
|
||||||
import { page } from 'vitest/browser';
|
import { page } from 'vitest/browser';
|
||||||
import TranscriptionBlock from './TranscriptionBlock.svelte';
|
import TranscriptionBlockHost from './TranscriptionBlock.test-host.svelte';
|
||||||
|
import type { ConfirmService } from '$lib/services/confirm.svelte.js';
|
||||||
|
|
||||||
afterEach(cleanup);
|
afterEach(cleanup);
|
||||||
|
|
||||||
|
const BASE_PROPS = {
|
||||||
|
blockId: 'block-1',
|
||||||
|
documentId: 'doc-1',
|
||||||
|
blockNumber: 3,
|
||||||
|
text: 'Liebe Mutter,',
|
||||||
|
label: null,
|
||||||
|
active: false,
|
||||||
|
saveState: 'idle' as const,
|
||||||
|
canComment: true,
|
||||||
|
currentUserId: 'user-1',
|
||||||
|
onTextChange: vi.fn(),
|
||||||
|
onFocus: vi.fn(),
|
||||||
|
onDeleteClick: vi.fn(),
|
||||||
|
onRetry: vi.fn()
|
||||||
|
};
|
||||||
|
|
||||||
|
// Renders TranscriptionBlock via the host, which provides ConfirmService context.
|
||||||
function renderBlock(overrides: Record<string, unknown> = {}) {
|
function renderBlock(overrides: Record<string, unknown> = {}) {
|
||||||
return render(TranscriptionBlock, {
|
return render(TranscriptionBlockHost, {
|
||||||
blockId: 'block-1',
|
...BASE_PROPS,
|
||||||
documentId: 'doc-1',
|
onServiceReady: () => {},
|
||||||
blockNumber: 3,
|
|
||||||
text: 'Liebe Mutter,',
|
|
||||||
label: null,
|
|
||||||
active: false,
|
|
||||||
saveState: 'idle' as const,
|
|
||||||
canComment: true,
|
|
||||||
currentUserId: 'user-1',
|
|
||||||
onTextChange: vi.fn(),
|
|
||||||
onFocus: vi.fn(),
|
|
||||||
onDeleteClick: vi.fn(),
|
|
||||||
onRetry: vi.fn(),
|
|
||||||
...overrides
|
...overrides
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -162,29 +169,57 @@ describe('TranscriptionBlock — reorder controls', () => {
|
|||||||
|
|
||||||
// ─── Delete confirmation ──────────────────────────────────────────────────────
|
// ─── Delete confirmation ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
describe('TranscriptionBlock — delete confirmation', () => {
|
function renderBlockWithService(overrides: Record<string, unknown> = {}) {
|
||||||
it('does not call onDeleteClick when user cancels confirm dialog', async () => {
|
let service!: ConfirmService;
|
||||||
const onDeleteClick = vi.fn();
|
render(TranscriptionBlockHost, {
|
||||||
vi.spyOn(window, 'confirm').mockReturnValue(false);
|
blockId: 'block-1',
|
||||||
renderBlock({ onDeleteClick });
|
documentId: 'doc-1',
|
||||||
|
blockNumber: 3,
|
||||||
|
text: 'Liebe Mutter,',
|
||||||
|
label: null,
|
||||||
|
active: false,
|
||||||
|
saveState: 'idle' as const,
|
||||||
|
canComment: true,
|
||||||
|
currentUserId: 'user-1',
|
||||||
|
onTextChange: vi.fn(),
|
||||||
|
onFocus: vi.fn(),
|
||||||
|
onDeleteClick: vi.fn(),
|
||||||
|
onRetry: vi.fn(),
|
||||||
|
onServiceReady: (s: ConfirmService) => {
|
||||||
|
service = s;
|
||||||
|
},
|
||||||
|
...overrides
|
||||||
|
});
|
||||||
|
return { service };
|
||||||
|
}
|
||||||
|
|
||||||
const deleteBtn = page.getByRole('button', { name: 'Löschen' });
|
describe('TranscriptionBlock — delete confirmation', () => {
|
||||||
await deleteBtn.click();
|
it('does not call onDeleteClick when user cancels via confirm service', async () => {
|
||||||
|
const onDeleteClick = vi.fn();
|
||||||
|
const { service } = renderBlockWithService({ onDeleteClick });
|
||||||
|
|
||||||
|
// Use native DOM click so the async handler starts but yields at the await,
|
||||||
|
// letting the test observe service.options and settle the promise.
|
||||||
|
const deleteBtn = document.querySelector('button[aria-label="Löschen"]') as HTMLButtonElement;
|
||||||
|
deleteBtn.click();
|
||||||
|
await vi.waitFor(() => expect(service.options).not.toBeNull());
|
||||||
|
service.settle(false);
|
||||||
|
await vi.waitFor(() => expect(service.options).toBeNull());
|
||||||
|
|
||||||
expect(onDeleteClick).not.toHaveBeenCalled();
|
expect(onDeleteClick).not.toHaveBeenCalled();
|
||||||
vi.restoreAllMocks();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it('calls onDeleteClick when user confirms deletion', async () => {
|
it('calls onDeleteClick when user confirms via confirm service', async () => {
|
||||||
const onDeleteClick = vi.fn();
|
const onDeleteClick = vi.fn();
|
||||||
vi.spyOn(window, 'confirm').mockReturnValue(true);
|
const { service } = renderBlockWithService({ onDeleteClick });
|
||||||
renderBlock({ onDeleteClick });
|
|
||||||
|
|
||||||
const deleteBtn = page.getByRole('button', { name: 'Löschen' });
|
const deleteBtn = document.querySelector('button[aria-label="Löschen"]') as HTMLButtonElement;
|
||||||
await deleteBtn.click();
|
deleteBtn.click();
|
||||||
|
await vi.waitFor(() => expect(service.options).not.toBeNull());
|
||||||
|
service.settle(true);
|
||||||
|
await vi.waitFor(() => expect(service.options).toBeNull());
|
||||||
|
|
||||||
expect(onDeleteClick).toHaveBeenCalledOnce();
|
expect(onDeleteClick).toHaveBeenCalledOnce();
|
||||||
vi.restoreAllMocks();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { provideConfirmService, type ConfirmService } from '$lib/services/confirm.svelte.js';
|
||||||
|
import TranscriptionBlock from './TranscriptionBlock.svelte';
|
||||||
|
|
||||||
|
type BlockProps = {
|
||||||
|
blockId: string;
|
||||||
|
documentId: string;
|
||||||
|
blockNumber: number;
|
||||||
|
text: string;
|
||||||
|
label: string | null;
|
||||||
|
active: boolean;
|
||||||
|
saveState: 'idle' | 'saving' | 'saved' | 'fading' | 'error';
|
||||||
|
canComment: boolean;
|
||||||
|
currentUserId: string | null;
|
||||||
|
onTextChange: (text: string) => void;
|
||||||
|
onFocus: () => void;
|
||||||
|
onDeleteClick: () => void;
|
||||||
|
onRetry: () => void;
|
||||||
|
onMoveUp?: () => void;
|
||||||
|
onMoveDown?: () => void;
|
||||||
|
isFirst?: boolean;
|
||||||
|
isLast?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
let {
|
||||||
|
onServiceReady,
|
||||||
|
...blockProps
|
||||||
|
}: BlockProps & {
|
||||||
|
onServiceReady: (s: ConfirmService) => void;
|
||||||
|
} = $props();
|
||||||
|
|
||||||
|
const service = provideConfirmService();
|
||||||
|
onServiceReady(service);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<TranscriptionBlock {...blockProps} />
|
||||||
Reference in New Issue
Block a user