#2283 Remission starten

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/confirm-receipt-number-modal.component.html

@@ -1,22 +0,0 @@
-<button class="close-btn" (click)="ref.close()">
-  <ui-icon icon="close" size="21px"></ui-icon>
-</button>
-
-<h1>
-  Ist Ihre
-  {{ isNative ? 'Wannennummer' : 'Packstück-ID' }}
-  korrekt oder möchten <br />
-  Sie diese erneut scannen?
-</h1>
-<h3>
-  {{ ref.data }}
-</h3>
-
-<div class="actions-wrapper">
-  <button type="button" (click)="ref.close(false)">
-    Erneut Scannen
-  </button>
-  <button type="button" class="primary" (click)="ref.close(true)">
-    Nummer korrekt
-  </button>
-</div>

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/confirm-receipt-number-modal.component.scss

@@ -1,28 +0,0 @@
-:host {
-  @apply block box-content relative;
-}
-
-.close-btn {
-  @apply absolute -top-2 right-0 text-ucla-blue border-none bg-transparent;
-}
-
-h1 {
-  @apply text-xl font-bold text-center;
-}
-
-h3 {
-  @apply text-3xl font-bold text-center;
-}
-
-.actions-wrapper {
-  @apply grid grid-flow-col items-center content-center gap-4 mx-auto mb-4;
-  width: fit-content;
-
-  button {
-    @apply border-solid border-brand border-2 rounded-full px-6 py-3 bg-white text-brand text-cta-l font-bold;
-
-    &.primary {
-      @apply bg-brand text-white;
-    }
-  }
-}

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/confirm-receipt-number-modal.component.ts

@@ -1,17 +0,0 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
-import { UiModalRef } from '@ui/modal';
-import { NativeContainerService } from 'native-container';
-
-@Component({
-  selector: 'app-confirm.receipt-number-modal',
-  templateUrl: 'confirm-receipt-number-modal.component.html',
-  styleUrls: ['confirm-receipt-number-modal.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ConfirmReceiptNumberModalComponent {
-  get isNative() {
-    return this._nativeContainer.isUiWebview().isNative;
-  }
-
-  constructor(public ref: UiModalRef<boolean, string>, private _nativeContainer: NativeContainerService) {}
-}

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/confirm-receipt-number-modal.module.ts

@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { ConfirmReceiptNumberModalComponent } from './confirm-receipt-number-modal.component';
-import { UiIconModule } from '@ui/icon';
-
-@NgModule({
-  imports: [CommonModule, UiIconModule],
-  exports: [ConfirmReceiptNumberModalComponent],
-  declarations: [ConfirmReceiptNumberModalComponent],
-})
-export class ConfirmReceiptNumberModalModule {}

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/index.ts

@@ -1,4 +0,0 @@
-// start:ng42.barrel
-export * from './confirm-receipt-number-modal.component';
-export * from './confirm-receipt-number-modal.module';
-// end:ng42.barrel

apps/sales/src/app/modules/remission/pages/remission-list-started/shipping-document-creation/shipping-document-creation.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ChangeDetectionStrategy, ViewChild } from '@angular/core';
+import { Component, OnInit, ChangeDetectionStrategy, ViewChild, ViewChildren } from '@angular/core';
 import { Select, Store } from '@ngxs/store';
 import { RemissionSelectors } from 'apps/sales/src/app/core/store/selectors/remission.selectors';
 import { Observable, of } from 'rxjs';
@@ -7,12 +7,10 @@ import { RemissionScanProductInvalidBarcodeComponent } from '../../../components
 import { isNullOrUndefined } from 'util';
 import { AppService } from '@sales/core-services';
 import { RemissionService, ShippingDocument, RemissionProcess } from '@isa/remission';
-import { ErrorService } from 'apps/sales/src/app/core/error/component/error.service';
 import { SetRemissionShippingDocument } from 'apps/sales/src/app/core/store/actions/remission.actions';
 import { NativeContainerService } from 'shared/public_api';
-import { HttpErrorResponse } from '@angular/common/http';
-import { UiErrorModalComponent, UiMessageModalComponent, UiModalService } from '@ui/modal';
-import { ConfirmReceiptNumberModalComponent } from './confirm-receipt-number-modal/confirm-receipt-number-modal.component';
+import { UiErrorModalComponent, UiModalService } from '@ui/modal';
+import { UiSearchboxNextComponent } from '@ui/searchbox';
 
 @Component({
   selector: 'app-shipping-document-creation',
@@ -37,11 +35,13 @@ export class ShippingDocumentCreationComponent implements OnInit {
   @ViewChild('invalidBarcodeDialog')
   invalidBarcodeDialog: RemissionScanProductInvalidBarcodeComponent;
 
+  @ViewChild(UiSearchboxNextComponent, { static: false })
+  searchbox: UiSearchboxNextComponent;
+
   constructor(
     private appService: AppService,
     private nativeService: NativeContainerService,
     private remissionService: RemissionService,
-    private errorService: ErrorService,
     private store: Store,
     private modal: UiModalService
   ) {}
@@ -60,11 +60,7 @@ export class ShippingDocumentCreationComponent implements OnInit {
 
   async shippingDocumentScanned(receiptNumber: string) {
     if (receiptNumber && receiptNumber.length > 3) {
-      const result = await this.modal.open({ content: ConfirmReceiptNumberModalComponent, data: receiptNumber }).afterClosed$.toPromise();
-
-      if (result.data) {
-        this.createShippingDocument(receiptNumber);
-      }
+      this.createShippingDocument(receiptNumber);
     } else {
       this.invalidBarcodeDialog.openDialog();
     }
@@ -91,10 +87,16 @@ export class ShippingDocumentCreationComponent implements OnInit {
           return this.remissionService.createShippingDocument(params).pipe(
             filter((shippingDocument) => !isNullOrUndefined(shippingDocument)),
             catchError((error) => {
-              this.modal.open({
-                content: UiErrorModalComponent,
-                data: error,
-              });
+              this.modal
+                .open({
+                  content: UiErrorModalComponent,
+                  data: error,
+                })
+                .afterClosed$.subscribe(() => {
+                  this.searchbox?.setQuery('');
+                  this.searchbox?.focus();
+                });
+
               return of(undefined);
             }),
             take(1)

apps/sales/src/app/modules/remission/remission-client.module.ts

@@ -84,7 +84,6 @@ import { RemissionScrollButtonComponent } from './components/remission-scroll-bu
 import { ShippingDocumentActionsComponent } from './pages/remission-list-started/shipping-document-container/shipping-document-actions';
 import { RemissionListStartActionComponent } from './components/remission-list-actions/remission-list-start';
 import { UiSearchboxNextModule } from '@ui/searchbox';
-import { ConfirmReceiptNumberModalModule } from './pages/remission-list-started/shipping-document-creation/confirm-receipt-number-modal/confirm-receipt-number-modal.module';
 import { ConfirmContainerNumberModalModule } from './pages/remission-finish/confirm-container-number';
 
 @NgModule({
@@ -158,7 +157,6 @@ import { ConfirmContainerNumberModalModule } from './pages/remission-finish/conf
     FilterLoaderModule,
     RemissionUeberlaufCapacitiesModule,
     UiSearchboxNextModule,
-    ConfirmReceiptNumberModalModule,
     ConfirmContainerNumberModalModule,
   ],
 })

apps/ui/searchbox/src/lib/next/searchbox.component.ts

@@ -149,8 +149,8 @@ export class UiSearchboxNextComponent implements AfterViewInit, OnDestroy, After
 
   onKeyup(event: KeyboardEvent) {
     if (event.key === 'Enter') {
-      if (this.autocomplete.opend && this.autocomplete.activeItem) {
-        this.setQuery(this.autocomplete.activeItem?.item);
+      if (this.autocomplete?.opend && this.autocomplete?.activeItem) {
+        this.setQuery(this.autocomplete?.activeItem?.item);
         this.autocomplete?.close();
       }
       this.search.emit(this.query);