Simplify QueryFilter.filterArguments for callers (#9069)

Author: srawlins

packages/devtools_app/lib/src/screens/logging/logging_controller.dart

@@ -739,10 +739,9 @@ class LoggingController extends DevToolsScreenController
 
     final queryFilter = filter.queryFilter;
     if (!queryFilter.isEmpty) {
-      final filteredOutByQueryFilterArgument = queryFilter
-          .filterArguments
-          .values
-          .any((argument) => !argument.matchesValue(log));
+      final filteredOutByQueryFilterArgument = queryFilter.filterArguments.any(
+        (argument) => !argument.matchesValue(log),
+      );
       if (filteredOutByQueryFilterArgument) return false;
 
       if (filter.queryFilter.substringExpressions.isNotEmpty) {

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

@@ -449,9 +449,7 @@ class NetworkController extends DevToolsScreenController
       ..clear()
       ..addAll(
         _currentNetworkRequests.value.where((NetworkRequest r) {
-          final filteredOutByQueryFilterArgument = queryFilter
-              .filterArguments
-              .values
+          final filteredOutByQueryFilterArgument = queryFilter.filterArguments
               .any((argument) => !argument.matchesValue(r));
           if (filteredOutByQueryFilterArgument) return false;
 

packages/devtools_app/lib/src/screens/profiler/cpu_profiler_controller.dart

@@ -679,9 +679,7 @@ class CpuProfilerController extends DisposableController
 
       final queryFilter = filter.queryFilter;
       if (!queryFilter.isEmpty) {
-        final filteredOutByQueryFilterArgument = queryFilter
-            .filterArguments
-            .values
+        final filteredOutByQueryFilterArgument = queryFilter.filterArguments
             .any((argument) => !argument.matchesValue(stackFrame));
         if (filteredOutByQueryFilterArgument) return false;
 

packages/devtools_app/lib/src/shared/ui/filter.dart

@@ -13,6 +13,7 @@ import 'package:flutter/material.dart';
 import '../primitives/utils.dart';
 import 'common_widgets.dart';
 
+/// A mapping from filter kinds to [QueryFilterArgument]s.
 typedef QueryFilterArgs<T> = Map<String, QueryFilterArgument<T>>;
 typedef SettingFilters<T> = List<SettingFilter<T, Object>>;
 
@@ -39,7 +40,7 @@ mixin FilterControllerMixin<T> on DisposableController
   ///
   /// This should be overriden as a getter by subclasses to support persisting
   /// the most recent filter to DevTools preferences.
-  ValueNotifier<String>? filterTagNotifier;
+  ValueNotifier<String>? get filterTagNotifier => null;
 
   ValueListenable<Filter<T>> get activeFilter => _activeFilter;
 
@@ -94,6 +95,7 @@ mixin FilterControllerMixin<T> on DisposableController
   /// query with arguments may look like 'foo category:bar type:baz'. In this
   /// example, 'category' and 'type' would need to be defined as query filter
   /// arguments.
+  @visibleForOverriding
   QueryFilterArgs<T> createQueryFilterArgs() =>
       <String, QueryFilterArgument<T>>{};
 
@@ -244,12 +246,11 @@ class _FilterDialogState<T> extends State<FilterDialog<T>>
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          for (final filter in widget.controller.settingFilters) ...[
+          for (final filter in widget.controller.settingFilters)
             if (filter is ToggleFilter<T>)
               _ToggleFilterElement(filter: filter)
             else
               _SettingFilterElement(filter: filter),
-          ],
         ],
       ),
     );
@@ -452,14 +453,14 @@ class SettingFilter<T, V> {
   Map<String, Object?> get valueAsJson => {id: setting.value};
 }
 
-class QueryFilter {
+class QueryFilter<T> {
   const QueryFilter._({
-    this.filterArguments = const <String, QueryFilterArgument>{},
+    QueryFilterArgs<T> filterArguments = const {},
     this.substringExpressions = const <Pattern>[],
     this.isEmpty = false,
-  });
+  }) : _filterArguments = filterArguments;
 
-  factory QueryFilter.empty({required QueryFilterArgs args}) {
+  factory QueryFilter.empty({required QueryFilterArgs<T> args}) {
     return QueryFilter._(
       filterArguments: args,
       substringExpressions: <Pattern>[],
@@ -469,7 +470,7 @@ class QueryFilter {
 
   factory QueryFilter.parse(
     String query, {
-    required QueryFilterArgs args,
+    required QueryFilterArgs<T> args,
     required bool useRegExp,
   }) {
     if (query.isEmpty) {
@@ -529,7 +530,12 @@ class QueryFilter {
     );
   }
 
-  final QueryFilterArgs filterArguments;
+  /// The mapping of filter kinds fo [QueryFilterArgument]s.
+  final QueryFilterArgs<T> _filterArguments;
+
+  /// The collection of all [QueryFilterArgument]s.
+  Iterable<QueryFilterArgument<T>> get filterArguments =>
+      _filterArguments.values;
 
   final List<Pattern> substringExpressions;
 
@@ -540,7 +546,7 @@ class QueryFilter {
           ? ''
           : [
             ...substringExpressions.toStringList(),
-            for (final arg in filterArguments.values) arg.display,
+            for (final arg in filterArguments) arg.display,
           ].join(' ').trim();
 }
 

packages/devtools_app/test/shared/ui/filter_test.dart

@@ -448,9 +448,7 @@ class _TestController extends DisposableController
 
       final queryFilter = filter.queryFilter;
       if (!queryFilter.isEmpty) {
-        final filteredOutByQueryFilterArgument = queryFilter
-            .filterArguments
-            .values
+        final filteredOutByQueryFilterArgument = queryFilter.filterArguments
             .any((argument) => !argument.matchesValue(element));
         if (filteredOutByQueryFilterArgument) return false;