@sumaris-net/ngx-components 0.25.7 → 0.25.8

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

@@ -36,7 +36,7 @@ import { MatAutocomplete, MatAutocompleteTrigger, MatAutocompleteModule, MAT_AUT
 import { __awaiter, __decorate } from 'tslib';
 import * as i1$6 from '@angular/forms';
 import { NG_VALUE_ACCESSOR, FormGroupDirective, ReactiveFormsModule, AbstractControl, Validators, FormBuilder, FormControl, FormGroup, FormArray } from '@angular/forms';
-import { timer, merge, fromEvent, Subscription, BehaviorSubject, Subject, isObservable, of, noop as noop$8, Observable, defer, combineLatest, EMPTY } from 'rxjs';
+import { timer, merge, fromEvent, Subscription, BehaviorSubject, Subject, isObservable, of, noop as noop$8, Observable, defer, from, combineLatest, EMPTY } from 'rxjs';
 import { filter, first, map, takeUntil, startWith, debounceTime, takeWhile, switchMap, tap, distinctUntilChanged, mergeMap, catchError, throttleTime } from 'rxjs/operators';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
@@ -13659,7 +13659,7 @@ class PlatformService {
         this.browser = browser;
         this.downloader = downloader;
         this._started = false;
-        this._downloadingPromise = new Map();
+        this._downloadingJobs = new Map();
         this._debug = !environment.production;
         if (this._debug)
             console.debug('[platform] Creating service');
@@ -13775,48 +13775,42 @@ class PlatformService {
             window.open(url, target, features, replace);
         }
     }
-    getDownloadingPromise(uri) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._downloadingPromise.get(uri);
-        });
+    getDownloadingJob(uri) {
+        return this._downloadingJobs.get(uri);
     }
     download(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!request || !request.uri)
-                throw new Error('Missing argument \'request\' or \'request.uri\'');
-            if (this._android && this.downloader) {
-                // Check if not already downloading file
-                let promise = this._downloadingPromise.get(request.uri);
-                if (promise)
-                    return promise;
-                request = Object.assign({ visibleInDownloadsUi: true, notificationVisibility: NotificationVisibility.VisibleNotifyCompleted, title: request.title || request.filename }, request);
-                try {
-                    console.debug('[platform] Downloading, using request: ' + JSON.stringify(request));
-                    // Start download
-                    promise = this.downloader.download(request);
-                    // Remember this request uri
-                    this._downloadingPromise.set(request.uri, promise);
-                    const location = yield promise;
-                    console.info('[platform] File successfully downloaded at:' + location);
-                    return location;
-                }
-                catch (err) {
-                    console.error('[platform] Unable to download: ' + (err && err.message || err));
-                    throw err;
-                }
-                finally {
-                    // Forget the request
-                    this._downloadingPromise.delete(request.uri);
-                }
-            }
-            // Fallback (if not Android and Cordova): opening the URI using the browser
-            // TODO: find a way to download under iOS (see https://www.c-sharpcorner.com/article/how-to-download-a-file-using-file-transfer-plugin-in-ionic-3/)
-            else {
-                console.warn('[platform] Cannot use Android downloader: using browser open()');
-                this.open(request.uri, '_system', 'location=no', true);
-                return undefined;
-            }
-        });
+        if (!request || !request.uri)
+            throw new Error('Missing argument \'request\' or \'request.uri\'');
+        if (this._android && this.downloader) {
+            // Check if not already downloading file
+            let location$ = this._downloadingJobs.get(request.uri);
+            if (location$)
+                return location$;
+            request = Object.assign({ visibleInDownloadsUi: true, notificationVisibility: NotificationVisibility.VisibleNotifyCompleted, title: request.title || request.filename }, request);
+            console.debug('[platform] Downloading, using request: ' + JSON.stringify(request));
+            // Start download
+            location$ = from(this.downloader.download(request));
+            // Remember this request uri
+            this._downloadingJobs.set(request.uri, location$);
+            return location$
+                .pipe(tap(location => {
+                console.info('[platform] File successfully downloaded at:' + location);
+                // Forget the request
+                this._downloadingJobs.delete(request.uri);
+            }), catchError(err => {
+                console.error('[platform] Unable to download: ' + (err && err.message || err));
+                // Forget the request
+                this._downloadingJobs.delete(request.uri);
+                throw err;
+            }));
+        }
+        // Fallback (if not Android and Cordova): opening the URI using the browser
+        // TODO: find a way to download under iOS (see https://www.c-sharpcorner.com/article/how-to-download-a-file-using-file-transfer-plugin-in-ionic-3/)
+        else {
+            console.warn('[platform] Cannot use Android downloader: using browser open()');
+            this.open(request.uri, '_system', 'location=no', true);
+            return of();
+        }
     }
     /* -- protected methods -- */
     configureCordovaPlugins(mobile) {
@@ -18544,7 +18538,7 @@ class AppInstallUpgradeCard {
                 console.error('[install-upgrade-card] Missing required argument \'link.url\'');
                 return; // Skip
             }
-            return this.listenDownloadPromise(link.url, this.platform.download({
+            return this.listenDownloadJob(link.url, this.platform.download({
                 uri: link.url,
                 title: link.title,
                 filename: link.filename,
@@ -18600,9 +18594,9 @@ class AppInstallUpgradeCard {
             }
             // Listening downloading promise, if exists
             (this.upgradeLinks || []).forEach(link => {
-                const promise = this.platform.getDownloadingPromise(link.url);
-                if (promise)
-                    this.listenDownloadPromise(link.url, promise);
+                const job = this.platform.getDownloadingJob(link.url);
+                if (job)
+                    this.listenDownloadJob(link.url, job);
             });
         });
     }
@@ -18704,9 +18698,9 @@ class AppInstallUpgradeCard {
             yield Toasts.show(this.toastController, this.translate, opts);
         });
     }
-    listenDownloadPromise(url, promise) {
+    listenDownloadJob(url, job) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!url || !promise)
+            if (!url || !job)
                 return; // Skip
             try {
                 // Mark as downloading
@@ -18715,8 +18709,11 @@ class AppInstallUpgradeCard {
                     this.downloading = true;
                     this.markForCheck();
                 }
-                const location = yield promise;
-                console.info('[install-upgrade-card] File downloaded at: ' + location);
+                const location = yield job.toPromise();
+                if (location) {
+                    console.info('[install-upgrade-card] File downloaded at: ' + location);
+                    return this.showDownloadCompleteDialog();
+                }
             }
             // Failed: display a toast
             catch (err) {
@@ -18727,7 +18724,6 @@ class AppInstallUpgradeCard {
                 this.downloading = false;
                 this.markForCheck();
             }
-            return this.showDownloadCompleteDialog();
         });
     }
     showDownloadFailedToast(err) {