diff --git a/src/portal/lib/src/tag/tag-detail.component.html b/src/portal/lib/src/tag/tag-detail.component.html index 43c78ad90..c391a5f0a 100644 --- a/src/portal/lib/src/tag/tag-detail.component.html +++ b/src/portal/lib/src/tag/tag-detail.component.html @@ -69,7 +69,7 @@
- +
diff --git a/src/portal/lib/src/tag/tag-detail.component.ts b/src/portal/lib/src/tag/tag-detail.component.ts index ffe3f8702..beba8aae9 100644 --- a/src/portal/lib/src/tag/tag-detail.component.ts +++ b/src/portal/lib/src/tag/tag-detail.component.ts @@ -23,6 +23,7 @@ export class TagDetailComponent implements OnInit { @Input() repositoryId: string; @Input() withAdmiral: boolean; @Input() withClair: boolean; + @Input() withAdminRole: boolean; tagDetails: Tag = { name: "--", size: "--", diff --git a/src/portal/lib/src/vulnerability-scanning/result-grid.component.html b/src/portal/lib/src/vulnerability-scanning/result-grid.component.html index b1b12988e..39ffd4b1d 100644 --- a/src/portal/lib/src/vulnerability-scanning/result-grid.component.html +++ b/src/portal/lib/src/vulnerability-scanning/result-grid.component.html @@ -10,7 +10,7 @@
- + {{'VULNERABILITY.GRID.COLUMN_ID' | translate}} {{'VULNERABILITY.GRID.COLUMN_SEVERITY' | translate}} diff --git a/src/portal/lib/src/vulnerability-scanning/result-grid.component.ts b/src/portal/lib/src/vulnerability-scanning/result-grid.component.ts index d3b623fe0..2eb1bf692 100644 --- a/src/portal/lib/src/vulnerability-scanning/result-grid.component.ts +++ b/src/portal/lib/src/vulnerability-scanning/result-grid.component.ts @@ -20,6 +20,7 @@ export class ResultGridComponent implements OnInit { @Input() tagId: string; @Input() repositoryId: string; + @Input() withAdminRole: boolean; constructor( private scanningService: ScanningResultService, diff --git a/src/portal/src/app/account/sign-in/sign-in.component.scss b/src/portal/src/app/account/sign-in/sign-in.component.scss index ae9461e23..cc7b6c44a 100644 --- a/src/portal/src/app/account/sign-in/sign-in.component.scss +++ b/src/portal/src/app/account/sign-in/sign-in.component.scss @@ -57,7 +57,4 @@ background: transparent; flex-wrap: wrap; margin-top:-20px; - .login { - background:transparent; - } } \ No newline at end of file diff --git a/src/portal/src/app/repository/tag-detail/tag-detail-page.component.html b/src/portal/src/app/repository/tag-detail/tag-detail-page.component.html index 0a7a030b8..ca6f72401 100644 --- a/src/portal/src/app/repository/tag-detail/tag-detail-page.component.html +++ b/src/portal/src/app/repository/tag-detail/tag-detail-page.component.html @@ -4,5 +4,10 @@ < {{'REPOSITORY.REPOSITORIES'| translate}} < {{repositoryId}}
- +
\ No newline at end of file diff --git a/src/portal/src/app/repository/tag-detail/tag-detail-page.component.ts b/src/portal/src/app/repository/tag-detail/tag-detail-page.component.ts index 24a19ff4b..9232789e6 100644 --- a/src/portal/src/app/repository/tag-detail/tag-detail-page.component.ts +++ b/src/portal/src/app/repository/tag-detail/tag-detail-page.component.ts @@ -14,6 +14,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import {AppConfigService} from "../../app-config.service"; +import { SessionService } from '../../shared/session.service'; @Component({ selector: 'repository', @@ -28,7 +29,8 @@ export class TagDetailPageComponent implements OnInit { constructor( private route: ActivatedRoute, private appConfigService: AppConfigService, - private router: Router + private router: Router, + private session: SessionService ) { } @@ -46,6 +48,10 @@ export class TagDetailPageComponent implements OnInit { return this.appConfigService.getConfig().with_clair; } + get withAdminRole(): boolean { + return this.session.getCurrentUser().has_admin_role; + } + goBack(tag: string): void { this.router.navigate(["harbor", "projects", this.projectId, "repositories", tag]); }