diff --git a/src/ui_ng/lib/src/tag/tag-detail.component.ts b/src/ui_ng/lib/src/tag/tag-detail.component.ts
index 5a98ef8b3..9a1be6b3a 100644
--- a/src/ui_ng/lib/src/tag/tag-detail.component.ts
+++ b/src/ui_ng/lib/src/tag/tag-detail.component.ts
@@ -24,6 +24,7 @@ export class TagDetailComponent implements OnInit {
@Input() tagId: string;
@Input() repositoryId: string;
+ @Input() withAdmiral: boolean;
tagDetails: Tag = {
name: "--",
size: "--",
diff --git a/src/ui_ng/lib/src/tag/tag.component.html.ts b/src/ui_ng/lib/src/tag/tag.component.html.ts
index 96be13e60..381660994 100644
--- a/src/ui_ng/lib/src/tag/tag.component.html.ts
+++ b/src/ui_ng/lib/src/tag/tag.component.html.ts
@@ -17,7 +17,8 @@ export const TAG_TEMPLATE = `
-
+
+
@@ -44,7 +45,7 @@ export const TAG_TEMPLATE = `
-
+
diff --git a/src/ui_ng/lib/src/tag/tag.component.ts b/src/ui_ng/lib/src/tag/tag.component.ts
index 4999baf5a..8f44593f2 100644
--- a/src/ui_ng/lib/src/tag/tag.component.ts
+++ b/src/ui_ng/lib/src/tag/tag.component.ts
@@ -80,7 +80,7 @@ export class TagComponent implements OnInit, AfterViewInit {
@Input() registryUrl: string;
@Input() withNotary: boolean;
@Input() withClair: boolean;
-
+ @Input() withAdmiral: boolean;
@Output() refreshRepo = new EventEmitter
();
@Output() tagClickEvent = new EventEmitter();
@Output() signatureOutput = new EventEmitter();
diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json
index ebc5040c4..52ae9f4cb 100644
--- a/src/ui_ng/package.json
+++ b/src/ui_ng/package.json
@@ -31,7 +31,7 @@
"clarity-icons": "^0.10.17",
"clarity-ui": "^0.10.27",
"core-js": "^2.4.1",
- "harbor-ui": "0.6.57",
+ "harbor-ui": "0.6.58",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",
diff --git a/src/ui_ng/src/app/config/config.component.html b/src/ui_ng/src/app/config/config.component.html
index fee0a3a17..6f00dce28 100644
--- a/src/ui_ng/src/app/config/config.component.html
+++ b/src/ui_ng/src/app/config/config.component.html
@@ -12,7 +12,7 @@
-
+
@@ -28,10 +28,9 @@
-
diff --git a/src/ui_ng/src/app/config/config.component.ts b/src/ui_ng/src/app/config/config.component.ts
index c6b6d5889..cadd50437 100644
--- a/src/ui_ng/src/app/config/config.component.ts
+++ b/src/ui_ng/src/app/config/config.component.ts
@@ -81,6 +81,10 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
return this.appConfigService.getConfig().with_clair;
}
+ public get withAdmiral(): boolean {
+ return this.appConfigService.getConfig().with_admiral;
+ }
+
isCurrentTabLink(tabId: string): boolean {
return this.currentTabId === tabId;
}
diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.html b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
index 6ac3bdc22..05f465388 100644
--- a/src/ui_ng/src/app/project/project-detail/project-detail.component.html
+++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.html
@@ -13,7 +13,7 @@
{{'PROJECT_DETAIL.REPLICATION' | translate}}
-
+
{{'PROJECT_DETAIL.LABELS' | translate}}
diff --git a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts
index 61c78d112..a6176de00 100644
--- a/src/ui_ng/src/app/project/project-detail/project-detail.component.ts
+++ b/src/ui_ng/src/app/project/project-detail/project-detail.component.ts
@@ -20,6 +20,7 @@ import { SessionService } from '../../shared/session.service';
import { ProjectService } from '../../project/project.service';
import { RoleMapping } from '../../shared/shared.const';
+import {AppConfigService} from "../../app-config.service";
@Component({
selector: 'project-detail',
@@ -38,6 +39,7 @@ export class ProjectDetailComponent {
private route: ActivatedRoute,
private router: Router,
private sessionService: SessionService,
+ private appConfigService: AppConfigService,
private projectService: ProjectService) {
this.hasSignedIn = this.sessionService.getCurrentUser() !== null;
@@ -61,6 +63,10 @@ export class ProjectDetailComponent {
return this.sessionService.getCurrentUser() != null;
}
+ public get withAdmiral(): boolean {
+ return this.appConfigService.getConfig().with_admiral;
+ }
+
backToProject(): void {
if (window.sessionStorage) {
window.sessionStorage.setItem('fromDetails', 'true');
diff --git a/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.html b/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.html
index f95fc141b..08e9f7776 100644
--- a/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.html
+++ b/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.html
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.ts b/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.ts
index 7dc45c42b..4c96bc373 100644
--- a/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.ts
+++ b/src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.ts
@@ -13,6 +13,7 @@
// limitations under the License.
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
+import {AppConfigService} from "../../app-config.service";
@Component({
selector: 'repository',
@@ -25,6 +26,7 @@ export class TagDetailPageComponent implements OnInit {
constructor(
private route: ActivatedRoute,
+ private appConfigService: AppConfigService,
private router: Router
) {
}
@@ -35,6 +37,10 @@ export class TagDetailPageComponent implements OnInit {
this.projectId = this.route.snapshot.params["id"];
}
+ get withAdmiral(): boolean {
+ return this.appConfigService.getConfig().with_admiral;
+ }
+
goBack(tag: string): void {
this.router.navigate(["harbor", "projects", this.projectId, "repositories", tag]);
}
diff --git a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.html b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.html
index f9ea701ea..9c506dfb1 100644
--- a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.html
+++ b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.html
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts
index 7cf2255a5..842a58de4 100644
--- a/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts
+++ b/src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts
@@ -68,6 +68,10 @@ export class TagRepositoryComponent implements OnInit {
return this.appConfigService.getConfig().with_clair;
}
+ get withAdmiral(): boolean {
+ return this.appConfigService.getConfig().with_admiral;
+ }
+
get hasSignedIn(): boolean {
return this.session.getCurrentUser() !== null;
}