Merge pull request #7323 from zhoumeina/replication_ng

modify filter to show all the filters in once

src/portal/lib/src/create-edit-rule/create-edit-rule.component.html

@@ -64,7 +64,7 @@
             <div class="filterSelect" *ngFor="let filter of filters.controls; let i=index">
               <div [formGroupName]="i">
                 <div class="width-70">
-                  <label>{{"REPLICATION." + supportedFilters[i].type.toUpperCase() | translate}}:</label>
+                  <label>{{"REPLICATION." + supportedFilters[i]?.type.toUpperCase() | translate}}:</label>
                 </div>
                 <label *ngIf="supportedFilters[i]?.style==='input'" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-bottom-left"
                   [class.invalid]='(filter.value.dirty || filter.value.touched) && filter.value.invalid'>
@@ -76,12 +76,9 @@
                     <option *ngFor="let value of supportedFilters[i]?.values;" value="{{value}}">{{value}}</option>
                   </select>
                 </div>
-                <clr-icon *ngIf="i=== filters.length-1" shape="times-circle" class="is-solid" (click)="deleteFilter(i)"></clr-icon>
               </div>
             </div>
           </div>
-          <clr-icon id="add-label-list" shape="plus-circle" class="is-solid mr-t-11" [hidden]="isFilterHide" (click)="addNewFilter()"></clr-icon>
-
         </div>
         <!--destination registry-->
         <div *ngIf="isPushMode" class="form-group form-group-override">

src/portal/lib/src/create-edit-rule/create-edit-rule.component.ts

@@ -94,6 +94,10 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
   initRegistryInfo(id: number): void {
     this.repService.getRegistryInfo(id).subscribe(adapter => {
       this.supportedFilters = adapter.supported_resource_filters;
+      this.supportedFilters.forEach(element => {
+        this.filters.push(this.initFilter(element.type));
+      });
+
       this.supportedTriggers = adapter.supported_triggers;
       this.ruleForm.get("trigger").get("type").setValue(this.supportedTriggers[0]);
     });
@@ -138,7 +142,7 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
 
   modeChange(): void {
     if (this.isPushMode) {
-    this.initRegistryInfo(0);
+      this.initRegistryInfo(0);
     }
   }
 
@@ -230,10 +234,29 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
       enabled: rule.enabled
     });
 
-    this.noSelectedEndpoint = false;
-    if (rule.filters) {
-      this.setFilter(rule.filters);
+    // reset the filter list.
+    let filters = [];
+    for (let i = 0; i < this.supportedFilters.length; i++) {
+      let findTag: boolean = false;
+      if (rule.filters) {
+        rule.filters.forEach((ruleItem, j) => {
+          if (this.supportedFilters[i].type === ruleItem.type) {
+            filters.push(ruleItem);
+            findTag = true;
+          }
+        });
+      }
+
+      if (!findTag) {
+        filters.push({ type: this.supportedFilters[i].type, value: "" });
+      }
+
     }
+
+    this.noSelectedEndpoint = false;
+    this.setFilter(filters);
+    // end of reset the filter list.
+
     // Force refresh view
     let hnd = setInterval(() => this.ref.markForCheck(), 100);
     setTimeout(() => clearInterval(hnd), 2000);
@@ -285,20 +308,6 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
     return this.filters.length;
   }
 
-  addNewFilter(): void {
-    let index = this.getCurrentIndex();
-    this.filters.push(this.initFilter(this.supportedFilters[index].type));
-    if (index + 1 >= this.supportedFilters.length) {
-      this.isFilterHide = true;
-    }
-  }
-
-  // delete a filter
-  deleteFilter(i: number): void {
-    this.filters.removeAt(i);
-    this.isFilterHide = false;
-  }
-
   // Replication Schedule select value exchange
   selectSchedule($event: any): void {
 
@@ -326,6 +335,13 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
     } else {
       copyRuleForm.dest_registry = null;
     }
+    let filters: any = copyRuleForm.filters;
+    // remove the filters which user not set.
+    for (let i = filters.length - 1; i >= 0; i--) {
+      if (filters[i].value === "") {
+        copyRuleForm.filters.splice(i, 1);
+      }
+    }
 
     if (this.policyId < 0) {
       this.repService

src/portal/lib/src/service/interface.ts

@@ -118,6 +118,7 @@ export interface ReplicationRule extends Base {
 
 export class Filter {
   type: string;
+  value?: string;
   constructor(type: string) {
     this.type = type;
   }