feat: add timestamp toggle and request name to terminal log tiles

This commit is contained in:
Udhay-Adithya
2025-09-14 01:26:37 +05:30
parent 9463c47a9d
commit eb4dcfe5d3
2 changed files with 125 additions and 13 deletions

View File

@@ -3,6 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../models/terminal/models.dart'; import '../../models/terminal/models.dart';
import '../../consts.dart'; import '../../consts.dart';
import '../../providers/terminal_providers.dart'; import '../../providers/terminal_providers.dart';
import '../../providers/collection_providers.dart';
import '../../widgets/button_copy.dart'; import '../../widgets/button_copy.dart';
import '../../widgets/field_search.dart'; import '../../widgets/field_search.dart';
import '../../widgets/terminal_tiles.dart'; import '../../widgets/terminal_tiles.dart';
@@ -18,6 +19,7 @@ class TerminalPage extends ConsumerStatefulWidget {
class _TerminalPageState extends ConsumerState<TerminalPage> { class _TerminalPageState extends ConsumerState<TerminalPage> {
final TextEditingController _searchCtrl = TextEditingController(); final TextEditingController _searchCtrl = TextEditingController();
bool _showTimestamps = false; // user toggle
// Initially all levels will be selected // Initially all levels will be selected
final Set<TerminalLevel> _selectedLevels = { final Set<TerminalLevel> _selectedLevels = {
@@ -36,6 +38,8 @@ class _TerminalPageState extends ConsumerState<TerminalPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final state = ref.watch(terminalStateProvider); final state = ref.watch(terminalStateProvider);
final collection = ref.watch(collectionStateNotifierProvider);
final selectedId = ref.watch(selectedIdStateProvider);
final allEntries = state.entries; final allEntries = state.entries;
final filtered = _applyFilters(allEntries); final filtered = _applyFilters(allEntries);
@@ -58,13 +62,46 @@ class _TerminalPageState extends ConsumerState<TerminalPage> {
separatorBuilder: (_, __) => const Divider(height: 1), separatorBuilder: (_, __) => const Divider(height: 1),
itemBuilder: (ctx, i) { itemBuilder: (ctx, i) {
final e = filtered[filtered.length - 1 - i]; final e = filtered[filtered.length - 1 - i];
String requestName = '';
if (e.source == TerminalSource.js) {
if (selectedId != null) {
final model = collection?[selectedId];
if (model != null) {
requestName =
model.name.isNotEmpty ? model.name : model.id;
} else {
requestName = selectedId;
}
}
} else if (e.requestId != null) {
final model = collection?[e.requestId];
if (model != null) {
requestName =
model.name.isNotEmpty ? model.name : model.id;
} else {
requestName = e.requestId!;
}
}
switch (e.source) { switch (e.source) {
case TerminalSource.js: case TerminalSource.js:
return JsLogTile(entry: e); return JsLogTile(
entry: e,
showTimestamp: _showTimestamps,
requestName:
requestName.isNotEmpty ? requestName : null,
);
case TerminalSource.network: case TerminalSource.network:
return NetworkLogTile(entry: e); return NetworkLogTile(
entry: e,
showTimestamp: _showTimestamps,
requestName:
requestName.isNotEmpty ? requestName : null,
);
case TerminalSource.system: case TerminalSource.system:
return SystemLogTile(entry: e); return SystemLogTile(
entry: e,
showTimestamp: _showTimestamps,
);
} }
}, },
), ),
@@ -96,6 +133,22 @@ class _TerminalPageState extends ConsumerState<TerminalPage> {
..addAll(set); ..addAll(set);
}), }),
), ),
const SizedBox(width: 4),
Tooltip(
message: 'Show timestamps',
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Checkbox(
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
value: _showTimestamps,
onChanged: (v) =>
setState(() => _showTimestamps = v ?? false),
),
const Text('Timestamp', style: TextStyle(fontSize: 12)),
],
),
),
const Spacer(), const Spacer(),
// Clear button // Clear button

View File

@@ -4,8 +4,10 @@ import '../models/terminal/models.dart';
import 'expandable_section.dart'; import 'expandable_section.dart';
class SystemLogTile extends StatelessWidget { class SystemLogTile extends StatelessWidget {
const SystemLogTile({super.key, required this.entry}); const SystemLogTile(
{super.key, required this.entry, this.showTimestamp = false});
final TerminalEntry entry; final TerminalEntry entry;
final bool showTimestamp;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
assert(entry.system != null, 'System tile requires SystemLogData'); assert(entry.system != null, 'System tile requires SystemLogData');
@@ -35,10 +37,17 @@ class SystemLogTile extends StatelessWidget {
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( if (showTimestamp) ...[
padding: const EdgeInsets.only(top: 2, right: 8), Padding(
child: Icon(icon, size: 18, color: iconColor), padding: const EdgeInsets.only(top: 2, right: 8),
), child: Text(_formatTs(entry.ts), style: subStyle),
),
] else ...[
Padding(
padding: const EdgeInsets.only(top: 2, right: 8),
child: Icon(icon, size: 18, color: iconColor),
),
],
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -58,8 +67,14 @@ class SystemLogTile extends StatelessWidget {
} }
class JsLogTile extends StatelessWidget { class JsLogTile extends StatelessWidget {
const JsLogTile({super.key, required this.entry}); const JsLogTile(
{super.key,
required this.entry,
this.showTimestamp = false,
this.requestName});
final TerminalEntry entry; final TerminalEntry entry;
final bool showTimestamp;
final String? requestName;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
assert(entry.js != null, 'JS tile requires JsLogData'); assert(entry.js != null, 'JS tile requires JsLogData');
@@ -83,13 +98,29 @@ class JsLogTile extends StatelessWidget {
case TerminalLevel.debug: case TerminalLevel.debug:
break; break;
} }
final bodyParts = <String>[];
if (requestName != null && requestName!.isNotEmpty) {
bodyParts.add('[$requestName]');
}
// Add JS level/context prefix to disambiguate
if (j.context != null && j.context!.isNotEmpty) {
bodyParts.add('(${j.context})');
}
bodyParts.addAll(j.args);
final bodyText = bodyParts.join(' ');
return Container( return Container(
color: bg, color: bg,
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (icon != null) ...[ if (showTimestamp) ...[
Padding(
padding: const EdgeInsets.only(top: 2, right: 8),
child: Text(_formatTs(entry.ts),
style: Theme.of(context).textTheme.bodySmall),
),
] else if (icon != null) ...[
Padding( Padding(
padding: const EdgeInsets.only(top: 2, right: 8), padding: const EdgeInsets.only(top: 2, right: 8),
child: Icon(icon, size: 18, color: iconColor), child: Icon(icon, size: 18, color: iconColor),
@@ -97,7 +128,7 @@ class JsLogTile extends StatelessWidget {
], ],
Expanded( Expanded(
child: SelectableText( child: SelectableText(
j.args.join(' '), bodyText,
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium,
), ),
), ),
@@ -108,8 +139,14 @@ class JsLogTile extends StatelessWidget {
} }
class NetworkLogTile extends StatefulWidget { class NetworkLogTile extends StatefulWidget {
const NetworkLogTile({super.key, required this.entry}); const NetworkLogTile(
{super.key,
required this.entry,
this.showTimestamp = false,
this.requestName});
final TerminalEntry entry; final TerminalEntry entry;
final bool showTimestamp;
final String? requestName;
@override @override
State<NetworkLogTile> createState() => _NetworkLogTileState(); State<NetworkLogTile> createState() => _NetworkLogTileState();
} }
@@ -123,6 +160,11 @@ class _NetworkLogTileState extends State<NetworkLogTile> {
final status = n.responseStatus != null ? '${n.responseStatus}' : null; final status = n.responseStatus != null ? '${n.responseStatus}' : null;
final duration = final duration =
n.duration != null ? '${n.duration!.inMilliseconds} ms' : null; n.duration != null ? '${n.duration!.inMilliseconds} ms' : null;
final title = [
if (widget.requestName != null && widget.requestName!.isNotEmpty)
'[${widget.requestName}]',
methodUrl,
].join(' ');
return Column( return Column(
children: [ children: [
InkWell( InkWell(
@@ -131,9 +173,18 @@ class _NetworkLogTileState extends State<NetworkLogTile> {
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
child: Row( child: Row(
children: [ children: [
if (widget.showTimestamp) ...[
Padding(
padding: const EdgeInsets.only(right: 8),
child: Text(
_formatTs(widget.entry.ts),
style: Theme.of(context).textTheme.bodySmall,
),
),
],
Expanded( Expanded(
child: Text( child: Text(
methodUrl, title,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium, style: Theme.of(context).textTheme.bodyMedium,
@@ -220,3 +271,11 @@ class NetworkDetails extends StatelessWidget {
return SelectableText(lines); return SelectableText(lines);
} }
} }
String _formatTs(DateTime ts) {
// Show only time (HH:mm:ss) for compactness
final h = ts.hour.toString().padLeft(2, '0');
final m = ts.minute.toString().padLeft(2, '0');
final s = ts.second.toString().padLeft(2, '0');
return '$h:$m:$s';
}