Skip to content

UI: dry-run preview — render server details (predicted rename/actions) #19

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
merged 9 commits into from
Sep 26, 2025
Merged

UI: dry-run preview — render server details (predicted rename/actions) #19

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d4ab62
feat(category): restore management page import flow; use dry-run prev…
zensgit Sep 19, 2025
8cef9ac
feat(api): templates list pagination (page/per_page) + ETag support (…
zensgit Sep 19, 2025
091c8d3
feat(templates): add ETag + pagination fetch (client) and result wrapper
zensgit Sep 19, 2025
d6b01d4
fix: 修复Flutter编译错误和Provider缺失问题
zensgit Sep 19, 2025
23e1ab0
Merge branch 'main' into pr/templates-etag-frontend
zensgit Sep 19, 2025
4260fce
feat(ui): template import dialog — add ETag pagination (Load more) us…
zensgit Sep 19, 2025
b8dcfea
feat(api): dry_run details — predicted rename, existing category summ…
zensgit Sep 19, 2025
74aa573
feat(ui): dry-run preview renders server details (predicted rename / …
zensgit Sep 19, 2025
6dd6bd0
resolve merge conflicts: keep PR UI for category_management_enhanced.…
zensgit Sep 26, 2025
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
36 changes: 26 additions & 10 deletions jive-flutter/lib/screens/management/category_management_enhanced.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:jive_money/models/category.dart';
import 'package:jive_money/models/category_template.dart';
import 'package:jive_money/providers/category_provider.dart';
import 'package:jive_money/providers/ledger_provider.dart';
import 'package:jive_money/services/api/category_service.dart';
import 'package:jive_money/widgets/bottom_sheets/import_details_sheet.dart';
import '../../models/category.dart';
import '../../models/category_template.dart';
import '../../providers/category_provider.dart';
import '../../providers/ledger_provider.dart';
import '../../services/api/category_service.dart';
import '../../widgets/bottom_sheets/import_details_sheet.dart';

class CategoryManagementEnhancedPage extends ConsumerStatefulWidget {
const CategoryManagementEnhancedPage({super.key});
Expand All @@ -17,6 +17,22 @@ class CategoryManagementEnhancedPage extends ConsumerStatefulWidget {
class _CategoryManagementEnhancedPageState extends ConsumerState<CategoryManagementEnhancedPage> {
bool _busy = false;

String _renderDryRunSubtitle(ImportActionDetail d) {
switch (d.action) {
case 'renamed':
return '将重命名' + (d.predictedName != null ? ' → ${d.predictedName}' : '');
Copy link

Copilot AI Sep 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the 'renamed' case, if predictedName is absent but finalName is present, the subtitle omits the target name. Consider falling back to finalName so users always see the rename target: for example, use final target = d.predictedName ?? d.finalName ?? d.originalName; then return '将重命名 → $target'.

Suggested change
return '将重命名' + (d.predictedName != null ? ' → ${d.predictedName}' : '');
final target = d.predictedName ?? d.finalName ?? d.originalName;
return '将重命名' + (target != null ? ' → $target' : '');

Copilot uses AI. Check for mistakes.

case 'updated':
return '将覆盖同名分类';
case 'skipped':
return '将跳过' + (d.reason != null ? '（${d.reason}）' : '');
case 'failed':
return '预检失败' + (d.reason != null ? '（${d.reason}）' : '');
case 'imported':
default:
return '将创建';
}
}

@override
Widget build(BuildContext context) {
return Scaffold(
Expand Down Expand Up @@ -183,8 +199,8 @@ class _CategoryManagementEnhancedPageState extends ConsumerState<CategoryManagem
final color = (d.action == 'failed' || d.action == 'skipped') ? Colors.orange : Colors.green;
return ListTile(
dense: true,
title: Text(d.finalName ?? d.originalName),
subtitle: Text(d.action + (d.reason!=null ? ' (${d.reason})' : '')),
title: Text(d.predictedName ?? d.finalName ?? d.originalName),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The UI is attempting to use d.predictedName, but the ImportActionDetail class in lib/services/api/category_service.dart does not seem to have this field defined. This will lead to a compile-time or runtime error.

The backend has been updated to provide predicted_name, so the frontend ImportActionDetail model needs to be updated accordingly to include this new field and parse it from the JSON response.

subtitle: Text(_renderDryRunSubtitle(d)),
trailing: Icon(
d.action == 'failed' ? Icons.error : (d.action=='skipped'? Icons.warning_amber : Icons.check_circle),
color: color,
Expand Down Expand Up @@ -239,8 +255,8 @@ class _CategoryManagementEnhancedPageState extends ConsumerState<CategoryManagem
child: const Text('确认导入'),
),
],
),
);
);
});
},
);
}
Expand Down
Loading