Merge branch 'release/1.5'

#2555 Hotfix Historie und Print Dialog doppelte Scrollbar

Related work items: #2555

apps/domain/oms/src/lib/action-handlers/print-compartment-label.action-handler.ts

@@ -20,6 +20,7 @@ export class PrintCompartmentLabelActionHandler extends ActionHandler<OrderItems
     await this.uiModal
       .open({
         content: PrintModalComponent,
+        config: { showScrollbarY: false },
         data: {
           printImmediately: !this.nativeContainerService.isUiWebview().isNative,
           printerType: 'Label',

apps/domain/oms/src/lib/action-handlers/print-shipping-note.action-handler.ts

@@ -21,6 +21,7 @@ export class PrintShippingNoteActionHandler extends ActionHandler<OrderItemsCont
     await this.uiModal
       .open({
         content: PrintModalComponent,
+        config: { showScrollbarY: false },
         data: {
           printImmediately: !this.nativeContainerService.isUiWebview().isNative,
           printerType: 'Label',

apps/modal/printer/src/lib/modal-printer.component.scss

@@ -18,6 +18,10 @@
   font-weight: 400 !important;
 }
 
+::ng-deep modal-print-cart ui-select .ui-select-options {
+  max-height: 9rem !important;
+}
+
 ui-select {
   min-width: 255px;
 }

apps/page/catalog/src/lib/article-details/article-details.component.ts

@@ -146,6 +146,7 @@ export class ArticleDetailsComponent implements OnInit, OnDestroy {
       } as PrintModalData,
       config: {
         panelClass: [],
+        showScrollbarY: false,
       },
     });
   }

apps/page/catalog/src/lib/article-details/article-details.store.ts

@@ -233,8 +233,8 @@ export class ArticleDetailsStore extends ComponentStore<ArticleDetailsState> {
       const availability = isDownload ? downloadAvailability : pickupAvailability || deliveryDigAvailability;
       return item?.catalogAvailability?.supplier === 'S' && !isDownload
         ? `${item?.catalogAvailability?.ssc} - ${item?.catalogAvailability?.sscText}`
-        : availability.ssc || availability.sscText
-        ? `${availability.ssc} - ${availability.sscText}`
+        : availability?.ssc || availability?.sscText
+        ? `${availability?.ssc} - ${availability?.sscText}`
         : 'Keine Lieferanten vorhanden';
     })
   );

apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts

@@ -369,6 +369,7 @@ export class CheckoutReviewComponent implements OnInit {
       } as PrintModalData,
       config: {
         panelClass: [],
+        showScrollbarY: false,
       },
     });
   }

apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.ts

@@ -123,6 +123,7 @@ export class CheckoutSummaryComponent {
       } as PrintModalData,
       config: {
         panelClass: [],
+        showScrollbarY: false,
       },
     });
   }

apps/page/customer/src/lib/customer-details/customer-details.component.ts

@@ -198,6 +198,7 @@ export class CustomerDetailsComponent implements OnInit {
     this.modal.open({
       content: HistoryComponent,
       title: 'Historie',
+      config: { showScrollbarY: false },
       data: {
         mode: 'customer',
         item: customer,

apps/page/customer/src/lib/customer-details/customer-order-details/order-item-card/customer-order-item-card.component.ts

@@ -54,6 +54,7 @@ export class CustomerOrderItemCardComponent implements OnInit {
     this._modal.open({
       content: HistoryComponent,
       title: 'Historie',
+      config: { showScrollbarY: false },
       data: {
         mode: 'order',
         item: {

apps/page/customer/src/lib/customer-search/search-main/search-main.component.ts

@@ -46,7 +46,7 @@ export class CustomerSearchMainComponent implements OnInit, OnDestroy {
           // Updaten der QueryParams wenn diese sich ändern
           if (!isEqual(this.search.getQueryParams(), queryParams)) {
             const params = { ...queryParams };
-            delete params.scrollPos;
+            delete params?.scrollPos;
             this.search.setQueryParams({ params });
           }
 

apps/page/customer/src/lib/customer-search/search-results/search-results.component.ts

@@ -57,7 +57,7 @@ export class CustomerSearchResultComponent implements OnInit, OnDestroy {
           // scrollPos muss entfernt werden um die items anhand der QueryParams zu cachen
           if (!isEqual(this.search.getQueryParams(), queryParams)) {
             const params = { ...queryParams };
-            delete params.scrollPos;
+            delete params?.scrollPos;
             const items = this.cache?.get<PagedResult<CustomerSearchType>>(params)?.result;
             const hits = this.cache?.get<PagedResult<CustomerSearchType>>(params)?.hits;
             this.search.setQueryParams({ params });
@@ -67,7 +67,7 @@ export class CustomerSearchResultComponent implements OnInit, OnDestroy {
           }
 
           // Nach dem setzen der Items im store an die letzte Position scrollen
-          setTimeout(() => this.scrollContainer.nativeElement.scrollTo(0, Number(queryParams.scrollPos ?? 0)), 0);
+          setTimeout(() => this.scrollContainer.nativeElement.scrollTo(0, Number(queryParams?.scrollPos ?? 0)), 0);
 
           // Fügt Breadcrumb hinzu falls dieser noch nicht vorhanden ist
           await this.breadcrumb.addBreadcrumbIfNotExists({

apps/page/goods-in/src/lib/goods-in-cleanup-list/goods-in-cleanup-list.component.ts

@@ -105,7 +105,7 @@ export class GoodsInCleanupListComponent implements OnInit, OnDestroy {
     for (const crumb of crumbs) {
       this._breadcrumb.patchBreadcrumb(crumb.id, {
         name: crumb.name,
-        params: { scroll_position: this.scrollContainer.scrollPos },
+        params: { scroll_position: this.scrollContainer?.scrollPos ?? 0 },
       });
     }
   }

apps/page/goods-in/src/lib/goods-in-list/goods-in-list.store.ts

@@ -73,22 +73,16 @@ export class GoodsInListStore extends ComponentStore<GoodsInListState> {
         }).pipe(
           tapResponse(
             (res) => {
-              if (options.clear) {
-                this.patchState({
-                  hits: res.hits,
-                  results: res.result,
-                  take: 25,
-                  loading: false,
-                });
-              } else {
-                const items = this.get((s) => s.results);
-                this.patchState({
-                  hits: res.hits,
-                  results: [...items, ...res.result],
-                  take: 25,
-                  loading: false,
-                });
-              }
+              const result = res.result ?? [];
+
+              const items = options.clear ? result : [..._results, ...result];
+              this.patchState({
+                hits: res.hits,
+                results: items,
+                take: 25,
+                loading: false,
+              });
+
               this._searchResultSubject.next(res);
               if (res.hits > 1) {
                 const path = '/goods/in/list/';
@@ -98,6 +92,7 @@ export class GoodsInListStore extends ComponentStore<GoodsInListState> {
                   });
                 }
               }
+
               options?.cb?.call(undefined);
             },
             (err: Error) => {

apps/page/goods-in/src/lib/goods-in-reservation/goods-in-reservation.component.ts

@@ -105,7 +105,7 @@ export class GoodsInReservationComponent implements OnInit, OnDestroy {
     for (const crumb of crumbs) {
       this._breadcrumb.patchBreadcrumb(crumb.id, {
         name: crumb.name,
-        params: { scroll_position: this.scrollContainer.scrollPos, take: this._store.results?.length },
+        params: { scroll_position: this.scrollContainer?.scrollPos ?? 0, take: this._store.results?.length },
       });
     }
   }

apps/page/goods-out/src/lib/goods-out-search/search-results/goods-out-search-results.component.ts

@@ -127,7 +127,7 @@ export class GoodsOutSearchResultsComponent extends ComponentStore<GoodsOutSearc
   }
 
   async updateBreadcrumb(queryParams: Record<string, string> = this._goodsOutSearchStore.filter?.getQueryParams()) {
-    const scroll_position = this.scrollContainer.scrollPos;
+    const scroll_position = this.scrollContainer?.scrollPos;
     const take = this._goodsOutSearchStore.results?.length;
 
     if (queryParams) {

apps/page/task-calendar/src/lib/components/task-list/task-list.component.ts

@@ -218,6 +218,7 @@ export class TaskListComponent {
       } as PrintModalData,
       config: {
         panelClass: [],
+        showScrollbarY: false,
       },
     });
   }

apps/page/task-calendar/src/lib/modals/article-list/article-list-modal.component.ts

@@ -42,6 +42,7 @@ export class ArticleListModalComponent {
       } as PrintModalData,
       config: {
         panelClass: [],
+        showScrollbarY: false,
       },
     });
   }

apps/page/task-calendar/src/lib/modals/pdf-viewer/pdf-viewer-modal.component.ts

@@ -58,6 +58,7 @@ export class PdfViewerModalComponent {
         data,
         config: {
           panelClass: [],
+          showScrollbarY: false,
         },
       });
     };

apps/shared/goods-in-out/src/lib/goods-in-out-order-details/goods-in-out-order-details-item/goods-in-out-order-details-item.component.ts

@@ -200,6 +200,7 @@ export class SharedGoodsInOutOrderDetailsItemComponent extends ComponentStore<Sh
     this._modal.open({
       content: HistoryComponent,
       title: 'Historie',
+      config: { showScrollbarY: false },
       data: {
         mode: 'goods',
         item: this.orderItem,