diff --git a/app/lib/application/pipelines_app.dart b/app/lib/application/pipelines_app.dart index de92448a..d44478e7 100644 --- a/app/lib/application/pipelines_app.dart +++ b/app/lib/application/pipelines_app.dart @@ -71,7 +71,7 @@ bool shouldReconnectOnForeground(ConnectionKind kind) => /// /// Tests may inject the client and route-information provider; the session /// owns the socket either way, so there is never a second app-level connection. -typedef _RunIndicators = ({int attention, int running, int failed}); +typedef _RunIndicators = ({int attention, int running}); class PipelinesApp extends StatefulWidget { const PipelinesApp({ @@ -209,7 +209,6 @@ class _PipelinesAppState extends State final _attentionCount = ValueNotifier<_RunIndicators>(( attention: 0, running: 0, - failed: 0, )); /// Android background delivery (no service elsewhere). @@ -565,11 +564,9 @@ class _PipelinesAppState extends State /// frame arrives outside any build and applies at once. void _attentionChanged() { if (!mounted) return; - final statuses = runTabCounts(_attention.rows); final count = ( attention: _attention.entries.length, - running: statuses.running, - failed: statuses.failed, + running: runningRunCount(_attention.rows), ); if (count == _attentionCount.value) return; if (SchedulerBinding.instance.schedulerPhase == @@ -826,7 +823,6 @@ class _PipelinesAppState extends State ], attentionCount: counts.attention, runningRunCount: counts.running, - failedRunCount: counts.failed, destination: _destinationOf(route.kind), onDestinationSelected: _selectDestination, onClosePage: () => _delegate.goTo( diff --git a/app/lib/features/runs/domain/run_tab_counts.dart b/app/lib/features/runs/domain/run_tab_counts.dart index 90c763fd..4079fc06 100644 --- a/app/lib/features/runs/domain/run_tab_counts.dart +++ b/app/lib/features/runs/domain/run_tab_counts.dart @@ -1,14 +1,9 @@ import '../../../core/api_gateway.dart'; -typedef RunTabCounts = ({int running, int failed}); - -/// Independent status counts from known, unfiltered server summaries. -/// Dismissing a notification does not change a run's failed status. -RunTabCounts runTabCounts(Iterable runs) { +/// Counts executing work without treating failed or completed runs as active. +int runningRunCount(Iterable runs) { var running = 0; - var failed = 0; for (final run in runs) { - if (run['status'] == 'failed') failed++; if (const { 'succeeded', 'failed', @@ -23,5 +18,5 @@ RunTabCounts runTabCounts(Iterable runs) { running++; } } - return (running: running, failed: failed); + return running; } diff --git a/app/lib/features/runs/ui/runs_list.dart b/app/lib/features/runs/ui/runs_list.dart index 8ba56b64..3f5d149f 100644 --- a/app/lib/features/runs/ui/runs_list.dart +++ b/app/lib/features/runs/ui/runs_list.dart @@ -103,19 +103,14 @@ class RunsList extends StatelessWidget { if (!ShellBar.available(context)) { return _ownBar(context, [const Spacer(), ...actions]); } - final counts = runTabCounts(controller.runs); return ShellBar( active: active, actions: actions, // The Runs tab counts runs still executing. child: ShellBadge( kind: ShellBadgeKind.running, - count: counts.running, - child: ShellBadge( - kind: ShellBadgeKind.failed, - count: counts.failed, - child: _shortcutList(context), - ), + count: runningRunCount(controller.runs), + child: _shortcutList(context), ), ); } diff --git a/app/lib/shell/adaptive_shell.dart b/app/lib/shell/adaptive_shell.dart index 83a1c811..e74e3266 100644 --- a/app/lib/shell/adaptive_shell.dart +++ b/app/lib/shell/adaptive_shell.dart @@ -24,7 +24,6 @@ class AdaptiveShell extends StatefulWidget { this.onSearch, this.attentionCount = 0, this.runningRunCount, - this.failedRunCount, this.listPaneWidthStore = const SharedPreferencesListPaneWidthStore(), this.barActions = const [], }); @@ -53,7 +52,6 @@ class AdaptiveShell extends StatefulWidget { /// App-wide counts when available; standalone screens publish their own. final int? runningRunCount; - final int? failedRunCount; @override State createState() => _AdaptiveShellState(); @@ -130,9 +128,6 @@ class _AdaptiveShellState extends State { running: widget.runningRunCount ?? _bar.badge(destination, ShellBadgeKind.running), - failed: - widget.failedRunCount ?? - _bar.badge(destination, ShellBadgeKind.failed), attention: widget.attentionCount, child: icon, ); diff --git a/app/lib/shell/attention_badge.dart b/app/lib/shell/attention_badge.dart index 234df09a..3de5d619 100644 --- a/app/lib/shell/attention_badge.dart +++ b/app/lib/shell/attention_badge.dart @@ -44,49 +44,34 @@ class AttentionDestinationIcon extends StatelessWidget { } } -/// Both status counts remain visible: failures never hide executing work. +/// The Runs tab shows executing work only; its error counter is removed. class RunsDestinationIcon extends StatelessWidget { const RunsDestinationIcon({ super.key, required this.running, - required this.failed, required this.child, this.attention = 0, }); final int running; - final int failed; final int attention; final Widget child; @override Widget build(BuildContext context) { - final colors = Theme.of(context).colorScheme; - final labels = [ - if (running > 0) '$running runs in progress', - if (failed > 0) '$failed failed runs', - if (attention > 0) attentionBadgeLabel(attention), - ]; + final labels = [if (running > 0) '$running runs in progress']; return Semantics( label: labels.join(', '), child: ExcludeSemantics( child: Tooltip( message: labels.isEmpty ? 'Runs' : 'Runs: ${labels.join(', ')}', excludeFromSemantics: true, - child: Badge.count( - key: const ValueKey('shell.badge.runs.failed'), - count: failed, - maxCount: 99, - isLabelVisible: failed > 0, - backgroundColor: colors.error, - textColor: colors.onError, - child: ActivityBadge( - key: const ValueKey('shell.badge.runs.running'), - count: running, - label: 'runs in progress', - bottom: true, - child: child, - ), + child: ActivityBadge( + key: const ValueKey('shell.badge.runs.running'), + count: running, + label: 'runs in progress', + bottom: true, + child: child, ), ), ), diff --git a/app/lib/shell/shell_bar.dart b/app/lib/shell/shell_bar.dart index d9e3718d..f457f235 100644 --- a/app/lib/shell/shell_bar.dart +++ b/app/lib/shell/shell_bar.dart @@ -357,9 +357,6 @@ enum ShellBadgeKind { /// Runs still executing. running, - /// Runs whose server status is failed, independent of attention dismissal. - failed, - /// Chats with messages not yet seen. unread, } diff --git a/app/notes/runs-tab-status-indicators.md b/app/notes/runs-tab-status-indicators.md index 92e700dd..ad36e3c5 100644 --- a/app/notes/runs-tab-status-indicators.md +++ b/app/notes/runs-tab-status-indicators.md @@ -1,5 +1,18 @@ # Independent Runs tab indicators +## Current behavior + +The user requested temporary removal of the error counter. The failed badge, +its tab label/tooltip count and its tab-publication plumbing are removed. The +running indicator stays. The unfinished seen-state change was preserved outside +the checkout rather than included in this release. + +Regression checks for this removal: 734 application, Runs, attention and shell +tests passed; analysis was clean. The earlier dual-counter description below is +historical and no longer describes the visible tab. + +## Earlier dual-counter implementation (superseded) + The Runs tab now shows the executing count at the lower edge in the primary theme colour and the failed count at the upper edge in the error colour. Neither suppresses the other. Zero hides its indicator; the failed label caps diff --git a/app/test/application/attention_badge_wiring_test.dart b/app/test/application/attention_badge_wiring_test.dart index 4d77c86f..1ef3ce2f 100644 --- a/app/test/application/attention_badge_wiring_test.dart +++ b/app/test/application/attention_badge_wiring_test.dart @@ -18,7 +18,7 @@ void main() { Finder badgeCount(String count) => find.descendant(of: find.byType(Badge), matching: find.text(count)); - testWidgets('waiting is announced without being labelled as a failed run', ( + testWidgets('attention events do not restore the removed error counter', ( tester, ) async { final semantics = tester.ensureSemantics(); @@ -45,7 +45,7 @@ void main() { ], ); expect(find.text('Nightly build'), findsWidgets); - expect(tester.widget(find.byType(Badge)).isLabelVisible, isFalse); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); expect(find.bySemanticsLabel(needingAttention), findsNothing); await tester.tap(find.byKey(const ValueKey('shell.destination.pipelines'))); @@ -63,16 +63,16 @@ void main() { await tester.pump(); expect(provider.value.uri.path, '/pipelines'); - expect(tester.widget(find.byType(Badge)).isLabelVisible, isFalse); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); expect( tester .widget(find.byType(RunsDestinationIcon)) - .failed, + .running, 0, ); expect( find.bySemanticsLabel(RegExp('Notifications, 1 needing attention')), - findsOneWidget, + findsNothing, ); // The decision taken elsewhere clears the badge the same way. @@ -81,7 +81,7 @@ void main() { ); await tester.pump(); await tester.pump(); - expect(tester.widget(find.byType(Badge)).isLabelVisible, isFalse); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); expect(badgeCount('1'), findsNothing); expect(find.bySemanticsLabel(needingAttention), findsNothing); semantics.dispose(); @@ -98,7 +98,7 @@ void main() { addTearDown(provider.dispose); await pumpApp(tester, channel: channel, client: client, provider: provider); - expect(tester.widget(find.byType(Badge)).isLabelVisible, isFalse); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); channel.incoming.add( jsonEncode({ @@ -119,7 +119,7 @@ void main() { expect( tester .widget(find.byType(RunsDestinationIcon)) - .failed, + .running, 0, ); }); diff --git a/app/test/application/run_tab_indicators_test.dart b/app/test/application/run_tab_indicators_test.dart index f14e5041..95dd86ad 100644 --- a/app/test/application/run_tab_indicators_test.dart +++ b/app/test/application/run_tab_indicators_test.dart @@ -10,7 +10,7 @@ import '../core/transport/pipelines_client_test.dart' show FakeChannel; import 'pipelines_app_test.dart' show pumpApp, replyList; void main() { - testWidgets('both run counts update while another destination is visible', ( + testWidgets('running updates across tabs without restoring the error counter', ( tester, ) async { SharedPreferences.setMockInitialValues({}); @@ -59,7 +59,7 @@ void main() { RunsDestinationIcon counts() => tester.widget(find.byType(RunsDestinationIcon)); expect(counts().running, 1); - expect(counts().failed, 1); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); expect(counts().attention, 2); await tester.tap(find.byKey(const ValueKey('shell.destination.pipelines'))); @@ -75,7 +75,7 @@ void main() { await tester.pumpAndSettle(); expect(provider.value.uri.path, '/pipelines'); expect(counts().running, 1); - expect(counts().failed, 2); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); // Waiting -> failed must repaint even though total attention is unchanged. expect(counts().attention, 2); @@ -89,7 +89,7 @@ void main() { ); await tester.pumpAndSettle(); expect(counts().running, 0); - expect(counts().failed, 2); + expect(find.byKey(const ValueKey('shell.badge.runs.failed')), findsNothing); expect(tester.takeException(), isNull); }); } diff --git a/app/test/features/runs/domain/run_tab_counts_test.dart b/app/test/features/runs/domain/run_tab_counts_test.dart index b52eb247..1efa174f 100644 --- a/app/test/features/runs/domain/run_tab_counts_test.dart +++ b/app/test/features/runs/domain/run_tab_counts_test.dart @@ -2,9 +2,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/features/runs/domain/run_tab_counts.dart'; void main() { - test('running and failed statuses are counted independently', () { + test('running work excludes failed and completed runs', () { expect( - runTabCounts([ + runningRunCount([ {'status': 'running', 'executing': true}, {'status': 'queued', 'executing': true}, {'status': 'failed', 'executing': false}, @@ -12,30 +12,30 @@ void main() { {'status': 'canceled'}, {'status': 'interrupted'}, ]), - (running: 2, failed: 1), + 2, ); }); test('terminal statuses override stale execution flags', () { expect( - runTabCounts([ + runningRunCount([ {'status': 'failed', 'executing': true}, {'status': 'succeeded', 'executing': true}, ]), - (running: 0, failed: 1), + 0, ); }); test('older running summaries work without inventing other live states', () { expect( - runTabCounts([ + runningRunCount([ {'status': 'running'}, {'status': 'running', 'executing': false}, {'status': 'queued'}, {'status': 'waiting'}, ]), - (running: 1, failed: 0), + 1, ); - expect(runTabCounts([]), (running: 0, failed: 0)); + expect(runningRunCount([]), 0); }); } diff --git a/app/test/shell/attention_badge_test.dart b/app/test/shell/attention_badge_test.dart index 6b8f720e..66348283 100644 --- a/app/test/shell/attention_badge_test.dart +++ b/app/test/shell/attention_badge_test.dart @@ -3,12 +3,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:pipelines_app/shell/adaptive_shell.dart'; import 'package:pipelines_app/ui/adaptive/floating_destination_bar.dart'; -/// The Runs tab mirrors the attention count in every mount: the floating tab -/// bar at full width on a phone and right-aligned on a wide window. Zero draws -/// the bare icon with no count and no attention semantics. +/// The Runs tab keeps running work visible without an error counter. void main() { - final needingAttention = RegExp('3 failed runs'); - final anyAttention = RegExp('failed runs'); + final needingAttention = RegExp('3 runs in progress'); + final anyAttention = RegExp('runs in progress'); Future pumpShell( WidgetTester tester, { @@ -19,7 +17,7 @@ void main() { tester.view.devicePixelRatio = 1; addTearDown(tester.view.resetPhysicalSize); addTearDown(tester.view.resetDevicePixelRatio); - final shell = AdaptiveShell(failedRunCount: count); + final shell = AdaptiveShell(runningRunCount: count, attentionCount: 99); await tester.pumpWidget(MaterialApp(home: shell)); } @@ -31,9 +29,12 @@ void main() { await pumpShell(tester, width: width, count: 3); expect(find.byType(FloatingDestinationBar), findsOneWidget); expect(find.byType(NavigationRail), findsNothing); - final badge = find.byType(Badge); + final badge = find.byKey(const ValueKey('shell.badge.runs.running')); expect(badge, findsOneWidget); - expect(tester.widget(badge).isLabelVisible, isTrue); + expect( + find.byKey(const ValueKey('shell.badge.runs.failed')), + findsNothing, + ); expect( find.descendant(of: badge, matching: find.text('3')), findsOneWidget, @@ -45,9 +46,12 @@ void main() { testWidgets('$mount hides the badge at zero', (tester) async { final semantics = tester.ensureSemantics(); await pumpShell(tester, width: width, count: 0); - final badge = find.byType(Badge); + final badge = find.byKey(const ValueKey('shell.badge.runs.running')); expect(badge, findsOneWidget); - expect(tester.widget(badge).isLabelVisible, isFalse); + expect( + find.byKey(const ValueKey('shell.badge.runs.failed')), + findsNothing, + ); expect( find.descendant( of: badge, @@ -66,7 +70,10 @@ void main() { await tester.tap(find.byKey(ValueKey('shell.destination.$name'))); await tester.pumpAndSettle(); expect( - find.descendant(of: find.byType(Badge), matching: find.text('2')), + find.descendant( + of: find.byKey(const ValueKey('shell.badge.runs.running')), + matching: find.text('2'), + ), findsOneWidget, reason: 'badge missing on $name', ); diff --git a/app/test/shell/pane_bar_row_test.dart b/app/test/shell/pane_bar_row_test.dart index 0f5bae59..35955a87 100644 --- a/app/test/shell/pane_bar_row_test.dart +++ b/app/test/shell/pane_bar_row_test.dart @@ -66,10 +66,9 @@ void main() { ), ); - Widget shell({int attention = 0, int failed = 0}) { + Widget shell({int attention = 0}) { final app = AdaptiveShell( attentionCount: attention, - failedRunCount: failed, destinationBodies: { AppDestination.runs: (_) => ShellBadge( kind: ShellBadgeKind.running, @@ -219,14 +218,14 @@ void main() { ); }); - testWidgets('the Runs tab shows running and failed indicators together', ( + testWidgets('the Runs tab keeps running work without an error counter', ( tester, ) async { await setSize(tester, const Size(1200, 800)); - await tester.pumpWidget(shell(attention: 2, failed: 2)); + await tester.pumpWidget(shell(attention: 2)); await tester.pump(); await tester.pump(); - expect(find.text('2'), findsOneWidget); + expect(find.text('2'), findsNothing); expect(find.text('4'), findsOneWidget); await tester.pumpWidget(shell()); diff --git a/app/test/shell/run_status_indicators_test.dart b/app/test/shell/run_status_indicators_test.dart index 8e7d7219..3e2452a2 100644 --- a/app/test/shell/run_status_indicators_test.dart +++ b/app/test/shell/run_status_indicators_test.dart @@ -5,46 +5,38 @@ import 'package:pipelines_app/shell/adaptive_shell.dart'; void main() { for (final width in [390.0, 1000.0]) { for (final brightness in Brightness.values) { - testWidgets('running and failed are distinct at $width $brightness', ( - tester, - ) async { - tester.view.physicalSize = Size(width, 900); - tester.view.devicePixelRatio = 1; - addTearDown(tester.view.reset); - final semantics = tester.ensureSemantics(); - final theme = ThemeData(brightness: brightness); - await tester.pumpWidget( - MaterialApp( - theme: theme, - home: const AdaptiveShell(runningRunCount: 2, failedRunCount: 3), - ), - ); - await tester.pumpAndSettle(); - final failed = find.byKey(const ValueKey('shell.badge.runs.failed')); - final running = find.byKey(const ValueKey('shell.badge.runs.running')); - expect( - find.descendant(of: failed, matching: find.text('3')), - findsOneWidget, - ); - expect( - find.descendant(of: running, matching: find.text('2')), - findsOneWidget, - ); - expect( - tester.widget(failed).backgroundColor, - theme.colorScheme.error, - ); - expect( - tester.getRect(find.text('3')).bottom, - lessThan(tester.getRect(find.text('2')).top), - ); - expect( - find.bySemanticsLabel(RegExp('2 runs in progress, 3 failed runs')), - findsOneWidget, - ); - expect(tester.takeException(), isNull); - semantics.dispose(); - }); + testWidgets( + 'running stays visible without an error counter at $width $brightness', + (tester) async { + tester.view.physicalSize = Size(width, 900); + tester.view.devicePixelRatio = 1; + addTearDown(tester.view.reset); + final semantics = tester.ensureSemantics(); + final theme = ThemeData(brightness: brightness); + await tester.pumpWidget( + MaterialApp( + theme: theme, + home: const AdaptiveShell(runningRunCount: 2, attentionCount: 3), + ), + ); + await tester.pumpAndSettle(); + final failed = find.byKey(const ValueKey('shell.badge.runs.failed')); + final running = find.byKey( + const ValueKey('shell.badge.runs.running'), + ); + expect(failed, findsNothing); + expect( + find.descendant(of: running, matching: find.text('2')), + findsOneWidget, + ); + expect( + find.bySemanticsLabel(RegExp('2 runs in progress')), + findsOneWidget, + ); + expect(tester.takeException(), isNull); + semantics.dispose(); + }, + ); } } }