npm - @sumaris-net/ngx-components - Versions diffs - 1.11.1 → 1.11.4 - Mend

@sumaris-net/ngx-components 1.11.1 → 1.11.4

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 (8) hide show

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

@@ -18114,22 +18114,30 @@
                                 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.type === i2$1.HttpEventType.UploadProgress) {
-                                    var total = event.total || file.size;
-                                    file.progress = Math.min(1, event.loaded / total);
+                                // 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 content = event.body;
-                                    file.finalName = content === null || content === void 0 ? void 0 : content.finalName;
+                                    var body = event.body;
+                                    file.finalName = body === null || body === void 0 ? void 0 : body.finalName;
                                     file.progress = 1;
-                                    var message = content.message || event.statusText || 'succeed';
-                                    console.info("[upload-file] " + file.name + ": " + message + " (finalName: " + file.finalName + ")");
+                                    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 = ((_a = err.error) === null || _a === void 0 ? void 0 : _a.message) || 'FILE.UPLOAD.ERROR';
+                                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();