@sumaris-net/ngx-components 1.5.8 → 1.6.0

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

@@ -551,7 +551,7 @@
         // Pagination (truncate if need)
         var pageData = filteredItems;
         if (opts) {
-            if (isNotNil(opts.offset) && opts.offset > 0) {
+            if ((opts.offset || 0) > 0) {
                 pageData = pageData.slice(opts.offset);
             }
             if (isNotNil(opts.size) && pageData.length > opts.size) {
@@ -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)
@@ -24423,7 +24424,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
@@ -24892,8 +24898,10 @@
          * @param opts Use interactive=false to avoid user interaction (e.g. user confirmation)
          */
         AppTable.prototype.deleteRows = function (event, rows, opts) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var confirmed, canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -24907,15 +24915,34 @@
                                 return [2 /*return*/, 0];
                             if (this.loading || isEmptyArray(rows))
                                 return [2 /*return*/, 0];
+                            // Make sure to keep newly created row
+                            if (((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.id) === -1 && this.editedRow.editing && !rows.includes(this.editedRow)) {
+                                confirmed = this.confirmEditCreate();
+                                if (!confirmed)
+                                    return [2 /*return*/, 0]; // Cannot delete (e.g. edited row is invalid)
+                            }
                             return [4 /*yield*/, this.canDeleteRows(rows, opts)];
                         case 1:
                             canDelete = _d.sent();
                             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();
@@ -24939,7 +24966,7 @@
                             return [4 /*yield*/, this._dataSource.deleteAll(rowsToDelete)];
                         case 5:
                             _d.sent();
-                            // Not need to update manually, because watchALl().subscribe() will update this count
+                            // DO not update manually, because watchALl().subscribe() will update this count
                             //this.totalRowCount -= deleteCount;
                             //this.visibleRowCount -= deleteCount;
                             this.selection.clear();
@@ -25857,13 +25884,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; });
@@ -25916,7 +25959,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
@@ -25962,6 +26005,8 @@
             this._subscription.unsubscribe();
             this._$ready.complete();
             this._$ready.unsubscribe();
+            this._$loading.complete();
+            this._$loading.unsubscribe();
         };
         AppEditor.prototype.addChildForm = function (form) {
             if (!form)
@@ -28726,9 +28771,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;