From c667cb49e1e39ccc74e86867f4f83f396449d53a Mon Sep 17 00:00:00 2001 From: YoussefDahi <125285822+YoussefDahi@users.noreply.github.com> Date: Fri, 21 Feb 2025 15:06:02 +0100 Subject: [PATCH] new config used for defaultEnv (#152) --- src/app/app.component.ts | 6 +++--- src/app/views/architecture/architecture.view.ts | 4 ++-- src/app/views/dashboard/dashboard.component.ts | 4 ++-- src/app/views/detail/database/detail-database.view.ts | 4 ++-- src/app/views/detail/ftp/detail-ftp.view.ts | 6 +++--- src/app/views/detail/ldap/detail-ldap.view.ts | 6 +++--- .../views/detail/session/main/detail-session-main.view.ts | 4 ++-- .../views/detail/session/rest/detail-session-rest.view.ts | 4 ++-- src/app/views/detail/smtp/detail-smtp.view.ts | 4 ++-- .../statistic/application/statistic-application.view.ts | 4 ++-- .../views/statistic/database/statistic-database.view.ts | 4 ++-- src/app/views/statistic/rest/statistic-rest.view.ts | 7 ++----- src/app/views/statistic/user/statistic-user.view.ts | 5 ++--- src/app/views/statistic/view/statistic-client.view.ts | 7 +++---- src/app/views/tree/tree.view.ts | 4 ++-- src/main.ts | 6 +++--- 16 files changed, 37 insertions(+), 42 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 82c3386..f402086 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,7 +2,7 @@ import {Component, inject, OnDestroy, OnInit} from '@angular/core'; import {FormControl} from '@angular/forms'; import {ActivatedRoute} from '@angular/router'; import {distinctUntilChanged, finalize, Subscription} from 'rxjs'; -import {app, application, environment} from 'src/environments/environment'; +import {app} from 'src/environments/environment'; import {EnvRouter} from "./service/router.service"; import {Constants} from "./views/constants"; import {InstanceService} from "./service/jquery/instance.service"; @@ -61,7 +61,7 @@ export class AppComponent implements OnInit, OnDestroy { next: res => { // TODO res.env always undefined let r = this._activatedRoute.snapshot.queryParams['env']; if (!r) { - r = application.default_env; + r = app.defaultEnv; } if (this.env.value != r) { this.env.setValue(r, {emitEvent: false}); @@ -71,7 +71,7 @@ export class AppComponent implements OnInit, OnDestroy { } ngOnInit(): void { - this.envs = [application.default_env]; + this.envs = [app.defaultEnv]; if (!localStorage.getItem('server')) { localStorage.setItem('server', app.host); } diff --git a/src/app/views/architecture/architecture.view.ts b/src/app/views/architecture/architecture.view.ts index 1907a58..d108847 100644 --- a/src/app/views/architecture/architecture.view.ts +++ b/src/app/views/architecture/architecture.view.ts @@ -5,7 +5,7 @@ import {FormControl, FormGroup, Validators} from "@angular/forms"; import {EnvRouter} from "../../service/router.service"; import {ActivatedRoute, Params} from "@angular/router"; import {combineLatest, finalize, forkJoin, fromEvent, map, Subscription} from "rxjs"; -import {application, makeDatePeriod} from "../../../environments/environment"; +import {app, application, makeDatePeriod} from "../../../environments/environment"; import {Location} from "@angular/common"; import {TreeService} from "../../service/tree.service"; import {mxCell} from "mxgraph"; @@ -187,7 +187,7 @@ export class ArchitectureView implements OnInit, AfterViewInit, OnDestroy { queryParams: this._activatedRoute.queryParams }).subscribe({ next: (v: { params: Params, queryParams: Params }) => { - this.params.env = v.queryParams.env || application.default_env; + this.params.env = v.queryParams.env || app.defaultEnv; this.params.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.api.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.params.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.api.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.params.start, new Date(this.params.end.getFullYear(), this.params.end.getMonth(), this.params.end.getDate() - 1)); diff --git a/src/app/views/dashboard/dashboard.component.ts b/src/app/views/dashboard/dashboard.component.ts index d163f83..2b0b052 100644 --- a/src/app/views/dashboard/dashboard.component.ts +++ b/src/app/views/dashboard/dashboard.component.ts @@ -2,7 +2,7 @@ import {AfterViewInit, Component, inject, OnDestroy, ViewChild} from '@angular/c import { ActivatedRoute, Params } from '@angular/router'; import {combineLatest, config, finalize, forkJoin, map, Observable, Subscription, take} from 'rxjs'; import { DatePipe, Location } from '@angular/common'; -import { application, makeDatePeriod } from 'src/environments/environment'; +import {app, application, makeDatePeriod} from 'src/environments/environment'; import { EnvRouter } from "../../service/router.service"; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Constants } from '../constants'; @@ -84,7 +84,7 @@ export class DashboardComponent implements AfterViewInit, OnDestroy { queryParams: this._activatedRoute.queryParams }).subscribe({ next: (v: { params: Params, queryParams: Params }) => { - this.params.env = v.queryParams.env || application.default_env; + this.params.env = v.queryParams.env || app.defaultEnv; this.params.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.home.default_period || makeDatePeriod(0, 1)).start; this.params.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.home.default_period || makeDatePeriod(0, 1)).end; this.params.serveurs = Array.isArray(v.queryParams['appname']) ? v.queryParams['appname'] : v.queryParams['appname'] ? [v.queryParams['appname']] : [] diff --git a/src/app/views/detail/database/detail-database.view.ts b/src/app/views/detail/database/detail-database.view.ts index dfda770..52a95c0 100644 --- a/src/app/views/detail/database/detail-database.view.ts +++ b/src/app/views/detail/database/detail-database.view.ts @@ -5,7 +5,7 @@ import {combineLatest, finalize, forkJoin, Subscription} from "rxjs"; import {Timeline} from 'vis-timeline'; import {DatePipe} from '@angular/common'; import {TraceService} from 'src/app/service/trace.service'; -import {application} from 'src/environments/environment'; +import {app, application} from 'src/environments/environment'; import {DatabaseRequest, DatabaseRequestStage, ExceptionInfo} from 'src/app/model/trace.model'; import {EnvRouter} from "../../../service/router.service"; import {DurationPipe} from "../../../shared/pipe/duration.pipe"; @@ -62,7 +62,7 @@ export class DetailDatabaseView implements OnInit, OnDestroy { ]).subscribe({ next: ([params, data, queryParams]) => { this.params = {idSession: params.id_session, idJdbc: params.id_jdbc, - typeSession: data.type, typeMain: params.type_main, env: queryParams.env || application.default_env}; + typeSession: data.type, typeMain: params.type_main, env: queryParams.env || app.defaultEnv}; this.request = null; this.getRequest(); } diff --git a/src/app/views/detail/ftp/detail-ftp.view.ts b/src/app/views/detail/ftp/detail-ftp.view.ts index 82ec995..7a67e69 100644 --- a/src/app/views/detail/ftp/detail-ftp.view.ts +++ b/src/app/views/detail/ftp/detail-ftp.view.ts @@ -1,10 +1,10 @@ import {Component, ElementRef, inject, OnDestroy, OnInit, ViewChild} from "@angular/core"; -import {DataItem, Timeline} from "vis-timeline"; +import {Timeline} from "vis-timeline"; import {ActivatedRoute} from "@angular/router"; import {TraceService} from "../../../service/trace.service"; import {DatePipe} from "@angular/common"; import {combineLatest, finalize, forkJoin, map, Subscription} from "rxjs"; -import {application} from "../../../../environments/environment"; +import {app} from "../../../../environments/environment"; import {ExceptionInfo, FtpRequest, FtpRequestStage} from "../../../model/trace.model"; import {EnvRouter} from "../../../service/router.service"; import {getErrorClassName, Utils} from "../../../shared/util"; @@ -40,7 +40,7 @@ export class DetailFtpView implements OnInit, OnDestroy { ]).subscribe({ next: ([params, data, queryParams]) => { this.params = {idSession: params.id_session, idFtp: params.id_ftp, - typeSession: data.type, typeMain: params.type_main, env: queryParams.env || application.default_env}; + typeSession: data.type, typeMain: params.type_main, env: queryParams.env || app.defaultEnv}; this.request = null; this.getRequest(); } diff --git a/src/app/views/detail/ldap/detail-ldap.view.ts b/src/app/views/detail/ldap/detail-ldap.view.ts index 8b05816..17660ab 100644 --- a/src/app/views/detail/ldap/detail-ldap.view.ts +++ b/src/app/views/detail/ldap/detail-ldap.view.ts @@ -1,11 +1,11 @@ import {Component, ElementRef, inject, OnDestroy, OnInit, ViewChild} from "@angular/core"; import {ActivatedRoute} from "@angular/router"; import {TraceService} from "../../../service/trace.service"; -import {DataItem, Timeline} from "vis-timeline"; +import {Timeline} from "vis-timeline"; import {combineLatest, finalize, forkJoin, Subscription} from "rxjs"; import {ExceptionInfo, NamingRequest, NamingRequestStage} from "../../../model/trace.model"; import {DatePipe} from "@angular/common"; -import {application} from "../../../../environments/environment"; +import {app} from "../../../../environments/environment"; import {DurationPipe} from "../../../shared/pipe/duration.pipe"; import {EnvRouter} from "../../../service/router.service"; @@ -40,7 +40,7 @@ export class DetailLdapView implements OnInit, OnDestroy { ]).subscribe({ next: ([params, data, queryParams]) => { this.params = {idSession: params.id_session, idLdap: params.id_ldap, - typeSession: data.type, typeMain: params.type_main, env: queryParams.env || application.default_env}; + typeSession: data.type, typeMain: params.type_main, env: queryParams.env || app.defaultEnv}; this.request = null; this.getRequest(); } diff --git a/src/app/views/detail/session/main/detail-session-main.view.ts b/src/app/views/detail/session/main/detail-session-main.view.ts index d33eddd..66f5b86 100644 --- a/src/app/views/detail/session/main/detail-session-main.view.ts +++ b/src/app/views/detail/session/main/detail-session-main.view.ts @@ -5,7 +5,7 @@ import {TraceService} from "../../../../service/trace.service"; import {EnvRouter} from "../../../../service/router.service"; import {Location} from "@angular/common"; import {combineLatest, defer, finalize, map, merge, of, Subscription, switchMap} from "rxjs"; -import {application} from "../../../../../environments/environment"; +import {app} from "../../../../../environments/environment"; import {Constants} from "../../../constants"; @Component({ @@ -33,7 +33,7 @@ export class DetailSessionMainView implements OnInit, OnDestroy { this._activatedRoute.queryParams ]).subscribe({ next: ([params, queryParams]) => { - this.env = queryParams.env || application.default_env; + this.env = queryParams.env || app.defaultEnv; this.type = params.type_main; this.getSession(params.id_session); this._location.replaceState(`${this._router.url.split('?')[0]}?env=${this.env}`) diff --git a/src/app/views/detail/session/rest/detail-session-rest.view.ts b/src/app/views/detail/session/rest/detail-session-rest.view.ts index bed1cbc..b11b786 100644 --- a/src/app/views/detail/session/rest/detail-session-rest.view.ts +++ b/src/app/views/detail/session/rest/detail-session-rest.view.ts @@ -4,7 +4,7 @@ import {ActivatedRoute} from "@angular/router"; import {TraceService} from "../../../../service/trace.service"; import {Location} from "@angular/common"; import {catchError, combineLatest, finalize, of, Subscription, switchMap, merge, map,defer} from "rxjs"; -import {application} from "../../../../../environments/environment"; +import {app} from "../../../../../environments/environment"; import {Utils} from "../../../../shared/util"; import {EnvRouter} from "../../../../service/router.service"; @@ -33,7 +33,7 @@ export class DetailSessionRestView implements OnInit, OnDestroy { this._activatedRoute.queryParams ]).subscribe({ next: ([params, queryParams]) => { - this.env = queryParams.env || application.default_env; + this.env = queryParams.env || app.defaultEnv; this.getSession(params.id_session); this._location.replaceState(`${this._router.url.split('?')[0]}?env=${this.env}`) } diff --git a/src/app/views/detail/smtp/detail-smtp.view.ts b/src/app/views/detail/smtp/detail-smtp.view.ts index a9ce08b..0208b85 100644 --- a/src/app/views/detail/smtp/detail-smtp.view.ts +++ b/src/app/views/detail/smtp/detail-smtp.view.ts @@ -5,7 +5,7 @@ import {DataItem, Timeline} from "vis-timeline"; import {combineLatest, finalize, forkJoin, Subscription} from "rxjs"; import {ExceptionInfo, Mail, MailRequest, MailRequestStage} from "../../../model/trace.model"; import {DatePipe} from "@angular/common"; -import {application} from "../../../../environments/environment"; +import {app, application} from "../../../../environments/environment"; import {EnvRouter} from "../../../service/router.service"; import {DurationPipe} from "../../../shared/pipe/duration.pipe"; import {MatTableDataSource} from "@angular/material/table"; @@ -44,7 +44,7 @@ export class DetailSmtpView implements OnInit, OnDestroy { ]).subscribe({ next: ([params, data, queryParams]) => { this.params = {idSession: params.id_session, idSmtp: params.id_smtp, - typeSession: data.type, typeMain: params.type_main, env: queryParams.env || application.default_env}; + typeSession: data.type, typeMain: params.type_main, env: queryParams.env || app.defaultEnv}; this.request = null; this.getRequest(); } diff --git a/src/app/views/statistic/application/statistic-application.view.ts b/src/app/views/statistic/application/statistic-application.view.ts index 8f18011..40dc84e 100644 --- a/src/app/views/statistic/application/statistic-application.view.ts +++ b/src/app/views/statistic/application/statistic-application.view.ts @@ -16,7 +16,7 @@ import { } from "rxjs"; import {Constants, FilterConstants, FilterMap, FilterPreset} from "../../constants"; import {formatters, mapParams, periodManagement} from "src/app/shared/util"; -import {application, makeDatePeriod} from "src/environments/environment"; +import {app, application, makeDatePeriod} from "src/environments/environment"; import {FilterService} from "src/app/service/filter.service"; import {EnvRouter} from "../../../service/router.service"; import {InstanceService} from "../../../service/jquery/instance.service"; @@ -66,7 +66,7 @@ export class StatisticApplicationView implements OnInit, OnDestroy { }).subscribe({ next: (v: { params: Params, queryParams: Params }) => { this.name = v.params.server_name; - this.env = v.queryParams.env || application.default_env; + this.env = v.queryParams.env || app.defaultEnv; this.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.app.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.app.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.start, new Date(this.end.getFullYear(), this.end.getMonth(), this.end.getDate() - 1)); diff --git a/src/app/views/statistic/database/statistic-database.view.ts b/src/app/views/statistic/database/statistic-database.view.ts index 3860292..4399854 100644 --- a/src/app/views/statistic/database/statistic-database.view.ts +++ b/src/app/views/statistic/database/statistic-database.view.ts @@ -6,7 +6,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { JQueryService } from 'src/app/service/jquery/jquery.service'; import { MatTableDataSource } from '@angular/material/table'; import { Constants } from '../../constants'; -import { application, makeDatePeriod } from 'src/environments/environment'; +import {app, application, makeDatePeriod} from 'src/environments/environment'; import { formatters, periodManagement } from 'src/app/shared/util'; import { ChartProvider, field } from '@oneteme/jquery-core'; import {DatabaseRequestService} from "../../../service/jquery/database-request.service"; @@ -52,7 +52,7 @@ export class StatisticDatabaseView implements OnInit { next: (v: { params: Params, queryParams: Params }) => { this.db = v.params.database_name; - this.env = v.queryParams.env || application.default_env; + this.env = v.queryParams.env || app.defaultEnv; this.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.start, new Date(this.end.getFullYear(), this.end.getMonth(), this.end.getDate() - 1)); diff --git a/src/app/views/statistic/rest/statistic-rest.view.ts b/src/app/views/statistic/rest/statistic-rest.view.ts index f03a033..332917f 100644 --- a/src/app/views/statistic/rest/statistic-rest.view.ts +++ b/src/app/views/statistic/rest/statistic-rest.view.ts @@ -6,17 +6,14 @@ import { BehaviorSubject, combineLatest, finalize, - forkJoin, map, Observable, - of, Subscription, - switchMap, tap } from "rxjs"; import {Constants, FilterConstants, FilterMap, FilterPreset} from "../../constants"; import {formatters, mapParams, periodManagement,} from "src/app/shared/util"; -import {application, makeDatePeriod} from "src/environments/environment"; +import {app, application, makeDatePeriod} from "src/environments/environment"; import {FilterService} from "src/app/service/filter.service"; import {EnvRouter} from "../../../service/router.service"; import {InstanceService} from "../../../service/jquery/instance.service"; @@ -60,7 +57,7 @@ export class StatisticRestView implements OnInit, OnDestroy { next: (v: { params: Params, queryParams: Params }) => { this.params.serverName = v.params.server_name; this.params.restName = v.params.rest_name; - this.params.env = v.queryParams.env || application.default_env; + this.params.env = v.queryParams.env || app.defaultEnv; this.params.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.api.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.params.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.api.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.params.start, new Date(this.params.end.getFullYear(), this.params.end.getMonth(), this.params.end.getDate() - 1)); diff --git a/src/app/views/statistic/user/statistic-user.view.ts b/src/app/views/statistic/user/statistic-user.view.ts index f721add..7560c8a 100644 --- a/src/app/views/statistic/user/statistic-user.view.ts +++ b/src/app/views/statistic/user/statistic-user.view.ts @@ -1,11 +1,10 @@ import { Component, OnDestroy, OnInit, inject } from "@angular/core"; -import { JQueryService } from "src/app/service/jquery/jquery.service"; import { ActivatedRoute, Params } from "@angular/router"; import { DatePipe, Location } from '@angular/common'; import { FormControl, FormGroup, Validators } from "@angular/forms"; import {BehaviorSubject, Observable, Subscription, combineLatest, finalize, map, tap} from "rxjs"; import { Constants, FilterConstants, FilterMap, FilterPreset } from "../../constants"; -import { application, makeDatePeriod } from "src/environments/environment"; +import {app, application, makeDatePeriod} from "src/environments/environment"; import { FilterService } from "src/app/service/filter.service"; import { mapParams, formatters, periodManagement } from "src/app/shared/util"; import {EnvRouter} from "../../../service/router.service"; @@ -54,7 +53,7 @@ export class StatisticUserView implements OnInit, OnDestroy { }).subscribe({ next: (v: { params: Params, queryParams: Params }) => { this.name = v.params.user_name; - this.env = v.queryParams.env || application.default_env; + this.env = v.queryParams.env || app.defaultEnv; this.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.start, new Date(this.end.getFullYear(), this.end.getMonth(), this.end.getDate() - 1)); diff --git a/src/app/views/statistic/view/statistic-client.view.ts b/src/app/views/statistic/view/statistic-client.view.ts index 6607050..c35bfd1 100644 --- a/src/app/views/statistic/view/statistic-client.view.ts +++ b/src/app/views/statistic/view/statistic-client.view.ts @@ -3,15 +3,14 @@ import {MainSessionService} from "../../../service/jquery/main-session.service"; import {InstanceService} from "../../../service/jquery/instance.service"; import {combineLatest, finalize, map, Observable, of, Subscription, tap} from "rxjs"; import {ActivatedRoute, Params} from "@angular/router"; -import {application, makeDatePeriod} from "../../../../environments/environment"; +import {app, application, makeDatePeriod} from "../../../../environments/environment"; import {formatters, periodManagement} from "../../../shared/util"; -import {AbstractControl, FormBuilder, FormControl, FormGroup, Validators} from "@angular/forms"; +import {FormControl, FormGroup, Validators} from "@angular/forms"; import {EnvRouter} from "../../../service/router.service"; import {DatePipe, Location} from "@angular/common"; import {Constants} from "../../constants"; import {RestRequestService} from "../../../service/jquery/rest-request.service"; import {countByFields, groupByField} from "../rest/statistic-rest.view"; -import {ChartProvider} from "@oneteme/jquery-core"; @Component({ templateUrl: './statistic-client.view.html', @@ -44,7 +43,7 @@ export class StatisticClientView implements OnInit, OnDestroy { queryParams: this._activatedRoute.queryParams }).subscribe({ next: (v: { params: Params, queryParams: Params }) => { - this.params = {name: v.params.client_name, env: v.queryParams.env || application.default_env}; + this.params = {name: v.params.client_name, env: v.queryParams.env || app.defaultEnv}; this.params.start = v.queryParams.start ? new Date(v.queryParams.start) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6)).start; this.params.end = v.queryParams.end ? new Date(v.queryParams.end) : (application.dashboard.database.default_period || application.dashboard.default_period || makeDatePeriod(6, 1)).end; this.patchDateValue(this.params.start, new Date(this.params.end.getFullYear(), this.params.end.getMonth(), this.params.end.getDate() - 1)); diff --git a/src/app/views/tree/tree.view.ts b/src/app/views/tree/tree.view.ts index 4867fa1..f2e9461 100644 --- a/src/app/views/tree/tree.view.ts +++ b/src/app/views/tree/tree.view.ts @@ -4,7 +4,7 @@ import {combineLatest, finalize, forkJoin, fromEvent, Observable, Subscription} import { Location } from '@angular/common'; import { TraceService } from 'src/app/service/trace.service'; -import { application } from 'src/environments/environment'; +import {app, application} from 'src/environments/environment'; import { EnvRouter } from "../../service/router.service"; import { RestRequest, ServerMainSession, ServerRestSession, RestServerNode, Label, MainServerNode, JdbcRequestNode, FtpRequestNode, MailRequestNode, LdapRequestNode, RestRequestNode, ExceptionInfo, DatabaseRequest, MailRequest, NamingRequest, FtpRequest, SessionStage, LinkRequestNode } from 'src/app/model/trace.model'; import { TreeService } from 'src/app/service/tree.service'; @@ -66,7 +66,7 @@ export class TreeView implements OnDestroy { ]).subscribe({ next: ([params, data, queryParams]) => { this.id = params['id_session']; - this.env = queryParams.env || application.default_env; + this.env = queryParams.env || app.defaultEnv; this.serverLbl = Label[queryParams.server_lbl] || Label.SERVER_IDENTITY this.linkLbl = Label[queryParams.link_lbl] || Label.ELAPSED_LATENSE this.patchDataView(this.serverLbl,this.linkLbl) diff --git a/src/main.ts b/src/main.ts index a7f9943..0855c94 100644 --- a/src/main.ts +++ b/src/main.ts @@ -21,11 +21,10 @@ function loadConfig(){ matchRegex(resp.defaultEnv, "defaultEnv",ENV_PATTERN) || delete resp.defaultEnv; matchRegex(resp.gridViewPeriod, "gridViewPeriod", PERIOD_PATTERN) || delete resp.gridViewPeriod; matchRegex(resp.kpiViewPeriod, "kpiViewPeriod", PERIOD_PATTERN) || delete resp.kpiViewPeriod; - console.info(`Loaded remote config: ${JSON.stringify(app)}`) return resp; }) .catch((err)=> { - console.warn(`Error while loading config, Default config will be used: ${JSON.stringify(app)}`); + console.warn(`Error while loading config`); return {}; }) @@ -45,6 +44,7 @@ function loadConfig(){ loadConfig() .then((resp)=>{ - Object.assign(app,resp); + Object.assign(app,resp); + console.info(`Loaded config: ${JSON.stringify(app)}`) platformBrowserDynamic().bootstrapModule(AppModule).catch(err => console.error(err)) }); \ No newline at end of file