@sumaris-net/ngx-components 1.23.14 → 1.23.16

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

@@ -20853,10 +20853,11 @@
                 return __generator(this, function (_b) {
                     if (this.debug)
                         console.debug('[memory-data-service] Stopping...');
-                    this.savingSubject.next(false);
-                    this.dirtySubject.next(false);
                     this.dataSubject.complete();
+                    this.dataSubject.unsubscribe();
                     this.dataSubject = new rxjs.BehaviorSubject(null);
+                    this.savingSubject.next(false);
+                    this.dirtySubject.next(false);
                     return [2 /*return*/];
                 });
             });
@@ -20886,25 +20887,40 @@
                             if (isNil(originalData)) {
                                 console.warn('[memory-data-service] Cannot load all: no value set. Will return empty result');
                             }
-                            // Wait while idle
-                            return [4 /*yield*/, this.waitWhileSaving()];
+                            _b.label = 1;
                         case 1:
-                            // Wait while idle
+                            _b.trys.push([1, , 6, 7]);
+                            if (!!this.started) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.ready()];
+                        case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3:
+                            if (!this.saving) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this.waitWhileSaving()];
+                        case 4:
                             _b.sent();
+                            _b.label = 5;
+                        case 5: return [3 /*break*/, 7];
+                        case 6:
+                            if (!this.started)
+                                return [2 /*return*/, undefined]; // Stopped (e.g. after saved)
+                            return [7 /*endfinally*/];
+                        case 7:
                             excludedDataByFilter = [];
-                            _b.label = 2;
-                        case 2:
-                            _b.trys.push([2, , 5, 6]);
+                            _b.label = 8;
+                        case 8:
+                            _b.trys.push([8, , 11, 12]);
                             if (isEmptyArray(originalData)) {
                                 return [2 /*return*/, { data: [], total: 0 }];
                             }
                             data = this._sortFn(originalData, sortBy, sortDirection);
-                            if (!this._onLoad) return [3 /*break*/, 4];
+                            if (!this._onLoad) return [3 /*break*/, 10];
                             return [4 /*yield*/, this._onLoad(data)];
-                        case 3:
+                        case 9:
                             data = _b.sent();
-                            _b.label = 4;
-                        case 4:
+                            _b.label = 10;
+                        case 10:
                             // Apply filter (will update hiddenData)
                             data = this.filter(data, filter, excludedDataByFilter);
                             total = data.length;
@@ -20961,13 +20977,13 @@
                                 }); };
                             }
                             return [2 /*return*/, res];
-                        case 5:
+                        case 11:
                             // Remember hidden data
                             if (offset === 0) {
                                 this._hiddenData = !excludedDataByPagination ? excludedDataByFilter : excludedDataByFilter.concat.apply(excludedDataByFilter, __spread(excludedDataByPagination));
                             }
                             return [7 /*endfinally*/];
-                        case 6: return [2 /*return*/];
+                        case 12: return [2 /*return*/];
                     }
                 });
             });
@@ -20979,7 +20995,8 @@
             return this.dataSubject
                 .pipe(operators.takeUntil(this.stopSubject), 
             // Warn if waiting value to be set
-            operators.tap(function (data) { return !data && console.debug('[memory-data-service] Waiting value to be set...'); }), operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }));
+            operators.tap(function (data) { return _this.debug && !data && console.debug('[memory-data-service] Waiting value to be set...'); }), operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }), operators.filter(isNotNil) // Skip no result (e.g. when stopped)
+            );
         };
         InMemoryEntitiesService.prototype.saveAll = function (data, options) {
             return __awaiter(this, void 0, void 0, function () {