summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
219fe61)
- Fix to show the version
Change-Id: I32cd425b88e6eb95f34b04e47a459b7382b952a2
Signed-off-by: SANDHYA.JS <sandhya.j@tataelxsi.co.in>
(cherry picked from commit
60f0a51c47cca2eaff2e9cf55deacf0c90548f04)
/**
* @file Header Component
*/
/**
* @file Header Component
*/
+import { isNullOrUndefined } from 'util';
import { Component, Injector, OnInit } from '@angular/core';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
import { Component, Injector, OnInit } from '@angular/core';
import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
import { TranslateService } from '@ngx-translate/core';
/** handle translate @public */
public translateService: TranslateService;
/** handle translate @public */
public translateService: TranslateService;
+ /** Version holds version @public */
+ public getLocalStorageVersion: string;
+
/** Utilizes auth service for any auth operations @private */
private authService: AuthenticationService;
/** Utilizes auth service for any auth operations @private */
private authService: AuthenticationService;
this.authService.ProjectName.subscribe((projectNameFinal: string): void => {
this.getSelectedProject = projectNameFinal;
});
this.authService.ProjectName.subscribe((projectNameFinal: string): void => {
this.getSelectedProject = projectNameFinal;
});
+ this.sharedService.fetchOSMVersion();
this.username$ = this.authService.username;
this.projectService.setHeaderProjects();
this.projectList$ = this.projectService.projectList;
this.PACKAGEVERSION = environment.packageVersion;
this.username$ = this.authService.username;
this.projectService.setHeaderProjects();
this.projectList$ = this.projectService.projectList;
this.PACKAGEVERSION = environment.packageVersion;
- const getLocalStorageVersion: string = sessionStorage.getItem('osmVersion');
- if (getLocalStorageVersion === null) {
+ if (!isNullOrUndefined(sessionStorage.getItem('version'))) {
+ this.getLocalStorageVersion = sessionStorage.getItem('version');
+ } else if (!isNullOrUndefined(this.sharedService.osmVersion)) {
+ this.getLocalStorageVersion = this.sharedService.osmVersion;
+ }
+ if (this.getLocalStorageVersion === null) {
- } else if (getLocalStorageVersion !== this.sharedService.osmVersion) {
+ } else if (this.getLocalStorageVersion !== sessionStorage.getItem('osmVersion')) {
this.showNewVersion();
}
}
this.showNewVersion();
}
}
this.changePassword.next(false);
const langCode: string = sessionStorage.getItem('languageCode');
const redirecturl: string = isNullOrUndefined(sessionStorage.getItem('returnUrl')) ? '/' : sessionStorage.getItem('returnUrl');
this.changePassword.next(false);
const langCode: string = sessionStorage.getItem('languageCode');
const redirecturl: string = isNullOrUndefined(sessionStorage.getItem('returnUrl')) ? '/' : sessionStorage.getItem('returnUrl');
- const osmVersion: string = isNullOrUndefined(sessionStorage.getItem('osmVersion')) ? '' : sessionStorage.getItem('osmVersion');
+ const osmVersion: string = isNullOrUndefined(sessionStorage.getItem('version')) ? '' : sessionStorage.getItem('version');
sessionStorage.clear();
sessionStorage.setItem('languageCode', langCode);
sessionStorage.setItem('returnUrl', redirecturl);
sessionStorage.clear();
sessionStorage.setItem('languageCode', langCode);
sessionStorage.setItem('returnUrl', redirecturl);
const version: string[] = res.version.split('+');
if (!isNullOrUndefined(version[0])) {
this.osmVersion = version[0];
const version: string[] = res.version.split('+');
if (!isNullOrUndefined(version[0])) {
this.osmVersion = version[0];
+ sessionStorage.setItem('version', version[0]);
} else {
this.osmVersion = null;
}
} else {
this.osmVersion = null;
}