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

Merge pull request #7435 from pureshine/hidden-vul

Browse Source 
Hide vulnrability if clair is not installed
This commit is contained in:
Fangyuan Cheng 2019-04-18 16:33:53 +08:00 committed by GitHub
commit c8e131b024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/portal/src/app/base/harbor-shell/harbor-shell.component.html
View File

@ -46,15 +46,15 @@
</a> </a>
</clr-vertical-nav-group-children> </clr-vertical-nav-group-children>
</clr-vertical-nav-group> </clr-vertical-nav-group>
<clr-vertical-nav-group *ngIf="isSystemAdmin" routerLinkActive="active"> <clr-vertical-nav-group *ngIf="isSystemAdmin && (withClair || hasAdminRole)" routerLinkActive="active">
<clr-icon shape="event" clrVerticalNavIcon></clr-icon> <clr-icon shape="event" clrVerticalNavIcon></clr-icon>
{{'SIDE_NAV.TASKS' | translate}} {{'SIDE_NAV.TASKS' | translate}}
<a routerLink="#" hidden aria-hidden="true"></a> <a routerLink="#" hidden aria-hidden="true"></a>
<clr-vertical-nav-group-children *clrIfExpanded="true"> <clr-vertical-nav-group-children *clrIfExpanded="true">
<a clrVerticalNavLink routerLink="/harbor/vulnerability" routerLinkActive="active"> <a clrVerticalNavLink *ngIf="withClair" routerLink="/harbor/vulnerability" routerLinkActive="active">
{{'SIDE_NAV.SYSTEM_MGMT.VULNERABILITY' | translate}} {{'SIDE_NAV.SYSTEM_MGMT.VULNERABILITY' | translate}}
</a> </a>
<a clrVerticalNavLink routerLink="/harbor/gc" routerLinkActive="active"> <a clrVerticalNavLink *ngIf="hasAdminRole" routerLink="/harbor/gc" routerLinkActive="active">
{{'SIDE_NAV.SYSTEM_MGMT.GARBAGE_COLLECTION' | translate}} {{'SIDE_NAV.SYSTEM_MGMT.GARBAGE_COLLECTION' | translate}}
</a> </a>
</clr-vertical-nav-group-children> </clr-vertical-nav-group-children>

9
src/portal/src/app/base/harbor-shell/harbor-shell.component.ts
View File

@ -107,6 +107,15 @@ export class HarborShellComponent implements OnInit, OnDestroy {
return account != null; return account != null;
} }
public get withClair(): boolean {
return this.appConfigService.getConfig().with_clair;
}
public get hasAdminRole(): boolean {
return this.session.getCurrentUser() &&
this.session.getCurrentUser().has_admin_role;
}
// Open modal dialog // Open modal dialog
openModal(event: ModalEvent): void { openModal(event: ModalEvent): void {
switch (event.modalName) { switch (event.modalName) {