@bizdoc/core 1.11.0-next.7 → 1.11.0-next.8

package/fesm2020/bizdoc-core.mjs

@@ -3,7 +3,7 @@ import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, Directive, Component, ViewChild, Pipe, Optional, Self, HostBinding, Input, EventEmitter, Output, ViewContainerRef, Injector, TemplateRef, NgModule, ElementRef, HostListener, ViewChildren, Host, SkipSelf, APP_INITIALIZER } from '@angular/core';
 import * as i1 from '@angular/common/http';
 import { HttpRequest, HttpResponse, HttpEventType, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { Subject, Observable, of, fromEvent, forkJoin, BehaviorSubject, filter as filter$1, debounceTime as debounceTime$1, takeUntil as takeUntil$1, from, merge, throwError, interval, first as first$1, map as map$1, switchMap as switchMap$1, isObservable, tap as tap$1, EMPTY } from 'rxjs';
+import { Subject, Observable, of, fromEvent, forkJoin, BehaviorSubject, filter as filter$1, debounceTime as debounceTime$1, takeUntil as takeUntil$1, from, merge, throwError, interval, first as first$1, map as map$1, switchMap as switchMap$1, isObservable, tap as tap$1, catchError as catchError$1, EMPTY } from 'rxjs';
 import { map, tap, switchMap, takeUntil, shareReplay, debounceTime, filter, startWith, first, take, finalize, catchError } from 'rxjs/operators';
 import { HubConnectionBuilder, HubConnectionState } from '@microsoft/signalr';
 import dayjs from 'dayjs';
@@ -1330,7 +1330,7 @@ class MailboxService {
                     observe.complete();
                 }
             }, e => {
-                observe.error({ status: e.status, error: e.body });
+                observe.error(e);
                 observe.complete();
             });
             return {
@@ -1375,7 +1375,7 @@ class MailboxService {
                     observe.complete();
                 }
             }, e => {
-                observe.error({ status: e.status, error: e.body });
+                observe.error(e);
                 observe.complete();
             });
             return {
@@ -8221,7 +8221,6 @@ class ComposeFormComponent {
         this.working = true;
         this.workingChange.emit(true);
         let exists;
-        const fileMap = {};
         files.forEach(f => {
             if (!exists)
                 exists = this.model.attachments.some(a => a.fileName === f.name && !a.deleted && !a.failed);
@@ -8229,14 +8228,13 @@ class ComposeFormComponent {
             if (retry > -1)
                 this.model.attachments.splice(retry, 1);
             const model = this._constructAttachment(f);
-            fileMap[f.name] = model;
             this.model.attachments.push(model);
         });
         return this._mailbox.upload(this.model.id, this.model.formId, this.model.version, files).
             pipe(tap((r) => {
             files.length === 1 ? this._sb.toast(!exists ? 'UploadOk' : 'UploadVersionOk', files[0].name) :
                 this._sb.toast('UploadMany', files.length);
-            r.forEach(i => Object.assign(fileMap[i.fileName], i, { progress: null, }, i));
+            r.forEach(i => Object.assign(this.model.attachments.find(a => a.fileName == i.fileName && !a.id), i, { progress: null, }, i));
             this.working = false;
             this.workingChange.emit(false);
         }, e => {
@@ -8437,7 +8435,7 @@ class ComposeFormComponent {
                 case 409: // version change
                     {
                         const obj = response.error /* serialized model */;
-                        this._assign(obj);
+                        obj && this._assign(obj);
                         this._reset();
                         this._sb.error('VersionErr', this.model.number);
                         break;
@@ -25809,7 +25807,7 @@ class FileInput {
                 //}
                 Object.assign(item, a, { progress: null, checkedOut: null });
                 this._sb.toast(this._translate.get('CheckedIn', item.fileName));
-            }, () => this._sb.error());
+            }, e => this._handleError(e));
         });
     }
     checkOut(item) {
@@ -25833,12 +25831,28 @@ class FileInput {
                 this._value = this.items = null;
             this._onChange(this._value);
             this._model.attachments.remove(item);
-        }, () => this._sb.error());
+        }, e => this._handleError(e));
         if (this._model.draft)
             task();
         else
             this._sb.ask('DeleteFileAsk', 'DeleteFile', { color: 'warn' }).subscribe(ok => ok && task());
     }
+    _handleError(response) {
+        switch (response.status) {
+            case 401:
+                break;
+            case 409: // version change
+                {
+                    this._sb.error('VersionErr', this._model.number);
+                    break;
+                }
+            case 406: // validation exception
+                this._sb.errorString(response.error);
+                break;
+            default:
+                this._sb.error();
+        }
+    }
     ngOnInit() {
         const container = this._dropableElement.nativeElement;
         this._dragDrop.subscribe(ok => {
@@ -25870,14 +25884,21 @@ class FileInput {
             for (let item of checkedOut) {
                 let file = files.find(f => f.name.startsWith(item.fileName));
                 if (file) {
-                    let observable = this._mailbox.checkIn(this._model.id, this._model.version, item.id, file).pipe(tap$1(e => {
+                    let observable = this._mailbox.checkIn(this._model.id, this._model.version, item.id, file).
+                        pipe(tap$1(e => {
                         //Object.assign(item, a, { progress: null });
+                    }), catchError$1(e => {
+                        this._handleError(e);
+                        return of(false);
                     }));
                     observables.push(observable);
                 }
             }
-            forkJoin(observables).subscribe(() => this._sb.toast(checkedOut.length > 1 ? this._translate.get('CheckedInN', checkedOut.length) :
-                this._translate.get('CheckedIn', checkedOut[0].fileName)), () => this._sb.error());
+            forkJoin(observables).subscribe(e => {
+                const attachments = e.filter(e => e);
+                attachments.length && this._sb.toast(attachments.length > 1 ? this._translate.get('CheckedInN', attachments.length) :
+                    this._translate.get('CheckedIn', attachments[0].fileName));
+            });
         }
         else
             this._upload(files);
@@ -25992,7 +26013,10 @@ class FileInput {
                 pipe(tap$1(e => {
                 //  if (e.progress) {
                 //  }
-            }), map$1(e => e[0]));
+            }), map$1(e => e[0]), catchError$1(e => {
+                this._handleError(e);
+                return of(false);
+            }));
             observables.push(observable);
         }
         this._input.nativeElement.value = null;
@@ -26001,14 +26025,14 @@ class FileInput {
             if (!this.items)
                 this.items = [];
             e.forEach(a => {
+                if (!a)
+                    return;
                 ids.push(a.id);
                 this._model.attachments.push(a);
                 this.items.push(this._createItem(a.id));
             });
             this._value = this.multiple ? ids : ids[0];
             this._onChange(this._value);
-        }, e => {
-            this._sb.error();
         });
     }
     ngOnDestroy() {