@acorex/modules 21.0.0-next.56 → 21.0.0-next.59

package/fesm2022/acorex-modules-locale-management.mjs

@@ -13,10 +13,10 @@ import { AXDropdownModule } from '@acorex/components/dropdown';
 import { AXPopoverModule } from '@acorex/components/popover';
 import { AXPRegionalSetting, AXPSettingsService, AXPSearchCommandProvider, createEntityCommandOptions, AXP_LOCALE_MANAGEMENT_PORT, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER, createAllQueryView, AXPEntityCommandScope } from '@acorex/platform/common';
 export { AXPRegionalSetting } from '@acorex/platform/common';
-import { signalStore, withState, withMethods, patchState, withHooks } from '@ngrx/signals';
 import { AXCalendarService } from '@acorex/core/date-time';
 import { AXLocaleService, AX_LOCALE_PROFILE_PROVIDERS } from '@acorex/core/locale';
 import { AXTranslationService } from '@acorex/core/translation';
+import { signalStore, withState, withMethods, patchState, withHooks } from '@ngrx/signals';
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import { AXPCommonMenuKeys, AXPWidgetsList } from '@acorex/modules/common';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
@@ -72,6 +72,11 @@ const LocaleManagementManifest = {
 };
 //#endregion
 
+const REGIONAL_SETTING_KEYS = [
+    AXPRegionalSetting.LocaleProfile,
+    AXPRegionalSetting.Language,
+    AXPRegionalSetting.Calendar,
+];
 // Regional Store - Manages regional settings and system changes
 const AXPRegionalStoreService = signalStore({ providedIn: 'root' }, 
 // Initial State
@@ -128,35 +133,35 @@ withMethods((store, settingsService = inject(AXPSettingsService), localeService
             await applyProfileFormats(profile);
             await applyChanges();
         },
+        /**
+         * Applies effective regional settings (user → tenant → platform) to locale, calendar, i18n, and document direction.
+         */
         async loadSetting() {
-            const profileCode = (await settingsService.scope(AXPPlatformScope.User).get(AXPRegionalSetting.LocaleProfile)) || 'en-US';
+            const profileCode = (await settingsService.get(AXPRegionalSetting.LocaleProfile)) || 'en-US';
             patchState(store, { profile: profileCode });
             if (profileCode) {
                 await localeService.setProfile(profileCode);
             }
-            setTimeout(async () => {
-                const profile = localeService.activeProfile();
-                await applyProfileFormats(profile);
-                const calendar = (await settingsService.scope(AXPPlatformScope.User).get(AXPRegionalSetting.Calendar));
-                patchState(store, { calendar: calendar });
+            const calendar = (await settingsService.get(AXPRegionalSetting.Calendar));
+            if (calendar) {
+                patchState(store, { calendar });
                 calendarService.setActiveCalendar(calendar);
-                const language = (await settingsService.scope(AXPPlatformScope.User).get(AXPRegionalSetting.Language));
-                patchState(store, { language: language });
+            }
+            const language = (await settingsService.get(AXPRegionalSetting.Language));
+            if (language) {
+                patchState(store, { language });
                 translateService.setActiveLang(language);
-                await applyChanges();
-            });
+            }
+            await applyChanges();
         },
     };
-}), withHooks((store, settingsService = inject(AXPSettingsService), translateService = inject(AXTranslationService)) => ({
+}), withHooks((store, settingsService = inject(AXPSettingsService)) => ({
     onInit() {
+        settingsService.onLoaded.subscribe(() => {
+            void store.loadSetting();
+        });
         settingsService.onChanged.subscribe(async (setting) => {
-            const keys = [
-                AXPRegionalSetting.LocaleProfile,
-                AXPRegionalSetting.Language,
-                AXPRegionalSetting.Calendar
-            ];
-            //
-            if (keys.some(k => setting.keys.includes(k))) {
+            if (REGIONAL_SETTING_KEYS.some((k) => setting.keys.includes(k))) {
                 await store.loadSetting();
             }
         });
@@ -1190,12 +1195,12 @@ class AXMLocaleManagementModule {
     constructor(appInitService, injector) {
         const service = injector.get(AXPRegionalStoreService);
         appInitService.registerTask({
-            name: 'Settings',
-            statusText: 'Apply Regional Settings ...',
+            name: 'regional-settings',
+            statusText: '@locale-management:app-startup.applying-regional-settings',
             priority: 5,
             run: async () => {
                 await service.loadSetting();
-            }
+            },
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMLocaleManagementModule, deps: [{ token: i1$1.AXPAppStartUpService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }