@acorex/platform 20.2.0-next.0 → 20.2.0-next.2

package/fesm2022/acorex-platform-themes-default.mjs

@@ -41,12 +41,12 @@ import { inject, computed, effect, ViewChild, Input, ChangeDetectionStrategy, Vi
 import { FormsModule } from '@angular/forms';
 import * as i1$3 from '@angular/router';
 import { RouterModule, Router, NavigationEnd, RouteReuseStrategy, ROUTES } from '@angular/router';
-import { Subject, takeUntil, filter } from 'rxjs';
+import { Subject, takeUntil, filter, firstValueFrom } from 'rxjs';
 import * as i1$2 from '@acorex/platform/layout/components';
 import { AXPComponentSlotModule, AXPTaskBadgeService, AXPMenuBadgeHelper, AXPTaskBadgeDirective } from '@acorex/platform/layout/components';
 import * as i2$2 from '@acorex/components/side-menu';
 import { AXSideMenuModule } from '@acorex/components/side-menu';
-import { AXPPlatformScope, AXPBroadcastEventService } from '@acorex/platform/core';
+import { AXPPlatformScope, AXPBroadcastEventService, AXPContextStore } from '@acorex/platform/core';
 import { sortBy } from 'lodash-es';
 import { AXAvatarModule } from '@acorex/components/avatar';
 import { AXImageModule } from '@acorex/components/image';
@@ -104,7 +104,9 @@ class AXPEntityDetailListViewComponent {
             .pipe(takeUntil(this.destroyed))
             .subscribe((event) => {
             console.log(event);
-            this.grid.refresh();
+            this.grid.refresh({
+                reset: false,
+            });
         });
     }
     ngAfterViewInit() {
@@ -410,22 +412,32 @@ class AXPRootLayoutComponent {
         this.sessionService = inject(AXPSessionService);
         this.unsubscriber = inject(AXUnsubscriber);
         this.workflowService = inject(AXPWorkflowService);
+        this.contextStore = inject(AXPContextStore);
     }
     ngOnInit() {
         // Select the menu item based on the current route when the page loads
         this.menuStore.selectMenuItemByRoute(this.router.url);
-        // Update the selected menu item whenever the route changes
         this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe((event) => {
+            // Update the selected menu item whenever the route changes
             this.menuStore.selectMenuItemByRoute(event.urlAfterRedirects);
+            // Reset the context store
+            this.contextStore.reset();
         });
         this.eventService.listen(AXPSessionStatus.SignedOut).subscribe(() => {
             console.log('signed out in root layout');
             this.router.navigate(['/auth/login']);
         });
         //
-        this.sessionService.status$.pipe(this.unsubscriber.takeUntilDestroy).subscribe(async (c) => {
-            const keys = [AXPSessionStatus.SignedOut, AXPSessionStatus.Unauthenticated, AXPSessionStatus.Expired];
-            if (keys.includes(c)) {
+        this.sessionService.status$.pipe(this.unsubscriber.takeUntilDestroy).subscribe(async (status) => {
+            // Don't redirect if still loading
+            const isLoading = await firstValueFrom(this.sessionService.isLoading$);
+            if (isLoading) {
+                console.log('Session is still loading, skipping redirect check');
+                return;
+            }
+            const redirectKeys = [AXPSessionStatus.SignedOut, AXPSessionStatus.Unauthenticated, AXPSessionStatus.Expired];
+            if (redirectKeys.includes(status)) {
+                console.log('Redirecting to login due to status:', status);
                 this.router.navigate(['/auth/login']);
             }
         });
@@ -434,10 +446,10 @@ class AXPRootLayoutComponent {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXPRootLayoutComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.3", type: AXPRootLayoutComponent, isStandalone: true, selector: "ng-component", providers: [AXUnsubscriber], ngImport: i0, template: `
-    @if (layout.isMenuHorizontal()) {
-      <axp-root-horizontal-layout></axp-root-horizontal-layout>
-    } @else {
-      <axp-root-vertical-layout></axp-root-vertical-layout>
+    @if(layout.isMenuHorizontal()){
+    <axp-root-horizontal-layout></axp-root-horizontal-layout>
+    }@else{
+    <axp-root-vertical-layout></axp-root-vertical-layout>
     }
   `, isInline: true, dependencies: [{ kind: "component", type: AXPRootHorizontalLayoutComponent, selector: "axp-root-horizontal-layout" }, { kind: "component", type: AXPRootVerticalLayoutComponent, selector: "axp-root-vertical-layout" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
@@ -445,10 +457,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
             type: Component,
             args: [{
                     template: `
-    @if (layout.isMenuHorizontal()) {
-      <axp-root-horizontal-layout></axp-root-horizontal-layout>
-    } @else {
-      <axp-root-vertical-layout></axp-root-vertical-layout>
+    @if(layout.isMenuHorizontal()){
+    <axp-root-horizontal-layout></axp-root-horizontal-layout>
+    }@else{
+    <axp-root-vertical-layout></axp-root-vertical-layout>
     }
   `,
                     encapsulation: ViewEncapsulation.None,
@@ -984,7 +996,7 @@ class AXPDefaultThemeModule {
                                 ///
                                 modify: () => import('./acorex-platform-themes-default-entity-master-modify-view.component-Cn-0fTWn.mjs').then((c) => c.AXPEntityMasterModifyViewComponent),
                                 //
-                                list: () => import('./acorex-platform-themes-default-entity-master-list-view.component-DJdedfa_.mjs').then((c) => c.AXPEntityMasterListViewComponent),
+                                list: () => import('./acorex-platform-themes-default-entity-master-list-view.component-C8UhVBSM.mjs').then((c) => c.AXPEntityMasterListViewComponent),
                             },
                         },
                     };
@@ -1023,7 +1035,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                                             ///
                                             modify: () => import('./acorex-platform-themes-default-entity-master-modify-view.component-Cn-0fTWn.mjs').then((c) => c.AXPEntityMasterModifyViewComponent),
                                             //
-                                            list: () => import('./acorex-platform-themes-default-entity-master-list-view.component-DJdedfa_.mjs').then((c) => c.AXPEntityMasterListViewComponent),
+                                            list: () => import('./acorex-platform-themes-default-entity-master-list-view.component-C8UhVBSM.mjs').then((c) => c.AXPEntityMasterListViewComponent),
                                         },
                                     },
                                 };