@osovitny/anatoly 3.21.36 → 3.21.38

package/fesm2022/osovitny-anatoly.mjs

@@ -73,7 +73,7 @@ import { UploadsModule } from '@progress/kendo-angular-upload';
 </file>
 */
 const SessionStorageKeys = {
-    appCoreSettings: 'appCoreSettings',
+    appSettings: 'appSettings',
     appMSALSettings: 'appMSALSettings'
 };
 const AppContextStorageKeys = {
@@ -106,7 +106,7 @@ const AppContextStorageKeys = {
 */
 //App
 function getAppCoreSettings() {
-    const json = sessionStorage.getItem(SessionStorageKeys.appCoreSettings);
+    const json = sessionStorage.getItem(SessionStorageKeys.appSettings);
     return json ? JSON.parse(json) : null;
 }
 function resetAppCoreSettings() {
@@ -117,6 +117,67 @@ function resetAppCoreSettings() {
     IsProdMode = !IsDevMode;
     ClientApps = AppCoreSettings?.clientApps;
 }
+function getAppSettingsById(id) {
+    let apps = ClientApps;
+    if (apps && id) {
+        for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
+            if (app.id == id) {
+                return app;
+            }
+        }
+    }
+    return null;
+}
+function getAppSettingsByName(name) {
+    let apps = ClientApps;
+    if (apps && name) {
+        for (let i = 0; i < apps.length; i++) {
+            let app = apps[i];
+            if (app.name == name) {
+                return app;
+            }
+        }
+    }
+    return null;
+}
+function getCurrentApp() {
+    let appSettings = getAppSettingsByName(AppName);
+    let appOne = getAppSettingsById(1);
+    if (!appSettings || !appOne) {
+        return null;
+    }
+    return {
+        id: appSettings.id,
+        root: appSettings.root,
+        one: appOne,
+        oneUrl: appOne?.baseUrl + appOne?.root
+    };
+}
+let AppCoreSettings;
+let AppVersion;
+let IsDevMode = true;
+let IsProdMode = !IsDevMode;
+let ClientApps;
+const AppName = g_AppName;
+const LibName = g_LibName;
+const ApiUrl = g_ApiUrl;
+resetAppCoreSettings();
+
+/*
+<file>
+  Project:
+    @osovitny/anatoly
+
+  Authors:
+    Vadim Osovitny vadim.osovitny@osovitny.com
+
+  Created:
+    2 Jun 2026
+
+  Copyright (c) 2016-2025 Osovitny Inc. All rights reserved.
+</file>
+*/
 var AssetGroupType;
 (function (AssetGroupType) {
     AssetGroupType[AssetGroupType["App"] = 1] = "App";
@@ -129,9 +190,9 @@ var AssetGroupType;
   Output pattern: {base}/{AppName}/assets/{assetGroup}/{assetType}/{file}
 
   assetGroup tokens:
-    App      → {AppName}   e.g. "am"
-    Lib      → {LibName}   e.g. "@nexl"
-    External → external/{libname}
+    App      -> {AppName}   e.g. "am"
+    Lib      -> {LibName}   e.g. "@nexl"
+    External -> external/{libname}
 
   assetType:
     jsons  - JSON data files
@@ -139,14 +200,14 @@ var AssetGroupType;
     images - image files
 
   Examples (AppName = "am", LibName = "@nexl", CDN disabled):
-    App     → /am/assets/am/jsons/countries.json?v=1
-    Lib     → /am/assets/@nexl/l10n/en.json?v=1
-    External→ /am/assets/external/anatoly/jsons/file.json?v=1
+    App     -> /am/assets/am/jsons/countries.json?v=1
+    Lib     -> /am/assets/@nexl/l10n/en.json?v=1
+    External-> /am/assets/external/anatoly/jsons/file.json?v=1
 
   Examples (CDN = "https://cdn.novaexpress.ai"):
-    App     → https://cdn.novaexpress.ai/am/assets/am/jsons/countries.json
-    Lib     → https://cdn.novaexpress.ai/am/assets/@nexl/l10n/en.json
-    External→ https://cdn.novaexpress.ai/am/assets/external/anatoly/jsons/file.json
+    App     -> https://cdn.novaexpress.ai/am/assets/am/jsons/countries.json
+    Lib     -> https://cdn.novaexpress.ai/am/assets/@nexl/l10n/en.json
+    External-> https://cdn.novaexpress.ai/am/assets/external/anatoly/jsons/file.json
 */
 function formatAssetsUrl(assetGroupType, url) {
     const path = url.replace(/^\/+/, '');
@@ -167,12 +228,12 @@ function formatAssetsUrl(assetGroupType, url) {
   Output pattern: {base}/{AppName}/{url}
 
   Tokens in url are resolved before building the path:
-    {AppName} → AppName (e.g. "am")
-    {LibName} → LibName (e.g. "@nexl")
+    {AppName} -> AppName (e.g. "am")
+    {LibName} -> LibName (e.g. "@nexl")
 
   base:
-    CDN disabled → "" (relative URL, e.g. /am/assets/...)
-    CDN enabled  → "https://cdn.novaexpress.ai"
+    CDN disabled -> "" (relative URL, e.g. /am/assets/...)
+    CDN enabled  -> "https://cdn.novaexpress.ai"
 
   Absolute URLs (starting with "http") are returned as-is.
 */
@@ -201,15 +262,6 @@ function formatUrl(url) {
     }
     return fullUrl;
 }
-let AppCoreSettings;
-let AppVersion;
-let IsDevMode = true;
-let IsProdMode = !IsDevMode;
-let ClientApps;
-const AppName = g_AppName;
-const LibName = g_LibName;
-const ApiUrl = g_ApiUrl;
-resetAppCoreSettings();
 
 /*
 <file>
@@ -339,18 +391,17 @@ class LoggingService {
             ?? appCoreSettings?.logging?.default
             ?? appCoreSettings?.logging?.Default
             ?? appCoreSettings?.diagnostics?.logLevel
-            ?? appCoreSettings?.logLevel
-            ?? LoggingService.getMsalLogLevel();
-        return LoggingService.toLogLevel(configuredValue);
-    }
-    static getMsalLogLevel() {
-        try {
-            const json = sessionStorage.getItem(SessionStorageKeys.appMSALSettings);
-            return json ? JSON.parse(json)?.app?.system?.loggerOptions?.logLevel : null;
-        }
-        catch {
-            return null;
+            ?? appCoreSettings?.logLevel;
+        if (configuredValue !== null && typeof configuredValue !== 'undefined') {
+            return LoggingService.toLogLevel(configuredValue);
         }
+        return LoggingService.isDevMode(appCoreSettings)
+            ? AnatolyLogLevel.Verbose
+            : AnatolyLogLevel.Off;
+    }
+    static isDevMode(appCoreSettings) {
+        const value = appCoreSettings?.isDevMode ?? appCoreSettings?.IsDevMode;
+        return value === true || `${value}`.toLowerCase() === 'true';
     }
     static toLogLevel(value) {
         if (value === null || typeof value === 'undefined') {
@@ -805,58 +856,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.15", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }, { type: LocalStorageService }, { type: SessionStorageService }] });
 
-/*
-<file>
-  Project:
-    @osovitny/anatoly
-
-  Authors:
-    Vadim Osovitny vadim.osovitny@osovitny.com
-
-  Created:
-    1 Apr 2024
-
-  Copyright (c) 2016-2025 Osovitny Inc. All rights reserved.
-</file>
-*/
-function getAppSettingsById(id) {
-    let apps = ClientApps;
-    if (apps && id) {
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            if (app.id == id) {
-                return app;
-            }
-        }
-    }
-    return null;
-}
-function getAppSettingsByName(name) {
-    let apps = ClientApps;
-    if (apps && name) {
-        for (let i = 0; i < apps.length; i++) {
-            let app = apps[i];
-            if (app.name == name) {
-                return app;
-            }
-        }
-    }
-    return null;
-}
-function getCurrentApp() {
-    let appSettings = getAppSettingsByName(AppName);
-    let appOne = getAppSettingsById(1);
-    if (!appSettings || !appOne) {
-        return null;
-    }
-    return {
-        id: appSettings.id,
-        root: appSettings.root,
-        one: appOne,
-        oneUrl: appOne?.baseUrl + appOne?.root
-    };
-}
-
 /*
 <file>
   Project:
@@ -2688,7 +2687,6 @@ class AnatolyHttpInterceptor {
         }
         //4. getCurrentContext
         if (lowerCaseUrl.indexOf('getcurrentcontext') > -1) {
-            // Only checks MSAL's current active account. It does not start login or token acquisition by itself; it only decides whether this request should call getAccessToken() at all.
             authorizationTokenRequired = this.authService.isUserAuthenticated();
         }
         // Change Url if need it -------------------------------------------->
@@ -10110,10 +10108,10 @@ class AppService extends ApiServiceBase {
             stopwatch.stop();
             stopwatch.printElapsedAsMilliseconds();
             if (data) {
-                let appCoreSettings = JSON.stringify(data.core);
+                let appSettings = JSON.stringify(data.app);
                 let appMSALSettings = JSON.stringify(data.msal);
-                appCoreSettings = appCoreSettings.replace(/--APPNAME--/g, g_AppName);
-                sessionStorage.setItem(SessionStorageKeys.appCoreSettings, appCoreSettings);
+                appSettings = appSettings.replace(/--APPNAME--/g, g_AppName);
+                sessionStorage.setItem(SessionStorageKeys.appSettings, appSettings);
                 sessionStorage.setItem(SessionStorageKeys.appMSALSettings, appMSALSettings);
                 resetAppCoreSettings();
                 resetMsalSettings();