@osovitny/anatoly 3.17.72 → 3.17.74

package/fesm2022/osovitny-anatoly.mjs

@@ -6,7 +6,7 @@ import { NavigationEnd, NavigationStart, NavigationCancel, NavigationError, Rout
 import * as i1$1 from '@angular/common/http';
 import { HttpResponse, HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { map, tap, mergeMap } from 'rxjs/operators';
-import { BehaviorSubject, Subject, filter, takeUntil, map as map$1, catchError, of, timer, merge, fromEvent, forkJoin } from 'rxjs';
+import { BehaviorSubject, Subject, filter, takeUntil, map as map$1, catchError, of, merge, forkJoin, timer, fromEvent } from 'rxjs';
 import * as i4 from '@azure/msal-angular';
 import { MSAL_GUARD_CONFIG, MsalGuard, MsalInterceptor, MSAL_INTERCEPTOR_CONFIG, MSAL_INSTANCE, MsalService, MsalBroadcastService, MsalModule } from '@azure/msal-angular';
 import { BrowserUtils, EventType, InteractionStatus, InteractionType, InteractionRequiredAuthError, PromptValue, PublicClientApplication, LogLevel } from '@azure/msal-browser';
@@ -597,27 +597,6 @@ class BaseGoService {
         type: Injectable
     }], () => [{ type: i1.ActivatedRoute }, { type: i1.Router }], null); })();
 
-/*
-<file>
-  Project:
-    @osovitny/anatoly
-
-  Authors:
-    Vadim Osovitny vadim@osovitny.com
-    Anatoly Osovitny anatoly@osovitny.com
-
-  Created:
-    26 Jun 2020
- 
-  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
-</file>
-*/
-function throwIfAlreadyLoaded(parentModule, moduleName) {
-    if (parentModule) {
-        throw new Error(`${moduleName} has already been loaded. Import ${moduleName} modules in the AppModule only.`);
-    }
-}
-
 /*
 <file>
   Project:
@@ -1108,12 +1087,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);
@@ -1148,6 +1127,12 @@ class AppContextService extends ApiServiceBase {
             this.current = context;
         }
     }
+    loadRequiredJsonFiles() {
+        return null;
+    }
+    loadRequiredItems() {
+        return null;
+    }
     updateCurrent(success = null) {
         this.getCurrentPrivate(success, false);
     }
@@ -1785,13 +1770,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 +1808,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 +1827,6 @@ class AnatolyHttpInterceptor {
         ];
     }
     handleHttpRequest(request, next, loadingRequired) {
-        //#1. old approach
         return next.handle(request).pipe(tap({
             next: (event) => {
                 if (event instanceof HttpResponse) {
@@ -1847,27 +1835,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;
@@ -1975,23 +1945,13 @@ class AnatolyHttpInterceptor {
 
   Created:
     26 Jun 2020
-
+ 
   Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
 </file>
 */
-class Subs {
-    constructor() {
-        this.subs = [];
-    }
-    add(...subscriptions) {
-        this.subs = this.subs.concat(subscriptions);
-    }
-    set sink(subscription) {
-        this.subs.push(subscription);
-    }
-    unsubscribe() {
-        this.subs.forEach((sub) => sub && sub.unsubscribe());
-        this.subs = [];
+function throwIfAlreadyLoaded(parentModule, moduleName) {
+    if (parentModule) {
+        throw new Error(`${moduleName} has already been loaded. Import ${moduleName} modules in the AppModule only.`);
     }
 }
 
@@ -2094,6 +2054,151 @@ is = {
 };
 */
 
+class StarterService extends ApiServiceBase {
+    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)) {
+            //Logging
+            this.logger.info('StarterService.applicationStarting: got 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");
+        stopwatch.start();
+        this.baseUrl = `${ApiUrl}/appContext`;
+        return this.get('applicationStarting').pipe(map(data => {
+            //Logging
+            stopwatch.stop();
+            stopwatch.printElapsedAsMilliseconds();
+            this.appContext.init(data.context);
+        }));
+    }
+    ensureApplicationStarted() {
+        //1. Application Starting
+        let applicationStarting$ = this.applicationStarting();
+        //2. Load json files
+        let jsonFiles$ = this.appContext.loadRequiredJsonFiles();
+        //3. Load required items, like settings
+        let requiredItems$ = this.appContext.loadRequiredItems();
+        //Tasks to execute
+        let parallelTasks = [];
+        let tasks$ = null;
+        if (jsonFiles$)
+            parallelTasks.push(jsonFiles$);
+        if (requiredItems$)
+            parallelTasks.push(requiredItems$);
+        /*
+          VadimOS:
+          concat is NOT wokring here, no idea why. Just executing first task
+          let tasks$ = concat(applicationStarting$, parallelTasks$);
+    
+          https://github.com/ReactiveX/rxjs/issues/2427
+          https://github.com/ReactiveX/rxjs/issues/2188
+        */
+        if (parallelTasks.length > 0) {
+            let parallelTasks$ = merge(...parallelTasks);
+            tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
+        }
+        else {
+            tasks$ = applicationStarting$;
+        }
+        //Logging
+        let stopwatch = new Stopwatch("StarterService.ensureApplicationStarted");
+        stopwatch.start();
+        return tasks$.pipe(map(() => {
+            //Logging
+            stopwatch.stop();
+            stopwatch.printElapsedAsMilliseconds();
+        }));
+    }
+    static { this.ɵfac = function StarterService_Factory(t) { return new (t || StarterService)(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(AppContextService), i0.ɵɵinject(LoggingService)); }; }
+    static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: StarterService, factory: StarterService.ɵfac }); }
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(StarterService, [{
+        type: Injectable
+    }], () => [{ type: i1$1.HttpClient }, { type: AppContextService }, { type: LoggingService }], null); })();
+
+/*
+<file>
+  Project:
+    @osovitny/anatoly
+
+  Authors:
+    Vadim Osovitny vadim@osovitny.com
+    Anatoly Osovitny anatoly@osovitny.com
+
+  Created:
+    15 Nov 2023
+
+  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
+</file>
+*/
+//Node
+class StarterGuard {
+    constructor(starter) {
+        this.starter = starter;
+    }
+    ensureApplicationStarted() {
+        return this.starter.ensureApplicationStarted().pipe(mergeMap(() => {
+            return of(true);
+        }));
+    }
+    canActivate(next, state) {
+        return this.ensureApplicationStarted();
+    }
+    canActivateChild(route, state) {
+        if (route.component) {
+            return this.ensureApplicationStarted();
+        }
+        return of(true);
+    }
+    static { this.ɵfac = function StarterGuard_Factory(t) { return new (t || StarterGuard)(i0.ɵɵinject(StarterService)); }; }
+    static { this.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: StarterGuard, factory: StarterGuard.ɵfac }); }
+}
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(StarterGuard, [{
+        type: Injectable
+    }], () => [{ type: StarterService }], null); })();
+
+/*
+<file>
+  Project:
+    @osovitny/anatoly
+
+  Authors:
+    Vadim Osovitny vadim@osovitny.com
+    Anatoly Osovitny anatoly@osovitny.com
+
+  Created:
+    26 Jun 2020
+
+  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
+</file>
+*/
+class Subs {
+    constructor() {
+        this.subs = [];
+    }
+    add(...subscriptions) {
+        this.subs = this.subs.concat(subscriptions);
+    }
+    set sink(subscription) {
+        this.subs.push(subscription);
+    }
+    unsubscribe() {
+        this.subs.forEach((sub) => sub && sub.unsubscribe());
+        this.subs = [];
+    }
+}
+
 /*
 <file>
   Project:
@@ -2503,13 +2608,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 +2622,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 +2918,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>
 */
@@ -2943,84 +3049,6 @@ class IdleService {
             }]
     }], null, null); })();
 
-/*
-<file>
-  Project:
-    @osovitny/anatoly
-
-  Authors:
-    Vadim Osovitny vadim@osovitny.com
-    Anatoly Osovitny anatoly@osovitny.com
-
-  Created:
-    15 Nov 2023
-
-  Copyright (c) 2016-2022 Osovitny Inc. All rights reserved.
-</file>
-*/
-class StarterServiceBase extends ApiServiceBase {
-    constructor(http, appContext) {
-        super(http);
-        this.http = http;
-        this.appContext = appContext;
-    }
-    applicationStarting() {
-        let context = this.appContext.current;
-        if (!is.objectNullOrEmpty(context)) {
-            //this.appContext.init(context);
-            return of(context);
-        }
-        //Log
-        let stopwatch = new Stopwatch("applicationStarting");
-        stopwatch.start();
-        this.baseUrl = `${ApiUrl}/appContext`;
-        return this.get('applicationStarting').pipe(map(data => {
-            //Log
-            stopwatch.stop();
-            stopwatch.printElapsedAsMilliseconds();
-            this.appContext.init(data.context);
-        }));
-    }
-    ensureApplicationStarted() {
-        //1. Application Starting
-        let applicationStarting$ = this.applicationStarting();
-        //2. Load json files
-        let jsonFiles$ = this.appContext.loadRequiredJsonFiles();
-        //3. Load required items, like settings
-        let requiredItems$ = this.appContext.loadRequiredItems();
-        //Tasks to execute
-        let parallelTasks = [];
-        let tasks$ = null;
-        if (jsonFiles$)
-            parallelTasks.push(jsonFiles$);
-        if (requiredItems$)
-            parallelTasks.push(requiredItems$);
-        /*
-          VadimOS:
-          concat is NOT wokring here, no idea why. Just executing first task
-          let tasks$ = concat(applicationStarting$, parallelTasks$);
-    
-          https://github.com/ReactiveX/rxjs/issues/2427
-          https://github.com/ReactiveX/rxjs/issues/2188
-        */
-        if (parallelTasks.length > 0) {
-            let parallelTasks$ = merge(...parallelTasks);
-            tasks$ = forkJoin([applicationStarting$, parallelTasks$]);
-        }
-        else {
-            tasks$ = applicationStarting$;
-        }
-        //Log
-        let stopwatch = new Stopwatch("ensureApplicationStarted");
-        stopwatch.start();
-        return tasks$.pipe(map(() => {
-            //Log
-            stopwatch.stop();
-            stopwatch.printElapsedAsMilliseconds();
-        }));
-    }
-}
-
 /*
 <file>
   Project:
@@ -7551,6 +7579,7 @@ class AnatolyCoreModule {
             DigitalMarketingService,
             GoogleAnalyticsService,
             LoadingService,
+            StarterService,
             LocalStorageService,
             SessionStorageService,
             LoggingService,
@@ -7582,6 +7611,7 @@ class AnatolyCoreModule {
                     DigitalMarketingService,
                     GoogleAnalyticsService,
                     LoadingService,
+                    StarterService,
                     LocalStorageService,
                     SessionStorageService,
                     LoggingService,
@@ -8413,5 +8443,5 @@ class AnatolyModule {
  * Generated bundle index. Do not edit.
  */
 
-export { AddressComponent, AdminGuard, Alerts, AnatolyCoreModule, AnatolyDataModule, AnatolyHttpInterceptor, AnatolyIAMModule, AnatolyIAMPagesModule, AnatolyModule, AnatolyPaymentsModule, AnatolyUIModule, ApiServiceBase, ApiUrl, AppContextService, AppCoreSettings, AppName, AppSettings, AppVersion, AuthService, AuthenticationGuard, BaseGoService, Browser, BuyAccessButtonComponent, CardBodyComponent, CardComponent, CardFooterComponent, CardHeaderComponent, CheckIconComponent, ClientApps, CompanyComponent, ComponentBase, ContactUsDialog, ContactUsForm, Convert, Copy2ClipboardComponent, CoreApiService, CountryDropdownlist, DOM, DataPagerComponent, DateConvert, DefaultEditorOptions, DialogBase, DigitalMarketingService, EditComponentBase, EditPageBase, EmailsApiService, EnumEditComponentBase, FileSizePipe, FormValidationSummaryComponent, FormsHtmlEditorComponent, GlobalErrorHandler, GoogleAnalyticsService, GridEditServiceBase, GridReadServiceBase, Guid, HoveringDirective, HtmlEditorComponent, HtmlEditorComponentBase, IdleService, InjectorInstance, IsDevMode, IsProdMode, ItemValidationSummaryComponent, L10NUrl, L10nUtils, ListBase, LoadingComponent, LoadingService, LocalStorageService, LocalizationInjectorInstance, LocalizationModule, LocalizationService, LocalizationSettingsModule, LocalizePipe, LoggingService, MSALUtils, NativeElementDirective, NodataComponent, NotificationService, PageBase, PageSpinnerComponent, PagedPageBase, PayPalComponent, PayPalScriptService, QSUtils, ReplaceTextPipe, SafeHtmlPipe, ScriptService, SessionStorageService, SignInButtonComponent, SignOutButtonComponent, SignUpButtonComponent, StarterServiceBase, Stopwatch, Subs, SubscribePlanButtonComponent, TimezoneDropdownlist, UrlSlugComponent, Utils, ValidationSummaryComponent, XmlFormatter, dateFormats, dateTimeFormats, getAppSettingsById, getAppSettingsByName, is, localizationInitializerFactory, throwIfAlreadyLoaded, timeFormats, translateLoaderFactory };
+export { AddressComponent, AdminGuard, Alerts, AnatolyCoreModule, AnatolyDataModule, AnatolyHttpInterceptor, AnatolyIAMModule, AnatolyIAMPagesModule, AnatolyModule, AnatolyPaymentsModule, AnatolyUIModule, ApiServiceBase, ApiUrl, AppContextService, AppCoreSettings, AppName, AppSettings, AppVersion, AuthService, AuthenticationGuard, BaseGoService, Browser, BuyAccessButtonComponent, CardBodyComponent, CardComponent, CardFooterComponent, CardHeaderComponent, CheckIconComponent, ClientApps, CompanyComponent, ComponentBase, ContactUsDialog, ContactUsForm, Convert, Copy2ClipboardComponent, CoreApiService, CountryDropdownlist, DOM, DataPagerComponent, DateConvert, DefaultEditorOptions, DialogBase, DigitalMarketingService, EditComponentBase, EditPageBase, EmailsApiService, EnumEditComponentBase, FileSizePipe, FormValidationSummaryComponent, FormsHtmlEditorComponent, GlobalErrorHandler, GoogleAnalyticsService, GridEditServiceBase, GridReadServiceBase, Guid, HoveringDirective, HtmlEditorComponent, HtmlEditorComponentBase, IdleService, InjectorInstance, IsDevMode, IsProdMode, ItemValidationSummaryComponent, L10NUrl, L10nUtils, ListBase, LoadingComponent, LoadingService, LocalStorageService, LocalizationInjectorInstance, LocalizationModule, LocalizationService, LocalizationSettingsModule, LocalizePipe, LoggingService, MSALUtils, NativeElementDirective, NodataComponent, NotificationService, PageBase, PageSpinnerComponent, PagedPageBase, PayPalComponent, PayPalScriptService, QSUtils, ReplaceTextPipe, SafeHtmlPipe, ScriptService, SessionStorageService, SignInButtonComponent, SignOutButtonComponent, SignUpButtonComponent, StarterGuard, StarterService, Stopwatch, Subs, SubscribePlanButtonComponent, TimezoneDropdownlist, UrlSlugComponent, Utils, ValidationSummaryComponent, XmlFormatter, dateFormats, dateTimeFormats, getAppSettingsById, getAppSettingsByName, is, localizationInitializerFactory, throwIfAlreadyLoaded, timeFormats, translateLoaderFactory };
 //# sourceMappingURL=osovitny-anatoly.mjs.map