sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[HIMA-1043] updated libraries & handled errors thrown when scanning postuck id

Browse Source
This commit is contained in:
Eraldo Hasanaj
2020-03-03 11:00:40 +01:00
parent 20fdc81aa8
commit 77bcb82fb0
3 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.ts
View File

@@ -39,6 +39,7 @@ import { RemissionToTopToBottomActionsComponent } from '../../components/remissi
import { RemissionFinishingProcessStatus } from '../../models/remission-finishing-process-status.enum';
// tslint:disable-next-line: max-line-length
import { RemissionScanProductInvalidBarcodeComponent } from '../../components/remission-scan-product-invalid-barcode/remission-scan-product-invalid-barcode.component';
import { ErrorService } from 'apps/sales/src/app/core/error/component/error.service';
@Component({
selector: 'app-remission-list-started',
@@ -89,7 +90,8 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
private remissionHelper: RemissionHelperService,
private router: Router,
private appService: AppService,
private cdrf: ChangeDetectorRef
private cdrf: ChangeDetectorRef,
private errorService: ErrorService
) {}
ngOnInit() {
@@ -443,16 +445,18 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
currentShippingDocumentStatusSubscriptionhandler = (status: boolean) => {
const shippingDocument$ = !status ? this.createShippingDocument$() : this.continueExistingShippingDocument();
shippingDocument$.subscribe(shippingDocument => {
this.remissionService
.getShippingDocuments({
remissionProcessId: this.remissionProcess.id,
shippingDocumentId: shippingDocument.id
})
.pipe(
filter(data => !isNullOrUndefined(data)),
takeUntil(this.destroy$)
)
.subscribe(this.shippingDocumentSubscriptionHandler);
if (shippingDocument) {
this.remissionService
.getShippingDocuments({
remissionProcessId: this.remissionProcess.id,
shippingDocumentId: shippingDocument.id
})
.pipe(
filter(data => !isNullOrUndefined(data)),
takeUntil(this.destroy$)
)
.subscribe(this.shippingDocumentSubscriptionHandler);
}
});
};
@@ -473,7 +477,11 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
return this.remissionService.createShippingDocument(params).pipe(
filter(data => !isNullOrUndefined(data)),
take(1)
take(1),
catchError(error => {
this.errorService.addErrors(error.httpError.code, error.message, JSON.stringify(error.invalidProperties));
return of(undefined);
})
);
}

48
package-lock.json generated
View File

@@ -1039,65 +1039,65 @@
}
},
"@cmf/catalog-api": {
"version": "0.1.23",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.23.tgz",
"integrity": "sha1-zv0lv4UlfoyB4+4p7LerXhJqtPk=",
"version": "0.1.24",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.24.tgz",
"integrity": "sha1-UJutPTN2kIt0BWZJm6ViXbre7PU=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/core": {
"version": "0.1.23",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.23.tgz",
"integrity": "sha1-hEOVD5NgBN4PsV3vySNzuC0XW40=",
"version": "0.1.24",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.24.tgz",
"integrity": "sha1-VikCC0+gVcW2MSt1BODzjlDE5Bw=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/inventory-api": {
"version": "0.1.23",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.23.tgz",
"integrity": "sha1-jM19Pb5bC0PMhEL3Suk0eUZ7+vo=",
"version": "0.1.24",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.24.tgz",
"integrity": "sha1-HtWtNfsOLGchks2IOL+ZQ2Hv8wQ=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/trade-api": {
"version": "0.1.23",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.23.tgz",
"integrity": "sha1-7LvR5nGeyK+316L6SvpeNkYTG5U=",
"version": "0.1.24",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.24.tgz",
"integrity": "sha1-NVdd17cwWqJMjzPGjZp8BmbSBuM=",
"requires": {
"tslib": "^1.9.0"
}
},
"@isa/catsearch-api": {
"version": "0.0.51",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.51.tgz",
"integrity": "sha1-1dKh2jvJ02aOIh8NzDWBIOt29IU=",
"version": "0.0.53",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.53.tgz",
"integrity": "sha1-C9wTPDm5Wlkhrf3DIq03p24ANwE=",
"requires": {
"tslib": "^1.9.0"
}
},
"@isa/print-api": {
"version": "0.0.51",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.51.tgz",
"integrity": "sha1-64MgV4LfWa4wmLkXp+ZffEZbc7E=",
"version": "0.0.53",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.53.tgz",
"integrity": "sha1-PF/QmUo5BaET3lRm8knylrPhKOM=",
"requires": {
"tslib": "^1.9.0"
}
},
"@isa/remi-api": {
"version": "0.0.51",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.51.tgz",
"integrity": "sha1-U/LHSc+5HYyIiFTiCaNPTV41c7U=",
"version": "0.0.53",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.53.tgz",
"integrity": "sha1-JOXgi8bWMl3jvSTF63I9XekzcdA=",
"requires": {
"tslib": "^1.9.0"
}
},
"@isa/remission": {
"version": "0.2.38",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.2.38.tgz",
"integrity": "sha1-7q+HD+gmx3Gd0MBz6hmf+js1o4k=",
"version": "0.2.39",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.2.39.tgz",
"integrity": "sha1-HVk7LjbISh5r7iOmJlmiDvYL7MM=",
"requires": {
"tslib": "^1.9.0"
}

16
package.json
View File

@@ -30,14 +30,14 @@
"@angular/pwa": "^0.13.4",
"@angular/router": "~7.2.12",
"@angular/service-worker": "~7.2.12",
"@cmf/catalog-api": "^0.1.23",
"@cmf/core": "^0.1.23",
"@cmf/inventory-api": "^0.1.23",
"@cmf/trade-api": "^0.1.23",
"@isa/catsearch-api": "^0.0.51",
"@isa/print-api": "0.0.51",
"@isa/remi-api": "^0.0.51",
"@isa/remission": "^0.2.38",
"@cmf/catalog-api": "^0.1.24",
"@cmf/core": "^0.1.24",
"@cmf/inventory-api": "^0.1.24",
"@cmf/trade-api": "^0.1.24",
"@isa/catsearch-api": "^0.0.53",
"@isa/print-api": "0.0.53",
"@isa/remi-api": "^0.0.53",
"@isa/remission": "^0.2.39",
"@ng-idle/core": "^8.0.0-beta.4",
"@ng-idle/keepalive": "^8.0.0-beta.4",
"@ngxs/store": "^3.4.1",