Refine network cancellation logic and related tests.

Author: rishika0212

packages/devtools_app/lib/src/screens/network/network_request_inspector_views.dart

@@ -707,28 +707,30 @@ class NetworkRequestOverviewView extends StatelessWidget {
     ];
   }
 
+  Duration? get _totalDuration => (data as DartIOHttpRequestData).duration;
+
   Widget _buildTimingRow(
     Color color,
-    String label,
-    Duration duration,
-    Duration totalDuration,
+    String segmentLabel,
+    Duration segmentDuration,
   ) {
-    final flex = (duration.inMicroseconds / totalDuration.inMicroseconds * 100)
-        .round();
+    final totalDuration = _totalDuration!;
+    final flex =
+        (segmentDuration.inMicroseconds / totalDuration.inMicroseconds * 100)
+            .round();
     return Flexible(
       flex: flex,
       child: DevToolsTooltip(
-        message: '$label - ${durationText(duration)}',
+        message: '$segmentLabel - ${durationText(segmentDuration)}',
         child: Container(height: _timingGraphHeight, color: color),
       ),
     );
   }
 
   Widget _buildHttpTimeGraph() {
     final data = this.data as DartIOHttpRequestData;
-    final requestDuration = data.duration;
-    if (requestDuration == null ||
-        requestDuration.inMicroseconds == 0 ||
+    if (_totalDuration == null ||
+        _totalDuration!.inMicroseconds == 0 ||
         data.instantEvents.isEmpty) {
       return Container(
         key: httpTimingGraphKey,
@@ -751,18 +753,14 @@ class NetworkRequestOverviewView extends StatelessWidget {
     final timingWidgets = <Widget>[];
     for (final instant in data.instantEvents) {
       final duration = instant.timeRange.duration;
-      timingWidgets.add(
-        _buildTimingRow(nextColor(), instant.name, duration, requestDuration),
-      );
+      timingWidgets.add(_buildTimingRow(nextColor(), instant.name, duration));
     }
     final duration = Duration(
       microseconds:
           data.endTimestamp!.microsecondsSinceEpoch -
           data.instantEvents.last.timestamp.microsecondsSinceEpoch,
     );
-    timingWidgets.add(
-      _buildTimingRow(nextColor(), 'Response', duration, requestDuration),
-    );
+    timingWidgets.add(_buildTimingRow(nextColor(), 'Response', duration));
     return Row(key: httpTimingGraphKey, children: timingWidgets);
   }
 

packages/devtools_app/lib/src/shared/http/http_request_data.dart

@@ -165,9 +165,7 @@ class DartIOHttpRequestData extends NetworkRequest {
 
   @override
   Duration? get duration {
-    if (inProgress || !isValid) {
-      return null;
-    }
+    if (inProgress || !isValid) return null;
     return _endTime?.difference(_request.startTime);
   }
 
@@ -253,10 +251,14 @@ class DartIOHttpRequestData extends NetworkRequest {
     return connectionInfo != null ? connectionInfo[_localPortKey] : null;
   }
 
+  /// True if the HTTP request hasn't completed yet, determined by
+  /// `isRequestComplete` / `isResponseComplete` from the profile data.
   @override
   bool get inProgress {
     if (_isCancelled) return false;
-    return _request.endTime == null;
+    return _hasError
+        ? !_request.isRequestComplete
+        : !_request.isResponseComplete;
   }
 
   /// All instant events logged to the timeline for this HTTP request.
@@ -333,10 +335,7 @@ class DartIOHttpRequestData extends NetworkRequest {
 
     if (_hasError) return 'Error';
 
-    final statusCode = _request.response?.statusCode;
-    if (statusCode != null) return statusCode.toString();
-
-    return null;
+    return _request.response?.statusCode.toString();
   }
 
   @override

packages/devtools_app/test/screens/network/network_model_test.dart

@@ -540,15 +540,15 @@ void main() {
   );
 
   test(
-    'request without response and endTime is complete but not cancelled',
+    'request without response and endTime remains in progress and not cancelled',
     () {
       final pendingRequest = DartIOHttpRequestData(
         HttpProfileRequest.parse(Map<String, dynamic>.of(httpGetPendingJson))!,
         requestFullDataFromVmService: false,
       );
 
       expect(pendingRequest.status, isNull);
-      expect(pendingRequest.inProgress, false);
+      expect(pendingRequest.inProgress, true);
       expect(pendingRequest.duration, isNull);
     },
   );
@@ -582,7 +582,7 @@ void main() {
     );
 
     expect(cancelledWithStatusRequest.status, isNot('Cancelled'));
-    expect(cancelledWithStatusRequest.inProgress, false);
+    expect(cancelledWithStatusRequest.inProgress, true);
     expect(cancelledWithStatusRequest.status, '200');
     expect(cancelledWithStatusRequest.didFail, false);
   });

packages/devtools_app/test/screens/network/network_profiler_test.dart

@@ -407,7 +407,7 @@ void main() {
         expect(find.text('Method: '), findsOneWidget);
         expect(find.text('GET'), findsOneWidget);
         expect(find.text('Status: '), findsOneWidget);
-        expect(find.text('Cancelled'), findsOneWidget);
+        expect(find.text('Error'), findsOneWidget);
         expect(find.text('Port: '), findsNothing);
         expect(find.text('Content type: '), findsNothing);
 

packages/devtools_app/test/test_infra/test_data/http_get_cancelled_json.dart

@@ -1,4 +1,4 @@
-// Copyright 2020 The Flutter Authors
+// Copyright 2026 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.