[results feed] Remove old filter popup
Also removes "fetching results..." message from header.
There is a "fetching" message in the body.
Change-Id: I52c88455232fa60c7d75a592b076614ca10bd451
Reviewed-on: https://dart-review.googlesource.com/c/dart_ci/+/149140
Reviewed-by: Alexander Thomas <athom@google.com>
diff --git a/results_feed/lib/src/components/app.html b/results_feed/lib/src/components/app.html
index 5d16881..9f61a94 100644
--- a/results_feed/lib/src/components/app.html
+++ b/results_feed/lib/src/components/app.html
@@ -1,16 +1,6 @@
<header class="blue">
- <material-button
- icon
- class="material-drawer-button"
- (trigger)="showFilter = true">
- <material-icon icon="filter_list"></material-icon>
- </material-button>
<span class="title">{{title}}</span>
<results-filter></results-filter>
- <span *ngIf="fetching != null">
- <material-icon icon="autorenew"></material-icon>
- fetching results...
- </span>
<span
class="button"
(click)="toggleLogin()">
@@ -22,21 +12,6 @@
</header>
<div class="results-feed-body">
- <modal [(visible)]="showFilter">
- <material-dialog
- info
- class="info-dialog"
- [autoDismissable]="showFilter"
- (dismiss)="showFilter = false">
- <h1 header>
- Filter
- <material-button icon autoFocus (trigger)="showFilter = false">
- <material-icon icon="close"></material-icon>
- </material-button>
- </h1>
- <app-filter style="padding: 16px; position: fixed"></app-filter>
- </material-dialog>
- </modal>
<dart-commit
*ngFor="let changeGroup of changeGroups.values"
[changeGroup]="changeGroup"
diff --git a/results_feed/lib/src/components/app_component.css b/results_feed/lib/src/components/app_component.css
index 7d0bd18..532b288 100644
--- a/results_feed/lib/src/components/app_component.css
+++ b/results_feed/lib/src/components/app_component.css
@@ -44,8 +44,3 @@
overflow-y: scroll;
background-color: ghostwhite;
}
-
-.info-dialog {
- width: 50%;
- height: 70%;
-}
diff --git a/results_feed/lib/src/components/app_component.dart b/results_feed/lib/src/components/app_component.dart
index 8017c8a..31e582c 100644
--- a/results_feed/lib/src/components/app_component.dart
+++ b/results_feed/lib/src/components/app_component.dart
@@ -7,13 +7,7 @@
import 'package:angular/angular.dart';
import 'package:angular_components/angular_components.dart';
-import 'package:angular_components/app_layout/material_temporary_drawer.dart';
-import 'package:angular_components/laminate/components/modal/modal.dart';
-import 'package:angular_components/laminate/overlay/module.dart';
import 'package:angular_components/material_button/material_button.dart';
-import 'package:angular_components/material_dialog/material_dialog.dart';
-import 'package:angular_components/material_icon/material_icon.dart';
-import 'package:angular_components/material_toggle/material_toggle.dart';
import 'package:angular_router/angular_router.dart';
import 'package:dart_results_feed/src/components/results_filter_component.dart';
@@ -23,7 +17,6 @@
import '../formatting.dart';
import '../model/commit.dart';
import '../model/comment.dart';
-import '../services/filter_component.dart';
import '../services/filter_service.dart';
import '../services/firestore_service.dart';
import '../services/build_service.dart';
@@ -35,14 +28,8 @@
coreDirectives,
AutoDismissDirective,
CommitComponent,
- FilterComponent,
FilterRowComponent,
- MaterialIconComponent,
MaterialButtonComponent,
- MaterialDialogComponent,
- MaterialTemporaryDrawerComponent,
- MaterialToggleComponent,
- ModalComponent,
ResultsFilterComponent,
],
providers: [
@@ -68,7 +55,6 @@
int lastIndex;
Future fetching;
num infiniteScrollVisibleRatio = 0;
- bool showFilter = false;
final ApplicationRef _applicationRef;
final FirestoreService _firestoreService;
diff --git a/results_feed/lib/src/services/filter_component.dart b/results_feed/lib/src/services/filter_component.dart
deleted file mode 100644
index 81c9be5..0000000
--- a/results_feed/lib/src/services/filter_component.dart
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
-// for details. 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:angular/angular.dart';
-import 'package:angular_components/angular_components.dart';
-import 'package:angular_components/material_radio/material_radio.dart';
-import 'package:angular_components/material_radio/material_radio_group.dart';
-import 'package:angular_components/material_select/material_select.dart';
-import 'package:angular_components/material_select/material_select_item.dart';
-
-import 'filter_service.dart';
-
-const allConfigurationGroups = Filter.allConfigurationGroups;
-
-@Component(selector: 'app-filter', exports: [
- allConfigurationGroups
-], directives: [
- coreDirectives,
- MaterialRadioComponent,
- MaterialRadioGroupComponent,
- MaterialSelectComponent,
- MaterialSelectItemComponent,
- NgModel,
-], template: '''
- <material-radio-group
- [ngModel]="changeType"
- (ngModelChange)="setChangeType(\$event)">
- <material-radio
- *ngFor="let option of changeTypes"
- style="display: flex"
- [value]="option">{{option['label']}}
- </material-radio>
- </material-radio-group>
- <hr>
- <b>Show changes on builders:</b>
- <material-select
- class="bordered-list"
- focusList
- [selection]="groupSelector"
- [itemRenderer]="identityFunction">
- <material-select-item
- *ngFor="let group of allConfigurationGroups"
- focusItem
- [value]="group">
- </material-select-item>
- </material-select>
-''')
-class FilterComponent {
- static const allConfigurationGroups = Filter.allConfigurationGroups;
-
- @Input()
- FilterService service;
- SelectionModel<String> groupSelector;
-
- Filter get filter => service.filter;
-
- FilterComponent(this.service) {
- groupSelector = SelectionModel.multi(
- selectedValues: service.filter.configurationGroups);
- groupSelector.selectionChanges.listen(onSelectionChange);
- changeType = changeTypes.firstWhere(
- (type) =>
- type['latestFailures'] == filter.showLatestFailures &&
- type['unapprovedOnly'] == filter.showUnapprovedOnly,
- orElse: () => changeTypes.first);
- }
-
- void onSelectionChange(_) {
- final values = groupSelector.selectedValues.toList();
- service.changeFilter(filter.copy(configurationGroups: values));
- }
-
- List<Map> changeTypes = [
- {
- 'label': 'Show all changes',
- 'latestFailures': false,
- 'unapprovedOnly': false
- },
- {
- 'label': 'Show latest failures',
- 'latestFailures': true,
- 'unapprovedOnly': false
- },
- {
- 'label': 'Show latest unapproved failures',
- 'latestFailures': true,
- 'unapprovedOnly': true
- },
- ];
-
- Map changeType;
-
- void setChangeType(Map event) {
- changeType = event;
- service.changeFilter(filter.copy(
- showLatestFailures: event['latestFailures'],
- showUnapprovedOnly: event['unapprovedOnly']));
- }
-
- String identityFunction(t) => t;
-}
