@sumaris-net/ngx-components 1.11.4 → 1.11.7

package/bundles/sumaris-net.ngx-components.umd.js

@@ -18002,8 +18002,8 @@
         UploadFileComponent.prototype.deleteFile = function (index) {
             return __awaiter(this, void 0, void 0, function () {
                 var file, deleted, err_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             file = this.files[index];
                             if (!(file.progress === 1 && this.deleteFn)) return [3 /*break*/, 6];
@@ -18011,18 +18011,18 @@
                                 console.warn("[upload-file] This file already deleting");
                                 return [2 /*return*/];
                             }
-                            _b.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _b.trys.push([1, 3, 4, 5]);
+                            _d.trys.push([1, 3, 4, 5]);
                             file.deleting = true;
                             return [4 /*yield*/, this.deleteFn(file)];
                         case 2:
-                            deleted = _b.sent();
+                            deleted = _d.sent();
                             if (!deleted)
                                 return [2 /*return*/];
                             return [3 /*break*/, 5];
                         case 3:
-                            err_1 = _b.sent();
+                            err_1 = _d.sent();
                             console.error(err_1 && err_1.message || err_1);
                             return [2 /*return*/];
                         case 4:
@@ -18039,7 +18039,7 @@
                                 console.warn("[upload-file] Cannot remove this file while uploading");
                                 return [2 /*return*/];
                             }
-                            _b.label = 7;
+                            _d.label = 7;
                         case 7:
                             this.files.splice(index, 1);
                             this.cd.markForCheck();
@@ -18054,7 +18054,7 @@
          * @param files (Files List)
          */
         UploadFileComponent.prototype.prepareFilesList = function (files) {
-            var _b;
+            var _d;
             var items;
             if (files instanceof FileList) {
                 items = [];
@@ -18066,7 +18066,7 @@
             else {
                 items = files;
             }
-            (_b = this.files).push.apply(_b, __spread(items));
+            (_d = this.files).push.apply(_d, __spread(items));
             this.fileDropEl.nativeElement.value = '';
             // Start upload
             if (this.instantUpload) {
@@ -18080,79 +18080,76 @@
             return __awaiter(this, void 0, void 0, function () {
                 var $processingFileCountChange, $changes, jobs;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            if (!files) {
-                                console.info('[upload-file] Uploading all files...');
-                                files = this.files;
-                            }
-                            $processingFileCountChange = new rxjs.BehaviorSubject(this.processingFilesCount);
-                            $changes = new rxjs.Subject();
-                            $changes.subscribe(function (_) {
-                                _this.cd.markForCheck();
-                                $processingFileCountChange.next(_this.processingFilesCount);
-                            });
-                            jobs = files
-                                .map(function (f) { return f; })
-                                .filter(function (file) { return isNil(file.progress) && !file.error; }) // Skip if already started or in error
-                                .map(function (file, i) {
-                                // Wait if need
-                                if (isNotNil(_this.maxParallelUpload)) {
-                                    return $processingFileCountChange.pipe(operators.debounceTime(i), // call of filter() must be different for waiting job
-                                    operators.filter(function (count) { return count < _this.maxParallelUpload; }), operators.map(function (_) {
-                                        // Start uploading
-                                        if (isNil(file.progress))
-                                            file.progress = 0;
-                                        $changes.next();
-                                        return file;
-                                    }), operators.first());
-                                }
+                return __generator(this, function (_d) {
+                    if (!files) {
+                        console.info('[upload-file] Uploading all files...');
+                        files = this.files;
+                    }
+                    $processingFileCountChange = new rxjs.BehaviorSubject(this.processingFilesCount);
+                    $changes = new rxjs.Subject();
+                    $changes.subscribe(function (_) {
+                        _this.cd.markForCheck();
+                        $processingFileCountChange.next(_this.processingFilesCount);
+                    });
+                    jobs = files
+                        .map(function (f) { return f; })
+                        .filter(function (file) { return isNil(file.progress) && !file.error; }) // Skip if already started or in error
+                        .map(function (file, i) {
+                        // Wait if need
+                        if (isNotNil(_this.maxParallelUpload)) {
+                            return $processingFileCountChange.pipe(operators.debounceTime(i), // call of filter() must be different for waiting job
+                            operators.filter(function (count) { return count < _this.maxParallelUpload; }), operators.map(function (_) {
                                 // Start uploading
                                 if (isNil(file.progress))
                                     file.progress = 0;
-                                return rxjs.of(file);
-                            })
-                                .map(function (file$) { return file$.pipe(operators.tap(function (file) { return console.debug("[upload-file] " + file.name + ": uploading..."); }), operators.switchMap(function (file) { return _this.uploadFn(file).pipe(operators.map(function (event) {
-                                // Progress event
-                                if ((event === null || event === void 0 ? void 0 : event.type) === i2$1.HttpEventType.UploadProgress || event.type === i2$1.HttpEventType.User) {
-                                    var total = event.total || 1;
-                                    var loaded = event.loaded || 0;
-                                    file.progress = Math.min(1, loaded / total);
-                                }
-                                // Response event
-                                else if (event instanceof i2$1.HttpResponse || event instanceof FileResponse) {
-                                    var body = event.body;
-                                    file.finalName = body === null || body === void 0 ? void 0 : body.finalName;
-                                    file.progress = 1;
-                                    var message = (body === null || body === void 0 ? void 0 : body.message) || event.statusText || 'OK';
-                                    console.debug("[upload-file] " + file.name + ": " + message
-                                        + (file.finalName ? " (finalName: " + file.finalName + ")" : ''));
-                                }
-                                else {
-                                    // Other events
-                                    console.warn('[upload-file] Unknown event, returned by uploadFn\'s observable:', event);
-                                }
-                                return file;
-                            }), operators.catchError(function (err) {
-                                var _a;
-                                console.error(err);
-                                file.error = err && (err.message || ((_a = err.error) === null || _a === void 0 ? void 0 : _a.message)) || 'FILE.UPLOAD.ERROR';
-                                return rxjs.of(file);
-                            }), operators.tap(function () {
                                 $changes.next();
-                                _this.cd.markForCheck();
-                            })); })); });
-                            return [4 /*yield*/, rxjs.forkJoin(jobs).toPromise()
-                                    .then(function (files) {
-                                    $changes.complete();
-                                    $changes.unsubscribe();
-                                    return files;
-                                })];
-                        case 1: 
-                        // Wait jobs to finish
-                        return [2 /*return*/, _b.sent()];
-                    }
+                                return file;
+                            }), operators.first());
+                        }
+                        // Start uploading
+                        if (isNil(file.progress))
+                            file.progress = 0;
+                        return rxjs.of(file);
+                    })
+                        .map(function (file$) { return file$.pipe(
+                    // Log
+                    operators.tap(function (file) { return console.debug("[upload-file] " + file.name + ": uploading..."); }), 
+                    // Start uploading
+                    operators.switchMap(function (file) { return _this.uploadFn(file)
+                        .pipe(operators.map(function (event) {
+                        var _a, _b, _c;
+                        // Progress event
+                        if ((event === null || event === void 0 ? void 0 : event.type) === i2$1.HttpEventType.UploadProgress || event.type === i2$1.HttpEventType.User) {
+                            var total = event.total || 1;
+                            var loaded = event.loaded || 0;
+                            file.progress = Math.min(1, loaded / total);
+                        }
+                        // Response event
+                        else if (event instanceof i2$1.HttpResponse || event instanceof FileResponse) {
+                            file.result = event.body;
+                            file.progress = 1;
+                            var message = ((_a = file.result) === null || _a === void 0 ? void 0 : _a.message) || event.statusText || 'OK';
+                            console.debug("[upload-file] " + file.name + ": " + message
+                                + (((_b = file.result) === null || _b === void 0 ? void 0 : _b.finalName) ? " (finalName: " + ((_c = file.result) === null || _c === void 0 ? void 0 : _c.finalName) + ")" : ''));
+                        }
+                        // Other events
+                        else {
+                            console.warn('[upload-file] Unknown event, returned by uploadFn\'s observable:', event);
+                        }
+                        return file;
+                    }), operators.catchError(function (err) {
+                        var _a;
+                        console.error(err);
+                        file.error = err && (err.message || ((_a = err.error) === null || _a === void 0 ? void 0 : _a.message)) || 'FILE.UPLOAD.ERROR';
+                        return rxjs.of(file);
+                    }), operators.tap(function () {
+                        $changes.next();
+                        _this.cd.markForCheck();
+                    })); })); });
+                    // Wait jobs to finish
+                    return [2 /*return*/, rxjs.forkJoin(jobs)
+                            .pipe(operators.tap(function (_) { return $changes.complete(); }))
+                            .toPromise()];
                 });
             });
         };
@@ -18215,7 +18212,7 @@
         });
         UploadFilePopover.prototype.onValidate = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                var files, errors, filenames, err_1;
+                var files, errors, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -18253,10 +18250,8 @@
                                 errors.forEach(function (error) { return console.error(error); });
                                 throw { message: 'FILE.UPLOAD.ERROR' };
                             }
-                            filenames = files
-                                .map(function (file) { return file.finalName || file.name; });
                             // return filenames
-                            return [4 /*yield*/, this.popoverController.dismiss({ filenames: filenames })];
+                            return [4 /*yield*/, this.popoverController.dismiss(files)];
                         case 5:
                             // return filenames
                             _a.sent();
@@ -19859,6 +19854,74 @@
         return JobUtils;
     }());
 
+    var FilesUtils = /** @class */ (function () {
+        function FilesUtils() {
+        }
+        FilesUtils.showUploadPopover = function (popoverController, event, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var modal, _a, data, role;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, popoverController.create({
+                                component: UploadFilePopover,
+                                componentProps: opts,
+                                backdropDismiss: false,
+                                keyboardClose: false,
+                                event: event,
+                                translucent: true,
+                                cssClass: 'popover-large',
+                            })];
+                        case 1:
+                            modal = _b.sent();
+                            return [4 /*yield*/, modal.present()];
+                        case 2:
+                            _b.sent();
+                            return [4 /*yield*/, modal.onDidDismiss()];
+                        case 3:
+                            _a = _b.sent(), data = _a.data, role = _a.role;
+                            return [2 /*return*/, {
+                                    role: role,
+                                    data: data ? data : undefined
+                                }];
+                    }
+                });
+            });
+        };
+        FilesUtils.readAsText = function (file, encoding) {
+            var $progress = new rxjs.Subject();
+            var reader = new FileReader();
+            encoding = (encoding || 'UTF-8').toLowerCase();
+            // Listen progress
+            reader.onprogress = function (e) {
+                var total = e.total || 1;
+                var loaded = e.total || 0;
+                if (loaded < total)
+                    $progress.next({ type: i2$1.HttpEventType.UploadProgress, loaded: loaded, total: total });
+            };
+            // Listen end
+            reader.onloadend = function (e) {
+                var body = reader.result;
+                if (typeof body === 'string') {
+                    $progress.next(new FileResponse({ body: body }));
+                    $progress.complete();
+                }
+                else {
+                    console.error("Cannot read file '" + file.name + "' as text");
+                    $progress.error("Cannot read file as text");
+                }
+            };
+            // Listen error
+            reader.onerror = function (event) {
+                console.error('[files] Error while reading file:', event);
+                $progress.error(event);
+            };
+            // Start reading the file
+            reader.readAsText(file, encoding);
+            return $progress.asObservable();
+        };
+        return FilesUtils;
+    }());
+
     /**
      * Define here theme colors
      */
@@ -30625,6 +30688,7 @@
     exports.FileResponse = FileResponse;
     exports.FileService = FileService;
     exports.FileSizePipe = FileSizePipe;
+    exports.FilesUtils = FilesUtils;
     exports.FormArrayHelper = FormArrayHelper;
     exports.FormButtonsBarComponent = FormButtonsBarComponent;
     exports.FormButtonsBarToken = FormButtonsBarToken;