@sumaris-net/ngx-components 1.23.50 → 1.23.52

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

@@ -1043,32 +1043,40 @@
     function filterFalse(obs, opts) {
         return obs.pipe(operators.filter(function (v) { return v === false; }));
     }
-    function decorateForFirst(obs, opts) {
+    function decorateWithTakeUntil(obs, opts) {
         // Set take until notifier
         var takeUntil$ = (opts === null || opts === void 0 ? void 0 : opts.stop) || ((opts === null || opts === void 0 ? void 0 : opts.timeout) && rxjs.timer(opts.timeout));
-        if (takeUntil$) {
-            // When stop, throw an error (useful when used with a toPromise())
-            if (opts.stopError) {
-                return rxjs.merge(obs.pipe(operators.takeUntil(takeUntil$)), takeUntil$
-                    .pipe(operators.map(function () {
-                    throw new Error(opts.timeout ? "Timeout " + opts.timeout + "ms" : "Stop");
-                })));
-            }
-            // Add a takeUntil
-            return obs.pipe(operators.takeUntil(takeUntil$));
-        }
-        return obs;
+        if (!takeUntil$)
+            return obs; // Skip
+        // When stop, throw an error (useful when used with a toPromise())
+        if (opts.stopError) {
+            var error_1;
+            if (opts.stopError === true) {
+                error_1 = new Error(opts.timeout ? "Timeout " + opts.timeout + "ms" : "stop");
+            }
+            else if (typeof opts.stopError === 'string') {
+                error_1 = new Error(opts.stopError);
+            }
+            else {
+                error_1 = opts.stopError;
+            }
+            takeUntil$ = takeUntil$.pipe(operators.map(function () {
+                throw error_1;
+            }));
+        }
+        return obs
+            .pipe(operators.takeUntil(takeUntil$));
     }
     function firstNotNil(obs, opts) {
-        return decorateForFirst(obs, opts).pipe(operators.first(isNotNil));
+        return decorateWithTakeUntil(obs.pipe(operators.first(isNotNil)), opts);
     }
     function firstTrue(obs, opts) {
-        return decorateForFirst(obs, opts).pipe(operators.first(function (v) { return v === true; }), operators.map(function (_) { }) // Convert to void
-        );
+        return decorateWithTakeUntil(obs.pipe(operators.first(function (v) { return v === true; }), operators.map(function (_) { }) // Convert to void
+        ), opts);
     }
     function firstFalse(obs, opts) {
-        return decorateForFirst(obs, opts).pipe(operators.first(function (v) { return v === false; }), operators.map(function (_) { }) // Convert to void
-        );
+        return decorateWithTakeUntil(obs.pipe(operators.first(function (v) { return v === false; }), operators.map(function (_) { }) // Convert to void
+        ), opts);
     }
     function firstTruePromise(obs, opts) {
         return firstTrue(obs, Object.assign({ stopError: true }, opts)).toPromise();
@@ -1126,9 +1134,8 @@
         opts = Object.assign({ stopError: true }, opts);
         // dueTime (without timeout)
         if (opts && opts.dueTime > 0) {
-            return rxjs.timer(opts.dueTime)
-                .pipe(operators.switchMap(function () { return firstTrue(observable, opts); }))
-                .toPromise();
+            observable = rxjs.timer(opts.dueTime)
+                .pipe(operators.switchMap(function () { return observable; }));
         }
         return firstTrue(observable, opts).toPromise();
     }
@@ -2068,8 +2075,7 @@
                 ? rxjs.timer(0)
                 : this.autocomplete.opened.pipe(operators.debounceTime(200));
             var scrollEnd$ = opened$
-                .pipe(operators.map(function (_) { return _this.getAutocompletePanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold)
-                .pipe(operators.takeUntil(_this.autocomplete.closed)); }));
+                .pipe(operators.map(function (_) { return _this.getAutocompletePanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold); }), operators.takeUntil(this.autocomplete.closed));
             // Trigger fetch more, end end scroll reached
             this._openedSubscription = scrollEnd$
                 .subscribe(function () { return _this._fetchMore$.emit(); });
@@ -2090,8 +2096,7 @@
                 ? rxjs.timer(0)
                 : this.matSelect._openedStream.pipe(operators.debounceTime(200));
             var scrollEnd$ = opened$
-                .pipe(operators.map(function (_) { return _this.getMatSelectPanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold)
-                .pipe(operators.takeUntil(_this.matSelect._closedStream)); }));
+                .pipe(operators.map(function (_) { return _this.getMatSelectPanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold); }), operators.takeUntil(this.matSelect._closedStream));
             // Trigger fetch more, end end scroll reached
             this._openedSubscription = scrollEnd$
                 .pipe(operators.filter(function (_) { return _this._moreItemsCount > 0; }))
@@ -9069,8 +9074,7 @@
                 ? rxjs.timer(0)
                 : this.autocomplete.opened.pipe(operators.debounceTime(200));
             var scrollEnd$ = opened$
-                .pipe(operators.map(function (_) { return _this.getAutocompletePanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold)
-                .pipe(operators.takeUntil(_this.autocomplete.closed)); }));
+                .pipe(operators.map(function (_) { return _this.getAutocompletePanel(); }), operators.filter(isNotNil), operators.switchMap(function (panel) { return fromScrollEndEvent(panel, threshold); }), operators.takeUntil(this.autocomplete.closed));
             // Trigger fetch more, end end scroll reached
             this._openedSubscription = scrollEnd$
                 .subscribe(function () { return _this._fetchMore$.emit(); });
@@ -33918,6 +33922,130 @@
         { type: i0.ChangeDetectorRef }
     ]; };
 
+    var ObservableTestPage = /** @class */ (function () {
+        function ObservableTestPage() {
+            this._stopSubject = new rxjs.Subject();
+            this.$value = new rxjs.Subject();
+            this.runningTaskCount = 0;
+            this.taskId = 0;
+            this.options = {
+                stop: this._stopSubject
+            };
+        }
+        ObservableTestPage.prototype.ngOnDestroy = function () {
+            this._stopSubject.next();
+        };
+        ObservableTestPage.prototype.setOptions = function (opts) {
+            var _a;
+            this.options = Object.assign(Object.assign({}, this.options), opts);
+            this.log('Options changes to: ', Object.assign(Object.assign({}, this.options), { stop: ((_a = this.options) === null || _a === void 0 ? void 0 : _a.stop) ? '$stop' : 'null' }));
+        };
+        ObservableTestPage.prototype.setOptionsError = function (errorMessage) {
+            this.setOptions({ stopError: new Error(errorMessage) });
+        };
+        ObservableTestPage.prototype.firstNotNilPromise = function (opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var logPrefix;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            logPrefix = "[firstNotNilPromise() #" + ++this.taskId + "] ";
+                            return [4 /*yield*/, this.execute(firstNotNilPromise, opts, logPrefix)];
+                        case 1:
+                            _b.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        ObservableTestPage.prototype.waitForTrue = function (opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var logPrefix;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            logPrefix = "[waitForTrue() #" + ++this.taskId + "] ";
+                            return [4 /*yield*/, this.execute(waitForTrue, opts, logPrefix)];
+                        case 1:
+                            _b.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        ObservableTestPage.prototype.execute = function (fn, opts, logPrefix) {
+            return __awaiter(this, void 0, void 0, function () {
+                var value$, result, err_1, errorMsg;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            opts = Object.assign(Object.assign(Object.assign({}, this.options), { stop: this._stopSubject }), opts);
+                            logPrefix = logPrefix || "[#" + ++this.taskId + "] ";
+                            value$ = this.$value.pipe(operators.tap(function (value) { return _this.log(logPrefix + ("Received value: " + value)); }));
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, 3, 4, 5]);
+                            this.runningTaskCount++;
+                            this.log(logPrefix + 'Waiting...');
+                            return [4 /*yield*/, fn(value$, opts)];
+                        case 2:
+                            result = _b.sent();
+                            // Dump result
+                            if (isNotNil(result))
+                                this.log(logPrefix + '[OK] with result:', result);
+                            else
+                                this.log(logPrefix + '[OK]');
+                            return [3 /*break*/, 5];
+                        case 3:
+                            err_1 = _b.sent();
+                            errorMsg = logPrefix + 'Error: ' + ((err_1 === null || err_1 === void 0 ? void 0 : err_1.message) || '');
+                            console.error(errorMsg, err_1);
+                            this.log(errorMsg
+                                + ((err_1 === null || err_1 === void 0 ? void 0 : err_1.originalStack) ? "<pre>" + err_1.originalStack + "</pre>" : ''));
+                            return [3 /*break*/, 5];
+                        case 4:
+                            this.runningTaskCount--;
+                            return [7 /*endfinally*/];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        ObservableTestPage.prototype.emit = function (value) {
+            this.$value.next(value);
+        };
+        ObservableTestPage.prototype.stop = function () {
+            this._stopSubject.next();
+        };
+        ObservableTestPage.prototype.log = function (message) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            var fullMessage = toDateISOString(moment$3()) + " - " + message;
+            if (args === null || args === void 0 ? void 0 : args.length) {
+                fullMessage += ' - <small>' + args.map(JSON.stringify).join(', ') + '</small>';
+            }
+            this.appendLog(fullMessage);
+        };
+        ObservableTestPage.prototype.appendLog = function (message) {
+            this.resultDiv.nativeElement.innerHTML += message + '<br/>';
+        };
+        return ObservableTestPage;
+    }());
+    ObservableTestPage.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'app-observable-test',
+                    template: "\n<ion-header>\n  <ion-toolbar color=\"primary\">\n\n    <ion-buttons slot=\"start\">\n      <ion-back-button></ion-back-button>\n    </ion-buttons>\n\n    <ion-title>Observables test page</ion-title>\n  </ion-toolbar>\n</ion-header>\n\n<ion-content class=\"ion-padding\">\n\n  <ion-card>\n    <ion-card-header>\n      <ion-card-title>waitFor, waitForTrue, waitForFalse</ion-card-title>\n    </ion-card-header>\n    <ion-card-content>\n      <div style=\"display: inline-block\">\n        <p>Set options: </p>\n        <ion-button color=\"medium\" fill=\"outline\" (click)=\"setOptions({stopError: false})\">stopError: false</ion-button>\n        <ion-button color=\"medium\" fill=\"outline\" (click)=\"setOptions({stopError: true})\">stopError: true</ion-button>\n        <ion-button color=\"medium\" fill=\"outline\" (click)=\"setOptions({stopError: 'my error'})\">stopError: 'my error'</ion-button>\n\n        <ion-button color=\"medium\" fill=\"outline\" (click)=\"setOptions({timeout: 2000})\">timeout: 2000</ion-button>\n        <ion-button color=\"medium\" fill=\"outline\" (click)=\"setOptions({timeout: null})\">timeout: null</ion-button>\n        <br/>\n        <p>Call await function: </p>\n        <ion-button (click)=\"waitForTrue()\">waitForTrue</ion-button>\n        <ion-button (click)=\"firstNotNilPromise()\">firstNotNilPromise</ion-button>\n        <br/>\n        <p>Send event to source: </p>\n        <ion-button (click)=\"emit(true)\">Emit 'true'</ion-button>\n        <ion-button (click)=\"emit(false)\">Emit 'false'</ion-button>\n        <br/>\n        <p>Stop: </p>\n        <ion-button color=\"danger\" (click)=\"stop()\">Stop</ion-button>\n      </div>\n    </ion-card-content>\n  </ion-card>\n\n  <ion-card>\n    <ion-toolbar>\n      <ion-title>Running job count: {{runningTaskCount}}</ion-title>\n      <ion-button fill=\"outline\" slot=\"end\" (click)=\"result.innerHTML=''\">Clear log</ion-button>\n    </ion-toolbar>\n    <ion-card-content>\n      <div #result style=\"color: var(--ion-color-medium)\">\n      </div>\n    </ion-card-content>\n  </ion-card>\n</ion-content>\n",
+                    styles: ["ion-button{text-transform:none!important}"]
+                },] }
+    ];
+    ObservableTestPage.ctorParameters = function () { return []; };
+    ObservableTestPage.propDecorators = {
+        resultDiv: [{ type: i0.ViewChild, args: ['result',] }]
+    };
+
     var SHARED_MATERIAL_TESTING_PAGES = [
         { label: 'Shared Material components', divider: true },
         { label: 'Date/Time field', page: '/testing/shared/datetime' },
@@ -33928,7 +34056,9 @@
         { label: 'Swipe component', page: '/testing/shared/swipe' },
         { label: 'Chips component', page: '/testing/shared/chips' },
         { label: 'Shared directives', divider: true },
-        { label: 'Badge icon directive', page: '/testing/shared/badge-icon' }
+        { label: 'Badge icon directive', page: '/testing/shared/badge-icon' },
+        { label: 'Shared utils', divider: true },
+        { label: 'Observable', page: '/testing/shared/observable' }
     ];
     var routes$1 = [
         {
@@ -33936,6 +34066,11 @@
             pathMatch: 'full',
             component: SharedTestsPage
         },
+        {
+            path: 'observable',
+            pathMatch: 'full',
+            component: ObservableTestPage
+        },
         {
             path: 'autocomplete',
             pathMatch: 'full',
@@ -34000,7 +34135,8 @@
                         NumpadTestPage,
                         SwipeTestPage,
                         ChipsTestPage,
-                        MatBadgeIconTestPage
+                        MatBadgeIconTestPage,
+                        ObservableTestPage
                     ],
                     exports: [
                         SharedMaterialModule,
@@ -34011,7 +34147,8 @@
                         LatLongTestPage,
                         NumpadTestPage,
                         SwipeTestPage,
-                        ChipsTestPage
+                        ChipsTestPage,
+                        ObservableTestPage
                     ]
                 },] }
     ];
@@ -35795,11 +35932,12 @@
     exports.ɵi = LocalSettingsValidatorService;
     exports.ɵj = AppUpdateOfflineModeCard;
     exports.ɵk = UserEventNotificationList;
-    exports.ɵl = DateTestPage;
-    exports.ɵm = NumpadTestPage;
-    exports.ɵn = MatBadgeIconTestPage;
-    exports.ɵo = ToastTestingModule;
-    exports.ɵp = ToastTestingPage;
+    exports.ɵl = ObservableTestPage;
+    exports.ɵm = DateTestPage;
+    exports.ɵn = NumpadTestPage;
+    exports.ɵo = MatBadgeIconTestPage;
+    exports.ɵp = ToastTestingModule;
+    exports.ɵq = ToastTestingPage;
 
     Object.defineProperty(exports, '__esModule', { value: true });