Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-04-03 18:46:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3277 from ninjadq/fix_unkonwn_package_is_0_issue

Browse Source 
Fix unkonwn package is 0 issue. #3170   #3178
This commit is contained in:
Deng, Qian 2017-09-26 15:30:46 +08:00 committed by GitHub
commit 0982dff6ed
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui_ng/lib/src/tag/tag.component.html.ts
View File

@ -30,7 +30,7 @@ export const TAG_TEMPLATE = `
<button class="action-item" *ngIf="hasProjectAdminRole" (click)="deleteTag(t)">{{'REPOSITORY.DELETE' | translate}}</button>
<button class="action-item" (click)="showDigestId(t)">{{'REPOSITORY.COPY_DIGEST_ID' | translate}}</button>
</clr-dg-action-overflow>
<clr-dg-cell style="width: 80px;" [ngSwitch]="withClair">
<clr-dg-cell style="width: 80px;" [ngSwitch]="existObservablePackage(t)">
<a *ngSwitchCase="true" href="javascript:void(0)" (click)="onTagClick(t)">{{t.name}}</a>
<span *ngSwitchDefault>{{t.name}}</span>
</clr-dg-cell>
@ -56,4 +56,4 @@ export const TAG_TEMPLATE = `
{{pagination.totalItems}} {{'REPOSITORY.ITEMS' | translate}}&nbsp;&nbsp;&nbsp;&nbsp;
<clr-dg-pagination #pagination [clrDgPageSize]="10"></clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>`;
</clr-datagrid>`;

9
src/ui_ng/lib/src/tag/tag.component.ts
View File

@ -253,7 +253,7 @@ export class TagComponent implements OnInit {
}
}
//Get vulnerability scanning status
//Get vulnerability scanning status
scanStatus(t: Tag): string {
if (t && t.scan_overview && t.scan_overview.scan_status) {
return t.scan_overview.scan_status;
@ -262,6 +262,13 @@ export class TagComponent implements OnInit {
return VULNERABILITY_SCAN_STATUS.unknown;
}
existObservablePackage(t: Tag): boolean {
return t.scan_overview &&
t.scan_overview.components &&
t.scan_overview.components.total &&
t.scan_overview.components.total > 0 ? true : false;
}
//Whether show the 'scan now' menu
canScanNow(t: Tag): boolean {
if (!this.withClair) { return false; }

8
src/ui_ng/lib/src/vulnerability-scanning/result-tip.component.ts
View File

@ -45,7 +45,9 @@ export class ResultTipComponent implements OnInit {
level = VulnerabilitySeverity.LOW;
}else if (this._unknownCount && this._unknownCount >= 1) {
level = VulnerabilitySeverity.UNKNOWN;
}else {
}else if (this.totalPackages == 0) {
level = VulnerabilitySeverity.UNKNOWN;
} else {
level = VulnerabilitySeverity.NONE;
}
return level;
@ -105,8 +107,8 @@ export class ResultTipComponent implements OnInit {
let m: number = this.totalPackages;
if (m === 0) {
//If no packages recognized, then show green bar
if (severity === VulnerabilitySeverity.NONE) {
//If no packages recognized, then show grey
if (severity === VulnerabilitySeverity.UNKNOWN) {
return MAX_TIP_WIDTH + 'px';
} else {
return 0 + 'px';

2
src/ui_ng/package.json
View File

@ -31,7 +31,7 @@
"clarity-icons": "^0.9.8",
"clarity-ui": "^0.9.8",
"core-js": "^2.4.1",
"harbor-ui": "0.4.71",
"harbor-ui": "0.4.72",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",