npm - @sumaris-net/ngx-components - Versions diffs - 1.11.2 → 1.11.5 - Mend

@sumaris-net/ngx-components 1.11.2 → 1.11.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

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

@@ -18081,74 +18081,70 @@
                 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());
-                                }
+                    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) {
-                                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);
-                                }
-                                else if (event instanceof i2$1.HttpResponse || event instanceof FileResponse) {
-                                    var content = event.body;
-                                    file.finalName = content === null || content === void 0 ? void 0 : content.finalName;
-                                    file.progress = 1;
-                                    var message = content.message || event.statusText || 'succeed';
-                                    console.info("[upload-file] " + file.name + ": " + message + " (finalName: " + file.finalName + ")");
-                                }
-                                else {
-                                    console.warn("[upload-file] " + file.name + ": Unknown event received by uploadFn : ", event);
-                                }
-                                return file;
-                            }), operators.catchError(function (err) {
-                                var _a;
-                                console.error(err);
-                                file.error = ((_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(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 + ")" : ''));
+                        }
+                        // 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()];
                 });
             });
         };
@@ -18211,7 +18207,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:
@@ -18249,10 +18245,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();
@@ -19855,6 +19849,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
      */
@@ -30621,6 +30683,7 @@
     exports.FileResponse = FileResponse;
     exports.FileService = FileService;
     exports.FileSizePipe = FileSizePipe;
+    exports.FilesUtils = FilesUtils;
     exports.FormArrayHelper = FormArrayHelper;
     exports.FormButtonsBarComponent = FormButtonsBarComponent;
     exports.FormButtonsBarToken = FormButtonsBarToken;