fix: hide app when globalLoading is true to avoid unwanted behavior w…

…hen switching apps (#218) * fix: ocxSrc directive with external image url, ocx slots * fix: loading remote component * fix: lint issues * fix: componentType may be undefined * fix: improve permission cache, use of ocxSrc, fix overflow of user avatar menu * fix: no permissions flickering * fix: hide app when globalLoading is true to avoid unwanted behavior when switching apps --------- Co-authored-by: kim.tran <[email protected]>
onecx · Apr 12, 2024 · 14d6e01 · 14d6e01
1 parent d7eab05
commit 14d6e01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/libs/shell-core/src/lib/components/portal-viewport/portal-viewport.component.html b/libs/shell-core/src/lib/components/portal-viewport/portal-viewport.component.html
@@ -28,9 +28,10 @@
   <div class="layout-main">
     <div class="layout-content relative">
       <ocx-slot name="subHeader"></ocx-slot>
-
-      <ng-content></ng-content>
-      <router-outlet></router-outlet>
+      <ng-container *ngIf="(appStateService.globalLoading$ | async) === false">
+        <ng-content></ng-content>
+        <router-outlet></router-outlet>
+      </ng-container>
     </div>
 
     <ocx-shell-footer></ocx-shell-footer>

diff --git a/libs/shell-core/src/lib/components/portal-viewport/portal-viewport.component.ts b/libs/shell-core/src/lib/components/portal-viewport/portal-viewport.component.ts
@@ -32,7 +32,7 @@ export class PortalViewportComponent implements OnInit, AfterViewInit, OnDestroy
     private renderer: Renderer2,
     private primengConfig: PrimeNGConfig,
     private messageService: MessageService,
-    private appStateService: AppStateService,
+    public appStateService: AppStateService,
     private portalMessageService: PortalMessageService,
     private userService: UserService,
     private themeService: ThemeService,