#2450 piad6 ui fehler

apps/page/catalog/src/lib/article-search/article-search.component.scss

@@ -1,6 +1,11 @@
+:host {
+  @apply flex flex-col w-full box-content absolute;
+}
+
 .filter {
-  @apply absolute font-sans flex items-center font-bold bg-inactive-customer border-0 text-regular py-px-8 px-px-15 rounded-filter justify-center right-0 top-px-10;
+  @apply absolute font-sans flex items-center font-bold bg-inactive-customer border-0 text-regular py-px-8 px-px-15 rounded-filter justify-center right-0;
   min-width: 106px;
+  top: -52px;
 
   .label {
     @apply ml-px-5;

apps/sales/src/app/app.component.html

@@ -1,7 +1,7 @@
 <lib-offline-overlay>
   <!-- lib offline depends on these three elements to be present inside of it -->
-  <app-header [ngClass]="{ loading: loading }" *ngIf="authenticated"></app-header>
-  <app-content [ngClass]="{ loading: loading }"></app-content>
-  <app-menu [ngClass]="{ loading: loading }" *ngIf="authenticated"></app-menu>
-  <img *ngIf="loading" src="/assets/images/Icon_Loading.svg" class="app-loader" />
+  <app-header [ngClass]="{ loading: loading$ | async }" *ngIf="authenticated"></app-header>
+  <app-content [ngClass]="{ loading: loading$ | async }"></app-content>
+  <app-menu [ngClass]="{ loading: loading$ | async }" *ngIf="authenticated"></app-menu>
+  <img *ngIf="loading$ | async" src="/assets/images/Icon_Loading.svg" class="app-loader" />
 </lib-offline-overlay>

apps/sales/src/app/app.component.ts

@@ -1,11 +1,10 @@
-import { Component, HostBinding, Inject, OnDestroy, OnInit, Renderer2 } from '@angular/core';
-import { Router, NavigationEnd, NavigationStart } from '@angular/router';
+import { ChangeDetectorRef, Component, Inject, OnDestroy, OnInit, Renderer2 } from '@angular/core';
+import { Router, NavigationEnd } from '@angular/router';
 import { Store } from '@ngxs/store';
-import { Subject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { take, filter, takeUntil } from 'rxjs/operators';
 import { SsoService } from 'sso';
 import { AppService } from './core/services/app.service';
-import { ModuleSwitcher } from './core/models/app-switcher.enum';
 import { AppState } from './core/store/state/app.state';
 import { AppConfiguration } from './app-configuration';
 import { NativeContainerService } from 'shared/lib/barcode-scanner';
@@ -23,7 +22,7 @@ import { DeviceDetectorService } from 'ngx-device-detector';
 })
 export class AppComponent implements OnInit, OnDestroy {
   title = 'Hugendubel InstoreApp';
-  loading = true;
+  loading$ = new BehaviorSubject(true);
   includeGoogleAnalytics = this.config.includeGoogleAnalytics;
   destroy$ = new Subject();
 
@@ -45,6 +44,14 @@ export class AppComponent implements OnInit, OnDestroy {
     private ngxsActions$: NgxsActions,
     private deviceDetectorService: DeviceDetectorService
   ) {
+    this.appService.loader$.subscribe(() => {
+      this.loading$.next(false);
+    });
+
+    this.appService.loader$.pipe(take(1)).subscribe(() => {
+      this.containerNotificationMessage();
+    });
+
     // intialisations done only when app loads
     this.appService.appLoadInitialisations();
 
@@ -82,11 +89,6 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.appService.loader$.pipe(take(1)).subscribe(() => {
-      this.loading = false;
-      this.containerNotificationMessage();
-    });
-
     if (this.includeGoogleAnalytics) {
       this.initGoogleAnalytics();
     }

apps/sales/src/app/components/header/header.component.ts

@@ -68,10 +68,6 @@ export class HeaderComponent implements OnInit, OnDestroy {
       this.doubleChoiceSwitch.isFirstSwitchedOn = section === 'customer';
       this.cdr.markForCheck();
     });
-
-    this._notificationsHub.notifications$.subscribe((data) => {
-      console.log('signalr - notifications', data);
-    });
   }
 
   ngOnDestroy() {

apps/sales/src/app/core/services/app.service.ts

@@ -73,7 +73,7 @@ export class AppService implements OnDestroy {
       });
 
     this.ssoService.registerAuthentication().then((authenticated) => {
-      if (authenticated) {
+      if (!!authenticated) {
         this.loadState();
         // this.loadVats();
         // this.loadSuppliers();
@@ -141,6 +141,8 @@ export class AppService implements OnDestroy {
               this.loader$.next();
             });
         });
+    } else {
+      this.loader$.next();
     }
   }