@osovitny/anatoly 3.17.71 → 3.17.73

package/fesm2022/osovitny-anatoly.mjs

@@ -1108,12 +1108,12 @@ class AppContextService extends ApiServiceBase {
         if (this.subscription != null) {
             return;
         }
-        //Log
-        let stopwatch = new Stopwatch("Requesting a new AppContext");
+        //Logging
+        let stopwatch = new Stopwatch("AppContextService: Requesting a new AppContext");
         stopwatch.start();
         this.subscription = this.get('getCurrentContext', null).subscribe({
             next: (data) => {
-                //Log
+                //Logging
                 stopwatch.stop();
                 stopwatch.printElapsedAsMilliseconds();
                 this.dataReceived(data);
@@ -1785,13 +1785,17 @@ class LoadingService extends BehaviorSubject {
 */
 //Node
 class LoggingService {
-    constructor() { }
-    logError(error) {
-        console.error(error);
+    constructor() {
     }
-    logInformation(info) {
+    info(info) {
         console.info(info);
     }
+    warn(info) {
+        console.warn(info);
+    }
+    error(error) {
+        console.error(error);
+    }
     static { this.ɵfac = function LoggingService_Factory(t) { return new (t || LoggingService)(); }; }
     static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: LoggingService, factory: LoggingService.ɵfac, providedIn: "root" }); }
 }
@@ -1819,10 +1823,10 @@ class LoggingService {
 */
 //Node
 class AnatolyHttpInterceptor {
-    constructor(authService, loadingService, loggingService) {
+    constructor(authService, loadingService, logger) {
         this.authService = authService;
         this.loadingService = loadingService;
-        this.loggingService = loggingService;
+        this.logger = logger;
         this.longRunningExceptions = [
             'chunkupload',
         ];
@@ -1838,7 +1842,6 @@ class AnatolyHttpInterceptor {
         ];
     }
     handleHttpRequest(request, next, loadingRequired) {
-        //#1. old approach
         return next.handle(request).pipe(tap({
             next: (event) => {
                 if (event instanceof HttpResponse) {
@@ -1847,27 +1850,9 @@ class AnatolyHttpInterceptor {
             },
             error: (err) => {
                 this.onRequestEnd(loadingRequired);
-                this.loggingService.logError(err);
+                this.logger.error(err);
             }
         }));
-        //#2. new approach
-        /*
-        return next.handle(request).pipe(
-            map(event => {
-              if (event instanceof HttpResponse) {
-                this.onRequestEnd(loadingRequired);
-              }
-    
-              return event;
-            }),
-            catchError((error) => {
-              this.onRequestEnd(loadingRequired);
-    
-              let errorMsg = "Something went wrong!";
-              return throwError(() => new Error(errorMsg))
-            })
-        )
-        */
     }
     intercept(req, next) {
         let isCDNEnabled = AppCoreSettings.IsCDNEnabled;
@@ -2503,13 +2488,13 @@ class L10nUtils {
   Created:
     26 Jun 2020
 
+  Details:
+    https://medium.com/@amcdnl/global-error-handling-with-angular2-6b992bdfb59c
+    https://medium.com/angular-in-depth/expecting-the-unexpected-best-practices-for-error-handling-in-angular-21c3662ef9e4
+
   Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
 </file>
 */
-/*
-  https://medium.com/@amcdnl/global-error-handling-with-angular2-6b992bdfb59c
-  https://medium.com/angular-in-depth/expecting-the-unexpected-best-practices-for-error-handling-in-angular-21c3662ef9e4
-*/
 //Node
 class GlobalErrorHandler {
     constructor(injector) {
@@ -2517,7 +2502,7 @@ class GlobalErrorHandler {
     }
     handleError(error) {
         const loggingService = this.injector.get(LoggingService);
-        loggingService.logError(error);
+        loggingService.error(error);
         // IMPORTANT: Rethrow the error otherwise it gets swallowed
         throw error;
     }
@@ -2813,11 +2798,12 @@ class DigitalMarketingService {
     29 Nov 2020
 
   Details:
-    https://yashints.dev/blog/2019/02/12/angular-ga-tagmanager
-    https://developers.google.com/analytics/devguides/collection/gtagjs/pages
-    https://developers.google.com/analytics/devguides/collection/upgrade/analyticsjs
     https://medium.com/@danielfilipkowskiblogs/adding-google-analytics-to-angular-v15-1766c4bdaed5
 
+    API:
+    https://developers.google.com/tag-platform/gtagjs/reference
+    https://developers.google.com/analytics/devguides/collection/ga4/events?client_type=gtag
+
   Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
 </file>
 */
@@ -2843,19 +2829,24 @@ class GoogleAnalyticsService {
             this.subscription.unsubscribe();
         }
     }
-    sendEvent(eventName, eventParams = null) {
+    event(name, params = null) {
         if (!this.ga) {
             return;
         }
-        if (eventParams) {
-            this.ga('event', eventName, eventParams);
+        try {
+            if (params) {
+                this.ga('event', name, params);
+            }
+            else {
+                this.ga('event', name);
+            }
         }
-        else {
-            this.ga('event', eventName);
+        catch (err) {
+            console.error('Google Analytics event error', err);
         }
     }
     get ga() {
-        let ga = window.ga;
+        let ga = window.gtag;
         return ga;
     }
     static { this.ɵfac = function GoogleAnalyticsService_Factory(t) { return new (t || GoogleAnalyticsService)(i0.ɵɵinject(i1.Router)); }; }
@@ -2954,23 +2945,28 @@ class IdleService {
 </file>
 */
 class StarterServiceBase extends ApiServiceBase {
-    constructor(http, appContext) {
+    constructor(http, appContext, logger) {
         super(http);
         this.http = http;
         this.appContext = appContext;
+        this.logger = logger;
     }
     applicationStarting() {
         let context = this.appContext.current;
         if (!is.objectNullOrEmpty(context)) {
-            //this.appContext.init(context);
+            //Logging
+            this.logger.info('StarterService.applicationStarting: got AppContext from Session Storage');
+            this.appContext.init(context);
             return of(context);
         }
-        //Log
-        let stopwatch = new Stopwatch("applicationStarting");
+        //Logging
+        this.logger.info('StarterService.applicationStarting: there is no AppContext in Session Storage');
+        //Logging
+        let stopwatch = new Stopwatch("StarterService.applicationStarting: getting AppContext");
         stopwatch.start();
         this.baseUrl = `${ApiUrl}/appContext`;
         return this.get('applicationStarting').pipe(map(data => {
-            //Log
+            //Logging
             stopwatch.stop();
             stopwatch.printElapsedAsMilliseconds();
             this.appContext.init(data.context);
@@ -3005,11 +3001,11 @@ class StarterServiceBase extends ApiServiceBase {
         else {
             tasks$ = applicationStarting$;
         }
-        //Log
-        let stopwatch = new Stopwatch("ensureApplicationStarted");
+        //Logging
+        let stopwatch = new Stopwatch("StarterService.ensureApplicationStarted");
         stopwatch.start();
         return tasks$.pipe(map(() => {
-            //Log
+            //Logging
             stopwatch.stop();
             stopwatch.printElapsedAsMilliseconds();
         }));