@sumaris-net/ngx-components 1.21.0-beta20 → 1.21.0-beta23

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

@@ -30182,9 +30182,9 @@
             _this.mutations = mutations;
             _this.subscriptions = subscriptions;
             _this.environment = environment;
-            _this._count$ = new rxjs.BehaviorSubject(0);
-            _this._subscriptions = new rxjs.Subscription();
+            _this.count$ = new rxjs.BehaviorSubject(0);
             _this.listeners = [];
+            _this._subscriptions = new rxjs.Subscription();
             _this._logPrefix = '[user-event-service] ';
             // For DEV only
             _this._debug = !(environment === null || environment === void 0 ? void 0 : environment.production);
@@ -30192,7 +30192,7 @@
         }
         Object.defineProperty(AbstractUserEventService.prototype, "userEventCount", {
             get: function () {
-                return this._count$.asObservable();
+                return this.count$.asObservable();
             },
             enumerable: false,
             configurable: true
@@ -30291,7 +30291,7 @@
                 data: entity
             });
             // Update count
-            this._count$.next(this._count$.value + 1);
+            this.count$.next(this.count$.value + 1);
         };
         AbstractUserEventService.prototype.count = function (filter, options) {
             var _a;
@@ -30306,6 +30306,8 @@
                             }
                             if (!filter)
                                 filter = this.defaultFilter();
+                            // Apply last reset date as start date
+                            filter.startDate = this.resetCountDate;
                             filter = this.asFilter(filter);
                             if (this._debug)
                                 console.debug(this._logPrefix + "Counting user events with filter:", filter);
@@ -30332,6 +30334,8 @@
             }
             if (!filter)
                 filter = this.defaultFilter();
+            // Apply last reset date as start date
+            filter.startDate = this.resetCountDate;
             filter = this.asFilter(filter);
             if (this._debug)
                 console.debug(this._logPrefix + "[WS] Listening count changes for user events with filter:", filter);
@@ -30348,7 +30352,7 @@
                 if (total && _this._debug)
                     console.debug(_this._logPrefix + "Received new user events count:", total);
                 // update count
-                _this._count$.next(total);
+                _this.count$.next(total);
                 return total;
             }));
         };
@@ -30648,7 +30652,10 @@
             this.listeners.push(listener);
         };
         AbstractUserEventService.prototype.resetCount = function () {
-            this._count$.next(undefined);
+            this.count$.next(undefined);
+            this.resetCountDate = moment$6();
+            // restart listening count changes
+            this.startListenCountChanges();
         };
         /* -- protected methods -- */
         AbstractUserEventService.prototype.onLogin = function () {
@@ -30662,17 +30669,25 @@
                             if (this._debug)
                                 console.debug(this._logPrefix + "Receiving user events count", count);
                             // Update count
-                            this._count$.next(count);
+                            this.count$.next(count);
                             // Then listen changes
-                            this._listenSubscription = this.listenCountChanges(undefined).subscribe();
+                            this.startListenCountChanges();
                             return [2 /*return*/];
                     }
                 });
             });
         };
         AbstractUserEventService.prototype.onLogout = function () {
+            this.stopListenCountChanges();
+        };
+        AbstractUserEventService.prototype.startListenCountChanges = function () {
+            this.stopListenCountChanges();
+            this._listenSubscription = this.listenCountChanges(undefined).subscribe();
+        };
+        AbstractUserEventService.prototype.stopListenCountChanges = function () {
             var _a;
             (_a = this._listenSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+            this._listenSubscription = undefined;
         };
         AbstractUserEventService.prototype.processUserEvent = function (source, that) {
             var e_3, _b;
@@ -31299,7 +31314,7 @@
             entity = this.processUserEvent(entity);
             entity.id = this.userEvents.length + 1;
             this.userEvents.push(entity);
-            this._count$.next(this.userEvents.length);
+            this.count$.next(this.userEvents.length);
         };
         UserEventTestService.prototype.asFilter = function (filter) {
             return filter;
@@ -31666,8 +31681,10 @@
     // @dynamic
     exports.JobProgression = JobProgression_1 = /** @class */ (function (_super) {
         __extends(JobProgression, _super);
-        function JobProgression() {
-            return _super.call(this, JobProgression_1.TYPENAME) || this;
+        function JobProgression(id) {
+            var _this = _super.call(this, JobProgression_1.TYPENAME) || this;
+            _this.id = id;
+            return _this;
         }
         JobProgression.prototype.fromObject = function (source) {
             _super.prototype.fromObject.call(this, source);
@@ -31779,13 +31796,16 @@
                 console.warn(this._logPrefix + "No service injected. Can't add a job");
                 return;
             }
-            if (this.debug) {
-                console.debug(this._logPrefix + "Add job id=" + id);
-            }
             if (!!this.getProgression(id)) {
                 console.warn(this._logPrefix + "Job (id=" + id + ") already present");
                 return;
             }
+            if (this.debug) {
+                console.debug(this._logPrefix + "Add job id=" + id);
+            }
+            // Adding empty job progression
+            var progression = new exports.JobProgression(id);
+            this.jobProgressions.push(progression);
             this.disabled = false;
             var sub = this.jobProgressionService.listenChanges(id)
                 .pipe(operators.filter(function (progression) {
@@ -31800,7 +31820,7 @@
                 // Get current progression object
                 var currentProgression = _this.getProgression(id);
                 if (!currentProgression) {
-                    // add it
+                    // add it if absent
                     _this.jobProgressions.push(progression);
                     if (_this.debug) {
                         console.debug(_this._logPrefix + "Progression added id=" + id, progression);