Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-27 19:17:47 +01:00
Code Issues Projects Releases Wiki Activity

Improve scan all page (#14940)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
Will Sun 2021-05-21 17:55:57 +08:00 committed by GitHub
parent 39bdd7b506
commit bea27a7da1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability/vulnerability-config.component.ts
View File

@ -11,6 +11,7 @@ import { DatePipe } from "@angular/common";
import { errorHandler } from "../../../../shared/units/shared.utils";
const SCHEDULE_TYPE_NONE = "None";
const TIMEOUT: number = 5000;
@Component({
selector: 'vulnerability-config',
templateUrl: './vulnerability-config.component.html',
@ -37,10 +38,10 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy {
"Success": "CONFIG.SCANNING.STATUS.SUCCESS",
"Scheduled": "CONFIG.SCANNING.STATUS.SCHEDULED"
};
private _loopInterval;
updatedTimeStr: string;
onGettingUpdatedTimeStr: boolean;
hasDefaultScanner: boolean = false;
private _timeout: any;
constructor(
private scanningService: ScanAllRepoService,
private errorHandlerEntity: ErrorHandler,
@ -51,21 +52,6 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy {
return this._scanningMetrics;
}
set scanningMetrics(metrics: ScanningMetrics) {
// start looping metrics
if (metrics && metrics.ongoing) {
if (!this._loopInterval) {
this._loopInterval = setInterval(() => {
this.getMetrics();
}, 5000);
}
}
// stop looping metrics
if (metrics && !metrics.ongoing) {
if (this._loopInterval) {
clearInterval(this._loopInterval);
this._loopInterval = null;
}
}
this._scanningMetrics = metrics;
}
get scanAvailable(): boolean {
@ -153,9 +139,9 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy {
}
ngOnDestroy() {
if (this._loopInterval) {
clearInterval(this._loopInterval);
this._loopInterval = null;
if (this._timeout) {
clearTimeout(this._timeout);
this._timeout = null;
}
}
isOnScanning(): boolean {
@ -168,6 +154,17 @@ export class VulnerabilityConfigComponent implements OnInit, OnDestroy {
.pipe(finalize(() => this.gettingMetrics = false))
.subscribe(response => {
if (response) {
if (response.ongoing) {
if (this._timeout) {
clearTimeout(this._timeout);
this._timeout = null;
}
if (!this._timeout) {
this._timeout = setTimeout(() => {
this.getMetrics();
}, TIMEOUT);
}
}
this.scanningMetrics = response;
}
});