From 455ebf51fcd5020b0760f5b5bd3c5a51783684f4 Mon Sep 17 00:00:00 2001
From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com>
Date: Sat, 30 Jul 2022 17:17:10 +0800
Subject: [PATCH] Fix null pointer issue for creating reolication rule (#17274)

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 .../list-project/list-project.component.html       |  1 -
 .../list-project/list-project.component.ts         | 14 +++++---------
 .../create-edit-rule.component.html                |  2 +-
 .../create-edit-rule/create-edit-rule.component.ts |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html
index 6482869fd..4e9b96c78 100644
--- a/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html
+++ b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.html
@@ -26,7 +26,6 @@
             <clr-dropdown-menu *clrIfOpen>
                 <button
                     [disabled]="!hasPermission || !canClickExport"
-                    [clrLoading]="checkingPermission"
                     clrDropdownItem
                     (click)="exportCVE()">
                     <clr-icon shape="export" size="16"></clr-icon>&nbsp;
diff --git a/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts
index 4d5934fc8..a502cd8ed 100644
--- a/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts
+++ b/src/portal/src/app/base/left-side-nav/projects/list-project/list-project.component.ts
@@ -91,7 +91,6 @@ export class ListProjectComponent implements OnDestroy {
     @ViewChild(ExportCveComponent)
     exportCveComponent: ExportCveComponent;
     hasPermission: boolean = false;
-    checkingPermission: boolean = false;
     canClickExport: boolean = true;
     constructor(
         private session: SessionService,
@@ -409,14 +408,11 @@ export class ListProjectComponent implements OnDestroy {
                     )
                 );
             });
-            this.checkingPermission = true;
-            forkJoin(obs)
-                .pipe(finalize(() => (this.checkingPermission = false)))
-                .subscribe(res => {
-                    if (res?.length) {
-                        this.hasPermission = res.every(item => item);
-                    }
-                });
+            forkJoin(obs).subscribe(res => {
+                if (res?.length) {
+                    this.hasPermission = res.every(item => item);
+                }
+            });
         }
     }
     triggerExportSuccess() {
diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
index 39bc263b1..0e92d0511 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.html
@@ -294,7 +294,7 @@
                                                     let-m="index">
                                                     <hbr-label-piece
                                                         class="label-piece"
-                                                        *ngIf="m < 1"
+                                                        *ngIf="m < 1 && label"
                                                         [hasIcon]="false"
                                                         [label]="
                                                             getLabel(label)
diff --git a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
index eb406177a..774901edc 100644
--- a/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
+++ b/src/portal/src/app/base/left-side-nav/replication/replication/create-edit-rule/create-edit-rule.component.ts
@@ -639,10 +639,10 @@ export class CreateEditRuleComponent implements OnInit, OnDestroy {
 
     setFilterAndTrigger(adapter) {
         this.supportedFilters = adapter.supported_resource_filters;
+        this.filters.clear(); // clear before init
         this.supportedFilters.forEach(element => {
             this.filters.push(this.initFilter(element.type));
         });
-
         this.supportedTriggers = adapter.supported_triggers;
         this.ruleForm
             .get('trigger')