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

Fix Scan task never ends in UI target/1.8.0

Browse Source 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
This commit is contained in:
FangyuanCheng 2019-04-23 01:52:47 +08:00
parent 66087aac82
commit 6f055cebc3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/lib/src/tag/tag.component.html
View File

@ -95,7 +95,7 @@
<hbr-copy-input #copyInput (onCopyError)="onCpError($event)" iconMode="true" defaultValue="docker pull {{registryUrl}}/{{repoName}}:{{t.name}}"></hbr-copy-input> <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>
<clr-dg-cell *ngIf="withClair"> <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>
<clr-dg-cell *ngIf="withNotary" [ngSwitch]="t.signature !== null"> <clr-dg-cell *ngIf="withNotary" [ngSwitch]="t.signature !== null">
<clr-icon shape="check-circle" *ngSwitchCase="true" size="20" class="color-green"></clr-icon> <clr-icon shape="check-circle" *ngSwitchCase="true" size="20" class="color-green"></clr-icon>

4
src/portal/lib/src/vulnerability-scanning/result-bar-chart.component.ts
View File

@ -29,6 +29,7 @@ const RETRY_TIMES: number = 3;
}) })
export class ResultBarChartComponent implements OnInit, OnDestroy { export class ResultBarChartComponent implements OnInit, OnDestroy {
@Input() repoName: string = ""; @Input() repoName: string = "";
@Input() tagStatus: string = "";
@Input() tagId: string = ""; @Input() tagId: string = "";
@Input() summary: VulnerabilitySummary; @Input() summary: VulnerabilitySummary;
onSubmitting: boolean = false; onSubmitting: boolean = false;
@ -47,6 +48,9 @@ export class ResultBarChartComponent implements OnInit, OnDestroy {
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
if (this.tagStatus === "running") {
this.scanNow();
}
this.scanSubscription = this.channel.scanCommand$.subscribe((tagId: string) => { this.scanSubscription = this.channel.scanCommand$.subscribe((tagId: string) => {
let myFullTag: string = this.repoName + "/" + this.tagId; let myFullTag: string = this.repoName + "/" + this.tagId;
if (myFullTag === tagId) { if (myFullTag === tagId) {

2
src/portal/lib/src/vulnerability-scanning/result-grid.component.html
View File

@ -18,7 +18,7 @@
<clr-dg-column [clrDgField]="'version'">{{'VULNERABILITY.GRID.COLUMN_VERSION' | translate}}</clr-dg-column> <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-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-row *clrDgItems="let res of scanningResults">
<clr-dg-cell><a href="{{res.link}}" target="_blank">{{res.id}}</a></clr-dg-cell> <clr-dg-cell><a href="{{res.link}}" target="_blank">{{res.id}}</a></clr-dg-cell>
<clr-dg-cell [ngSwitch]="res.severity"> <clr-dg-cell [ngSwitch]="res.severity">