@sumaris-net/ngx-components 1.23.1-rc3 → 1.23.1

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

@@ -1056,32 +1056,47 @@
     function filterNotNil(obs) {
         return obs.pipe(operators.filter(isNotNil));
     }
-    function firstNotNil(obs) {
-        return obs.pipe(operators.first(isNotNil));
-    }
     function filterTrue(obs) {
         return obs.pipe(operators.filter(function (v) { return v === true; }));
     }
-    function filterFalse(obs) {
+    function filterFalse(obs, opts) {
         return obs.pipe(operators.filter(function (v) { return v === false; }));
     }
+    function decorateForFirst(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;
+    }
+    function firstNotNil(obs, opts) {
+        return decorateForFirst(obs, opts).pipe(operators.first(isNotNil));
+    }
+    function firstTrue(obs, opts) {
+        return decorateForFirst(obs, opts).pipe(operators.first(function (v) { return v === true; }), operators.map(function (_) { }) // Convert to void
+        );
+    }
+    function firstFalse(obs, opts) {
+        return decorateForFirst(obs, opts).pipe(operators.first(function (v) { return v === false; }), operators.map(function (_) { }) // Convert to void
+        );
+    }
     function firstTruePromise(obs, opts) {
-        if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-            return obs.pipe(operators.first(function (v) { return v === true; }), operators.takeUntil(rxjs.timer(opts.timeout))).toPromise();
-        }
-        return obs.pipe(operators.first(function (v) { return v === true; })).toPromise();
+        return firstTrue(obs, Object.assign({ stopError: true }, opts)).toPromise();
     }
     function firstFalsePromise(obs, opts) {
-        if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-            return obs.pipe(operators.first(function (v) { return v === false; }), operators.takeUntil(rxjs.timer(opts.timeout))).toPromise();
-        }
-        return obs.pipe(operators.first(function (v) { return v === false; })).toPromise();
+        return firstFalse(obs, Object.assign({ stopError: true }, opts)).toPromise();
     }
     function firstNotNilPromise(obs, opts) {
-        if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-            return firstNotNil(obs).pipe(operators.takeUntil(rxjs.timer(opts.timeout))).toPromise();
-        }
-        return firstNotNil(obs).toPromise();
+        return firstNotNil(obs, Object.assign({ stopError: true }, opts)).toPromise();
     }
     function chainPromises(defers) {
         return (defers || []).reduce(function (previous, defer) {
@@ -1098,14 +1113,6 @@
                 .then(function (jobRes) { return finalResult.concat(jobRes); }); });
         }, null);
     }
-    function firstTrue(obs) {
-        return obs.pipe(operators.first(function (value) { return value === true; }), operators.map(function (_) { }) // Convert to void
-        );
-    }
-    function firstFalse(obs) {
-        return obs.pipe(operators.first(function (value) { return value === false; }), operators.map(function (_) { }) // Convert to void
-        );
-    }
     /**
      * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()
      * @param predicate
@@ -1113,7 +1120,7 @@
      */
     function waitFor(predicate, opts) {
         return __awaiter(this, void 0, void 0, function () {
-            var period, dueTime, wait$, $timeout;
+            var period, dueTime, wait$;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1126,15 +1133,7 @@
                         // For DEBUG :
                         //tap(() => console.debug("Waiting form idle...", form)),
                         operators.filter(function (_) { return predicate(); }), operators.map(function (_) { return true; }));
-                        // Add timeout
-                        if (opts && opts.timeout) {
-                            $timeout = rxjs.timer(opts.timeout);
-                            wait$ = rxjs.merge(wait$.pipe(operators.takeUntil($timeout)), $timeout
-                                .pipe(operators.map(function () {
-                                throw new Error("Timeout waitIdle() - after " + opts.timeout + "ms");
-                            })));
-                        }
-                        return [4 /*yield*/, firstNotNilPromise(wait$)];
+                        return [4 /*yield*/, firstNotNilPromise(wait$, opts)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1143,37 +1142,19 @@
         });
     }
     function waitForTrue(observable, opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var $timeout;
-            return __generator(this, function (_a) {
-                // Timeout (+ dueTime)
-                if (opts && opts.timeout > 0) {
-                    $timeout = rxjs.timer(opts.timeout);
-                    return [2 /*return*/, rxjs.merge(rxjs.timer(opts.dueTime || 0)
-                            .pipe(operators.switchMap(function () { return firstTrue(observable); }), operators.takeUntil($timeout)), $timeout
-                            .pipe(operators.map(function () {
-                            throw new Error("Timeout ready() - after " + opts.timeout + "ms");
-                        })))
-                            .toPromise()];
-                }
-                // dueTime (without timeout)
-                if (opts && opts.dueTime > 0) {
-                    return [2 /*return*/, rxjs.timer(opts.dueTime)
-                            .pipe(operators.switchMap(function () { return firstTrue(observable); }))
-                            .toPromise()];
-                }
-                return [2 /*return*/, firstTrue(observable).toPromise()];
-            });
-        });
+        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();
+        }
+        return firstTrue(observable, opts).toPromise();
     }
     function waitForFalse(observable, opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, waitForTrue(
-                    // Inverse the logic
-                    observable.pipe(operators.map(function (v) { return v === false; })), opts)];
-            });
-        });
+        return waitForTrue(
+        // Inverse the logic
+        observable.pipe(operators.map(function (v) { return v === false; })), opts);
     }
 
     function createPromiseEventEmitter() {
@@ -25826,7 +25807,7 @@
          * @param config Additional configuration for table.
          */
         function EntitiesTableDataSource(dataType, dataService, validatorService, options) {
-            var _this = _super_1.call(this, [], dataType, validatorService, Object.assign({ keepOriginalDataAfterConfirm: false, readOnly: false, saveOnlyDirtyRows: false, dataServiceOptions: {} }, options)) || this;
+            var _this = _super_1.call(this, [], dataType, validatorService, Object.assign({ keepOriginalDataAfterConfirm: false, readOnly: false, saveOnlyDirtyRows: false }, options)) || this;
             _this.dataService = dataService;
             _this._debug = false;
             _this._creating = false;
@@ -26130,9 +26111,13 @@
                         case 2:
                             // Call service deletion
                             _b.sent();
-                            rowNotDeleted = this.getRows()
-                                .map(function (row) { return rows.find(function (r) { return r === row; }); })
-                                .filter(isNotNil);
+                            rowNotDeleted = Object.getOwnPropertyNames(rowsById)
+                                .reduce(function (res, id) {
+                                var row = rowsById[id];
+                                var present = _this.getRow(+id) === row;
+                                return present ? res.concat(row) : res;
+                            }, []);
+                            //this.getRows().filter(row => rows.includes(row));
                             // Apply missing deletion
                             if (isNotEmptyArray(rowNotDeleted)) {
                                 console.warn("[table-datasource] Force deletion of " + rowNotDeleted.length + " rows (Is service update the cache ?)");
@@ -26938,6 +26923,7 @@
             // Stop event
             event === null || event === void 0 ? void 0 : event.stopPropagation();
             // Confirmation edition or creation
+            //const confirmed = this.dataSource.confirmEditCreate(row);
             var confirmed = row.confirmEditCreate();
             if (confirmed) {
                 // If edit finished, forget edited row