-
-
- Showing {renderedResults.length} of {visibleResults.length} results. Use filters, search, or sorting to narrow down.
-
-
- ) : visibleResults.length > 50 && (
-
-
Showing {visibleResults.length} results. Use filters, search, or sorting to narrow down.
+ {visibleResults.length > 0 && (
+
+
+
+ Showing {pageStart + 1}–{Math.min(pageStart + RESULTS_PAGE_SIZE, visibleResults.length)} of {visibleResults.length} results
+
+ {pageCount > 1 && (
+
+ )}
+
)}
diff --git a/frontend/src/features/results/htmlExportLimits.ts b/frontend/src/features/results/htmlExportLimits.ts
index 3de091a..28ca766 100644
--- a/frontend/src/features/results/htmlExportLimits.ts
+++ b/frontend/src/features/results/htmlExportLimits.ts
@@ -12,15 +12,15 @@ export class HtmlExportLimitError extends Error {
readonly limit: number,
) {
const description = kind === 'rows'
- ? `HTML export supports at most ${limit.toLocaleString()} rows; this result set has ${actual.toLocaleString()}.`
- : `HTML export ${kind} exceeds the ${formatMiB(limit)} MiB limit (${actual.toLocaleString()} UTF-8 bytes).`;
+ ? `HTML export supports at most ${limit.toLocaleString('en-US')} rows; this result set has ${actual.toLocaleString('en-US')}.`
+ : `HTML export ${kind} exceeds the ${formatMiB(limit)} MiB limit (${actual.toLocaleString('en-US')} UTF-8 bytes).`;
super(`${description} Use CSV export or reduce the result set.`);
}
}
function formatMiB(bytes: number): string {
- return (bytes / (1024 * 1024)).toLocaleString();
+ return (bytes / (1024 * 1024)).toLocaleString('en-US');
}
export function utf8ByteLength(value: string): number {
diff --git a/frontend/src/hooks/useComparisonWorkflow.auto-pair.test.ts b/frontend/src/hooks/useComparisonWorkflow.auto-pair.test.ts
index 0b1b20f..e291cba 100644
--- a/frontend/src/hooks/useComparisonWorkflow.auto-pair.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.auto-pair.test.ts
@@ -19,6 +19,7 @@ vi.mock('../services/tauri', () => ({
DIALOG_CANCELLED: 'cancelled',
compareFiles: compareFilesMock,
createSession: createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
downloadBlob: vi.fn(),
exportResults: vi.fn(),
isTauri: false,
diff --git a/frontend/src/hooks/useComparisonWorkflow.json-fields.test.ts b/frontend/src/hooks/useComparisonWorkflow.json-fields.test.ts
index c29032c..21ac4ef 100644
--- a/frontend/src/hooks/useComparisonWorkflow.json-fields.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.json-fields.test.ts
@@ -25,6 +25,7 @@ vi.mock('../services/tauri', () => ({
DIALOG_CANCELLED: 'cancelled',
compareFiles: compareFilesMock,
createSession: createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
exportResults: vi.fn(),
isTauri: false,
loadComparisonSnapshot: vi.fn(),
diff --git a/frontend/src/hooks/useComparisonWorkflow.pair-order.test.ts b/frontend/src/hooks/useComparisonWorkflow.pair-order.test.ts
index 2c85b01..2ccaf14 100644
--- a/frontend/src/hooks/useComparisonWorkflow.pair-order.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.pair-order.test.ts
@@ -28,6 +28,7 @@ vi.mock('../services/tauri', () => ({
DIALOG_CANCELLED: 'cancelled',
compareFiles: compareFilesMock,
createSession: createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
exportResults: vi.fn(),
isTauri: false,
loadComparisonSnapshot: loadComparisonSnapshotMock,
diff --git a/frontend/src/hooks/useComparisonWorkflow.snapshot-read-only.test.ts b/frontend/src/hooks/useComparisonWorkflow.snapshot-read-only.test.ts
index 9c9a19e..1d15975 100644
--- a/frontend/src/hooks/useComparisonWorkflow.snapshot-read-only.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.snapshot-read-only.test.ts
@@ -24,6 +24,7 @@ vi.mock('../services/tauri', () => ({
DIALOG_CANCELLED: 'cancelled',
compareFiles: compareFilesMock,
createSession: createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
downloadBlob: vi.fn(),
exportResults: vi.fn(),
isTauri: false,
diff --git a/frontend/src/hooks/useComparisonWorkflow.snapshot.test.ts b/frontend/src/hooks/useComparisonWorkflow.snapshot.test.ts
index 0aac908..1965640 100644
--- a/frontend/src/hooks/useComparisonWorkflow.snapshot.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.snapshot.test.ts
@@ -18,6 +18,7 @@ vi.mock('../services/tauri', () => ({
DIALOG_CANCELLED: 'cancelled',
compareFiles: vi.fn(),
createSession: createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
exportResults: vi.fn(),
isTauri: false,
loadComparisonSnapshot: loadComparisonSnapshotMock,
diff --git a/frontend/src/hooks/useComparisonWorkflow.test.ts b/frontend/src/hooks/useComparisonWorkflow.test.ts
index 87c8099..5f2e64b 100644
--- a/frontend/src/hooks/useComparisonWorkflow.test.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.test.ts
@@ -1001,32 +1001,6 @@ test('keeps public handlers stable across rerenders when their dependencies do n
expect(result.current.handleContinueToConfigure).toBe(initialHandlers.handleContinueToConfigure);
});
-test('reset creates a replacement session when the outgoing session is already missing', async () => {
- createSessionMock
- .mockResolvedValueOnce({ session_id: 'session-1' })
- .mockResolvedValueOnce({ session_id: 'session-2' });
- deleteSessionMock.mockRejectedValueOnce({ code: 'not_found', error: 'Session not found' });
-
- const { result } = renderHook(() => useComparisonWorkflow());
-
- await waitFor(() => {
- expect(result.current.state.sessionId).toBe('session-1');
- });
-
- await act(async () => {
- await result.current.handleReset();
- });
-
- await waitFor(() => {
- expect(result.current.state.sessionId).toBe('session-2');
- });
-
- expect(deleteSessionMock).toHaveBeenCalledWith('session-1');
- expect(createSessionMock).toHaveBeenCalledTimes(2);
- expect(result.current.state.error).toBeNull();
- expect(result.current.step).toBe('select');
-});
-
test('surfaces a reset error when deleting the outgoing session fails', async () => {
createSessionMock.mockResolvedValueOnce({ session_id: 'session-1' });
deleteSessionMock.mockRejectedValueOnce(new Error('delete failed'));
diff --git a/frontend/src/hooks/useComparisonWorkflow.ts b/frontend/src/hooks/useComparisonWorkflow.ts
index e56ff55..e662731 100644
--- a/frontend/src/hooks/useComparisonWorkflow.ts
+++ b/frontend/src/hooks/useComparisonWorkflow.ts
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useReducer, useRef } from 'react';
import type { ComparisonNormalizationConfig } from '../types/api';
-import type { MappingSelectionState } from '../types/ui';
+import type { MappingSelectionState, WorkflowRequestToken } from '../types/ui';
import {
INITIAL_WORKFLOW_STATE,
SNAPSHOT_READ_ONLY_ERROR,
@@ -14,7 +14,6 @@ import { useWorkflowNavigation } from './useWorkflowNavigation';
import {
SUPERSEDED_OPERATION_KINDS,
type WorkflowOperationKind,
- type WorkflowRequestToken,
} from './workflowRequestToken';
export function useComparisonWorkflow() {
diff --git a/frontend/src/hooks/useWorkflowComparisonActions.ts b/frontend/src/hooks/useWorkflowComparisonActions.ts
index 4577292..1b4f63d 100644
--- a/frontend/src/hooks/useWorkflowComparisonActions.ts
+++ b/frontend/src/hooks/useWorkflowComparisonActions.ts
@@ -2,14 +2,11 @@ import { useCallback, type Dispatch } from 'react';
import { buildAutoPairSelection } from '../features/mapping/autoPair';
import { compareFiles, loadFile, suggestMappings } from '../services/tauri';
import type { ComparisonNormalizationConfig, FileLetter, MappingDto } from '../types/api';
-import type { MappingSelectionState, SelectedFileSource } from '../types/ui';
+import type { MappingSelectionState, SelectedFileSource, WorkflowRequestToken } from '../types/ui';
import { buildCompareRequestPayload, type WorkflowAction, type WorkflowState } from './useComparisonWorkflow.reducer';
import { getSelectedFileName } from '../utils/selectedFileSource';
import { isSupersededError } from '../services/http';
-import type {
- WorkflowOperationKind,
- WorkflowRequestToken,
-} from './workflowRequestToken';
+import type { WorkflowOperationKind } from './workflowRequestToken';
interface UseWorkflowComparisonActionsParams {
state: WorkflowState['appState'];
diff --git a/frontend/src/hooks/useWorkflowPersistenceActions.ts b/frontend/src/hooks/useWorkflowPersistenceActions.ts
index 7e0da04..7ce9b3d 100644
--- a/frontend/src/hooks/useWorkflowPersistenceActions.ts
+++ b/frontend/src/hooks/useWorkflowPersistenceActions.ts
@@ -10,16 +10,13 @@ import {
saveComparisonSnapshot,
savePairOrder,
} from '../services/tauri';
-import type { MappingSelectionState } from '../types/ui';
+import type { MappingSelectionState, WorkflowRequestToken } from '../types/ui';
import {
type WorkflowAction,
type WorkflowState,
} from './useComparisonWorkflow.reducer';
import { isSupersededError } from '../services/http';
-import type {
- WorkflowOperationKind,
- WorkflowRequestToken,
-} from './workflowRequestToken';
+import type { WorkflowOperationKind } from './workflowRequestToken';
interface UseWorkflowPersistenceActionsParams {
state: WorkflowState['appState'];
diff --git a/frontend/src/hooks/useWorkflowSessionLifecycle.ts b/frontend/src/hooks/useWorkflowSessionLifecycle.ts
index 043781d..02ccab3 100644
--- a/frontend/src/hooks/useWorkflowSessionLifecycle.ts
+++ b/frontend/src/hooks/useWorkflowSessionLifecycle.ts
@@ -1,5 +1,6 @@
import { useCallback, useEffect, useRef, type Dispatch } from 'react';
import { createSession, deleteSession } from '../services/tauri';
+import type { WorkflowRequestToken } from '../types/ui';
import type { WorkflowAction, WorkflowState } from './useComparisonWorkflow.reducer';
interface UseWorkflowSessionLifecycleParams {
@@ -11,33 +12,6 @@ interface UseWorkflowSessionLifecycleParams {
advanceWorkflowGeneration: () => void;
}
-type WorkflowRequestToken = {
- sessionId: string | null;
- generation: number;
- mutation: number;
-};
-
-function isSessionNotFoundError(error: unknown): boolean {
- if (typeof error !== 'object' || error === null) {
- return false;
- }
-
- const candidate = error as { code?: unknown; error?: unknown; message?: unknown };
- return candidate.code === 'not_found'
- || candidate.error === 'Session not found'
- || candidate.message === 'Session not found';
-}
-
-async function deleteSessionIfPresent(sessionId: string) {
- try {
- await deleteSession(sessionId);
- } catch (error) {
- if (!isSessionNotFoundError(error)) {
- throw error;
- }
- }
-}
-
export function useWorkflowSessionLifecycle({
state,
dispatch,
@@ -62,7 +36,7 @@ export function useWorkflowSessionLifecycle({
sessionToDeleteOnUnmountRef.current = response.session_id;
dispatch({ type: 'sessionCreated', sessionId: response.session_id });
} else {
- await deleteSessionIfPresent(response.session_id);
+ await deleteSession(response.session_id);
}
} catch (error) {
if (!cancelled && mountedRef.current && isCurrentWorkflowRequest(token)) {
@@ -78,7 +52,7 @@ export function useWorkflowSessionLifecycle({
mountedRef.current = false;
if (sessionToDeleteOnUnmountRef.current) {
- void deleteSessionIfPresent(sessionToDeleteOnUnmountRef.current).catch(() => undefined);
+ void deleteSession(sessionToDeleteOnUnmountRef.current).catch(() => undefined);
}
};
}, [beginWorkflowRequest, dispatch, isCurrentWorkflowRequest, setWorkflowError]);
@@ -91,14 +65,14 @@ export function useWorkflowSessionLifecycle({
try {
if (outgoingSessionId) {
- await deleteSessionIfPresent(outgoingSessionId);
+ await deleteSession(outgoingSessionId);
}
const response = await createSession();
if (mountedRef.current && isCurrentWorkflowRequest(token)) {
sessionToDeleteOnUnmountRef.current = response.session_id;
dispatch({ type: 'sessionCreated', sessionId: response.session_id });
} else {
- await deleteSessionIfPresent(response.session_id);
+ await deleteSession(response.session_id);
}
} catch (error) {
if (mountedRef.current && isCurrentWorkflowRequest(token)) {
diff --git a/frontend/src/hooks/workflowRequestToken.ts b/frontend/src/hooks/workflowRequestToken.ts
index ce08440..2c433a9 100644
--- a/frontend/src/hooks/workflowRequestToken.ts
+++ b/frontend/src/hooks/workflowRequestToken.ts
@@ -1,16 +1,7 @@
-export type WorkflowOperationKind =
- | 'file_a'
- | 'file_b'
- | 'compare'
- | 'snapshot_restore';
+import type { WorkflowOperationKind } from '../types/ui';
+
+export type { WorkflowOperationKind } from '../types/ui';
-export type WorkflowRequestToken = {
- sessionId: string | null;
- generation: number;
- mutation: number;
- operationKind?: WorkflowOperationKind;
- operationSequence?: number;
-};
export const SUPERSEDED_OPERATION_KINDS: Record<
WorkflowOperationKind,
diff --git a/frontend/src/test/fixtures.tsx b/frontend/src/test/fixtures.tsx
index 1455e03..9f02a5a 100644
--- a/frontend/src/test/fixtures.tsx
+++ b/frontend/src/test/fixtures.tsx
@@ -19,6 +19,7 @@ vi.mock('../services/tauri', () => ({
isTauri: false,
DIALOG_CANCELLED: 'cancelled',
createSession: appTauriMocks.createSessionMock,
+ deleteSession: vi.fn().mockResolvedValue(undefined),
loadFile: appTauriMocks.loadFileMock,
compareFiles: appTauriMocks.compareFilesMock,
exportResults: appTauriMocks.exportResultsMock,
diff --git a/frontend/src/types/ui.ts b/frontend/src/types/ui.ts
index 1543227..04df7be 100644
--- a/frontend/src/types/ui.ts
+++ b/frontend/src/types/ui.ts
@@ -11,6 +11,19 @@ export interface AppFile {
}
export type SelectedFileSource = File | string;
+export type WorkflowOperationKind =
+ | 'file_a'
+ | 'file_b'
+ | 'compare'
+ | 'snapshot_restore';
+
+export interface WorkflowRequestToken {
+ sessionId: string | null;
+ generation: number;
+ mutation: number;
+ operationKind?: WorkflowOperationKind;
+ operationSequence?: number;
+}
export interface MappingSelectionState {
keyColumnsA: string[];
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 541f20b..bfa2137 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -514,7 +514,7 @@ dependencies = [
[[package]]
name = "csv-align"
-version = "2.2.0"
+version = "2.2.1"
dependencies = [
"axum",
"chrono",
@@ -535,7 +535,7 @@ dependencies = [
[[package]]
name = "csv-align-app"
-version = "2.2.0"
+version = "2.2.1"
dependencies = [
"anyhow",
"csv-align",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index ebfcab9..2b74d56 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "csv-align-app"
-version = "2.2.0"
+version = "2.2.1"
edition = "2024"
description = "CSV file comparison desktop application"
license = "MIT"
diff --git a/src-tauri/appstream/com.csvalign.desktop.metainfo.xml b/src-tauri/appstream/com.csvalign.desktop.metainfo.xml
index c62aa37..4adbdea 100644
--- a/src-tauri/appstream/com.csvalign.desktop.metainfo.xml
+++ b/src-tauri/appstream/com.csvalign.desktop.metainfo.xml
@@ -17,6 +17,7 @@