Merge pull request #7546 from pureshine/fix-vulnerability

Fix vulnerability doesn't call systeminfo api by default

src/portal/lib/src/config/gc/gc-history/gc-history.component.html

@@ -1,4 +1,7 @@
 <h5 class="history-header" id="history-header">{{'GC.JOB_HISTORY' | translate}}</h5>
+<span class="refresh-btn" (click)="getJobs()">
+  <clr-icon shape="refresh"></clr-icon>
+</span>
 <clr-datagrid [clrDgLoading]="loading">
   <clr-dg-column>{{'GC.JOB_ID' | translate}}</clr-dg-column>
   <clr-dg-column>{{'GC.TRIGGER_TYPE' | translate}}</clr-dg-column>

src/portal/lib/src/config/gc/gc-history/gc-history.component.scss

@@ -1,4 +1,15 @@
+@import '../../../mixin';
 .history-header {
     color: #000;
     margin:20px 0 6px 0;
 }
+
+.refresh-btn {
+    @include grid-right-top-pos;
+    margin-top: -30px;
+    cursor: pointer;
+    &:hover {
+        color: #007CBB;
+    }
+}
+  

src/portal/lib/src/config/vulnerability/vulnerability-config.component.ts

@@ -122,6 +122,12 @@ export class VulnerabilityConfigComponent implements OnInit {
       this.getSchedule();
     }
 
+    getSystemInfo(): void {
+      this.systemInfoService.getSystemInfo()
+         .subscribe((info: SystemInfo) => (this.systemInfo = info)
+         , error => this.errorHandler.error(error));
+    }
+
     convertToLocalTime(utcTime: number): Date {
         let dt: Date = new Date();
         dt.setTime(utcTime * 1000);
@@ -146,7 +152,8 @@ export class VulnerabilityConfigComponent implements OnInit {
                 });
 
                 // Update system info
-                this.getSystemInfo().subscribe(() => {
+                this.systemInfoService.getSystemInfo()
+                .subscribe(() => {
                   this.onSubmitting = false;
                 }, error => {
                   this.onSubmitting = false;
@@ -164,15 +171,6 @@ export class VulnerabilityConfigComponent implements OnInit {
             });
     }
 
-    getSystemInfo(): Observable<void | SystemInfo> {
-        return this.systemInfoService.getSystemInfo()
-            .pipe(map((info: SystemInfo) => this.systemInfo = info)
-            , catchError(error => {
-                this.errorHandler.error(error);
-                return of();
-            }));
-    }
-
     reset(cron): void {
         this.schedule = {
             schedule: {