Skip to content

Commit c98f613

Browse files
authored
Fix rerun filtered environments doesn't take into consideration review filters (#222)
* Fix rerun filtered environments doesn't take into consideration review filters * Add rejected filter option for environments * Remove commented out code
1 parent c0b9642 commit c98f613

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

frontend/lib/models/filters.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@ final emptyEnvironmentReviewFilters = FiltersGroup<EnvironmentReview>(
122122
filters: [
123123
Filter<EnvironmentReview>(
124124
name: 'Review status',
125-
extractOption: (te) =>
126-
te.reviewDecision.isEmpty ? 'Undecided' : 'Reviewed',
125+
extractOption: (er) => switch (er.reviewDecision) {
126+
[] => 'Undecided',
127+
[EnvironmentReviewDecision.rejected] => 'Rejected',
128+
[...] => 'Approved',
129+
},
127130
),
128131
],
129132
);

frontend/lib/ui/artefact_page/artefact_page_body.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ class ArtefactPageBody extends ConsumerWidget {
5858
testExecutions: filteredCombination.map((comb) => comb.$2),
5959
),
6060
const Spacer(),
61-
const RerunFilteredEnvironmentsButton(),
61+
RerunFilteredEnvironmentsButton(
62+
filteredTestExecutions:
63+
filteredCombination.map((comb) => comb.$2),
64+
),
6265
],
6366
),
6467
NonBlockingProviderPreloader(

frontend/lib/ui/artefact_page/rerun_filtered_environments_button.dart

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ import 'package:intersperse/intersperse.dart';
55

66
import '../../models/test_execution.dart';
77
import '../../providers/artefact_builds.dart';
8-
import '../../providers/filtered_test_executions.dart';
98
import '../../routing.dart';
109
import '../spacing.dart';
1110

1211
class RerunFilteredEnvironmentsButton extends ConsumerWidget {
13-
const RerunFilteredEnvironmentsButton({super.key});
12+
const RerunFilteredEnvironmentsButton({
13+
super.key,
14+
required this.filteredTestExecutions,
15+
});
16+
17+
final Iterable<TestExecution> filteredTestExecutions;
1418

1519
@override
1620
Widget build(BuildContext context, WidgetRef ref) {
1721
final pageUri = GoRouterState.of(context).uri;
1822
final artefactId = AppRoutes.artefactIdFromUri(pageUri);
1923

20-
final filteredTestExecutions = ref
21-
.watch(filteredTestExecutionsProvider(pageUri))
22-
.requireValue
23-
.toList();
24-
2524
handlePress() => showDialog(
2625
context: context,
2726
builder: (_) => _ConfirmationDialog(
@@ -46,7 +45,7 @@ class _ConfirmationDialog extends ConsumerWidget {
4645
required this.artefactId,
4746
});
4847

49-
final List<TestExecution> filteredTestExecutions;
48+
final Iterable<TestExecution> filteredTestExecutions;
5049
final int artefactId;
5150

5251
@override

0 commit comments

Comments
 (0)