mirror of
https://github.com/goharbor/harbor.git
synced 2024-12-24 01:27:49 +01:00
Fix Scan task never ends in UI target/1.8.0
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
This commit is contained in:
parent
66087aac82
commit
6f055cebc3
@ -95,7 +95,7 @@
|
||||
<hbr-copy-input #copyInput (onCopyError)="onCpError($event)" iconMode="true" defaultValue="docker pull {{registryUrl}}/{{repoName}}:{{t.name}}"></hbr-copy-input>
|
||||
</clr-dg-cell>
|
||||
<clr-dg-cell *ngIf="withClair">
|
||||
<hbr-vulnerability-bar [repoName]="repoName" [tagId]="t.name" [summary]="t.scan_overview"></hbr-vulnerability-bar>
|
||||
<hbr-vulnerability-bar [tagStatus]="t.scan_overview.scan_status" [repoName]="repoName" [tagId]="t.name" [summary]="t.scan_overview"></hbr-vulnerability-bar>
|
||||
</clr-dg-cell>
|
||||
<clr-dg-cell *ngIf="withNotary" [ngSwitch]="t.signature !== null">
|
||||
<clr-icon shape="check-circle" *ngSwitchCase="true" size="20" class="color-green"></clr-icon>
|
||||
|
@ -29,6 +29,7 @@ const RETRY_TIMES: number = 3;
|
||||
})
|
||||
export class ResultBarChartComponent implements OnInit, OnDestroy {
|
||||
@Input() repoName: string = "";
|
||||
@Input() tagStatus: string = "";
|
||||
@Input() tagId: string = "";
|
||||
@Input() summary: VulnerabilitySummary;
|
||||
onSubmitting: boolean = false;
|
||||
@ -47,6 +48,9 @@ export class ResultBarChartComponent implements OnInit, OnDestroy {
|
||||
) { }
|
||||
|
||||
ngOnInit(): void {
|
||||
if (this.tagStatus === "running") {
|
||||
this.scanNow();
|
||||
}
|
||||
this.scanSubscription = this.channel.scanCommand$.subscribe((tagId: string) => {
|
||||
let myFullTag: string = this.repoName + "/" + this.tagId;
|
||||
if (myFullTag === tagId) {
|
||||
|
@ -18,7 +18,7 @@
|
||||
<clr-dg-column [clrDgField]="'version'">{{'VULNERABILITY.GRID.COLUMN_VERSION' | translate}}</clr-dg-column>
|
||||
<clr-dg-column [clrDgField]="'fixedVersion'">{{'VULNERABILITY.GRID.COLUMN_FIXED' | translate}}</clr-dg-column>
|
||||
|
||||
<clr-dg-placeholder>{{'VULNERABILITY.GRID.PLACEHOLDER' | translate}}</clr-dg-placeholder>
|
||||
<clr-dg-placeholder>{{'VULNERABILITY.CHART.TOOLTIPS_TITLE_ZERO' | translate}}</clr-dg-placeholder>
|
||||
<clr-dg-row *clrDgItems="let res of scanningResults">
|
||||
<clr-dg-cell><a href="{{res.link}}" target="_blank">{{res.id}}</a></clr-dg-cell>
|
||||
<clr-dg-cell [ngSwitch]="res.severity">
|
||||
|
Loading…
Reference in New Issue
Block a user