Merge pull request #255 from bwsw/254-event-filter-fix

(closes #254): Bug with invisible selected filter fixed

Author: zolotyx

src/app/events/event-list.component.ts

@@ -66,9 +66,12 @@ export class EventListComponent implements OnInit {
   }
 
   public getEvents(params = { reload: false }): void {
-    if (params.reload) { this.loading = true; }
+    if (params.reload) {
+      this.loading = true;
+    }
     this.getEventsObservable(params)
-      .subscribe(() => this.loading = false);
+      .finally(() => this.loading = false)
+      .subscribe();
   }
 
   public getEventsObservable(params: { reload: boolean }): Observable<Array<Event>> {
@@ -109,7 +112,9 @@ export class EventListComponent implements OnInit {
   }
 
   private filterBySearch(events: Array<Event>): Array<Event> {
-    if (!this.query) { return events; }
+    if (!this.query) {
+      return events;
+    }
 
     const queryLower = this.query.toLowerCase();
     return events.filter((event: Event) => {
@@ -169,12 +174,19 @@ export class EventListComponent implements OnInit {
   }
 
   private getEventTypes(events: Array<Event>): Array<string> {
-    return events.reduce((acc, event) => {
+    const types = events.reduce((acc, event) => {
       if (!acc.includes(event.type)) {
         acc.push(event.type);
       }
       return acc;
     }, []);
+
+    return this.selectedTypes.reduce((acc, type) => {
+      if (!acc.includes(type)) {
+        acc.push(type);
+      }
+      return acc;
+    }, types);
   }
 
   private initTableModel(translations: any): void {

src/app/shared/services/notification.service.ts

@@ -22,7 +22,7 @@ export class NotificationService implements NotificationService {
   }
 
   public message(message: string | ParametrizedTranslation): Observable<MdlSnackbarComponent> {
-    let obs = new Subject<MdlSnackbarComponent>();
+    const obs = new Subject<MdlSnackbarComponent>();
     this.getTranslatedMessage(message)
       .switchMap(translatedMessage => {
         return this.snackbar.showSnackbar({
@@ -40,7 +40,7 @@ export class NotificationService implements NotificationService {
       handler: () => {},
       text: 'OK'
     }): Observable<MdlSnackbarComponent> {
-    let obs = new Subject<MdlSnackbarComponent>();
+    const obs = new Subject<MdlSnackbarComponent>();
     this.getTranslatedMessage(message)
       .switchMap(translatedMessage => {
         return this.snackbar.showSnackbar({message: translatedMessage, action});
@@ -60,7 +60,7 @@ export class NotificationService implements NotificationService {
       handler: () => {},
       text: 'OK'
     }): Observable<MdlSnackbarComponent> {
-    let obs = new Subject<MdlSnackbarComponent>();
+    const obs = new Subject<MdlSnackbarComponent>();
     this.getTranslatedMessage(message)
       .switchMap(translatedMessage => {
         return this.snackbar.showSnackbar({

src/app/vm/vm-list/vm-list.component.html

@@ -10,7 +10,7 @@
     ></cs-vm-filter>
   </ng-container>
 
-  <ng-container *loading="!vmList" cs-list>
+  <ng-container *loading="!vmList.length" cs-list>
     <ng-container *ngIf="showSubsections && !showSections">
       <ng-container *ngFor="let subsection of subsections">
         <cs-vm-list-subsection

src/app/vm/vm-list/vm-list.component.ts

@@ -52,8 +52,8 @@ export class VmListComponent implements OnInit {
   public sections: Array<VmListSection> = [];
   public subsections: Array<VmListSubsection> = [];
 
-  public vmList: Array<VirtualMachine>;
-  public visibleVmList: Array<VirtualMachine>;
+  public vmList: Array<VirtualMachine> = [];
+  public visibleVmList: Array<VirtualMachine> = [];
 
   constructor(
     public listService: ListService,
@@ -96,7 +96,7 @@ export class VmListComponent implements OnInit {
   }
 
   public updateFilters(filterData?: VmFilter): void {
-    if (!this.vmList) {
+    if (!this.vmList.length) {
       return;
     }
     if (!filterData && !this.filterData) {