@sumaris-net/ngx-components 1.20.0-rc1 → 1.20.0-rc2

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

@@ -25270,31 +25270,50 @@
             });
         };
         EntitiesTableDataSource.prototype.deleteAll = function (rows) {
-            var _this = this;
-            this.markAsLoading();
-            var data = this.getDataFromRows(rows);
-            var rowsById = rows.reduce(function (res, row) {
-                res[row.id] = row;
-                return res;
-            }, {});
-            var self = this;
-            var inheritedDelete = _super_1.prototype.delete;
-            return this.dataService.deleteAll(data, this.serviceOptions)
-                .catch(function (err) { return _this.handleErrorPromise(err); })
-                .then(function () {
-                // Workaround, to be sure all rows has been deleted
-                // Sometimes, the service miss deletion, or GrapQHl cache remove failed
-                var rowNotDeleted = Object.getOwnPropertyNames(rowsById).reduce(function (res, id) {
-                    var row = rowsById[id];
-                    var present = self.getRow(+id) === row;
-                    return present ? res.concat(row) : res;
-                }, []).sort(function (a, b) { return a.id > b.id ? -1 : 1; });
-                // Apply missing deletion
-                if (isNotEmptyArray(rowNotDeleted)) {
-                    console.warn("[table-datasource] Force deletion of " + rowNotDeleted.length + " rows (Is service applying deletion to observable ?)");
-                    rowNotDeleted.forEach(function (r) { return inheritedDelete.call(self, r.id); });
-                }
-                _this.loadingSubject.next(false);
+            var _super = Object.create(null, {
+                delete: { get: function () { return _super_1.prototype.delete; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var data, rowsById, self, rowNotDeleted, err_2;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            this.markAsLoading();
+                            data = this.getDataFromRows(rows);
+                            rowsById = rows.reduce(function (res, row) {
+                                res[row.id] = row;
+                                return res;
+                            }, {});
+                            self = this;
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 5, 6, 7]);
+                            return [4 /*yield*/, this.dataService.deleteAll(data, this.serviceOptions)];
+                        case 2:
+                            _a.sent();
+                            rowNotDeleted = Object.getOwnPropertyNames(rowsById).reduce(function (res, id) {
+                                var row = rowsById[id];
+                                var present = self.getRow(+id) === row;
+                                return present ? res.concat(row) : res;
+                            }, []).sort(function (a, b) { return a.id > b.id ? -1 : 1; });
+                            if (!isNotEmptyArray(rowNotDeleted)) return [3 /*break*/, 4];
+                            console.warn("[table-datasource] Force deletion of " + rowNotDeleted.length + " rows (Is service applying deletion to observable ?)");
+                            return [4 /*yield*/, Promise.all(rowNotDeleted.map(function (r) { return _super.delete.call(_this, r.id); }))];
+                        case 3:
+                            _a.sent();
+                            _a.label = 4;
+                        case 4: return [3 /*break*/, 7];
+                        case 5:
+                            err_2 = _a.sent();
+                            this.handleErrorPromise(err_2);
+                            return [3 /*break*/, 7];
+                        case 6:
+                            this.markAsLoaded();
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
+                    }
+                });
             });
         };
         EntitiesTableDataSource.prototype.getRows = function () {
@@ -25305,7 +25324,7 @@
                 createNew: { get: function () { return _super_1.prototype.createNew; } }
             });
             return __awaiter(this, void 0, void 0, function () {
-                var row, res, err_2;
+                var row, res, err_3;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -25325,8 +25344,8 @@
                             _a.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            err_2 = _a.sent();
-                            console.error(err_2 && err_2.message || err_2, err_2);
+                            err_3 = _a.sent();
+                            console.error(err_3 && err_3.message || err_3, err_3);
                             return [3 /*break*/, 4];
                         case 4:
                             this._editingRowCount++;