@sumaris-net/ngx-components 1.15.12 → 1.16.0

package/esm2015/src/app/shared/services/job.utils.js

@@ -1,6 +1,6 @@
 import { __awaiter } from "tslib";
 import { BehaviorSubject, defer } from 'rxjs';
-import { isNil, isNotNil } from '../functions';
+import { isNil, isNotNil, toNumber } from '../functions';
 // @dynamic
 export class JobUtils {
     static defers(runnableList, opts) {
@@ -11,22 +11,24 @@ export class JobUtils {
     }
     static run(runnable, opts) {
         const progression = new BehaviorSubject(0);
-        runnable(progression, opts)
+        runnable(Object.assign(Object.assign({}, opts), { progression }))
             .then(() => {
-            if (opts && opts.maxProgression)
+            if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            progression.complete();
+            if (opts === null || opts === void 0 ? void 0 : opts.progression)
+                opts.progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
-    static fetchAllPages(loadPageFn, progression, opts) {
+    static fetchAllPages(loadPageFn, opts) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || undefined;
             let total;
-            let loopCount;
+            let pageCount;
             let progressionStep;
-            let loopDataCount;
+            let currentPageDataCount;
             const fetchSize = opts && opts.fetchSize || 1000;
             let offset = 0;
             let data = [];
@@ -36,37 +38,42 @@ export class JobUtils {
                 // Get some items, using paging
                 const res = yield loadPageFn(offset, fetchSize);
                 data = data.concat(res.data);
-                loopDataCount = res.data && res.data.length || 0;
-                offset += loopDataCount;
+                currentPageDataCount = res.data && res.data.length || 0;
+                offset += currentPageDataCount;
                 // Set total count (only if not already set)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
-                    loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
-                    progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
+                    // Compute the number of page
+                    pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
+                    // Compute step, by dividing maxProgression by number of page
+                    const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
+                    progressionStep = maxProgression
+                        ? (maxProgression - actualProgression) / pageCount
+                        : undefined /*if 0 reset to undefined*/;
                 }
                 // Increment progression on each iteration (if possible)
-                if (isNotNil(progressionStep)) {
-                    progression.next(progression.getValue() + progressionStep);
+                if (opts && opts.progression && isNotNil(progressionStep)) {
+                    opts.progression.next(opts.progression.value + progressionStep);
                 }
                 if (opts && opts.onPageLoaded)
                     opts.onPageLoaded(res);
-            } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
+            } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
             if (isNotNil(progressionStep)) {
                 // If total return by loadAll was bad !
                 if (isNotNil(total) && data.length < total) {
                     console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
                     total = data.length;
-                    loopCount = Math.round(data.length / fetchSize + 0.5);
+                    pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
-                if (lastProgressionStep > 0) {
-                    progression.next(progression.getValue() + lastProgressionStep);
+                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
+                if (opts && opts.progression && lastProgressionStep > 0) {
+                    opts.progression.next(opts.progression.value + lastProgressionStep);
                 }
             }
             // Or increment once
-            else if (opts.maxProgression) {
-                progression.next(progression.getValue() + opts.maxProgression);
+            else if (opts && opts.progression && opts.maxProgression) {
+                opts.progression.next(opts.progression.value + opts.maxProgression);
             }
             return {
                 data,
@@ -75,4 +82,4 @@ export class JobUtils {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {BehaviorSubject, defer, Observable, Subject} from 'rxjs';\nimport {isNil, isNotNil} from '../functions';\nimport {LoadResult, LoadResultByPageFn} from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (progression: BehaviorSubject<number>, opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable(progression, opts)\n      .then(() => {\n        if (opts && opts.maxProgression) progression.next(opts.maxProgression);\n        progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    progression: BehaviorSubject<number>,\n    opts?: {\n      maxProgression?: number;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = opts && opts.maxProgression || undefined;\n    let total; let loopCount; let progressionStep; let loopDataCount: number;\n    const fetchSize = opts && opts.fetchSize || 1000;\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Get some items, using paging\n      const res = await loadPageFn(offset, fetchSize);\n      data = data.concat(res.data);\n      loopDataCount = res.data && res.data.length || 0;\n      offset += loopDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer\n        progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (isNotNil(progressionStep)) {\n        progression.next(progression.getValue() + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        loopCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);\n      if (lastProgressionStep > 0) {\n        progression.next(progression.getValue() + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts.maxProgression) {\n      progression.next(progression.getValue() + opts.maxProgression);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"job.utils.js","sourceRoot":"","sources":["../../../../../../src/app/shared/services/job.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import { BehaviorSubject, defer, Observable } from 'rxjs';\nimport { isNil, isNotNil, toNumber } from '../functions';\nimport { LoadResult, LoadResultByPageFn } from './entity-service.class';\n\nexport type CallableWithProgressionFn<O extends CallableWithProgressionOptions> = (opts?: O) => Promise<void>;\nexport interface CallableWithProgressionOptions {\n  maxProgression?: number;\n  progression?: BehaviorSubject<number>;\n  [key: string]: any;\n}\n\n// @dynamic\nexport class JobUtils {\n\n  static defers<O extends CallableWithProgressionOptions>(runnableList: CallableWithProgressionFn<O>[], opts?: O): Observable<number>[] {\n    return runnableList.map(runnable => JobUtils.defer(runnable, opts));\n  }\n\n  static defer<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts?: O): Observable<number> {\n    return defer<Observable<number>>(() => JobUtils.run(runnable, opts));\n  }\n\n  static run<O extends CallableWithProgressionOptions>(runnable: CallableWithProgressionFn<O>, opts: O): Observable<number> {\n\n    const progression = new BehaviorSubject<number>(0);\n    runnable({...opts, progression})\n      .then(() => {\n        if (opts?.maxProgression) progression.next(opts.maxProgression);\n        if (opts?.progression) opts.progression.complete();\n      })\n      .catch(err => progression.error(err));\n    return progression;\n  }\n\n  static async fetchAllPages<T>(\n    loadPageFn: LoadResultByPageFn<T>,\n    opts?: {\n      maxProgression?: number;\n      progression?: BehaviorSubject<number>;\n      onPageLoaded?: (pageResult: LoadResult<T>) => any;\n      logPrefix?: string;\n      fetchSize?: number;\n    }): Promise<LoadResult<T>> {\n\n    const maxProgression = opts && opts.maxProgression || undefined;\n    let total; let pageCount; let progressionStep; let currentPageDataCount: number;\n    const fetchSize = opts && opts.fetchSize || 1000;\n    let offset = 0;\n    let data: T[] = [];\n    do {\n\n      if (opts && opts.logPrefix) console.debug(`${opts.logPrefix} Fetching page #${offset / fetchSize}...`);\n\n      // Get some items, using paging\n      const res = await loadPageFn(offset, fetchSize);\n      data = data.concat(res.data);\n      currentPageDataCount = res.data && res.data.length || 0;\n      offset += currentPageDataCount;\n\n      // Set total count (only if not already set)\n      if (isNil(total) && isNotNil(res.total)) {\n        total = res.total;\n        // Compute the number of page\n        pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer\n        // Compute step, by dividing maxProgression by number of page\n        const actualProgression = Math.max(0, toNumber(opts && opts.progression?.value, 0));\n        progressionStep = maxProgression\n          ? (maxProgression - actualProgression) / pageCount\n          : undefined /*if 0 reset to undefined*/;\n      }\n\n      // Increment progression on each iteration (if possible)\n      if (opts && opts.progression && isNotNil(progressionStep)) {\n        opts.progression.next(opts.progression.value + progressionStep);\n      }\n\n      if (opts && opts.onPageLoaded) opts.onPageLoaded(res);\n\n    } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));\n\n    // Complete progression to reach progressionStep value (because of round)\n    if (isNotNil(progressionStep)) {\n\n      // If total return by loadAll was bad !\n      if (isNotNil(total) && data.length < total) {\n        console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);\n        total = data.length;\n        pageCount = Math.round(data.length / fetchSize + 0.5);\n      }\n\n      const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);\n      if (opts && opts.progression && lastProgressionStep > 0) {\n        opts.progression.next(opts.progression.value + lastProgressionStep);\n      }\n    }\n    // Or increment once\n    else if (opts && opts.progression && opts.maxProgression) {\n      opts.progression.next(opts.progression.value + opts.maxProgression);\n    }\n\n    return {\n      data,\n      total\n    };\n  }\n}\n"]}

package/esm2015/src/app/shared/upload-file/upload-file.component.js

@@ -1,6 +1,5 @@
 import { __awaiter } from "tslib";
 import { ChangeDetectorRef, Component, Input, ViewChild } from '@angular/core';
-import { HttpEventType } from '@angular/common/http';
 import { catchError, debounceTime, filter, first, map, switchMap, tap } from 'rxjs/operators';
 import { BehaviorSubject, forkJoin, of, Subject } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
@@ -116,7 +115,7 @@ export class UploadFileComponent {
             });
             const jobs = files
                 .map(f => f)
-                .filter(file => isNil(file.progress) && !file.error) // Skip if already started or in error
+                .filter(file => file && isNil(file.progress) && !file.error) // Skip if already started or in error
                 .map((file, i) => {
                 // Wait if need
                 if (isNotNil(this.maxParallelUpload)) {
@@ -134,12 +133,12 @@ export class UploadFileComponent {
                     file.progress = 0;
                 return of(file);
             })
-                .map(file$ => file$.pipe(
+                .map(file$ => file$.pipe(filter(isNotNil), 
             // Log
             tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)), 
             // Start uploading
             switchMap(file => this.uploadFn(file)
-                .pipe(map((event) => {
+                .pipe(filter(isNotNil), map((event) => {
                 // Progress event
                 if (isProgressEvent(event)) {
                     if (isNotNil(event.loaded) && event.loaded >= 0) {
@@ -149,10 +148,6 @@ export class UploadFileComponent {
                         file.progress = -1; // Indeterminate progression
                     }
                 }
-                // User event
-                else if (event.type === HttpEventType.User) {
-                    file.progress = -1; // Indeterminate progression
-                }
                 // Response event
                 else if (isResponseEvent(event)) {
                     file.progress = 1;
@@ -204,4 +199,4 @@ UploadFileComponent.propDecorators = {
     deleteFn: [{ type: Input }],
     maxParallelUpload: [{ type: Input }]
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload-file.component.js","sourceRoot":"","sources":["../../../../../../src/app/shared/upload-file/upload-file.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {ChangeDetectorRef, Component, ElementRef, Input, ViewChild} from '@angular/core';\nimport {HttpEventType} from '@angular/common/http';\nimport {catchError, debounceTime, filter, first, map, switchMap, tap} from 'rxjs/operators';\nimport {BehaviorSubject, forkJoin, Observable, of, Subject} from 'rxjs';\nimport {TranslateService} from '@ngx-translate/core';\nimport {FileDeleteFn, FileUploadFn, isProgressEvent, isResponseEvent, UploadFile} from './upload-file.model';\nimport {isNil, isNotNil} from '../functions';\nimport {waitFor, WaitForOptions} from '../observables';\n\n@Component({\n  selector: 'app-upload-file',\n  templateUrl: './upload-file.component.html',\n  styleUrls: ['./upload-file.component.scss'],\n})\nexport class UploadFileComponent {\n\n  @ViewChild('fileDropRef', { static: false }) fileDropEl: ElementRef;\n\n  @Input() fileExtension: string;\n  @Input() uniqueFile = false;\n  @Input() instantUpload = false;\n  @Input() uploadFn: FileUploadFn<any>;\n  @Input() deleteFn: FileDeleteFn<any>;\n  @Input() maxParallelUpload: number;\n\n  files: UploadFile<any>[] = [];\n\n  get processingFiles(): UploadFile<any>[] {\n    return this.files.filter(f => !f.deleting && isNotNil(f.progress) && f.progress < 1)\n  }\n\n  get processedFiles(): UploadFile<any>[] {\n    return this.files.filter(f => !f.deleting && f.progress === 1);\n  }\n\n  get processingFilesCount(): number {\n    return this.processingFiles.length;\n  }\n\n  constructor(protected cd: ChangeDetectorRef, protected translate: TranslateService) {}\n\n  /**\n   * on file drop handler\n   */\n  onFileDropped(event) {\n    this.prepareFilesList(event);\n  }\n\n  /**\n   * handle file from browsing\n   */\n  fileBrowseHandler(files) {\n    this.prepareFilesList(files);\n  }\n\n  /**\n   * Delete file from files list\n   *\n   * @param index (File index)\n   */\n  async deleteFile(index: number) {\n    const file = this.files[index];\n\n    if (file.progress === 1 && this.deleteFn) {\n      if (file.deleting) {\n        console.warn(`[upload-file] This file already deleting`);\n        return;\n      }\n      try {\n        file.deleting = true\n        const deleted = await this.deleteFn(file);\n        if (!deleted) return;\n      }\n      catch(err) {\n        console.error(err && err.message || err);\n        return;\n      }\n      finally {\n        file.deleting = false;\n      }\n\n      // Make sure index not changed\n      index = this.files.indexOf(file);\n      if (index === -1) return; // Not found (already removed ?)\n    }\n    else if (file.progress > 0) {\n      console.warn(`[upload-file] Cannot remove this file while uploading`);\n      return;\n    }\n\n    this.files.splice(index, 1);\n    this.cd.markForCheck();\n  }\n\n  /**\n   * Convert Files list to normal array list\n   *\n   * @param files (Files List)\n   */\n  prepareFilesList(files: FileList | File[]) {\n    let items: File[];\n    if (files instanceof FileList) {\n      items = [];\n      for (let i = 0; i < files.length; i++) {\n        const item = files.item(i);\n        items.push(item);\n      }\n    }\n    else {\n      items = files;\n    }\n    this.files.push(...items);\n\n    this.fileDropEl.nativeElement.value = '';\n\n    // Start upload\n    if (this.instantUpload) {\n      this.uploadFiles(items);\n    }\n  }\n\n  /**\n   * Execute upload\n   */\n  async uploadFiles(files?: File[]): Promise<UploadFile<any>[]> {\n\n    if (!files) {\n      console.info('[upload-file] Uploading all files...');\n      files = this.files;\n    }\n\n    const $processingFileCountChange = new BehaviorSubject(this.processingFilesCount);\n    const $changes = new Subject();\n    $changes.subscribe(_ => {\n      this.cd.markForCheck();\n      $processingFileCountChange.next(this.processingFilesCount);\n    });\n\n    const jobs: Observable<UploadFile<any>>[] = files\n      .map(f => f as UploadFile<any>)\n      .filter(file => isNil(file.progress) && !file.error) // Skip if already started or in error\n      .map((file, i) => {\n          // Wait if need\n          if (isNotNil(this.maxParallelUpload)) {\n            return $processingFileCountChange.pipe(\n              debounceTime(i), // call of filter() must be different for waiting job\n              filter(count => count < this.maxParallelUpload),\n              map(_ => {\n                // Start uploading\n                if (isNil(file.progress)) file.progress = 0;\n                $changes.next();\n                return file;\n              }),\n              first()\n            );\n          }\n          // Start uploading\n          if (isNil(file.progress)) file.progress = 0;\n          return of(file);\n        })\n\n      .map(file$ => file$.pipe(\n        // Log\n        tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)),\n\n        // Start uploading\n        switchMap(file => this.uploadFn(file)\n          .pipe(\n            map((event) => {\n\n              // Progress event\n              if (isProgressEvent(event)) {\n                if (isNotNil(event.loaded) && event.loaded >= 0) {\n                  file.progress = Math.min(1, event.loaded / (event.total || 1));\n                }\n                else {\n                  file.progress = -1; // Indeterminate progression\n                }\n              }\n\n              // User event\n              else if (event.type === HttpEventType.User) {\n                file.progress = -1; // Indeterminate progression\n              }\n\n              // Response event\n              else if (isResponseEvent(event)) {\n                file.progress = 1;\n                file.response = event;\n                console.debug(`[upload-file] ${file.name}: ${event.statusText || 'OK'}`, file.response);\n              }\n\n              // Other events: ignore\n              else {\n                // DEBUG\n                console.debug('[upload-file] Ignoring a file event: ', event);\n              }\n              return file;\n            }),\n            catchError((err) => {\n              console.error(err);\n              file.error = err && (err.message || err.error?.message) || 'FILE.UPLOAD.ERROR';\n              return of(file);\n            }),\n            tap(() => {\n              $changes.next();\n              this.cd.markForCheck();\n            })\n          )\n        )\n    ));\n\n    // Wait jobs to finish\n    return forkJoin(jobs)\n      .pipe(tap(_ => $changes.complete()))\n      .toPromise();\n  }\n\n  waitIdle(opts?: WaitForOptions): Promise<void> {\n    return waitFor(() => this.processingFilesCount === 0, opts);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload-file.component.js","sourceRoot":"","sources":["../../../../../../src/app/shared/upload-file/upload-file.component.ts"],"names":[],"mappings":"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","sourcesContent":["import {ChangeDetectorRef, Component, ElementRef, Input, ViewChild} from '@angular/core';\nimport {catchError, debounceTime, filter, first, map, switchMap, tap} from 'rxjs/operators';\nimport {BehaviorSubject, forkJoin, Observable, of, Subject} from 'rxjs';\nimport {TranslateService} from '@ngx-translate/core';\nimport {FileDeleteFn, FileUploadFn, isProgressEvent, isResponseEvent, UploadFile} from './upload-file.model';\nimport {isNil, isNotNil} from '../functions';\nimport {waitFor, WaitForOptions} from '../observables';\n\n@Component({\n  selector: 'app-upload-file',\n  templateUrl: './upload-file.component.html',\n  styleUrls: ['./upload-file.component.scss'],\n})\nexport class UploadFileComponent {\n\n  @ViewChild('fileDropRef', { static: false }) fileDropEl: ElementRef;\n\n  @Input() fileExtension: string;\n  @Input() uniqueFile = false;\n  @Input() instantUpload = false;\n  @Input() uploadFn: FileUploadFn<any>;\n  @Input() deleteFn: FileDeleteFn<any>;\n  @Input() maxParallelUpload: number;\n\n  files: UploadFile<any>[] = [];\n\n  get processingFiles(): UploadFile<any>[] {\n    return this.files.filter(f => !f.deleting && isNotNil(f.progress) && f.progress < 1)\n  }\n\n  get processedFiles(): UploadFile<any>[] {\n    return this.files.filter(f => !f.deleting && f.progress === 1);\n  }\n\n  get processingFilesCount(): number {\n    return this.processingFiles.length;\n  }\n\n  constructor(protected cd: ChangeDetectorRef, protected translate: TranslateService) {}\n\n  /**\n   * on file drop handler\n   */\n  onFileDropped(event) {\n    this.prepareFilesList(event);\n  }\n\n  /**\n   * handle file from browsing\n   */\n  fileBrowseHandler(files) {\n    this.prepareFilesList(files);\n  }\n\n  /**\n   * Delete file from files list\n   *\n   * @param index (File index)\n   */\n  async deleteFile(index: number) {\n    const file = this.files[index];\n\n    if (file.progress === 1 && this.deleteFn) {\n      if (file.deleting) {\n        console.warn(`[upload-file] This file already deleting`);\n        return;\n      }\n      try {\n        file.deleting = true\n        const deleted = await this.deleteFn(file);\n        if (!deleted) return;\n      }\n      catch(err) {\n        console.error(err && err.message || err);\n        return;\n      }\n      finally {\n        file.deleting = false;\n      }\n\n      // Make sure index not changed\n      index = this.files.indexOf(file);\n      if (index === -1) return; // Not found (already removed ?)\n    }\n    else if (file.progress > 0) {\n      console.warn(`[upload-file] Cannot remove this file while uploading`);\n      return;\n    }\n\n    this.files.splice(index, 1);\n    this.cd.markForCheck();\n  }\n\n  /**\n   * Convert Files list to normal array list\n   *\n   * @param files (Files List)\n   */\n  prepareFilesList(files: FileList | File[]) {\n    let items: File[];\n    if (files instanceof FileList) {\n      items = [];\n      for (let i = 0; i < files.length; i++) {\n        const item = files.item(i);\n        items.push(item);\n      }\n    }\n    else {\n      items = files;\n    }\n    this.files.push(...items);\n\n    this.fileDropEl.nativeElement.value = '';\n\n    // Start upload\n    if (this.instantUpload) {\n      this.uploadFiles(items);\n    }\n  }\n\n  /**\n   * Execute upload\n   */\n  async uploadFiles(files?: File[]): Promise<UploadFile<any>[]> {\n\n    if (!files) {\n      console.info('[upload-file] Uploading all files...');\n      files = this.files;\n    }\n\n    const $processingFileCountChange = new BehaviorSubject(this.processingFilesCount);\n    const $changes = new Subject();\n    $changes.subscribe(_ => {\n      this.cd.markForCheck();\n      $processingFileCountChange.next(this.processingFilesCount);\n    });\n\n    const jobs: Observable<UploadFile<any>>[] = files\n      .map(f => f as UploadFile<any>)\n      .filter(file => file && isNil(file.progress) && !file.error) // Skip if already started or in error\n      .map((file, i) => {\n          // Wait if need\n          if (isNotNil(this.maxParallelUpload)) {\n            return $processingFileCountChange.pipe(\n              debounceTime(i), // call of filter() must be different for waiting job\n              filter(count => count < this.maxParallelUpload),\n              map(_ => {\n                // Start uploading\n                if (isNil(file.progress)) file.progress = 0;\n                $changes.next();\n                return file;\n              }),\n              first()\n            );\n          }\n          // Start uploading\n          if (isNil(file.progress)) file.progress = 0;\n          return of(file);\n        })\n\n      .map(file$ => file$.pipe(\n        filter(isNotNil),\n        // Log\n        tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)),\n\n        // Start uploading\n        switchMap(file => this.uploadFn(file)\n          .pipe(\n            filter(isNotNil),\n            map((event) => {\n\n              // Progress event\n              if (isProgressEvent(event)) {\n                if (isNotNil(event.loaded) && event.loaded >= 0) {\n                  file.progress = Math.min(1, event.loaded / (event.total || 1));\n                }\n                else {\n                  file.progress = -1; // Indeterminate progression\n                }\n              }\n\n              // Response event\n              else if (isResponseEvent(event)) {\n                file.progress = 1;\n                file.response = event;\n                console.debug(`[upload-file] ${file.name}: ${event.statusText || 'OK'}`, file.response);\n              }\n\n              // Other events: ignore\n              else {\n                // DEBUG\n                console.debug('[upload-file] Ignoring a file event: ', event);\n              }\n              return file;\n            }),\n            catchError((err) => {\n              console.error(err);\n              file.error = err && (err.message || err.error?.message) || 'FILE.UPLOAD.ERROR';\n              return of(file);\n            }),\n            tap(() => {\n              $changes.next();\n              this.cd.markForCheck();\n            })\n          )\n        )\n    ));\n\n    // Wait jobs to finish\n    return forkJoin(jobs)\n      .pipe(tap(_ => $changes.complete()))\n      .toPromise();\n  }\n\n  waitIdle(opts?: WaitForOptions): Promise<void> {\n    return waitFor(() => this.processingFilesCount === 0, opts);\n  }\n}\n"]}

package/esm2015/src/app/shared/upload-file/upload-file.model.js

@@ -11,10 +11,10 @@ export class FileResponse {
     }
 }
 export function isProgressEvent(event) {
-    return event.type === HttpEventType.UploadProgress
-        || event.type === HttpEventType.DownloadProgress;
+    return event && (event.type === HttpEventType.UploadProgress
+        || event.type === HttpEventType.DownloadProgress);
 }
 export function isResponseEvent(event) {
-    return event.type === HttpEventType.Response;
+    return event && event.type === HttpEventType.Response;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWZpbGUubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC91cGxvYWQtZmlsZS91cGxvYWQtZmlsZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQVksYUFBYSxFQUFrQyxNQUFNLHNCQUFzQixDQUFDO0FBQy9GLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFFdEMsTUFBTSxPQUFPLFVBQWMsU0FBUSxJQUFJO0NBTXRDO0FBVUQsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBWSxJQUE0RDtRQUgvRCxTQUFJLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUlyQyxJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNwRCxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUEsSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxDQUFFLE1BQU0sS0FBSSxDQUFDLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxDQUFBLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxVQUFVLEtBQUksSUFBSSxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQUlELE1BQU0sVUFBVSxlQUFlLENBQUMsS0FBdUM7SUFDckUsT0FBTyxLQUFLLENBQUMsSUFBSSxLQUFLLGFBQWEsQ0FBQyxjQUFjO1dBQzdDLEtBQUssQ0FBQyxJQUFJLEtBQUssYUFBYSxDQUFDLGdCQUFnQixDQUFDO0FBQ3JELENBQUM7QUFDRCxNQUFNLFVBQVUsZUFBZSxDQUFJLEtBQWtDO0lBQ25FLE9BQU8sS0FBSyxDQUFDLElBQUksS0FBSyxhQUFhLENBQUMsUUFBUSxDQUFDO0FBQy9DLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge09ic2VydmFibGV9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHtIdHRwRXZlbnQsIEh0dHBFdmVudFR5cGUsIEh0dHBQcm9ncmVzc0V2ZW50LCBIdHRwUmVzcG9uc2V9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7aXNOb3ROaWx9IGZyb20gJy4uL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBVcGxvYWRGaWxlPFQ+IGV4dGVuZHMgRmlsZSB7XG4gIHByb2dyZXNzPzogbnVtYmVyO1xuICBkZWxldGluZz86IGJvb2xlYW47XG4gIGVycm9yPzogc3RyaW5nO1xuXG4gIHJlc3BvbnNlPzogRmlsZVJlc3BvbnNlPFQ+IHwgSHR0cFJlc3BvbnNlPFQ+O1xufVxuXG5leHBvcnQgdHlwZSBGaWxlVXBsb2FkRm48VD4gPSAoZmlsZTogRmlsZSkgPT4gT2JzZXJ2YWJsZTxGaWxlRXZlbnQ8VD4gfCBIdHRwRXZlbnQ8VD4+O1xuZXhwb3J0IHR5cGUgRmlsZURlbGV0ZUZuPFQ+ID0gKGZpbGU6IFVwbG9hZEZpbGU8VD4pID0+IFByb21pc2U8Ym9vbGVhbj47XG5leHBvcnQgaW50ZXJmYWNlIEZpbGVQcm9ncmVzc0V2ZW50IHtcbiAgdHlwZTogSHR0cEV2ZW50VHlwZS5Eb3dubG9hZFByb2dyZXNzIHwgSHR0cEV2ZW50VHlwZS5VcGxvYWRQcm9ncmVzcztcbiAgbG9hZGVkOiBudW1iZXI7XG4gIHRvdGFsPzogbnVtYmVyO1xuICBzdGF0dXNUZXh0Pzogc3RyaW5nO1xufVxuZXhwb3J0IGNsYXNzIEZpbGVSZXNwb25zZTxUPiB7XG4gIHJlYWRvbmx5IGJvZHk6IFR8bnVsbDtcbiAgcmVhZG9ubHkgdHlwZSA9IEh0dHBFdmVudFR5cGUuUmVzcG9uc2U7XG4gIHJlYWRvbmx5IHN0YXR1czogbnVtYmVyO1xuICByZWFkb25seSBzdGF0dXNUZXh0OiBzdHJpbmc7XG4gIGNvbnN0cnVjdG9yKGluaXQ/OiB7Ym9keT86IFR8bnVsbDsgc3RhdHVzVGV4dD86IHN0cmluZzsgc3RhdHVzPzogbnVtYmVyfSkge1xuICAgIHRoaXMuYm9keSA9IGlzTm90TmlsKGluaXQ/LmJvZHkpID8gaW5pdC5ib2R5IDogbnVsbDtcbiAgICB0aGlzLnN0YXR1cyA9IGluaXQ/LnN0YXR1cyB8fCAwO1xuICAgIHRoaXMuc3RhdHVzVGV4dCA9IGluaXQ/LnN0YXR1c1RleHQgfHwgJ09LJztcbiAgfVxufVxuXG5leHBvcnQgZGVjbGFyZSB0eXBlIEZpbGVFdmVudDxUPiA9IEh0dHBQcm9ncmVzc0V2ZW50IHwgSHR0cFJlc3BvbnNlPFQ+IHwgRmlsZVByb2dyZXNzRXZlbnQgfCBGaWxlUmVzcG9uc2U8VD4gO1xuXG5leHBvcnQgZnVuY3Rpb24gaXNQcm9ncmVzc0V2ZW50KGV2ZW50OiAgSHR0cEV2ZW50PGFueT4gfCBGaWxlRXZlbnQ8YW55Pik6IGV2ZW50IGlzIEh0dHBQcm9ncmVzc0V2ZW50IHwgRmlsZVByb2dyZXNzRXZlbnQge1xuICByZXR1cm4gZXZlbnQudHlwZSA9PT0gSHR0cEV2ZW50VHlwZS5VcGxvYWRQcm9ncmVzc1xuICAgIHx8IGV2ZW50LnR5cGUgPT09IEh0dHBFdmVudFR5cGUuRG93bmxvYWRQcm9ncmVzcztcbn1cbmV4cG9ydCBmdW5jdGlvbiBpc1Jlc3BvbnNlRXZlbnQ8VD4oZXZlbnQ6IEh0dHBFdmVudDxUPiB8IEZpbGVFdmVudDxUPik6IGV2ZW50IGlzIEh0dHBSZXNwb25zZTxUPiB8IEZpbGVSZXNwb25zZTxUPiB7XG4gIHJldHVybiBldmVudC50eXBlID09PSBIdHRwRXZlbnRUeXBlLlJlc3BvbnNlO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBsb2FkLWZpbGUubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL3NoYXJlZC91cGxvYWQtZmlsZS91cGxvYWQtZmlsZS5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQVksYUFBYSxFQUFrQyxNQUFNLHNCQUFzQixDQUFDO0FBQy9GLE9BQU8sRUFBQyxRQUFRLEVBQUMsTUFBTSxjQUFjLENBQUM7QUFFdEMsTUFBTSxPQUFPLFVBQWMsU0FBUSxJQUFJO0NBTXRDO0FBVUQsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBWSxJQUE0RDtRQUgvRCxTQUFJLEdBQUcsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUlyQyxJQUFJLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLGFBQUosSUFBSSx1QkFBSixJQUFJLENBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztRQUNwRCxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUEsSUFBSSxhQUFKLElBQUksdUJBQUosSUFBSSxDQUFFLE1BQU0sS0FBSSxDQUFDLENBQUM7UUFDaEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxDQUFBLElBQUksYUFBSixJQUFJLHVCQUFKLElBQUksQ0FBRSxVQUFVLEtBQUksSUFBSSxDQUFDO0lBQzdDLENBQUM7Q0FDRjtBQUlELE1BQU0sVUFBVSxlQUFlLENBQUMsS0FBdUM7SUFDckUsT0FBTyxLQUFLLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLGFBQWEsQ0FBQyxjQUFjO1dBQ3ZELEtBQUssQ0FBQyxJQUFJLEtBQUssYUFBYSxDQUFDLGdCQUFnQixDQUFDLENBQUM7QUFDdEQsQ0FBQztBQUNELE1BQU0sVUFBVSxlQUFlLENBQUksS0FBa0M7SUFDbkUsT0FBTyxLQUFLLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxhQUFhLENBQUMsUUFBUSxDQUFDO0FBQ3hELENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge09ic2VydmFibGV9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHtIdHRwRXZlbnQsIEh0dHBFdmVudFR5cGUsIEh0dHBQcm9ncmVzc0V2ZW50LCBIdHRwUmVzcG9uc2V9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7aXNOb3ROaWx9IGZyb20gJy4uL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBVcGxvYWRGaWxlPFQ+IGV4dGVuZHMgRmlsZSB7XG4gIHByb2dyZXNzPzogbnVtYmVyO1xuICBkZWxldGluZz86IGJvb2xlYW47XG4gIGVycm9yPzogc3RyaW5nO1xuXG4gIHJlc3BvbnNlPzogRmlsZVJlc3BvbnNlPFQ+IHwgSHR0cFJlc3BvbnNlPFQ+O1xufVxuXG5leHBvcnQgdHlwZSBGaWxlVXBsb2FkRm48VD4gPSAoZmlsZTogRmlsZSkgPT4gT2JzZXJ2YWJsZTxGaWxlRXZlbnQ8VD4gfCBIdHRwRXZlbnQ8VD4+O1xuZXhwb3J0IHR5cGUgRmlsZURlbGV0ZUZuPFQ+ID0gKGZpbGU6IFVwbG9hZEZpbGU8VD4pID0+IFByb21pc2U8Ym9vbGVhbj47XG5leHBvcnQgaW50ZXJmYWNlIEZpbGVQcm9ncmVzc0V2ZW50IHtcbiAgdHlwZTogSHR0cEV2ZW50VHlwZS5Eb3dubG9hZFByb2dyZXNzIHwgSHR0cEV2ZW50VHlwZS5VcGxvYWRQcm9ncmVzcztcbiAgbG9hZGVkOiBudW1iZXI7XG4gIHRvdGFsPzogbnVtYmVyO1xuICBzdGF0dXNUZXh0Pzogc3RyaW5nO1xufVxuZXhwb3J0IGNsYXNzIEZpbGVSZXNwb25zZTxUPiB7XG4gIHJlYWRvbmx5IGJvZHk6IFR8bnVsbDtcbiAgcmVhZG9ubHkgdHlwZSA9IEh0dHBFdmVudFR5cGUuUmVzcG9uc2U7XG4gIHJlYWRvbmx5IHN0YXR1czogbnVtYmVyO1xuICByZWFkb25seSBzdGF0dXNUZXh0OiBzdHJpbmc7XG4gIGNvbnN0cnVjdG9yKGluaXQ/OiB7Ym9keT86IFR8bnVsbDsgc3RhdHVzVGV4dD86IHN0cmluZzsgc3RhdHVzPzogbnVtYmVyfSkge1xuICAgIHRoaXMuYm9keSA9IGlzTm90TmlsKGluaXQ/LmJvZHkpID8gaW5pdC5ib2R5IDogbnVsbDtcbiAgICB0aGlzLnN0YXR1cyA9IGluaXQ/LnN0YXR1cyB8fCAwO1xuICAgIHRoaXMuc3RhdHVzVGV4dCA9IGluaXQ/LnN0YXR1c1RleHQgfHwgJ09LJztcbiAgfVxufVxuXG5leHBvcnQgZGVjbGFyZSB0eXBlIEZpbGVFdmVudDxUPiA9IEh0dHBQcm9ncmVzc0V2ZW50IHwgSHR0cFJlc3BvbnNlPFQ+IHwgRmlsZVByb2dyZXNzRXZlbnQgfCBGaWxlUmVzcG9uc2U8VD4gO1xuXG5leHBvcnQgZnVuY3Rpb24gaXNQcm9ncmVzc0V2ZW50KGV2ZW50OiAgSHR0cEV2ZW50PGFueT4gfCBGaWxlRXZlbnQ8YW55Pik6IGV2ZW50IGlzIEh0dHBQcm9ncmVzc0V2ZW50IHwgRmlsZVByb2dyZXNzRXZlbnQge1xuICByZXR1cm4gZXZlbnQgJiYgKGV2ZW50LnR5cGUgPT09IEh0dHBFdmVudFR5cGUuVXBsb2FkUHJvZ3Jlc3NcbiAgICB8fCBldmVudC50eXBlID09PSBIdHRwRXZlbnRUeXBlLkRvd25sb2FkUHJvZ3Jlc3MpO1xufVxuZXhwb3J0IGZ1bmN0aW9uIGlzUmVzcG9uc2VFdmVudDxUPihldmVudDogSHR0cEV2ZW50PFQ+IHwgRmlsZUV2ZW50PFQ+KTogZXZlbnQgaXMgSHR0cFJlc3BvbnNlPFQ+IHwgRmlsZVJlc3BvbnNlPFQ+IHtcbiAgcmV0dXJuIGV2ZW50ICYmIGV2ZW50LnR5cGUgPT09IEh0dHBFdmVudFR5cGUuUmVzcG9uc2U7XG59XG4iXX0=

package/fesm2015/sumaris-net.ngx-components.js

@@ -10084,14 +10084,10 @@ trigger('slideUpDownAnimation', [
 ]);
 
 class HttpUtils {
-    static getResource(http, uri, opts) {
+    static getText(http, uri, opts) {
         return __awaiter(this, void 0, void 0, function* () {
             // Add headers
-            opts = Object.assign({}, opts
-            //headers: new HttpHeaders(),
-            //.append('X-App-Name', environment.name)
-            //.append('X-App-Version', environment.version),
-            );
+            opts = opts || { responseType: 'text' };
             // Force no cache
             if (opts.nocache === true) {
                 opts.headers = (opts.headers instanceof HttpHeaders ? opts.headers : new HttpHeaders(opts.headers));
@@ -10099,9 +10095,35 @@ class HttpUtils {
                     .append('Cache-Control', 'no-cache')
                     .append('Pragma', 'no-cache');
             }
+            // Use web http client
             try {
-                // Using web http client
-                return (yield http.get(uri, opts).toPromise());
+                return (yield http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'text' })).toPromise());
+            }
+            catch (err) {
+                if (err && err.message) {
+                    console.error(`[network] Error on get request ${uri}: ${err.message}`, err);
+                }
+                else {
+                    console.error(`[network] Error on get request ${uri}: ${err && err.statusText} - ${JSON.stringify(err)}`);
+                }
+                throw { code: err.status, message: 'ERROR.UNKNOWN_NETWORK_ERROR' };
+            }
+        });
+    }
+    static getJson(http, uri, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Add headers
+            opts = opts || {};
+            // Force no cache
+            if (opts.nocache === true) {
+                opts.headers = (opts.headers instanceof HttpHeaders ? opts.headers : new HttpHeaders(opts.headers));
+                opts.headers
+                    .append('Cache-Control', 'no-cache')
+                    .append('Pragma', 'no-cache');
+            }
+            // Use web http client
+            try {
+                return (yield http.get(uri, Object.assign(Object.assign({}, opts), { responseType: 'json' })).toPromise());
             }
             catch (err) {
                 if (err && err.message) {
@@ -10128,7 +10150,7 @@ function getNodeInfo(http, peer, opts) {
         if (peerUrl.endsWith('/')) {
             peerUrl = peerUrl.substr(0, peerUrl.length - 1);
         }
-        return HttpUtils.getResource(http, peerUrl + '/api/node/info', opts);
+        return HttpUtils.getJson(http, peerUrl + '/api/node/info', opts);
     });
 }
 
@@ -11171,7 +11193,7 @@ class NetworkService extends StartableService {
                 if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
                     path += '?t=' + Date.now();
                 }
-                const appVersion = yield this.get(path, opts);
+                const appVersion = yield this.getText(path, opts);
                 if (isNotNilOrBlank(appVersion))
                     return appVersion;
             }
@@ -11379,28 +11401,37 @@ class NetworkService extends StartableService {
         });
         this._timerSubscription.add(() => console.debug('[network] Refresh timer stopped'));
     }
+    getText(path, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let uri = this.getUri(path);
+            return HttpUtils.getText(this.http, uri, opts);
+        });
+    }
     get(path, opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            let uri = path;
-            // If path is not an URI: prepend with peer URL
-            if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
-                let peerUrl = (this.peer && this.peer.url);
-                // Remove trailing slash
-                if (peerUrl.endsWith('/')) {
-                    peerUrl = peerUrl.substr(0, peerUrl.length - 1);
-                }
-                // Add first path
-                if (!path.startsWith('/')) {
-                    path = '/' + path;
-                }
-                // Create the URI: concat peer URL and path
-                uri = peerUrl + path;
-            }
-            // Execute the request
-            return HttpUtils.getResource(this.http, uri, opts);
+            let uri = this.getUri(path);
+            return HttpUtils.getJson(this.http, uri, opts);
         });
     }
     /* -- Protected methods -- */
+    getUri(path) {
+        let uri = path;
+        // If path is not an URI: prepend with peer URL
+        if (!uri.startsWith('http://') && !uri.startsWith('https://')) {
+            let peerUrl = (this.peer && this.peer.url);
+            // Remove trailing slash
+            if (peerUrl.endsWith('/')) {
+                peerUrl = peerUrl.substr(0, peerUrl.length - 1);
+            }
+            // Add first path
+            if (!path.startsWith('/')) {
+                path = '/' + path;
+            }
+            // Create the URI: concat peer URL and path
+            uri = peerUrl + path;
+        }
+        return uri;
+    }
     onDeviceConnectionChanged(connectionType) {
         connectionType = (connectionType || 'unknown').toLowerCase();
         if (connectionType.startsWith('cell'))
@@ -16127,11 +16158,11 @@ class FileResponse {
     }
 }
 function isProgressEvent(event) {
-    return event.type === HttpEventType.UploadProgress
-        || event.type === HttpEventType.DownloadProgress;
+    return event && (event.type === HttpEventType.UploadProgress
+        || event.type === HttpEventType.DownloadProgress);
 }
 function isResponseEvent(event) {
-    return event.type === HttpEventType.Response;
+    return event && event.type === HttpEventType.Response;
 }
 
 class UploadFileComponent {
@@ -16243,7 +16274,7 @@ class UploadFileComponent {
             });
             const jobs = files
                 .map(f => f)
-                .filter(file => isNil(file.progress) && !file.error) // Skip if already started or in error
+                .filter(file => file && isNil(file.progress) && !file.error) // Skip if already started or in error
                 .map((file, i) => {
                 // Wait if need
                 if (isNotNil(this.maxParallelUpload)) {
@@ -16261,12 +16292,12 @@ class UploadFileComponent {
                     file.progress = 0;
                 return of(file);
             })
-                .map(file$ => file$.pipe(
+                .map(file$ => file$.pipe(filter(isNotNil), 
             // Log
             tap(file => console.debug(`[upload-file] ${file.name}: uploading...`)), 
             // Start uploading
             switchMap(file => this.uploadFn(file)
-                .pipe(map((event) => {
+                .pipe(filter(isNotNil), map((event) => {
                 // Progress event
                 if (isProgressEvent(event)) {
                     if (isNotNil(event.loaded) && event.loaded >= 0) {
@@ -16276,10 +16307,6 @@ class UploadFileComponent {
                         file.progress = -1; // Indeterminate progression
                     }
                 }
-                // User event
-                else if (event.type === HttpEventType.User) {
-                    file.progress = -1; // Indeterminate progression
-                }
                 // Response event
                 else if (isResponseEvent(event)) {
                     file.progress = 1;
@@ -17658,22 +17685,24 @@ class JobUtils {
     }
     static run(runnable, opts) {
         const progression = new BehaviorSubject(0);
-        runnable(progression, opts)
+        runnable(Object.assign(Object.assign({}, opts), { progression }))
             .then(() => {
-            if (opts && opts.maxProgression)
+            if (opts === null || opts === void 0 ? void 0 : opts.maxProgression)
                 progression.next(opts.maxProgression);
-            progression.complete();
+            if (opts === null || opts === void 0 ? void 0 : opts.progression)
+                opts.progression.complete();
         })
             .catch(err => progression.error(err));
         return progression;
     }
-    static fetchAllPages(loadPageFn, progression, opts) {
+    static fetchAllPages(loadPageFn, opts) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || undefined;
             let total;
-            let loopCount;
+            let pageCount;
             let progressionStep;
-            let loopDataCount;
+            let currentPageDataCount;
             const fetchSize = opts && opts.fetchSize || 1000;
             let offset = 0;
             let data = [];
@@ -17683,37 +17712,42 @@ class JobUtils {
                 // Get some items, using paging
                 const res = yield loadPageFn(offset, fetchSize);
                 data = data.concat(res.data);
-                loopDataCount = res.data && res.data.length || 0;
-                offset += loopDataCount;
+                currentPageDataCount = res.data && res.data.length || 0;
+                offset += currentPageDataCount;
                 // Set total count (only if not already set)
                 if (isNil(total) && isNotNil(res.total)) {
                     total = res.total;
-                    loopCount = Math.round(res.total / fetchSize + 0.5); // Round to next integer
-                    progressionStep = maxProgression ? maxProgression / loopCount : undefined /*if 0 reset to undefined*/;
+                    // Compute the number of page
+                    pageCount = Math.round(res.total / fetchSize + 0.5); // Round to HALF_UP integer
+                    // Compute step, by dividing maxProgression by number of page
+                    const actualProgression = Math.max(0, toNumber(opts && ((_a = opts.progression) === null || _a === void 0 ? void 0 : _a.value), 0));
+                    progressionStep = maxProgression
+                        ? (maxProgression - actualProgression) / pageCount
+                        : undefined /*if 0 reset to undefined*/;
                 }
                 // Increment progression on each iteration (if possible)
-                if (isNotNil(progressionStep)) {
-                    progression.next(progression.getValue() + progressionStep);
+                if (opts && opts.progression && isNotNil(progressionStep)) {
+                    opts.progression.next(opts.progression.value + progressionStep);
                 }
                 if (opts && opts.onPageLoaded)
                     opts.onPageLoaded(res);
-            } while (loopDataCount > 0 && ((isNil(total) && loopDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
+            } while (currentPageDataCount > 0 && ((isNil(total) && currentPageDataCount === fetchSize) || (isNotNil(total) && (offset < total))));
             // Complete progression to reach progressionStep value (because of round)
             if (isNotNil(progressionStep)) {
                 // If total return by loadAll was bad !
                 if (isNotNil(total) && data.length < total) {
                     console.warn(`A function loadAll() returned a bad total (less than all page's data)! Expected ${total} but fetch ${data.length}`);
                     total = data.length;
-                    loopCount = Math.round(data.length / fetchSize + 0.5);
+                    pageCount = Math.round(data.length / fetchSize + 0.5);
                 }
-                const lastProgressionStep = opts.maxProgression - (progressionStep * loopCount);
-                if (lastProgressionStep > 0) {
-                    progression.next(progression.getValue() + lastProgressionStep);
+                const lastProgressionStep = opts.maxProgression - (progressionStep * pageCount);
+                if (opts && opts.progression && lastProgressionStep > 0) {
+                    opts.progression.next(opts.progression.value + lastProgressionStep);
                 }
             }
             // Or increment once
-            else if (opts.maxProgression) {
-                progression.next(progression.getValue() + opts.maxProgression);
+            else if (opts && opts.progression && opts.maxProgression) {
+                opts.progression.next(opts.progression.value + opts.maxProgression);
             }
             return {
                 data,
@@ -25403,23 +25437,20 @@ class PersonService extends BaseEntityService {
             return this.loadAll(0, !value ? 30 : 10, sortBy, sortDirection, Object.assign(Object.assign({}, filter), { searchText: value, statusIds: filter && filter.statusIds || [StatusIds.ENABLE], userProfiles: filter && filter.userProfiles }), { withTotal: true /* need by autocomplete */ });
         });
     }
-    executeImport(progression, opts) {
+    executeImport(filter, opts) {
         const _super = Object.create(null, {
             loadAll: { get: () => super.loadAll }
         });
         return __awaiter(this, void 0, void 0, function* () {
             const maxProgression = opts && opts.maxProgression || 100;
-            const filter = {
-                statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY],
-                userProfiles: ['SUPERVISOR', 'USER', 'GUEST']
-            };
+            filter = Object.assign(Object.assign({}, filter), { statusIds: [StatusIds.ENABLE, StatusIds.TEMPORARY], userProfiles: ['SUPERVISOR', 'USER', 'GUEST'] });
             console.info('[person-service] Importing persons...');
             const res = yield JobUtils.fetchAllPages((offset, size) => _super.loadAll.call(this, offset, size, 'id', null, filter, {
                 debug: false,
                 fetchPolicy: 'network-only',
                 withTotal: (offset === 0),
                 toEntity: false
-            }), progression, { maxProgression: maxProgression * 0.9 });
+            }), Object.assign(Object.assign({}, opts), { maxProgression: maxProgression * 0.9 }));
             // Save result locally
             yield this.entities.saveAll(res.data, { entityName: 'PersonVO', reset: true });
         });
@@ -25429,7 +25460,7 @@ class PersonService extends BaseEntityService {
         if (!source)
             return undefined;
         console.debug('TODO check isInstanceOf');
-        if (!isInstanceOf(source, Person)) {
+        if (!(source instanceof Person)) {
             source = Person.fromObject(source);
         }
         const target = source.asObject();