diff --git a/webapp/frontend/src/@treo/services/config/config.service.ts b/webapp/frontend/src/@treo/services/config/config.service.ts index 97bd0ee..b1501f5 100644 --- a/webapp/frontend/src/@treo/services/config/config.service.ts +++ b/webapp/frontend/src/@treo/services/config/config.service.ts @@ -3,6 +3,8 @@ import { BehaviorSubject, Observable } from 'rxjs'; import * as _ from 'lodash'; import { TREO_APP_CONFIG } from '@treo/services/config/config.constants'; +const SCRUTINY_CONFIG_LOCAL_STORAGE_KEY = 'scrutiny'; + @Injectable({ providedIn: 'root' }) @@ -10,14 +12,22 @@ export class TreoConfigService { // Private private _config: BehaviorSubject; - /** * Constructor */ - constructor(@Inject(TREO_APP_CONFIG) config: any) + constructor(@Inject(TREO_APP_CONFIG) defaultConfig: any) { + let currentScrutinyConfig = defaultConfig + + let localConfigStr = localStorage.getItem(SCRUTINY_CONFIG_LOCAL_STORAGE_KEY) + if(localConfigStr){ + //check localstorage for a value + let localConfig = JSON.parse(localConfigStr) + currentScrutinyConfig = localConfig + } + // Set the private defaults - this._config = new BehaviorSubject(config); + this._config = new BehaviorSubject(currentScrutinyConfig); } // ----------------------------------------------------------------------------------------------------- @@ -27,15 +37,20 @@ export class TreoConfigService /** * Setter and getter for config */ + //Setter set config(value: any) { // Merge the new config over to the current config const config = _.merge({}, this._config.getValue(), value); + //Store the config in localstorage + localStorage.setItem(SCRUTINY_CONFIG_LOCAL_STORAGE_KEY, JSON.stringify(config)); + // Execute the observable this._config.next(config); } + //Getter get config$(): Observable { return this._config.asObservable(); diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts index 21e7523..8294c94 100644 --- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts +++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts @@ -129,10 +129,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy continue } - let deviceName = `/dev/${deviceSummary.device.device_name}` - if(deviceSummary.device.host_id){ - deviceName = `${deviceSummary.device.host_id} - ${deviceName}` - } + let deviceName = this.deviceTitle(deviceSummary.device) var deviceSeriesMetadata = { name: deviceName,