Merge pull request #315 from liimaorg/bugix_reset_filter_add

angular deploy: reset filter selection on change
liimaorg · Dec 19, 2017 · 26c177e · 26c177e
2 parents 9cc3d76 + efe9f74
commit 26c177e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/AMW_angular/io/src/app/deployment/deployments.component.html b/AMW_angular/io/src/app/deployment/deployments.component.html
@@ -19,7 +19,7 @@ <h1>{{appState.get('pageTitle')}}</h1>
         <div class="form-group">
           <label for="selectFilterType" class="col-sm-1 control-label">Add filter</label>
           <div class="col-sm-10">
-            <select id="selectFilterType" class="form-control" [(ngModel)]="selectedFilterType" (change)="addFilter()">
+            <select id="selectFilterType" #selectModel="ngModel" class="form-control" [(ngModel)]="selectedFilterType" (change)="addFilter()">
               <option *ngFor="let filterType of filterTypes" [ngValue]="filterType">{{filterType.name}}</option>
             </select>
           </div>

diff --git a/AMW_angular/io/src/app/deployment/deployments.component.ts b/AMW_angular/io/src/app/deployment/deployments.component.ts
@@ -1,5 +1,6 @@
-import { Component, OnInit, NgZone } from '@angular/core';
+import { Component, OnInit, NgZone, ViewChild } from '@angular/core';
 import { Location } from '@angular/common';
+import { NgModel } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { AppState } from '../app.service';
 import { ComparatorFilterOption } from './comparator-filter-option';
@@ -21,6 +22,7 @@ declare var $: any;
 })
 
 export class DeploymentsComponent implements OnInit {
+  @ViewChild('selectModel') private selectModel: NgModel;
 
   defaultComparator: string = 'eq';
 
@@ -121,10 +123,11 @@ export class DeploymentsComponent implements OnInit {
       newFilter.type = this.selectedFilterType.type;
       newFilter.compOptions = this.comparatorOptionsForType(this.selectedFilterType.type);
       this.setValueOptionsForFilter(newFilter);
-      this.filters.unshift(newFilter);
+      this.filters.push(newFilter);
       this.enableDatepicker(newFilter.type);
       this.offset = 0;
       this.selectedFilterType = null;
+      this.selectModel.reset(null);
     }
   }