@sumaris-net/ngx-components 1.5.9 → 1.6.1

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

@@ -1117,6 +1117,14 @@
                 .then(function (jobRes) { return finalResult.concat(jobRes); }); });
         }, null);
     }
+    function firstTrue(obs) {
+        return obs.pipe(operators.first(function (v) { return v === true; }), operators.map(function (_) { }) // Convert to void
+        );
+    }
+    function firstFalse(obs) {
+        return obs.pipe(operators.first(function (v) { return v === false; }), operators.map(function (_) { }) // Convert to void
+        );
+    }
     /**
      * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()
      * @param predicate
@@ -1157,8 +1165,7 @@
         return __awaiter(this, void 0, void 0, function () {
             var firstTrueObservable, $timeout;
             return __generator(this, function (_a) {
-                firstTrueObservable = observable.pipe(operators.first(function (v) { return v === true; }), operators.map(function () { }) // convert to void
-                );
+                firstTrueObservable = firstTrue(observable);
                 // Timeout (+ dueTime)
                 if (opts && opts.timeout > 0) {
                     $timeout = rxjs.timer(opts.timeout);
@@ -19531,6 +19538,9 @@
             this.onSubmit.complete();
             this.onSubmit.unsubscribe();
             this._$ready.complete();
+            this._$ready.unsubscribe();
+            this._$loading.complete();
+            this._$loading.unsubscribe();
         };
         AppForm.prototype.cancel = function () {
             this.onCancel.emit();
@@ -19636,16 +19646,7 @@
          * @param opts
          */
         AppForm.prototype.ready = function (opts) {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, firstTruePromise(this._$ready)];
-                        case 1:
-                            _b.sent();
-                            return [2 /*return*/];
-                    }
-                });
-            });
+            return waitForTrue(this._$ready, opts);
         };
         /**
          * Wait form is idle (not loading)
@@ -23672,6 +23673,7 @@
             _this._useValidator = false;
             _this._stopWatching$ = new rxjs.Subject();
             _this._editingRowCount = 0;
+            _this._fetchMoreFn = null;
             _this.loadingSubject = new rxjs.BehaviorSubject(undefined);
             _this._options = Object.assign({ dataServiceOptions: {}, debug: config && config.suppressErrors === false, keepOriginalDataAfterConfirm: false }, config);
             _this._useValidator = isNotNil(validatorService);
@@ -23722,6 +23724,7 @@
             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)
                 .pipe(
@@ -23735,6 +23738,7 @@
                 }
                 else {
                     _this.updateDatasource((res.data || []));
+                    _this._fetchMoreFn = res.fetchMore;
                 }
                 return res;
             }));
@@ -23985,6 +23989,49 @@
                 });
             });
         };
+        EntitiesTableDataSource.prototype.getData = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var rows;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.getRows()];
+                        case 1:
+                            rows = _a.sent();
+                            return [2 /*return*/, this.getDataFromRows(rows)];
+                    }
+                });
+            });
+        };
+        EntitiesTableDataSource.prototype.fetchMore = function (opts) {
+            var _super = Object.create(null, {
+                updateDatasource: { get: function () { return _super_1.prototype.updateDatasource; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var res, existingData;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (!this._fetchMoreFn)
+                                return [2 /*return*/];
+                            if (this._editingRowCount > 0) {
+                                console.warn('Cannot fetch more because still editing row');
+                                return [2 /*return*/];
+                            }
+                            return [4 /*yield*/, this._fetchMoreFn()];
+                        case 1:
+                            res = _a.sent();
+                            if (isNotEmptyArray(res === null || res === void 0 ? void 0 : res.data))
+                                return [2 /*return*/];
+                            return [4 /*yield*/, this.getData()];
+                        case 2:
+                            existingData = _a.sent();
+                            _super.updateDatasource.call(this, existingData.concat.apply(existingData, __spread(res.data)), opts);
+                            this._fetchMoreFn = res.fetchMore;
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         /* -- protected method -- */
         EntitiesTableDataSource.prototype.markAsLoading = function () {
             if (this.loadingSubject.value !== true) {
@@ -24423,7 +24470,12 @@
             rxjs.combineLatest([
                 _this.onStartEditingRow,
                 _this._destroy$
-            ])), operators.map(function () { var _a; return (_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty; }), operators.filter(function (dirty) { return dirty === true; }), operators.first()); }))
+            ])
+            // DEBUG
+            //.pipe(
+            //  tap(() => console.debug('TODO stopping previous row listener'))
+            //)
+            ), operators.map(function () { var _a; return (_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty; }), operators.filter(function (dirty) { return dirty === true; }), operators.first()); }))
                 .subscribe(function () { return _this.markAsDirty(); }));
             // Call datasource refresh, on each refresh events
             this.registerSubscription(this.onRefresh
@@ -24895,6 +24947,7 @@
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var confirmed, canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -24920,9 +24973,22 @@
                             if (!canDelete)
                                 return [2 /*return*/, 0]; // Cannot delete
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
-                            // Cancel invalid rows (because of save() will failed if there is invalid rows)
-                            rows.filter(function (row) { var _a; return !((_a = row.validator) === null || _a === void 0 ? void 0 : _a.valid); })
-                                .forEach(function (row) { return row.cancelOrDelete(); });
+                            // Cancel invalid rows (because of save() will fail, if invalid rows exists)
+                            rows = rows.reduce(function (res, row) {
+                                if (row.validator && !row.validator.valid) {
+                                    var deleted = row.id === -1;
+                                    row.cancelOrDelete();
+                                    // When deleted (= newly created row) : decrement counter
+                                    if (deleted) {
+                                        _this.visibleRowCount--;
+                                        _this.totalRowCount--;
+                                        return res;
+                                    }
+                                }
+                                return res.concat(row);
+                            }, []);
+                            if (isEmptyArray(rows))
+                                return [2 /*return*/, 0];
                             return [4 /*yield*/, this.saveBeforeAction('delete')];
                         case 2:
                             saved = _d.sent();
@@ -24946,10 +25012,9 @@
                             return [4 /*yield*/, this._dataSource.deleteAll(rowsToDelete)];
                         case 5:
                             _d.sent();
-                            // Update manually, even if watchALl().subscribe() will update this count,
-                            // because of memory data service (see issue #
-                            this.totalRowCount -= deleteCount;
-                            this.visibleRowCount -= deleteCount;
+                            // DO not update manually, because watchALl().subscribe() will update this count
+                            //this.totalRowCount -= deleteCount;
+                            //this.visibleRowCount -= deleteCount;
                             this.selection.clear();
                             this.editedRow = undefined;
                             this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
@@ -25865,13 +25930,29 @@
             this._subscription = new rxjs.Subscription();
             this._enabled = false;
             this._dirty = false;
-            this._loading = true;
             this._$ready = new rxjs.BehaviorSubject(false);
+            this._$loading = new rxjs.BehaviorSubject(true);
             this.debug = false;
             this.submitted = false;
             this.toolbar = null;
             this.formButtonsBar = null;
         }
+        Object.defineProperty(AppEditor.prototype, "_loading", {
+            /**
+             *  @deprecated
+             */
+            get: function () {
+                return this._$loading.value;
+            },
+            /**
+             *  @deprecated
+             */
+            set: function (value) {
+                this._$loading.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(AppEditor.prototype, "tables", {
             get: function () {
                 return this._children && this._children.filter(function (c) { return c instanceof AppTable; });
@@ -25924,7 +26005,7 @@
         Object.defineProperty(AppEditor.prototype, "loading", {
             get: function () {
                 var _a;
-                return this._loading || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(function (c) { return c.enabled && c.loading; })) !== -1) || false;
+                return this._$loading.value || (((_a = this._children) === null || _a === void 0 ? void 0 : _a.findIndex(function (c) { return c.enabled && c.loading; })) !== -1) || false;
             },
             enumerable: false,
             configurable: true
@@ -25970,6 +26051,8 @@
             this._subscription.unsubscribe();
             this._$ready.complete();
             this._$ready.unsubscribe();
+            this._$loading.complete();
+            this._$loading.unsubscribe();
         };
         AppEditor.prototype.addChildForm = function (form) {
             if (!form)
@@ -28734,9 +28817,11 @@
     exports.filterNumberInput = filterNumberInput;
     exports.filterTrue = filterTrue;
     exports.firstArrayValue = firstArrayValue;
+    exports.firstFalse = firstFalse;
     exports.firstFalsePromise = firstFalsePromise;
     exports.firstNotNil = firstNotNil;
     exports.firstNotNilPromise = firstNotNilPromise;
+    exports.firstTrue = firstTrue;
     exports.firstTruePromise = firstTruePromise;
     exports.focusInput = focusInput;
     exports.focusNextInput = focusNextInput;