Skip to content

Commit 3a6d0b1

Browse files
committed
fix(header): display current version in header component
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent 92e78b3 commit 3a6d0b1

3 files changed

Lines changed: 18 additions & 32 deletions

File tree

frontend/src/app/shared/components/layout/header/header.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="navbar-img mr-3 d-flex justify-content-start align-items-center">
88
<img *ngIf="logoImage" [alt]="altImage" [src]="sanitizer.bypassSecurityTrustUrl(logoImage)"
99
class="cursor-pointer" routerLink="/dashboard/overview">
10-
<app-utm-version-info></app-utm-version-info>
10+
<app-utm-version-info [version]="currentVersion"></app-utm-version-info>
1111

1212
<!--<app-utm-license-info class="ml-4"></app-utm-license-info>-->
1313
<app-utm-vault-status class="ml-4"></app-utm-vault-status>

frontend/src/app/shared/components/layout/header/header.component.ts

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import {Component, OnDestroy, OnInit} from '@angular/core';
22
import {DomSanitizer} from '@angular/platform-browser';
3-
import {UtmModulesService} from '../../../../app-module/shared/services/utm-modules.service';
43
import {AccountService} from '../../../../core/auth/account.service';
5-
import {LoginService} from '../../../../core/login/login.service';
64
import {User} from '../../../../core/user/user.model';
7-
import {NavBehavior} from '../../../behaviors/nav.behavior';
85
import {ThemeChangeBehavior} from '../../../behaviors/theme-change.behavior';
96
import {ADMIN_ROLE} from '../../../constants/global.constant';
107
import {AppThemeLocationEnum} from '../../../enums/app-theme-location.enum';
11-
import {ActiveAdModuleActiveService} from '../../../services/active-modules/active-ad-module.service';
12-
import {UtmRunModeService} from '../../../services/active-modules/utm-run-mode.service';
8+
import {CheckForUpdatesService} from '../../../services/updates/check-for-updates.service';
139

1410
@Component({
1511
selector: 'app-header',
@@ -23,15 +19,12 @@ export class HeaderComponent implements OnInit, OnDestroy {
2319
place = AppThemeLocationEnum;
2420
logoImage: string;
2521
altImage: string;
22+
currentVersion: any;
2623

27-
constructor(private loginService: LoginService,
28-
private accountService: AccountService,
29-
private adModuleActiveService: ActiveAdModuleActiveService,
24+
constructor(private accountService: AccountService,
3025
public sanitizer: DomSanitizer,
31-
private moduleService: UtmModulesService,
32-
private navBehavior: NavBehavior,
33-
private utmRunModeService: UtmRunModeService,
34-
private themeChangeBehavior: ThemeChangeBehavior) {
26+
private themeChangeBehavior: ThemeChangeBehavior,
27+
private checkForUpdatesService: CheckForUpdatesService) {
3528
}
3629

3730
ngOnInit() {
@@ -43,6 +36,14 @@ export class HeaderComponent implements OnInit, OnDestroy {
4336
this.accountService.identity().then(account => {
4437
this.user = account;
4538
});
39+
40+
this.getVersionInfo();
41+
}
42+
43+
getVersionInfo() {
44+
this.checkForUpdatesService.getVersion().subscribe(response => {
45+
this.currentVersion = response.body;
46+
});
4647
}
4748

4849
ngOnDestroy() {
Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
1-
import {Component, OnDestroy, OnInit} from '@angular/core';
2-
import {CheckForUpdatesService} from '../../../../../../services/updates/check-for-updates.service';
1+
import {Component, Input, OnInit} from '@angular/core';
32
import {VersionInfo} from '../../../../../../types/updates/updates.type';
43

54
@Component({
65
selector: 'app-utm-version-info',
76
templateUrl: './utm-version-info.component.html',
87
styleUrls: ['./utm-version-info.component.css']
98
})
10-
export class UtmVersionInfoComponent implements OnInit, OnDestroy {
11-
currentVersion: VersionInfo;
9+
export class UtmVersionInfoComponent implements OnInit {
10+
@Input('version') currentVersion: VersionInfo;
1211

13-
constructor(private checkForUpdatesService: CheckForUpdatesService) {
14-
}
15-
16-
ngOnInit() {
17-
this.getVersionInfo();
18-
}
19-
20-
ngOnDestroy() {
21-
}
22-
23-
getVersionInfo() {
24-
this.checkForUpdatesService.getVersion().subscribe(response => {
25-
this.currentVersion = response.body;
26-
});
27-
}
12+
ngOnInit() {}
2813

2914
}

0 commit comments

Comments
 (0)