@sumaris-net/ngx-components 1.11.5 → 1.11.6

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,7 +18080,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 var $processingFileCountChange, $changes, jobs;
                 var _this = this;
-                return __generator(this, function (_b) {
+                return __generator(this, function (_d) {
                     if (!files) {
                         console.info('[upload-file] Uploading all files...');
                         files = this.files;
@@ -18111,7 +18111,13 @@
                             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) {
+                        .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;
@@ -18120,12 +18126,11 @@
                         }
                         // 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.result = event.body;
                             file.progress = 1;
-                            var message = (body === null || body === void 0 ? void 0 : body.message) || event.statusText || 'OK';
+                            var message = ((_a = file.result) === null || _a === void 0 ? void 0 : _a.message) || event.statusText || 'OK';
                             console.debug("[upload-file] " + file.name + ": " + message
-                                + (file.finalName ? " (finalName: " + file.finalName + ")" : ''));
+                                + (((_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 {