@osovitny/anatoly 3.19.35 → 3.19.37

package/fesm2022/osovitny-anatoly.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Output, Input, Inject, Pipe, provideAppInitializer, inject, NgModule, Directive, ChangeDetectionStrategy, ViewChild, ViewEncapsulation, HostListener, HostBinding } from '@angular/core';
-import { BehaviorSubject, merge, Subject, filter, takeUntil, map as map$1, catchError, of, forkJoin, timer, fromEvent, firstValueFrom } from 'rxjs';
+import { BehaviorSubject, forkJoin, Subject, filter, takeUntil, map as map$1, catchError, of, merge, timer, fromEvent, firstValueFrom } from 'rxjs';
 import { map, tap, mergeMap } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
 import { HttpResponse, HttpClient, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
@@ -404,7 +404,7 @@ class AppContextService extends ApiServiceBase {
             return;
         }
         //Logging
-        let stopwatch = new Stopwatch("AppContextService: Requesting a new AppContext");
+        let stopwatch = new Stopwatch("@osovitny/anatoly. AppContextService: Requesting a new AppContext");
         stopwatch.start();
         this.subscription = this.get('getCurrentContext', null).subscribe({
             next: (data) => {
@@ -472,11 +472,11 @@ class AppContextService extends ApiServiceBase {
                 this.usStates = data;
             }
         }));
-        let tasks$ = merge(countries$, languages$, timezones$, usStates$);
+        let tasks$ = forkJoin([countries$, languages$, timezones$, usStates$]);
         //Logging
-        let stopwatch = new Stopwatch("AppContextService: standard json files loaded");
+        let stopwatch = new Stopwatch("@osovitny/anatoly. AppContextService: loading standard json files");
         stopwatch.start();
-        return tasks$.pipe(map(() => {
+        return tasks$.pipe(tap(() => {
             this.fireJsonFilesLoaded();
             //Logging
             stopwatch.stop();
@@ -2745,14 +2745,12 @@ class StarterService extends ApiServiceBase {
         let context = this.appContext.current;
         if (!is.objectNullOrEmpty(context)) {
             //Logging
-            this.logger.info('StarterService.applicationStarting: got AppContext from Session Storage');
+            this.logger.info('@osovitny/anatoly. StarterService: getting AppContext from Session Storage');
             this.appContext.init(context);
             return of(context);
         }
         //Logging
-        this.logger.info('StarterService.applicationStarting: there is no AppContext in Session Storage');
-        //Logging
-        let stopwatch = new Stopwatch("StarterService.applicationStarting: getting AppContext");
+        let stopwatch = new Stopwatch("@osovitny/anatoly. StarterService: getting AppContext from API");
         stopwatch.start();
         this.baseUrl = `${ApiUrl}/appContext`;
         return this.get('applicationStarting').pipe(map(data => {
@@ -2795,7 +2793,7 @@ class StarterService extends ApiServiceBase {
             tasks$ = applicationStarting$;
         }
         //Logging
-        let stopwatch = new Stopwatch("StarterService: ensureApplicationStarted");
+        let stopwatch = new Stopwatch("@osovitny/anatoly. StarterService: ensureApplicationStarted");
         stopwatch.start();
         return tasks$.pipe(map(() => {
             //Logging