183863 sort jobs (#4989)

ievdokdm · web-flow · commit 49d3355b3ee5 · 2026-03-19T17:30:18.000Z
- For presubmit dashboard implemented checks sorting by task status first and by name within same status. - Added the functionality to auto-select the first check if none is currently selected. - Small fixes: - lowered padding - increased retry count while decreasing retry delay Fix: flutter/flutter#183863
diff --git a/app_dart/lib/src/service/scheduler.dart b/app_dart/lib/src/service/scheduler.dart
@@ -1468,7 +1468,10 @@ $stacktrace
     // We're doing a transactional update, which could fail if multiple tasks
     // are running at the same time so retry a sane amount of times before
     // giving up.
-    const r = RetryOptions(maxAttempts: 5, delayFactor: Duration(seconds: 5));
+    const r = RetryOptions(
+      delayFactor: Duration(seconds: 2),
+      maxDelay: Duration(minutes: 2),
+    );
 
     try {
       return await r.retry(() {
diff --git a/conductor/archive/presubmit_dashboard_sorting_20260318/index.md b/conductor/archive/presubmit_dashboard_sorting_20260318/index.md
@@ -0,0 +1,5 @@
+# Track presubmit_dashboard_sorting_20260318 Context
+
+- [Specification](./spec.md)
+- [Implementation Plan](./plan.md)
+- [Metadata](./metadata.json)
diff --git a/conductor/archive/presubmit_dashboard_sorting_20260318/metadata.json b/conductor/archive/presubmit_dashboard_sorting_20260318/metadata.json
@@ -0,0 +1,8 @@
+{
+  "track_id": "presubmit_dashboard_sorting_20260318",
+  "type": "feature",
+  "status": "new",
+  "created_at": "2026-03-18T10:00:00Z",
+  "updated_at": "2026-03-18T10:00:00Z",
+  "description": "For presubmit dashboard implement checks sorting by task status first and by name within same status. The order of statuses is the following: Failed, Infra Failure, In Progress, New, Cancelled, Skipped, Succeeded."
+}
diff --git a/conductor/archive/presubmit_dashboard_sorting_20260318/plan.md b/conductor/archive/presubmit_dashboard_sorting_20260318/plan.md
@@ -0,0 +1,47 @@
+# Implementation Plan - Presubmit Dashboard Sorting [checkpoint: 6de1e57]
+
+Implement sorting of checks in the Presubmit Guard Details view by status first (priority: Failed, Infra Failure, In Progress, New, Cancelled, Skipped, Succeeded) and then alphabetically by name.
+
+## User Review Required
+
+> [!IMPORTANT]
+> This change only affects the `_ChecksSidebar` in `PreSubmitView`. The sorting is fixed and applied to every stage within the view.
+
+- **Status Priority Order:**
+  1. Failed
+  2. Infra Failure
+  3. In Progress
+  4. New (waitingForBackfill)
+  5. Cancelled
+  6. Skipped
+  7. Succeeded
+
+## Proposed Changes
+
+### Dashboard Logic
+
+#### [x] Task: Create task sorting utility
+- Create `dashboard/lib/logic/task_sorting.dart`.
+- Implement `compareTasks(String nameA, TaskStatus statusA, String nameB, TaskStatus statusB)` function.
+- Implement `_statusPriority(TaskStatus status)` helper.
+
+### Dashboard Views
+
+#### [x] Task: Apply sorting to `_ChecksSidebar`
+- Modify `dashboard/lib/views/presubmit_view.dart`.
+- Import `../logic/task_sorting.dart`.
+- In `_ChecksSidebar.build`, sort `stage.builds.entries` before mapping them to `_CheckItem`.
+
+## Verification Plan
+
+### Automated Tests
+- Create `dashboard/test/logic/task_sorting_test.dart` to verify the sorting logic with various status and name combinations.
+- Add a test case to `dashboard/test/views/presubmit_view_test.dart` to ensure that checks are rendered in the expected sorted order.
+
+### Manual Verification
+1. Open the Cocoon dashboard.
+2. Navigate to a PR's presubmit details page.
+3. Verify that the checks in the sidebar are sorted correctly by status first, then by name.
+4. Ensure Failed and Infra Failure tasks appear at the top of their respective stages.
+
+- [x] Task: Conductor - User Manual Verification 'Presubmit Dashboard Sorting' (Protocol in workflow.md)
diff --git a/conductor/archive/presubmit_dashboard_sorting_20260318/spec.md b/conductor/archive/presubmit_dashboard_sorting_20260318/spec.md
@@ -0,0 +1,36 @@
+# Track Specification - Presubmit Dashboard Sorting
+
+## Overview
+This track focuses on improving the usability of the Presubmit Dashboard by implementing a consistent sorting logic for checks in the "Presubmit Guard Details View". Users currently find it difficult to locate failed or in-progress tasks when many checks are present. This new sorting logic will prioritize tasks requiring attention (Failed, Infra Failure, In Progress) and organize them alphabetically within each status.
+
+## Functional Requirements
+- Implement sorting for checks in the `Presubmit Guard Details View` of the Flutter dashboard.
+- The primary sort criteria is the **Task Status** following this priority order (highest to lowest):
+    1.  Failed
+    2.  Infra Failure
+    3.  In Progress
+    4.  New (waitingForBackfill)
+    5.  Cancelled
+    6.  Skipped
+    7.  Succeeded
+- The secondary sort criteria is the **Check Name** (alphabetical, ascending) within each status.
+- This sorting logic must be the **Fixed Default** behavior for the Details View.
+- The sorting should be handled entirely within the **Frontend (Dashboard)** using data already provided by the backend APIs.
+
+## Non-Functional Requirements
+- **Performance:** Sorting should be efficient and not cause noticeable latency in the UI, even for checks with many tasks.
+- **Maintainability:** Sorting logic should be encapsulated in a reusable utility or within the relevant Flutter component to ensure it's easy to test and update.
+- **Consistency:** Ensure the UI correctly updates and reflects the sorted order whenever task data is refreshed.
+
+## Acceptance Criteria
+- [ ] In the `Presubmit Guard Details View`, checks are sorted first by status according to the specified priority.
+- [ ] Within the same status, checks are sorted alphabetically by their name.
+- [ ] The sorting is applied automatically when the view is loaded or data is updated.
+- [ ] The implementation includes unit tests covering various combinations of statuses and names to verify correct sorting.
+- [ ] >95% code coverage for the new sorting logic and its integration.
+
+## Out of Scope
+- Backend API modifications for pre-sorted data.
+- User-selectable sorting options or toggles.
+- Sorting in the "Presubmit Guard Summary View" (unless explicitly requested later).
+- Sorting of other dashboards or views in Cocoon.
diff --git a/conductor/product.md b/conductor/product.md
@@ -19,7 +19,7 @@ Cocoon is the CI coordination and orchestration system for the Flutter project.
 *   **Tree Status Dashboard:** A Flutter-based web application that provides a visual overview of build health across various commits and branches.
 *   **Presubmit Check Details:** Backend APIs to retrieve detailed attempt history and status for specific presubmit checks, aiding in debugging and visibility.
 *   **Presubmit Guard Summaries:** Backend APIs to retrieve summaries of all presubmit checks (Presubmit Guards) of the provided pull request to the dashboard.
-*   **Presubmit Guard Details:** Displays detailed information and CI check statuses for a specific presubmit check (Presubmit Guard), and allows authenticated users to trigger re-runs for individual jobs or all failed jobs directly from the dashboard.
+*   **Presubmit Guard Details:** Displays detailed information and CI check statuses for a specific presubmit check (Presubmit Guard), sorted by status (prioritizing failures) and name for better visibility. Authenticated users can trigger re-runs for individual jobs or all failed jobs directly from the dashboard.
 *   **Merge Queue Visibility:** APIs for querying and inspecting recent GitHub Merge Queue webhook events to diagnose integration issues.
 *   **Auto-submit Bot:** Handles automated pull request management, including label-based merges, reverts, and validation checks.
 *   **GitHub Integration:** Robust handling of GitHub webhooks to sync commits, manage check runs, and report build statuses back to PRs.
diff --git a/dashboard/lib/logic/task_sorting.dart b/dashboard/lib/logic/task_sorting.dart
@@ -0,0 +1,50 @@
+// Copyright 2019 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:cocoon_common/task_status.dart';
+
+/// Compares two tasks by status first, then by name.
+///
+/// Status priority (highest to lowest):
+/// 1. Failed
+/// 2. Infra Failure
+/// 3. In Progress
+/// 4. New (waitingForBackfill)
+/// 5. Cancelled
+/// 6. Skipped
+/// 7. Succeeded
+int compareTasks(
+  String nameA,
+  TaskStatus statusA,
+  String nameB,
+  TaskStatus statusB,
+) {
+  final priorityA = _statusPriority(statusA);
+  final priorityB = _statusPriority(statusB);
+
+  if (priorityA != priorityB) {
+    return priorityA.compareTo(priorityB);
+  }
+
+  return nameA.toLowerCase().compareTo(nameB.toLowerCase());
+}
+
+int _statusPriority(TaskStatus status) {
+  switch (status) {
+    case TaskStatus.failed:
+      return 1;
+    case TaskStatus.infraFailure:
+      return 2;
+    case TaskStatus.inProgress:
+      return 3;
+    case TaskStatus.waitingForBackfill:
+      return 4;
+    case TaskStatus.cancelled:
+      return 5;
+    case TaskStatus.skipped:
+      return 6;
+    case TaskStatus.succeeded:
+      return 7;
+  }
+}
diff --git a/dashboard/lib/views/presubmit_view.dart b/dashboard/lib/views/presubmit_view.dart
@@ -14,6 +14,7 @@ import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../dashboard_navigation_drawer.dart';
+import '../logic/task_sorting.dart';
 import '../state/presubmit.dart';
 import '../widgets/app_bar.dart';
 import '../widgets/guard_status.dart' as pw;
@@ -520,6 +521,47 @@ class _ChecksSidebar extends StatefulWidget {
 
 class _ChecksSidebarState extends State<_ChecksSidebar> {
   final ScrollController _scrollController = ScrollController();
+  late List<List<MapEntry<String, TaskStatus>>> _sortedBuildsPerStage;
+
+  @override
+  void initState() {
+    super.initState();
+    _updateSortedBuilds();
+    _selectFirstCheck();
+  }
+
+  @override
+  void didUpdateWidget(_ChecksSidebar oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.guardResponse != oldWidget.guardResponse) {
+      _updateSortedBuilds();
+    }
+    if (widget.selectedCheck == null) {
+      _selectFirstCheck();
+    }
+  }
+
+  void _selectFirstCheck() {
+    if (widget.selectedCheck != null) return;
+    for (final stage in _sortedBuildsPerStage) {
+      if (stage.isNotEmpty) {
+        final firstCheck = stage.first.key;
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (mounted && widget.selectedCheck == null) {
+            widget.onCheckSelected(firstCheck);
+          }
+        });
+        break;
+      }
+    }
+  }
+
+  void _updateSortedBuilds() {
+    _sortedBuildsPerStage = widget.guardResponse.stages.map((stage) {
+      return stage.builds.entries.toList()
+        ..sort((a, b) => compareTasks(a.key, a.value, b.key, b.value));
+    }).toList();
+  }
 
   @override
   void dispose() {
@@ -545,6 +587,7 @@ class _ChecksSidebarState extends State<_ChecksSidebar> {
                 itemCount: widget.guardResponse.stages.length,
                 itemBuilder: (context, stageIndex) {
                   final stage = widget.guardResponse.stages[stageIndex];
+                  final sortedBuilds = _sortedBuildsPerStage[stageIndex];
                   return Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -567,7 +610,7 @@ class _ChecksSidebarState extends State<_ChecksSidebar> {
                           ),
                         ),
                       ),
-                      ...stage.builds.entries.map((entry) {
+                      ...sortedBuilds.map((entry) {
                         final isSelected = widget.selectedCheck == entry.key;
                         return _CheckItem(
                           name: entry.key,
@@ -616,7 +659,7 @@ class _CheckItem extends StatelessWidget {
     return InkWell(
       onTap: onTap,
       child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+        padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 2),
         decoration: BoxDecoration(
           color: isSelected
               ? (isDark
@@ -633,13 +676,13 @@ class _CheckItem extends StatelessWidget {
         child: Row(
           children: [
             _getStatusIcon(status),
-            const SizedBox(width: 12),
+            const SizedBox(width: 4),
             Expanded(
               child: Text(
                 name,
                 style: TextStyle(
                   fontSize: 14,
-                  fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
+                  fontWeight: FontWeight.normal,
                   color: isSelected && !isDark ? const Color(0xFF1F2937) : null,
                 ),
                 overflow: TextOverflow.ellipsis,
@@ -660,6 +703,7 @@ class _CheckItem extends StatelessWidget {
                 icon: const Icon(Icons.refresh, size: 18),
                 label: const Text('Re-run'),
                 style: TextButton.styleFrom(
+                  minimumSize: const Size(64, 18),
                   foregroundColor: isDark
                       ? const Color(0xFF58A6FF)
                       : const Color(0xFF0969DA),
diff --git a/dashboard/test/logic/task_sorting_test.dart b/dashboard/test/logic/task_sorting_test.dart
@@ -0,0 +1,75 @@
+// Copyright 2019 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:cocoon_common/task_status.dart';
+import 'package:flutter_dashboard/logic/task_sorting.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('compareTasks', () {
+    test('sorts by status priority', () {
+      final tasks = [
+        ('a', TaskStatus.succeeded),
+        ('b', TaskStatus.failed),
+        ('c', TaskStatus.infraFailure),
+        ('d', TaskStatus.inProgress),
+        ('e', TaskStatus.waitingForBackfill),
+        ('f', TaskStatus.cancelled),
+        ('g', TaskStatus.skipped),
+      ];
+
+      tasks.sort((a, b) => compareTasks(a.$1, a.$2, b.$1, b.$2));
+
+      expect(tasks, [
+        ('b', TaskStatus.failed),
+        ('c', TaskStatus.infraFailure),
+        ('d', TaskStatus.inProgress),
+        ('e', TaskStatus.waitingForBackfill),
+        ('f', TaskStatus.cancelled),
+        ('g', TaskStatus.skipped),
+        ('a', TaskStatus.succeeded),
+      ]);
+    });
+
+    test('sorts by name when status is the same', () {
+      final tasks = [
+        ('beta', TaskStatus.failed),
+        ('alpha', TaskStatus.failed),
+        ('gamma', TaskStatus.succeeded),
+        ('delta', TaskStatus.succeeded),
+      ];
+
+      tasks.sort((a, b) => compareTasks(a.$1, a.$2, b.$1, b.$2));
+
+      expect(tasks, [
+        ('alpha', TaskStatus.failed),
+        ('beta', TaskStatus.failed),
+        ('delta', TaskStatus.succeeded),
+        ('gamma', TaskStatus.succeeded),
+      ]);
+    });
+
+    test('complex sorting', () {
+      final tasks = [
+        ('z', TaskStatus.succeeded),
+        ('y', TaskStatus.failed),
+        ('x', TaskStatus.infraFailure),
+        ('w', TaskStatus.inProgress),
+        ('v', TaskStatus.failed),
+        ('u', TaskStatus.succeeded),
+      ];
+
+      tasks.sort((a, b) => compareTasks(a.$1, a.$2, b.$1, b.$2));
+
+      expect(tasks, [
+        ('v', TaskStatus.failed),
+        ('y', TaskStatus.failed),
+        ('x', TaskStatus.infraFailure),
+        ('w', TaskStatus.inProgress),
+        ('u', TaskStatus.succeeded),
+        ('z', TaskStatus.succeeded),
+      ]);
+    });
+  });
+}
diff --git a/dashboard/test/views/presubmit_view_test.dart b/dashboard/test/views/presubmit_view_test.dart
