@sumaris-net/ngx-components 1.23.1-rc5 → 1.23.3

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

@@ -1056,32 +1056,47 @@
     function filterNotNil(obs) {
         return obs.pipe(operators.filter(isNotNil));
     }
-    function firstNotNil(obs, opts) {
-        if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-            obs.pipe(operators.takeUntil(rxjs.timer(opts.timeout)), operators.first(isNotNil));
-        }
-        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.takeUntil(rxjs.timer(opts.timeout)), operators.first(function (v) { return v === true; })).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.takeUntil(rxjs.timer(opts.timeout)), operators.first(function (v) { return v === false; })).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) {
-        return firstNotNil(obs, opts).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() {
@@ -25832,7 +25813,6 @@
             _this._creating = false;
             _this._saving = false;
             _this._stopWatching$ = new rxjs.Subject();
-            _this._editingRowCount = 0;
             _this._fetchMoreFn = null;
             _this.loadingSubject = new rxjs.BehaviorSubject(undefined);
             _this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
@@ -25901,7 +25881,6 @@
         EntitiesTableDataSource.prototype.watchAll = function (offset, size, sortBy, sortDirection, filter) {
             var _this = this;
             this._stopWatching$.next();
-            this._editingRowCount = 0;
             this._fetchMoreFn = null;
             this.markAsLoading();
             return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
@@ -25909,8 +25888,8 @@
                 if (_this._saving) {
                     console.info("[table-datasource] Received " + _this._entityName + " data (from service), but still saving: skip");
                 }
-                else if (_this._editingRowCount > 0) {
-                    console.warn("[table-datasource] Received " + _this._entityName + " data, while " + _this._editingRowCount + " rows still editing: skip; Please check save() implementation in the table!");
+                else if (_this.hasSomeEditingRow()) {
+                    console.warn("[table-datasource] Received " + _this._entityName + " data, while some row still editing: skip; Please check save() implementation in the table!");
                 }
                 else {
                     _this.updateDatasource((res.data || []));
@@ -25969,7 +25948,6 @@
                                 // Stop with an error
                                 throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
-                            this._editingRowCount = 0;
                             data = void 0;
                             if (this.validatorService) {
                                 dataToSave_1 = [];
@@ -26049,7 +26027,6 @@
                 console.warn('[table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount--;
             return true;
         };
         EntitiesTableDataSource.prototype.confirmEdit = function (row) {
@@ -26059,7 +26036,6 @@
                 console.warn('[table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount--;
             return true;
         };
         EntitiesTableDataSource.prototype.startEdit = function (row) {
@@ -26069,7 +26045,6 @@
                 console.warn('[table-datasource] Row still has {editing: false} after startEdit()! Force editing');
                 row.validator.enable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount++;
         };
         EntitiesTableDataSource.prototype.handleError = function (error, message) {
             var errorMsg = error && error.message || error;
@@ -26094,9 +26069,7 @@
                 console.error("[table-datasource] Row to delete with id=" + id + " not found");
                 return;
             }
-            if (row.editing)
-                this._editingRowCount--;
-            this.loadingSubject.next(true);
+            this.markAsLoading();
             this.dataService.deleteAll([row.currentData], this.serviceOptions)
                 .catch(function (err) { return _this.handleServiceError(err); })
                 .then(function () {
@@ -26105,7 +26078,7 @@
                     var present = _this.getRow(id) === row;
                     if (present)
                         _super_1.prototype.delete.call(_this, id);
-                    _this.loadingSubject.next(false);
+                    _this.markAsLoaded();
                 }, 300);
             });
         };
@@ -26130,7 +26103,13 @@
                         case 2:
                             // Call service deletion
                             _b.sent();
-                            rowNotDeleted = this.getRows().filter(function (row) { return rows.includes(row); });
+                            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 ?)");
@@ -26142,7 +26121,7 @@
                             return [3 /*break*/, 5];
                         case 3:
                             err_1 = _b.sent();
-                            // Handle sservice error
+                            // Handle service error
                             this.handleServiceError(err_1);
                             return [3 /*break*/, 5];
                         case 4:
@@ -26159,6 +26138,9 @@
         EntitiesTableDataSource.prototype.getRows = function () {
             return this.rowsSubject.getValue();
         };
+        EntitiesTableDataSource.prototype.hasSomeEditingRow = function () {
+            return (this.rowsSubject.value || []).some(function (row) { return row.editing; });
+        };
         EntitiesTableDataSource.prototype.createNew = function (insertAt, options) {
             if (options === void 0) { options = { editing: true }; }
             var _super = Object.create(null, {
@@ -26194,10 +26176,7 @@
                             // Log, then continue
                             console.error(err_2 && err_2.message || err_2, err_2);
                             return [3 /*break*/, 6];
-                        case 6:
-                            if (row.editing)
-                                this._editingRowCount++;
-                            return [2 /*return*/, row];
+                        case 6: return [2 /*return*/, row];
                         case 7:
                             this._creating = false;
                             return [7 /*endfinally*/];
@@ -26222,8 +26201,8 @@
                         case 0:
                             if (!this._fetchMoreFn)
                                 return [2 /*return*/, false]; // Avoid multiple call
-                            if (this._editingRowCount > 0) {
-                                console.warn("Cannot fetch more " + this._entityName + " because " + this._editingRowCount + " row(s) still editing");
+                            if (this.hasSomeEditingRow()) {
+                                console.warn("Cannot fetch more " + this._entityName + " because some row) still editing");
                                 return [2 /*return*/];
                             }
                             console.debug("Will fetching more row(s) still...");
@@ -26302,7 +26281,6 @@
             this.savingSubject = new rxjs.BehaviorSubject(false);
             this.dirtySubject = new rxjs.BehaviorSubject(false);
             this.errorSubject = new rxjs.BehaviorSubject(undefined);
-            this.isRateLimitReached = false;
             this.selection = new collections.SelectionModel(true, []);
             this.editedRow = undefined;
             this.i18nColumnPrefix = 'COMMON.';
@@ -26710,7 +26688,7 @@
                 return rxjs.of(undefined); // Continue
             }))
                 .subscribe(function (res) { return _this.updateView(res); }));
-            // Listen dataSource events
+            // Listen dataSource loading events
             if (this._dataSource)
                 this.listenDatasourceLoading(this._dataSource);
         };
@@ -26792,7 +26770,6 @@
                     if (!res)
                         return [2 /*return*/]; // Skip (e.g error)
                     if (res && res.data) {
-                        this.isRateLimitReached = !this.paginator || (res.data.length < this.paginator.pageSize);
                         this.visibleRowCount = res.data.length;
                         this.totalRowCount = isNotNil(res.total) ? res.total : ((this.paginator && this.paginator.pageIndex * (this.paginator.pageSize || DEFAULT_PAGE_SIZE) || 0) + this.visibleRowCount);
                         if (this.debug)
@@ -26800,7 +26777,6 @@
                     }
                     else {
                         //if (this.debug) console.debug('[table] NO rows loaded');
-                        this.isRateLimitReached = true;
                         this.totalRowCount = 0;
                         this.visibleRowCount = 0;
                     }
@@ -26936,6 +26912,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
@@ -27208,22 +27185,19 @@
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
                             // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
                             rows = rows.filter(function (row) {
-                                if (row.validator && !row.validator.valid) {
-                                    // When deleted (= newly created row) : decrement counter
-                                    if (row.id === -1 || !row.editing) {
-                                        row.delete();
-                                        _this.visibleRowCount--;
-                                        _this.totalRowCount--;
-                                        return false; // Remove this row to the list, because already deleted
-                                    }
-                                    // Mark row as pristine, to avoid row to be saved even if still invalid
-                                    else {
-                                        // Will cancel only (delete will always go into the previous 'if')
-                                        row.cancelOrDelete();
-                                        // Mark row as pristine (if possible)
-                                        _this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
-                                        // Continue: the row will be deleted after the save
-                                    }
+                                // Delete the row, if newly created row (id = -1), or if invalid and not editing (= not cancellable)
+                                if (row.id === -1 || (!row.valid && !row.editing)) {
+                                    row.delete();
+                                    _this.visibleRowCount--;
+                                    _this.totalRowCount--;
+                                    return false;
+                                }
+                                // Cancel the row (and mark as pristine), when not valid but in edition
+                                else if (!row.valid && row.editing) {
+                                    row.cancel();
+                                    // Mark row as pristine (if possible)
+                                    _this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
+                                    return true; // Keep the row. the row will be deleted after the save
                                 }
                                 return true;
                             });
@@ -28068,8 +28042,9 @@
                 if (this.debug)
                     console.debug('[table] Many call to listenDatasource(): Cleaning previous subscriptions...');
                 this._dataSourceLoadingSubscription.unsubscribe();
-                this._subscription.remove(this._dataSourceLoadingSubscription);
+                this.unregisterSubscription(this._dataSourceLoadingSubscription);
             }
+            // Propage loading to table
             this._dataSourceLoadingSubscription = this._dataSource.loadingSubject
                 .pipe(operators.distinctUntilChanged(), 
             // If changed to True: propagate as soon as possible
@@ -28077,7 +28052,7 @@
             // If changed to False: wait 250ms before propagate (to make sure the spinner has been displayed)
             operators.debounceTime(250), operators.tap(function (loading) { return !loading && _this.setLoading(false); }))
                 .subscribe();
-            this._subscription.add(this._dataSourceLoadingSubscription);
+            this.registerSubscription(this._dataSourceLoadingSubscription);
         };
         AppTable.prototype.startCellValueChanges = function (name, row) {
             var def = this._cellValueChangesDefs[name];