This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-572
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-572 by this push:
new 652e3eb [DLAB-583]: added meta data service
652e3eb is described below
commit 652e3eb3c62815273870baed9381aad46db22f7a
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Fri Apr 12 16:08:29 2019 +0300
[DLAB-583]: added meta data service
---
.../resources/webapp/src/app/shared/navbar/navbar.component.html | 9 ++++-----
.../resources/webapp/src/app/shared/navbar/navbar.component.scss | 5 +++--
.../resources/webapp/src/app/shared/navbar/navbar.component.ts | 4 +++-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 938473c..d13c23e 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -42,14 +42,13 @@
<a *ngIf="healthStatus.status" [routerLink]="['/environment_management']"
class="statusbar">
<span class="material-icons" ngClass="{{healthStatus.status ||
''}}">radio_button_checked</span>
</a>
- <!-- *ngIf="metadata" -->
- <a class="statusbar" #info (click)="actions.toggle($event, info)">
- <span class="material-icons info">share</span>
+ <a *ngIf="metadata" class="statusbar" #info
(click)="actions.toggle($event, info)">
+ <span class="material-icons meta">share</span>
</a>
<bubble-up #actions class="list-menu" position="bottom-right">
<div class="app-info">
- <p><strong>Version:</strong> {{ metadata?.version | - }}</p>
- <p><strong>Branch</strong> {{ metadata?.branch | - }}</p>
+ <p><strong>Version: </strong> {{ metadata?.version }}</p>
+ <p><strong>Branch: </strong> {{ metadata?.branch }}</p>
</div>
</bubble-up>
<button class="btn btn-logout" (click)="logout_btnClick()">Log out <span
class="user-name">{{currentUserName}}</span></button>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index b6bc96f..e79d196 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -69,7 +69,8 @@
color: #bd4146;
}
}
- .info {
+ .meta {
+ color: #fff;
&:hover {
color: #c7d4d6;
}
@@ -133,7 +134,7 @@ a.nav-item {
}
}
-.ok, .warning, .error, .user-name {
+.ok, .warning, .error, .user-name, .meta {
transition: all .35s ease-in-out;
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index d924fb1..21938f9 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -197,7 +197,9 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
public checkVersionData(): void {
- this.healthStatusService.getAppMetaData().subscribe(res => this.metadata =
res);
+ this.healthStatusService.getAppMetaData().subscribe(
+ result => this.metadata = result || null,
+ error => console.log(error));
}
private selectQuotesAlert(type: string, user_quota?: number, total_quota?:
number): string {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
