From 3085de9f3081c4b490130182e2aecb2dfda06b4b Mon Sep 17 00:00:00 2001 From: Alan Silva Date: Thu, 22 Oct 2026 22:37:27 +0100 Subject: [PATCH] feat(app): chat row refusals can be dismissed with OK --- .../chat/ui/sessions/chat_adaptive.dart | 37 +++++++++++++++++-- .../chat/ui/sessions/chat_sessions_body.dart | 4 ++ .../ui/sessions/chat_sessions_controller.dart | 5 +++ .../ui/sessions/chat_sessions_screen.dart | 1 + .../ui/sessions/session_list_cupertino.dart | 8 +++- .../ui/sessions/session_list_material.dart | 8 +++- .../chat_session_shared_actions_test.dart | 7 ++++ 7 files changed, 64 insertions(+), 6 deletions(-) diff --git a/app/lib/features/chat/ui/sessions/chat_adaptive.dart b/app/lib/features/chat/ui/sessions/chat_adaptive.dart index 0607e926..beedac9f 100644 --- a/app/lib/features/chat/ui/sessions/chat_adaptive.dart +++ b/app/lib/features/chat/ui/sessions/chat_adaptive.dart @@ -166,10 +166,18 @@ class ChatCupertinoMessage extends StatelessWidget { /// first few words. Full width also stops a long refusal from turning a single /// Material row into a column taller than the viewport. class ChatRowError extends StatelessWidget { - const ChatRowError({super.key, required this.message, this.messageKey}); + const ChatRowError({ + super.key, + required this.message, + this.messageKey, + this.onDismiss, + }); final String message; + /// Clears this refusal; its control reads the web report's `OK`. + final VoidCallback? onDismiss; + /// Key placed on the message paragraph itself, so a test can assert that the /// rendered text did not exceed its line limit. final Key? messageKey; @@ -185,9 +193,30 @@ class ChatRowError extends StatelessWidget { : TextStyle(color: Theme.of(context).colorScheme.error); return Padding( padding: const EdgeInsetsDirectional.fromSTEB(16, 0, 16, 12), - child: DefaultTextStyle.merge( - style: style, - child: Text(message, key: messageKey), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: DefaultTextStyle.merge( + style: style, + child: Text(message, key: messageKey), + ), + ), + if (onDismiss != null) + Semantics( + button: true, + label: 'Dismiss refusal', + excludeSemantics: true, + child: cupertino + ? CupertinoButton( + padding: const EdgeInsetsDirectional.only(start: 8), + minimumSize: Size.zero, + onPressed: onDismiss, + child: const Text('OK'), + ) + : TextButton(onPressed: onDismiss, child: const Text('OK')), + ), + ], ), ); } diff --git a/app/lib/features/chat/ui/sessions/chat_sessions_body.dart b/app/lib/features/chat/ui/sessions/chat_sessions_body.dart index 0b545b18..7b405e4b 100644 --- a/app/lib/features/chat/ui/sessions/chat_sessions_body.dart +++ b/app/lib/features/chat/ui/sessions/chat_sessions_body.dart @@ -26,6 +26,7 @@ class ChatSessionsBody extends StatelessWidget { required this.onClearSearch, required this.isUnseen, required this.errorFor, + this.onDismissError, }); final List sessions; @@ -41,6 +42,7 @@ class ChatSessionsBody extends StatelessWidget { final VoidCallback onClearSearch; final bool Function(JsonMap) isUnseen; final String? Function(String sessionId) errorFor; + final ValueChanged? onDismissError; @override Widget build(BuildContext context) { @@ -89,6 +91,7 @@ class ChatSessionsBody extends StatelessWidget { onClearSearch: clearSearch, isUnseen: isUnseen, errorFor: errorFor, + onDismissError: onDismissError, ); } return MaterialSessionList( @@ -104,6 +107,7 @@ class ChatSessionsBody extends StatelessWidget { onClearSearch: clearSearch, isUnseen: isUnseen, errorFor: errorFor, + onDismissError: onDismissError, ); } } diff --git a/app/lib/features/chat/ui/sessions/chat_sessions_controller.dart b/app/lib/features/chat/ui/sessions/chat_sessions_controller.dart index 486892d1..d5dba163 100644 --- a/app/lib/features/chat/ui/sessions/chat_sessions_controller.dart +++ b/app/lib/features/chat/ui/sessions/chat_sessions_controller.dart @@ -81,6 +81,11 @@ class ChatSessionsController extends ChangeNotifier { /// The row an action failed on; the message is the server's own words. String? errorFor(String sessionId) => _actionErrors[sessionId]; + /// The operator acknowledged [sessionId]'s refusal; nothing is sent. + void dismissError(String sessionId) { + if (_actionErrors.remove(sessionId) != null) _notify(); + } + /// The last hidden session, while its Undo is still offered. String? get lastHidden => _lastHidden; diff --git a/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart b/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart index 1815db8a..1d40e529 100644 --- a/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart +++ b/app/lib/features/chat/ui/sessions/chat_sessions_screen.dart @@ -199,6 +199,7 @@ class _ChatSessionsScreenState extends State { }, isUnseen: _controller.isUnseen, errorFor: _controller.errorFor, + onDismissError: _controller.dismissError, ), // The web's hide report is a fixed overlay: replacing or // growing it must never move the list or overflow the screen. diff --git a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart index 21c81552..446a63ae 100644 --- a/app/lib/features/chat/ui/sessions/session_list_cupertino.dart +++ b/app/lib/features/chat/ui/sessions/session_list_cupertino.dart @@ -23,6 +23,7 @@ class CupertinoSessionList extends StatelessWidget { required this.onClearSearch, required this.isUnseen, required this.errorFor, + this.onDismissError, }); final List sections; @@ -37,6 +38,7 @@ class CupertinoSessionList extends StatelessWidget { final VoidCallback? onClearSearch; final bool Function(JsonMap) isUnseen; final String? Function(String sessionId) errorFor; + final ValueChanged? onDismissError; @override Widget build(BuildContext context) { @@ -88,7 +90,11 @@ class CupertinoSessionList extends StatelessWidget { onHide: onHide, ), if (error != null) - ChatRowError(message: error, messageKey: Key('chat-row-error-$id')), + ChatRowError( + message: error, + messageKey: Key('chat-row-error-$id'), + onDismiss: onDismissError == null ? null : () => onDismissError!(id), + ), ]; } } diff --git a/app/lib/features/chat/ui/sessions/session_list_material.dart b/app/lib/features/chat/ui/sessions/session_list_material.dart index 6d9e0e38..94c73545 100644 --- a/app/lib/features/chat/ui/sessions/session_list_material.dart +++ b/app/lib/features/chat/ui/sessions/session_list_material.dart @@ -23,6 +23,7 @@ class MaterialSessionList extends StatelessWidget { required this.onClearSearch, required this.isUnseen, required this.errorFor, + this.onDismissError, }); final List sections; @@ -37,6 +38,7 @@ class MaterialSessionList extends StatelessWidget { final VoidCallback? onClearSearch; final bool Function(JsonMap) isUnseen; final String? Function(String sessionId) errorFor; + final ValueChanged? onDismissError; @override Widget build(BuildContext context) { @@ -102,7 +104,11 @@ class MaterialSessionList extends StatelessWidget { onHide: onHide, ), if (error != null) - ChatRowError(message: error, messageKey: Key('chat-row-error-$id')), + ChatRowError( + message: error, + messageKey: Key('chat-row-error-$id'), + onDismiss: onDismissError == null ? null : () => onDismissError!(id), + ), ]; } } diff --git a/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart b/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart index 2c7713d6..3fab2d7c 100644 --- a/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart +++ b/app/test/features/chat/ui/sessions/chat_session_shared_actions_test.dart @@ -175,6 +175,13 @@ void main() { findsOneWidget, ); expect(gateway.count('chat_sessions'), 1); + + // OK acknowledges the refusal locally; nothing else is sent. + final sent = gateway.calls.length; + await tester.tap(find.text('OK')); + await tester.pumpAndSettle(); + expect(find.byKey(const Key('chat-row-error-s2')), findsNothing); + expect(gateway.calls.length, sent); }); testWidgets('a create reply without chat_session shows the web wording', (