@sumaris-net/ngx-components 1.23.15 → 1.23.17

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

@@ -10097,20 +10097,20 @@
                 ? function () { return prerequisiteService.ready(); }
                 : function () { return Promise.resolve(); };
         }
-        StartableService.prototype.start = function () {
+        StartableService.prototype.start = function (opts) {
             var _this = this;
             if (this._startPromise)
                 return this._startPromise;
             if (this._started)
                 return Promise.resolve(this._data);
             this._startPromise = this._startPrerequisite()
-                .then(function () { return _this.ngOnStart(); })
+                .then(function () { return _this.ngOnStart(opts); })
                 .then(function (data) {
                 _this._data = data;
                 _this._started = true;
                 _this._startPromise = undefined;
-                _this.startSubject.next(_this._data);
-                return _this._data;
+                _this.startSubject.next(data);
+                return data;
             })
                 .catch(function (err) {
                 console.error('Failed to start a service: ' + (err && err.message || err), err);
@@ -10120,6 +10120,17 @@
             });
             return this._startPromise;
         };
+        StartableService.prototype.ready = function () {
+            if (this._started)
+                return Promise.resolve(this._data);
+            if (this._startPromise)
+                return this._startPromise;
+            if (this._startByReadyFunction)
+                return this.start();
+            return this.startSubject
+                .pipe(operators.takeUntil(this.stopSubject))
+                .toPromise();
+        };
         StartableService.prototype.stop = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var err_1;
@@ -10147,7 +10158,7 @@
                 });
             });
         };
-        StartableService.prototype.restart = function () {
+        StartableService.prototype.restart = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -10164,7 +10175,7 @@
                             _b.sent(); // Then stop if started
                             _b.label = 4;
                         case 4: // Then stop if started
-                        return [2 /*return*/, this.start()]; // Then start again
+                        return [2 /*return*/, this.start(opts)]; // Then start again
                     }
                 });
             });
@@ -10183,23 +10194,20 @@
             enumerable: false,
             configurable: true
         });
-        StartableService.prototype.ready = function () {
-            if (this._started)
-                return Promise.resolve(this._data);
-            if (this._startPromise)
-                return this._startPromise;
-            if (this._startByReadyFunction)
-                return this.start();
-            return this.startSubject
-                .pipe(operators.takeUntil(this.stopSubject))
-                .toPromise();
-        };
+        Object.defineProperty(StartableService.prototype, "stopped", {
+            get: function () {
+                return !this._started && !this._startPromise;
+            },
+            enumerable: false,
+            configurable: true
+        });
         StartableService.prototype.registerSubscription = function (sub) {
             this._subscription = this._subscription || new rxjs.Subscription();
             return this._subscription.add(sub);
         };
         StartableService.prototype.unregisterSubscription = function (sub) {
-            this._subscription.remove(sub);
+            var _a;
+            (_a = this._subscription) === null || _a === void 0 ? void 0 : _a.remove(sub);
         };
         StartableService.prototype.unsubscribe = function () {
             var _a;
@@ -10207,11 +10215,7 @@
             this._subscription = null;
         };
         StartableService.prototype.ngOnStop = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    return [2 /*return*/];
-                });
-            });
+            // Can be overwritten by subclasses
         };
         return StartableService;
     }());
@@ -12735,6 +12739,166 @@
     Toasts.counter = 0;
     Toasts.stackSize = 0;
 
+    /**
+     * Same as StartableService, bu with a dataSubject instead of a simple 'data' property
+     */
+    var StartableObservableService = /** @class */ (function () {
+        function StartableObservableService(prerequisiteService) {
+            this.dataSubject = new rxjs.BehaviorSubject(null);
+            this.startSubject = new rxjs.Subject();
+            this.stopSubject = new rxjs.Subject();
+            this._debug = false;
+            this._startByReadyFunction = true; // should start when calling ready() ?
+            this._started = false;
+            this._startPromise = null;
+            this._startPrerequisite = null;
+            this._subscription = null;
+            this._startPrerequisite = prerequisiteService
+                ? function () { return prerequisiteService.ready(); }
+                : function () { return Promise.resolve(); };
+        }
+        StartableObservableService.prototype.start = function (opts) {
+            var _this = this;
+            if (this._startPromise)
+                return this._startPromise;
+            if (this._started)
+                return Promise.resolve(this.dataSubject.value);
+            this._startPromise = this._startPrerequisite()
+                .then(function () { return _this.ngOnStart(opts); })
+                .then(function (data) {
+                _this._started = true;
+                _this._startPromise = undefined;
+                // Should be done AFTER 'this._started = true', because of the 'filter' operator, inside ready() function
+                _this.dataSubject.next(data);
+                _this.startSubject.next(data);
+                return data;
+            })
+                .catch(function (err) {
+                console.error('Failed to start a service: ' + (err && err.message || err), err);
+                _this._started = false;
+                _this._startPromise = null;
+                return null;
+            });
+            return this._startPromise;
+        };
+        StartableObservableService.prototype.ready = function () {
+            var _this = this;
+            if (this._started)
+                return Promise.resolve(this.dataSubject.value);
+            if (this._startPromise)
+                return this._startPromise;
+            if (this._startByReadyFunction)
+                return this.start();
+            return this.dataSubject
+                .pipe(operators.takeUntil(this.stopSubject), 
+            // Wait start() to be called, to exclude the initial 'null' value
+            operators.filter(function (_) { return _this._started; }))
+                .toPromise();
+        };
+        StartableObservableService.prototype.stop = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var err_1;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, 3, 4]);
+                            this.unsubscribe();
+                            return [4 /*yield*/, this.ngOnStop()];
+                        case 1:
+                            _b.sent();
+                            return [3 /*break*/, 4];
+                        case 2:
+                            err_1 = _b.sent();
+                            console.error('Failed to stop a service: ' + (err_1 && err_1.message || err_1), err_1);
+                            return [3 /*break*/, 4];
+                        case 3:
+                            this._started = false;
+                            this._startPromise = undefined;
+                            this.stopSubject.next(); // Stop all running observables
+                            this.dataSubject.next(null); // Reset data
+                            return [7 /*endfinally*/];
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        StartableObservableService.prototype.restart = function (opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!this._startPromise) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this._startPromise];
+                        case 1:
+                            _b.sent(); // Wait end of previous loading
+                            _b.label = 2;
+                        case 2:
+                            if (!this._started) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.stop()];
+                        case 3:
+                            _b.sent(); // Then stop if started
+                            _b.label = 4;
+                        case 4: // Then stop if started
+                        return [2 /*return*/, this.start(opts)]; // Then start again
+                    }
+                });
+            });
+        };
+        Object.defineProperty(StartableObservableService.prototype, "started", {
+            get: function () {
+                return this._started;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(StartableObservableService.prototype, "starting", {
+            get: function () {
+                return !!this._startPromise;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(StartableObservableService.prototype, "stopped", {
+            get: function () {
+                return !this._started && !this._startPromise;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(StartableObservableService.prototype, "data", {
+            get: function () {
+                return this.dataSubject.value;
+            },
+            set: function (value) {
+                if (this.dataSubject.value !== value) {
+                    this.dataSubject.next(value);
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
+        StartableObservableService.prototype.registerSubscription = function (sub) {
+            this._subscription = this._subscription || new rxjs.Subscription();
+            return this._subscription.add(sub);
+        };
+        StartableObservableService.prototype.unregisterSubscription = function (sub) {
+            var _a;
+            (_a = this._subscription) === null || _a === void 0 ? void 0 : _a.remove(sub);
+        };
+        StartableObservableService.prototype.unsubscribe = function () {
+            var _a;
+            (_a = this._subscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            this._subscription = null;
+        };
+        StartableObservableService.prototype.ngOnStop = function () {
+            // Can be overwritten by subclasses
+        };
+        return StartableObservableService;
+    }());
+    StartableObservableService.ctorParameters = function () { return [
+        { type: undefined, decorators: [{ type: i0.Optional }] }
+    ]; };
+
     function getConnectionType(type) {
         switch (type) {
             case ngx$4.Connection.NONE:
@@ -12780,7 +12944,7 @@
             _this.splashScreen = splashScreen;
             _this.translate = translate;
             _this.toastController = toastController;
-            _this.onPeerChanges = _this.startSubject.pipe(operators.map(function (peer) { return peer && peer.url; }), operators.filter(isNotNilOrBlank), operators.distinctUntilChanged());
+            _this.onPeerChanges = _this.startSubject.pipe(operators.map(function (peer) { return peer === null || peer === void 0 ? void 0 : peer.url; }), operators.filter(isNotNilOrBlank), operators.distinctUntilChanged());
             _this.onNetworkStatusChanges = new rxjs.BehaviorSubject(null);
             _this.onResetNetworkCache = new i0.EventEmitter(true);
             _this._listeners = {};
@@ -12793,8 +12957,7 @@
                 _this._timerRefreshPeriod = NetworkRefreshTimerPeriod.DESKTOP;
                 _this._timerRefreshCondition = function () { return true; }; // Always check
             }
-            _this.resetData();
-            _this.startSubject.subscribe(function () { return _this.ngOnAfterStart(); });
+            _this.startSubject.subscribe(function (peer) { return _this.ngOnAfterStart(peer); });
             // For DEV only
             _this._debug = !environment.production;
             return _this;
@@ -12825,11 +12988,11 @@
         });
         Object.defineProperty(NetworkService.prototype, "peer", {
             get: function () {
-                return this._data && this._data.clone();
+                var _a;
+                return (_a = this.dataSubject.value) === null || _a === void 0 ? void 0 : _a.clone();
             },
             set: function (peer) {
-                this._startingPeer = peer;
-                this.restart();
+                this.restart(peer);
             },
             enumerable: false,
             configurable: true
@@ -12895,9 +13058,9 @@
                             // Disable the offline mode
                             this.setForceOffline(false);
                             // Restart
-                            this._startingPeer = peer;
-                            return [4 /*yield*/, this.restart()];
+                            return [4 /*yield*/, this.restart(peer)];
                         case 7:
+                            // Restart
                             _c.sent();
                             // Wait a promise, before recheck
                             return [4 /*yield*/, this.emit('beforeTryOnlineFinish', this.online)];
@@ -13209,20 +13372,21 @@
             });
         };
         /* -- protected functions -- */
-        NetworkService.prototype.ngOnStart = function () {
+        NetworkService.prototype.ngOnStart = function (peer) {
             return __awaiter(this, void 0, void 0, function () {
-                var peer, _b;
+                var _b;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
                             console.info('[network] Starting network...');
-                            _b = this._startingPeer;
+                            _b = peer;
                             if (_b) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.restoreLocally()];
                         case 1:
                             _b = (_c.sent());
                             _c.label = 2;
                         case 2:
+                            // Restoring local settings
                             peer = _b;
                             // Make sure to hide the splashscreen, before open the modal
                             if (!peer && this.splashScreen)
@@ -13242,7 +13406,7 @@
                 });
             });
         };
-        NetworkService.prototype.ngOnAfterStart = function () {
+        NetworkService.prototype.ngOnAfterStart = function (peer) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
@@ -13250,7 +13414,7 @@
                     switch (_b.label) {
                         case 0: 
                         // Wait settings starts, then save peer in settings
-                        return [4 /*yield*/, this.settings.apply({ peerUrl: this._data.url })];
+                        return [4 /*yield*/, this.settings.apply({ peerUrl: peer.url })];
                         case 1:
                             // Wait settings starts, then save peer in settings
                             _b.sent();
@@ -13268,16 +13432,10 @@
             });
         };
         NetworkService.prototype.ngOnStop = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
-                    this.resetData();
-                    // Stop timer if cannot refresh anymore
-                    if (this._timerRefreshCondition() === false) {
-                        this.stopRefreshTimer();
-                    }
-                    return [2 /*return*/];
-                });
-            });
+            // Stop timer, if cannot refresh anymore
+            if (this._timerRefreshCondition() === false) {
+                this.stopRefreshTimer();
+            }
         };
         /**
          * Try to restore peer from the local storage
@@ -13425,9 +13583,6 @@
                 }
             }
         };
-        NetworkService.prototype.resetData = function () {
-            this._data = null;
-        };
         /**
          * Get default peers, from environment
          */
@@ -13474,7 +13629,7 @@
             });
         };
         return NetworkService;
-    }(StartableService));
+    }(StartableObservableService));
     NetworkService.ɵprov = i0.ɵɵdefineInjectable({ factory: function NetworkService_Factory() { return new NetworkService(i0.ɵɵinject(i1$4.DOCUMENT), i0.ɵɵinject(i1$5.Platform), i0.ɵɵinject(i1$5.ModalController), i0.ɵɵinject(CryptoService), i0.ɵɵinject(i3$2.Storage), i0.ɵɵinject(LocalSettingsService), i0.ɵɵinject(i6.CacheService), i0.ɵɵinject(i2$1.HttpClient), i0.ɵɵinject(ENVIRONMENT), i0.ɵɵinject(i9.Network, 8), i0.ɵɵinject(i10.SplashScreen, 8), i0.ɵɵinject(i1$2.TranslateService, 8), i0.ɵɵinject(i1$5.ToastController, 8)); }, token: NetworkService, providedIn: "root" });
     NetworkService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
@@ -20793,7 +20948,7 @@
             _this.dataType = dataType;
             _this.filterType = filterType;
             _this.debug = false;
-            _this.dataSubject = new rxjs.BehaviorSubject(null);
+            _this._hiddenData = null;
             _this.dirtySubject = new rxjs.BehaviorSubject(false);
             _this.savingSubject = new rxjs.BehaviorSubject(false);
             options = Object.assign({ onSort: _this.sort }, options);
@@ -20808,6 +20963,7 @@
                 }
                 return undefined;
             });
+            _this._startByReadyFunction = false; // Need setValue() to be called, to start the service
             _this._sortByReplacement = Object.assign({
                 // Detect rankOrder on the entity class
                 id: (Object.getOwnPropertyNames(new dataType()).findIndex(function (key) { return key === 'rankOrder'; }) !== -1) ? 'rankOrder' : undefined
@@ -20838,25 +20994,30 @@
             enumerable: false,
             configurable: true
         });
-        InMemoryEntitiesService.prototype.ngOnStart = function () {
+        InMemoryEntitiesService.prototype.ngOnStart = function (data) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
+                    if (!data)
+                        throw new Error('Missing required data, to start this service');
                     if (this.debug)
                         console.debug('[memory-data-service] Starting...');
-                    return [2 /*return*/, firstNotNil(this.dataSubject, { stop: this.stopSubject })
-                            .toPromise()];
+                    this._hiddenData = [];
+                    this.markAsSaved();
+                    this.markAsPristine();
+                    return [2 /*return*/, data];
                 });
             });
         };
         InMemoryEntitiesService.prototype.ngOnStop = function () {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     if (this.debug)
                         console.debug('[memory-data-service] Stopping...');
-                    this.savingSubject.next(false);
-                    this.dirtySubject.next(false);
                     this.dataSubject.complete();
-                    this.dataSubject = new rxjs.BehaviorSubject(null);
+                    this.dataSubject.unsubscribe();
+                    this._hiddenData = null;
+                    this.markAsSaved();
+                    this.markAsPristine();
                     return [2 /*return*/];
                 });
             });
@@ -20866,19 +21027,24 @@
         };
         InMemoryEntitiesService.prototype.setValue = function (data) {
             if (this.dataSubject.value !== data) {
-                if (!this.started)
-                    this.start();
-                this._hiddenData = [];
-                this.dataSubject.next(data);
+                // If service already started, then update data
+                if (this.started) {
+                    this._hiddenData = [];
+                    this.dataSubject.next(data);
+                    this.markAsPristine();
+                }
+                // if service not started yet, then start it, using given data
+                else {
+                    this.start(data);
+                }
             }
-            this.markAsPristine();
         };
         InMemoryEntitiesService.prototype.loadAll = function (offset, size, sortBy, sortDirection, filter, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var originalData, excludedDataByFilter, excludedDataByPagination, data, total, res, nextOffset_1;
+                var originalData, err_1, excludedDataByFilter, excludedDataByPagination, data, total, res, nextOffset_1;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             offset = offset >= 0 ? offset : 0;
                             size = size >= 0 ? size : -1;
@@ -20886,32 +21052,44 @@
                             if (isNil(originalData)) {
                                 console.warn('[memory-data-service] Cannot load all: no value set. Will return empty result');
                             }
-                            if (!!this.started) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.ready()];
+                            _c.label = 1;
                         case 1:
-                            _b.sent();
-                            _b.label = 2;
+                            _c.trys.push([1, 4, , 5]);
+                            // Wait service is ready
+                            return [4 /*yield*/, this.ready()];
                         case 2:
-                            if (!this.saving) return [3 /*break*/, 4];
-                            return [4 /*yield*/, this.waitWhileSaving()];
+                            // Wait service is ready
+                            _c.sent();
+                            // Wait while busy (e.g. when saving, or deleting)
+                            return [4 /*yield*/, this.waitIdle({ stopError: false /*avoid error when stopped*/ })];
                         case 3:
-                            _b.sent();
-                            _b.label = 4;
+                            // Wait while busy (e.g. when saving, or deleting)
+                            _c.sent();
+                            return [3 /*break*/, 5];
                         case 4:
-                            excludedDataByFilter = [];
-                            _b.label = 5;
+                            err_1 = _c.sent();
+                            // Should be a stop error: log and continue
+                            if (!this.stopped)
+                                console.error('Unexpected error, while waiting :', err_1);
+                            return [3 /*break*/, 5];
                         case 5:
-                            _b.trys.push([5, , 8, 9]);
+                            // Make sure service is not stopped
+                            if (this.stopped)
+                                return [2 /*return*/, undefined];
+                            excludedDataByFilter = [];
+                            _c.label = 6;
+                        case 6:
+                            _c.trys.push([6, , 9, 10]);
                             if (isEmptyArray(originalData)) {
                                 return [2 /*return*/, { data: [], total: 0 }];
                             }
                             data = this._sortFn(originalData, sortBy, sortDirection);
-                            if (!this._onLoad) return [3 /*break*/, 7];
+                            if (!this._onLoad) return [3 /*break*/, 8];
                             return [4 /*yield*/, this._onLoad(data)];
-                        case 6:
-                            data = _b.sent();
-                            _b.label = 7;
                         case 7:
+                            data = _c.sent();
+                            _c.label = 8;
+                        case 8:
                             // Apply filter (will update hiddenData)
                             data = this.filter(data, filter, excludedDataByFilter);
                             total = data.length;
@@ -20959,22 +21137,22 @@
                             if (nextOffset_1 < total) {
                                 res.fetchMore = function () { return _this.loadAll(nextOffset_1, size, sortBy, sortDirection, filter, opts)
                                     .then(function (res) {
-                                    var _a;
+                                    var _a, _b;
                                     // Update hidden data (remove new fetched item)
                                     if ((_a = res.data) === null || _a === void 0 ? void 0 : _a.length) {
-                                        _this._hiddenData = _this._hiddenData.filter(function (item) { return !res.data.includes(item); });
+                                        _this._hiddenData = (_b = _this._hiddenData) === null || _b === void 0 ? void 0 : _b.filter(function (item) { return !res.data.includes(item); });
                                     }
                                     return res;
                                 }); };
                             }
                             return [2 /*return*/, res];
-                        case 8:
+                        case 9:
                             // Remember hidden data
                             if (offset === 0) {
                                 this._hiddenData = !excludedDataByPagination ? excludedDataByFilter : excludedDataByFilter.concat.apply(excludedDataByFilter, __spread(excludedDataByPagination));
                             }
                             return [7 /*endfinally*/];
-                        case 9: return [2 /*return*/];
+                        case 10: return [2 /*return*/];
                     }
                 });
             });
@@ -20986,20 +21164,21 @@
             return this.dataSubject
                 .pipe(operators.takeUntil(this.stopSubject), 
             // Warn if waiting value to be set
-            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.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 () {
-                var res, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var res, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!this.dataSubject.value)
                                 throw new Error('[memory-service] Could not save, because value not set');
                             this.markAsSaving();
-                            _c.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _c.trys.push([1, , 6, 7]);
+                            _d.trys.push([1, , 6, 7]);
                             // Restore hidden data
                             if (isNotEmptyArray(this._hiddenData))
                                 data = data.concat.apply(data, __spread(this._hiddenData));
@@ -21008,14 +21187,14 @@
                             if (!((res instanceof Promise))) return [3 /*break*/, 3];
                             return [4 /*yield*/, res];
                         case 2:
-                            _b = _c.sent();
+                            _c = _d.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _b = res;
-                            _c.label = 4;
+                            _c = res;
+                            _d.label = 4;
                         case 4:
-                            data = _b;
-                            _c.label = 5;
+                            data = _c;
+                            _d.label = 5;
                         case 5:
                             this.dataSubject.next(data);
                             this.markAsDirty();
@@ -21032,7 +21211,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 var data, updatedData, deleteCount;
                 var _this = this;
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     data = this.dataSubject.value;
                     if (!data)
                         throw new Error('[memory-service] Could not delete, because value not set');
@@ -21093,6 +21272,18 @@
             enumerable: false,
             configurable: true
         });
+        InMemoryEntitiesService.prototype.waitIdle = function (opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.waitWhileSaving(opts)];
+                        case 1:
+                            _c.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         /* -- protected methods -- */
         InMemoryEntitiesService.prototype.filter = function (data, _filter, hiddenData) {
             // if filter is DataFilter instance, use its test function
@@ -21118,9 +21309,14 @@
             }));
         };
         InMemoryEntitiesService.prototype.waitWhileSaving = function (opts) {
-            if (!this.saving)
-                return;
-            return firstFalsePromise(this.savingSubject, Object.assign({ stop: (opts === null || opts === void 0 ? void 0 : opts.stop) || rxjs.merge(this.stopSubject, this.dataSubject) }, opts));
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_c) {
+                    if (this.saving) {
+                        return [2 /*return*/, firstFalsePromise(this.savingSubject, Object.assign({ stop: (opts === null || opts === void 0 ? void 0 : opts.stop) || rxjs.merge(this.stopSubject, this.dataSubject), stopError: false }, opts))];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         };
         InMemoryEntitiesService.prototype.markAsSaving = function () {
             if (!this.savingSubject.value) {
@@ -21143,7 +21339,7 @@
             }
         };
         return InMemoryEntitiesService;
-    }(StartableService));
+    }(StartableObservableService));
     InMemoryEntitiesService.decorators = [
         { type: i0.Directive }
     ];
@@ -25855,8 +26051,8 @@
             _this._debug = false;
             _this._creating = false;
             _this._saving = false;
-            _this._stopWatching$ = new rxjs.Subject();
             _this._fetchMoreFn = null;
+            _this._stopWatchSubject = new rxjs.Subject();
             _this.loadingSubject = new rxjs.BehaviorSubject(undefined);
             _this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
             _this._debug = (options === null || options === void 0 ? void 0 : options.suppressErrors) === false && !environment.production;
@@ -25914,16 +26110,28 @@
             enumerable: false,
             configurable: true
         });
+        /**
+         * @deprecated use disconnect
+         */
         EntitiesTableDataSource.prototype.ngOnDestroy = function () {
-            this._stopWatching$.next();
-            this._stopWatching$.complete();
-            this._stopWatching$.unsubscribe();
-            this.loadingSubject.complete();
-            this.loadingSubject.unsubscribe();
+            this.close();
+        };
+        /**
+         * @deprecated use disconnect
+         */
+        EntitiesTableDataSource.prototype.close = function () {
+            if (!this._stopWatchSubject.closed) {
+                console.debug('[table-datasource] Closing...');
+                this._stopWatchSubject.next();
+                this._stopWatchSubject.complete();
+                this._stopWatchSubject.unsubscribe();
+                this.loadingSubject.complete();
+                this.loadingSubject.unsubscribe();
+            }
         };
         EntitiesTableDataSource.prototype.watchAll = function (offset, size, sortBy, sortDirection, filter) {
             var _this = this;
-            this._stopWatching$.next();
+            this._stopWatchSubject.next();
             this._fetchMoreFn = null;
             this.markAsLoading();
             return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
@@ -25941,7 +26149,7 @@
                 return res;
             }), 
             // Stop this pipe next time we call watchAll()
-            operators.takeUntil(this._stopWatching$)
+            operators.takeUntil(this._stopWatchSubject)
             // ⚠ Notice: Don't put any operator after takeUntil to avoid potential subscription leaks
             );
         };
@@ -26051,11 +26259,13 @@
         };
         EntitiesTableDataSource.prototype.connect = function (collectionViewer) {
             // DEBUG console.debug("[entities-datasource] connect");
+            this.viewer = collectionViewer;
             return _super_1.prototype.connect.call(this, collectionViewer);
         };
         EntitiesTableDataSource.prototype.disconnect = function (collectionViewer) {
+            console.debug('[table-datasource] Disconnecting...');
             _super_1.prototype.disconnect.call(this, collectionViewer);
-            this._stopWatching$.next();
+            this.close();
         };
         EntitiesTableDataSource.prototype.waitIdle = function (debounceTimeMs) {
             return firstFalsePromise(this.loadingSubject
@@ -26736,7 +26946,6 @@
         };
         AppTable.prototype.ngOnDestroy = function () {
             var _this = this;
-            var _a;
             this._subscription.unsubscribe();
             // Unsubscribe column value changes
             Object.keys(this._cellValueChangesDefs).forEach(function (col) { return _this.stopCellValueChanges(col, true); });
@@ -26761,7 +26970,6 @@
             this.onError.unsubscribe();
             this.destroySubject.next();
             this.destroySubject.unsubscribe();
-            (_a = this._dataSource) === null || _a === void 0 ? void 0 : _a.ngOnDestroy();
         };
         AppTable.prototype.updateView = function (res, opts) {
             return __awaiter(this, void 0, void 0, function () {
@@ -26799,12 +27007,11 @@
             }
         };
         AppTable.prototype.resetDataSource = function () {
-            var _a;
             if (this._dataSourceLoadingSubscription) {
                 this._dataSourceLoadingSubscription.unsubscribe();
                 this._subscription.remove(this._dataSourceLoadingSubscription);
             }
-            (_a = this._dataSource) === null || _a === void 0 ? void 0 : _a.ngOnDestroy();
+            //this._dataSource?.close();
             this._dataSource = null;
         };
         AppTable.prototype.addColumnDef = function (column) {
@@ -30431,7 +30638,7 @@
     };
 
     var moment$6 = momentImported__namespace;
-    var USER_EVENT_SERVICE = new i0.InjectionToken('UserEventService');
+    var APP_USER_EVENT_SERVICE = new i0.InjectionToken('UserEventService');
     var AbstractUserEventService = /** @class */ (function (_super) {
         __extends(AbstractUserEventService, _super);
         function AbstractUserEventService(graphql, accountService, network, translate, options) {
@@ -31347,7 +31554,7 @@
         { type: i0.ChangeDetectorRef },
         { type: i1$5.PopoverController },
         { type: LocalSettingsService, decorators: [{ type: i0.Optional }] },
-        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [USER_EVENT_SERVICE,] }] }
+        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [APP_USER_EVENT_SERVICE,] }] }
     ]; };
     UserEventNotificationList.propDecorators = {
         debug: [{ type: i0.Input }],
@@ -31364,11 +31571,12 @@
         ionItems: [{ type: i0.ViewChildren, args: [i1$5.IonItem,] }]
     };
 
-    var AppUserEventNotificationIcon = /** @class */ (function () {
-        function AppUserEventNotificationIcon(userEventService, accountService, popoverController) {
+    var UserEventNotificationIcon = /** @class */ (function () {
+        function UserEventNotificationIcon(userEventService, accountService, popoverController, cd) {
             this.userEventService = userEventService;
             this.accountService = accountService;
             this.popoverController = popoverController;
+            this.cd = cd;
             this.debug = false;
             this.titleI18n = 'SOCIAL.USER_EVENT.NOTIFICATION.TITLE';
             this.disabled = false;
@@ -31377,18 +31585,25 @@
             this._readEvent = new i0.EventEmitter();
             this._readEvents = new i0.EventEmitter();
         }
-        Object.defineProperty(AppUserEventNotificationIcon.prototype, "countChanges", {
+        Object.defineProperty(UserEventNotificationIcon.prototype, "countChanges", {
             get: function () {
+                var _this = this;
                 if (!this.userEventService)
                     return rxjs.of();
                 return this.userEventService
                     .countSubject
-                    .pipe(operators.map(function (value) { return value === 0 ? undefined : value; }));
+                    .pipe(operators.tap(function (value) {
+                    var visible = !_this.autoHide || value > 0;
+                    if (_this.visible !== visible) {
+                        _this.visible = visible;
+                        _this.cd.markForCheck();
+                    }
+                }), operators.map(function (value) { return value === 0 ? undefined : value; }));
             },
             enumerable: false,
             configurable: true
         });
-        AppUserEventNotificationIcon.prototype.ngOnInit = function () {
+        UserEventNotificationIcon.prototype.ngOnInit = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_a) {
@@ -31397,8 +31612,10 @@
                             if (isNil(this.userEventService)) {
                                 console.warn(this._logPrefix + "No service injected");
                                 this.disabled = true;
+                                this.visible = false;
                                 return [2 /*return*/];
                             }
+                            this.visible = toBoolean(this.visible, !this.autoHide);
                             // Wait service
                             return [4 /*yield*/, this.userEventService.ready()];
                         case 1:
@@ -31417,7 +31634,7 @@
                 });
             });
         };
-        AppUserEventNotificationIcon.prototype.showList = function (event) {
+        UserEventNotificationIcon.prototype.showList = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var popover;
                 return __generator(this, function (_a) {
@@ -31450,30 +31667,32 @@
                 });
             });
         };
-        AppUserEventNotificationIcon.prototype.ngOnDestroy = function () {
+        UserEventNotificationIcon.prototype.ngOnDestroy = function () {
             if (this.debug) {
                 console.debug(this._logPrefix + "Destroying");
             }
         };
-        return AppUserEventNotificationIcon;
+        return UserEventNotificationIcon;
     }());
-    AppUserEventNotificationIcon.decorators = [
+    UserEventNotificationIcon.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-user-event-notification-icon',
-                    template: "<button\n  #button\n  mat-icon-button\n  [title]=\"titleI18n | translate\"\n  [disabled]=\"disabled\"\n  (click)=\"showList($event)\"\n>\n  <mat-icon\n    [matBadge]=\"countChanges | async\"\n    matBadgeColor=\"accent\"\n    matBadgeSize=\"small\"\n    matBadgePosition=\"above after\"\n  >notifications\n  </mat-icon>\n</button>\n\n",
+                    template: "<button\n  #button\n  mat-icon-button\n  [title]=\"titleI18n | translate\"\n  [disabled]=\"disabled\"\n  *ngIf=\"visible\"\n  (click)=\"showList($event)\"\n>\n  <mat-icon\n    [matBadge]=\"countChanges | async\"\n    matBadgeColor=\"accent\"\n    matBadgeSize=\"small\"\n    matBadgePosition=\"above after\"\n  >notifications\n  </mat-icon>\n</button>\n\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush
                 },] }
     ];
-    AppUserEventNotificationIcon.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [USER_EVENT_SERVICE,] }] },
+    UserEventNotificationIcon.ctorParameters = function () { return [
+        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [APP_USER_EVENT_SERVICE,] }] },
         { type: AccountService },
-        { type: i1$5.PopoverController }
+        { type: i1$5.PopoverController },
+        { type: i0.ChangeDetectorRef }
     ]; };
-    AppUserEventNotificationIcon.propDecorators = {
+    UserEventNotificationIcon.propDecorators = {
         debug: [{ type: i0.Input }],
         titleI18n: [{ type: i0.Input }],
         disabled: [{ type: i0.Input }],
-        filter: [{ type: i0.Input }]
+        filter: [{ type: i0.Input }],
+        autoHide: [{ type: i0.Input }]
     };
 
     var UserEventModule = /** @class */ (function () {
@@ -31490,11 +31709,11 @@
                         ngxJdenticon.NgxJdenticonModule
                     ],
                     declarations: [
-                        AppUserEventNotificationIcon,
+                        UserEventNotificationIcon,
                         UserEventNotificationList
                     ],
                     exports: [
-                        AppUserEventNotificationIcon
+                        UserEventNotificationIcon
                     ]
                 },] }
     ];
@@ -31782,8 +32001,10 @@
         EntityClass({ typename: 'JobProgressionVO' })
     ], exports.JobProgression);
 
-    var JobProgressionServiceToken = new i0.InjectionToken('JobProgressionService');
-    var jobProgressionSubscription = core.gql(templateObject_1$2 || (templateObject_1$2 = __makeTemplateObject(["subscription UpdateJobProgression($id: Int!, $interval: Int){\n  data: updateJobProgression(id: $id, interval: $interval) {\n    id\n    name\n    message\n    current\n    total\n  }\n}"], ["subscription UpdateJobProgression($id: Int!, $interval: Int){\n  data: updateJobProgression(id: $id, interval: $interval) {\n    id\n    name\n    message\n    current\n    total\n  }\n}"])));
+    var APP_JOB_PROGRESSION_SERVICE = new i0.InjectionToken('JobProgressionService');
+    var QUERIES = {
+        listenChanges: core.gql(templateObject_1$2 || (templateObject_1$2 = __makeTemplateObject(["subscription UpdateJobProgression($id: Int!, $interval: Int){\n    data: updateJobProgression(id: $id, interval: $interval) {\n      id\n      name\n      message\n      current\n      total\n    }\n  }"], ["subscription UpdateJobProgression($id: Int!, $interval: Int){\n    data: updateJobProgression(id: $id, interval: $interval) {\n      id\n      name\n      message\n      current\n      total\n    }\n  }"])))
+    };
     var JobProgressionService = /** @class */ (function (_super) {
         __extends(JobProgressionService, _super);
         function JobProgressionService(graphql, environment) {
@@ -31795,6 +32016,15 @@
             _this._debug = !(environment === null || environment === void 0 ? void 0 : environment.production);
             return _this;
         }
+        JobProgressionService.prototype.watchAll = function (options) {
+            return rxjs.of([]); // TODO
+        };
+        JobProgressionService.prototype.addJob = function (id, job) {
+            throw new Error('no implemented');
+        };
+        JobProgressionService.prototype.removeJob = function (id) {
+            throw new Error('no implemented');
+        };
         JobProgressionService.prototype.listenChanges = function (id, options) {
             var _this = this;
             if (isNil(id))
@@ -31802,7 +32032,7 @@
             if (this._debug)
                 console.debug(this._logPrefix + "[WS] Listening changes for job progression {" + id + "}...");
             return this.graphql.subscribe({
-                query: jobProgressionSubscription,
+                query: QUERIES.listenChanges,
                 fetchPolicy: options === null || options === void 0 ? void 0 : options.fetchPolicy,
                 variables: { id: id, interval: toNumber(options === null || options === void 0 ? void 0 : options.interval, 10) },
                 error: { code: SocialErrorCodes.SUBSCRIBE_JOB_PROGRESSION_ERROR, message: 'SOCIAL.ERROR.SUBSCRIBE_JOB_PROGRESSION_ERROR' }
@@ -31845,8 +32075,8 @@
         jobProgressions: [{ type: i0.Input }]
     };
 
-    var JobProgressionComponent = /** @class */ (function () {
-        function JobProgressionComponent(jobProgressionService, popoverController, cd) {
+    var JobProgressionIcon = /** @class */ (function () {
+        function JobProgressionIcon(jobProgressionService, popoverController, cd) {
             this.jobProgressionService = jobProgressionService;
             this.popoverController = popoverController;
             this.cd = cd;
@@ -31862,19 +32092,24 @@
             this._subscriptionsById = {};
             this._logPrefix = '[job-progression] ';
         }
-        JobProgressionComponent.prototype.ngOnInit = function () {
+        JobProgressionIcon.prototype.ngOnInit = function () {
+            var _this = this;
             var _a, _b, _c, _d;
             if (isNil(this.jobProgressionService)) {
                 console.warn(this._logPrefix + "No service injected");
             }
             // parse options
-            this.autoHide = toBoolean((_a = this.options) === null || _a === void 0 ? void 0 : _a.autoHide, false);
+            this.autoHide = toBoolean(this.autoHide, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.autoHide) || false);
             this.visible = !this.autoHide;
             this.autoHideDelay = toNumber((_b = this.options) === null || _b === void 0 ? void 0 : _b.autoHideDelay, 1000);
             this.autoRemove = toBoolean((_c = this.options) === null || _c === void 0 ? void 0 : _c.autoRemove, true);
             this.autoRemoveDelay = toNumber((_d = this.options) === null || _d === void 0 ? void 0 : _d.autoRemoveDelay, 1000);
+            this._subscriptions.add(this.jobProgressionService.watchAll()
+                .subscribe(function (items) {
+                (items || []).forEach(function (item) { return _this.addJob(item.id, item); });
+            }));
         };
-        JobProgressionComponent.prototype.addJob = function (id) {
+        JobProgressionIcon.prototype.addJob = function (id, job) {
             var _this = this;
             if (isNil(this.jobProgressionService)) {
                 console.warn(this._logPrefix + "No service injected. Can't add a job");
@@ -31888,8 +32123,11 @@
                 console.debug(this._logPrefix + "Add job id=" + id);
             }
             // Adding empty job progression
-            var progression = new exports.JobProgression(id);
-            this.jobProgressions.push(progression);
+            var progression = this.getProgression(id);
+            if (!progression) {
+                progression = job || new exports.JobProgression(id);
+                this.jobProgressions.push(progression);
+            }
             this.disabled = false;
             var sub = this.jobProgressionService.listenChanges(id)
                 .pipe(operators.filter(function (progression) {
@@ -31952,7 +32190,7 @@
             this._subscriptionsById[id] = sub;
             this._subscriptions.add(sub);
         };
-        JobProgressionComponent.prototype.removeJob = function (id) {
+        JobProgressionIcon.prototype.removeJob = function (id) {
             if (this.debug) {
                 console.debug(this._logPrefix + "Remove job id=" + id);
             }
@@ -31967,10 +32205,10 @@
             }
             this.updateValue();
         };
-        JobProgressionComponent.prototype.getProgression = function (id) {
+        JobProgressionIcon.prototype.getProgression = function (id) {
             return this.jobProgressions.find(function (progression) { return progression.id === id; });
         };
-        JobProgressionComponent.prototype.updateValue = function () {
+        JobProgressionIcon.prototype.updateValue = function () {
             if (this.debug) {
                 console.debug(this._logPrefix + "Updating value");
             }
@@ -31991,7 +32229,7 @@
             }
             this.markForCheck();
         };
-        JobProgressionComponent.prototype.showList = function (event) {
+        JobProgressionIcon.prototype.showList = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var _e;
                 return __generator(this, function (_f) {
@@ -32024,34 +32262,35 @@
                 });
             });
         };
-        JobProgressionComponent.prototype.markForCheck = function () {
+        JobProgressionIcon.prototype.markForCheck = function () {
             this.cd.markForCheck();
         };
-        JobProgressionComponent.prototype.ngOnDestroy = function () {
+        JobProgressionIcon.prototype.ngOnDestroy = function () {
             if (this.debug) {
                 console.debug(this._logPrefix + "Destroying");
             }
             this._subscriptions.unsubscribe();
         };
-        return JobProgressionComponent;
+        return JobProgressionIcon;
     }());
-    JobProgressionComponent.decorators = [
+    JobProgressionIcon.decorators = [
         { type: i0.Component, args: [{
-                    selector: 'app-job-progression',
+                    selector: 'app-job-progression-icon',
                     template: "<button\n  #button\n  mat-icon-button\n  [title]=\"titleI18n | translate\"\n  [disabled]=\"disabled\"\n  *ngIf=\"visible\"\n  (click)=\"showList($event)\"\n>\n  <mat-icon\n    [matBadge]=\"jobProgressions?.length\"\n    [matBadgeHidden]=\"!jobProgressions?.length\"\n    matBadgeColor=\"accent\"\n    matBadgeSize=\"small\"\n    matBadgePosition=\"above after\"\n  >{{ disabled || jobProgressions?.length ? 'schedule' : 'task_alt' }}\n  </mat-icon>\n  <mat-spinner\n    #spinner\n    *ngIf=\"jobProgressions?.length\"\n    class=\"floating-spinner\"\n    [color]=\"color\"\n    [mode]=\"mode\"\n    [value]=\"value\"\n    diameter=\"30\"\n    strokeWidth=\"3\"\n  ></mat-spinner>\n</button>\n\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
                     styles: [".floating-spinner{position:absolute;top:6px;left:5px}"]
                 },] }
     ];
-    JobProgressionComponent.ctorParameters = function () { return [
-        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [JobProgressionServiceToken,] }] },
+    JobProgressionIcon.ctorParameters = function () { return [
+        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [APP_JOB_PROGRESSION_SERVICE,] }] },
         { type: i1$5.PopoverController },
         { type: i0.ChangeDetectorRef }
     ]; };
-    JobProgressionComponent.propDecorators = {
+    JobProgressionIcon.propDecorators = {
         debug: [{ type: i0.Input }],
         titleI18n: [{ type: i0.Input }],
         options: [{ type: i0.Input }],
+        autoHide: [{ type: i0.Input }],
         jobFinished: [{ type: i0.Output }]
     };
 
@@ -32068,11 +32307,11 @@
                         i1$2.TranslateModule.forChild(),
                     ],
                     declarations: [
-                        JobProgressionComponent,
+                        JobProgressionIcon,
                         JobProgressionList
                     ],
                     exports: [
-                        JobProgressionComponent
+                        JobProgressionIcon
                     ]
                 },] }
     ];
@@ -33937,7 +34176,7 @@
             console.debug('[test-table] Destroying table...');
             _super_1.prototype.ngOnDestroy.call(this);
             this.stopTimer();
-            this.dataService.stop();
+            //this.dataService.stop();
         };
         TableTestPage.prototype.restoreFilter = function () {
             var json = this.settings.getPageSettings(this.settingsId, 'filter');
@@ -34242,79 +34481,51 @@
                 },] }
     ];
 
-    var JobProgressionTestService = /** @class */ (function () {
-        function JobProgressionTestService() {
-        }
-        JobProgressionTestService.prototype.listenChanges = function (id, options) {
-            return rxjs.interval(100).pipe(operators.take(111), operators.map(function (value) {
-                if (value <= 10) {
-                    return {
-                        id: id,
-                        name: "Job #" + id,
-                        current: 0,
-                        total: 0,
-                        message: "Progression pending"
-                    };
-                }
-                value = value - 10;
-                return {
-                    id: id,
-                    name: "Job #" + id,
-                    current: value,
-                    total: 100,
-                    message: "Progression " + value + "/100"
-                };
-            }));
-        };
-        return JobProgressionTestService;
-    }());
-    JobProgressionTestService.decorators = [
-        { type: i0.Injectable }
-    ];
-
     var JobProgressionTestingPage = /** @class */ (function () {
-        function JobProgressionTestingPage() {
-            this.nJob = 0;
+        function JobProgressionTestingPage(jobProgressionService) {
+            this.jobProgressionService = jobProgressionService;
+            this.jobId = 0;
+            this.job = null;
             this.options = {
                 autoHide: true
             };
-            this.job = new exports.JobProgression();
-            this.job.id = 0;
-            this.job.name = 'test';
-            this.job.current = 0;
-            this.job.total = 100;
         }
         JobProgressionTestingPage.prototype.incrementJob = function (value) {
-            this.job.current = Math.max(0, this.job.current + value);
+            this.job = this.job || this.createJob();
+            this.job.current += value || 0;
             this.job.message = "Fake progression (very long message very long message very long message very long message) " + this.job.current + "/100";
             if (this.job.current > this.job.total) {
-                this.jobProgression.removeJob(0);
+                this.jobProgressionService.removeJob(this.job.id);
                 this.job.current = 0;
+                this.job = null; // Forget the job
             }
-            else if (!this.jobProgression.getProgression(0)) {
-                this.jobProgression.jobProgressions.push(this.job);
-            }
-            this.jobProgression.updateValue();
+            this.jobProgressionIcon.updateValue();
         };
         JobProgressionTestingPage.prototype.addJob = function () {
-            // Add fake job
-            this.nJob++;
-            this.jobProgression.addJob(this.nJob);
+            this.job = this.createJob();
+        };
+        JobProgressionTestingPage.prototype.createJob = function () {
+            var job = new exports.JobProgression();
+            job.id = ++this.jobId;
+            job.name = 'test';
+            job.current = 0;
+            job.total = 100;
+            this.jobProgressionService.addJob(job.id, job);
+            return job;
         };
         return JobProgressionTestingPage;
     }());
     JobProgressionTestingPage.decorators = [
         { type: i0.Component, args: [{
                     selector: 'job-progression-testing',
-                    template: "<ion-toolbar color=\"primary\">\n  <ion-title>Job progression</ion-title>\n</ion-toolbar>\n\n<ion-content class=\"ion-padding\">\n\n  <app-job-progression #jobProgression [debug]=\"true\" [options]=\"options\" ></app-job-progression>\n\n  <p>\n    <ion-button (click)=\"incrementJob(10)\">\n      +10\n    </ion-button>\n    <ion-button (click)=\"incrementJob(-10)\">\n      -10\n    </ion-button>\n  </p>\n  <p>\n    <ion-button (click)=\"addJob()\">Add Job</ion-button>\n  </p>\n</ion-content>\n",
-                    providers: [
-                        { provide: JobProgressionServiceToken, useClass: JobProgressionTestService }
-                    ]
+                    template: "<ion-toolbar color=\"primary\">\n  <ion-title>Job progression</ion-title>\n</ion-toolbar>\n\n<ion-content class=\"ion-padding\">\n\n  <app-job-progression-icon #icon [debug]=\"true\" [options]=\"options\" ></app-job-progression-icon>\n\n  <p>\n    <ion-button (click)=\"incrementJob(10)\">\n      +10\n    </ion-button>\n    <ion-button (click)=\"incrementJob(-10)\">\n      -10\n    </ion-button>\n  </p>\n  <p>\n    <ion-button (click)=\"addJob()\">Add Job</ion-button>\n  </p>\n</ion-content>\n"
                 },] }
     ];
-    JobProgressionTestingPage.ctorParameters = function () { return []; };
+    JobProgressionTestingPage.ctorParameters = function () { return [
+        { type: JobProgressionService, decorators: [{ type: i0.Inject, args: [APP_JOB_PROGRESSION_SERVICE,] }] }
+    ]; };
     JobProgressionTestingPage.propDecorators = {
-        jobProgression: [{ type: i0.ViewChild, args: ['jobProgression',] }]
+        jobProgressionIcon: [{ type: i0.ViewChild, args: ['icon',] }]
     };
 
     var JobTestingModule = /** @class */ (function () {
@@ -34804,7 +35015,7 @@
                 },] }
     ];
     UserEventTestingPage.ctorParameters = function () { return [
-        { type: UserEventTestService, decorators: [{ type: i0.Inject, args: [USER_EVENT_SERVICE,] }] },
+        { type: UserEventTestService, decorators: [{ type: i0.Inject, args: [APP_USER_EVENT_SERVICE,] }] },
         { type: i3.Router },
         { type: i1$5.AlertController },
         { type: i1$2.TranslateService }
@@ -34869,6 +35080,55 @@
                 },] }
     ];
 
+    var JobProgressionTestService = /** @class */ (function () {
+        function JobProgressionTestService() {
+            this.jobsSubject = new rxjs.BehaviorSubject([]);
+        }
+        JobProgressionTestService.prototype.addJob = function (id, job) {
+            var exists = this.jobsSubject.value.some(function (j) { return j.id === id; });
+            if (!exists) {
+                job = job || new exports.JobProgression(id);
+                this.jobsSubject.next(__spread(this.jobsSubject.value, [job]));
+            }
+        };
+        JobProgressionTestService.prototype.removeJob = function (id) {
+            var jobs = this.jobsSubject.value;
+            var index = jobs.findIndex(function (j) { return j.id === id; });
+            if (index !== -1) {
+                jobs.splice(index, 1);
+                this.jobsSubject.next(jobs);
+            }
+        };
+        JobProgressionTestService.prototype.watchAll = function () {
+            return this.jobsSubject.asObservable();
+        };
+        JobProgressionTestService.prototype.listenChanges = function (id, options) {
+            return rxjs.interval(100).pipe(operators.take(111), operators.map(function (value) {
+                if (value <= 10) {
+                    return {
+                        id: id,
+                        name: "Job #" + id,
+                        current: 0,
+                        total: 0,
+                        message: "Progression pending"
+                    };
+                }
+                value = value - 10;
+                return {
+                    id: id,
+                    name: "Job #" + id,
+                    current: value,
+                    total: 100,
+                    message: "Progression " + value + "/100"
+                };
+            }));
+        };
+        return JobProgressionTestService;
+    }());
+    JobProgressionTestService.decorators = [
+        { type: i0.Injectable }
+    ];
+
     // Environment
 
     /**
@@ -34881,6 +35141,7 @@
     exports.APP_FORM_ERROR_I18N_KEYS = APP_FORM_ERROR_I18N_KEYS;
     exports.APP_GRAPHQL_TYPE_POLICIES = APP_GRAPHQL_TYPE_POLICIES;
     exports.APP_HOME_BUTTONS = APP_HOME_BUTTONS;
+    exports.APP_JOB_PROGRESSION_SERVICE = APP_JOB_PROGRESSION_SERVICE;
     exports.APP_LOCALES = APP_LOCALES;
     exports.APP_LOCAL_SETTINGS = APP_LOCAL_SETTINGS;
     exports.APP_LOCAL_SETTINGS_OPTIONS = APP_LOCAL_SETTINGS_OPTIONS;
@@ -34888,6 +35149,7 @@
     exports.APP_MENU_ITEMS = APP_MENU_ITEMS;
     exports.APP_MENU_OPTIONS = APP_MENU_OPTIONS;
     exports.APP_TESTING_PAGES = APP_TESTING_PAGES;
+    exports.APP_USER_EVENT_SERVICE = APP_USER_EVENT_SERVICE;
     exports.AboutModal = AboutModal;
     exports.AbstractUserEventService = AbstractUserEventService;
     exports.AccountPage = AccountPage;
@@ -34923,7 +35185,6 @@
     exports.AppTabEditorOptions = AppTabEditorOptions;
     exports.AppTable = AppTable;
     exports.AppTableUtils = AppTableUtils;
-    exports.AppUserEventNotificationIcon = AppUserEventNotificationIcon;
     exports.AppValidatorService = AppValidatorService;
     exports.AppendToInputDirective = AppendToInputDirective;
     exports.ArrayFilterPipe = ArrayFilterPipe;
@@ -35022,9 +35283,9 @@
     exports.IsOnFieldModePipe = IsOnFieldModePipe;
     exports.Job = Job;
     exports.JobModule = JobModule;
-    exports.JobProgressionComponent = JobProgressionComponent;
+    exports.JobProgressionIcon = JobProgressionIcon;
+    exports.JobProgressionList = JobProgressionList;
     exports.JobProgressionService = JobProgressionService;
-    exports.JobProgressionServiceToken = JobProgressionServiceToken;
     exports.JobProgressionTestService = JobProgressionTestService;
     exports.JobProgressionTestingPage = JobProgressionTestingPage;
     exports.JobTestingModule = JobTestingModule;
@@ -35159,7 +35420,6 @@
     exports.TranslatablePipe = TranslatablePipe;
     exports.TranslateContextPipe = TranslateContextPipe;
     exports.TranslateContextService = TranslateContextService;
-    exports.USER_EVENT_SERVICE = USER_EVENT_SERVICE;
     exports.UploadFile = UploadFile;
     exports.UploadFileComponent = UploadFileComponent;
     exports.UploadFilePopover = UploadFilePopover;
@@ -35167,6 +35427,7 @@
     exports.UploadFileTestingPage = UploadFileTestingPage;
     exports.UriUtils = UriUtils;
     exports.UserEventModule = UserEventModule;
+    exports.UserEventNotificationIcon = UserEventNotificationIcon;
     exports.UserEventTestService = UserEventTestService;
     exports.UserEventTestingModule = UserEventTestingModule;
     exports.UserEventTestingPage = UserEventTestingPage;
@@ -35325,15 +35586,15 @@
     exports.ɵ0 = ɵ0;
     exports.ɵa = CustomReuseStrategy;
     exports.ɵb = MatNumpadDomService;
-    exports.ɵc = isFocusableElement;
-    exports.ɵd = RegisterForm;
-    exports.ɵe = AccountValidatorService;
-    exports.ɵf = RegisterModal;
-    exports.ɵg = UserSettingsValidatorService;
-    exports.ɵh = LocalSettingsValidatorService;
-    exports.ɵi = AppUpdateOfflineModeCard;
-    exports.ɵj = UserEventNotificationList;
-    exports.ɵk = JobProgressionList;
+    exports.ɵc = StartableObservableService;
+    exports.ɵd = isFocusableElement;
+    exports.ɵe = RegisterForm;
+    exports.ɵf = AccountValidatorService;
+    exports.ɵg = RegisterModal;
+    exports.ɵh = UserSettingsValidatorService;
+    exports.ɵi = LocalSettingsValidatorService;
+    exports.ɵj = AppUpdateOfflineModeCard;
+    exports.ɵk = UserEventNotificationList;
     exports.ɵl = DateTestPage;
     exports.ɵm = NumpadTestPage;
     exports.ɵn = MatBadgeIconTestPage;