@sumaris-net/ngx-components 1.21.0-beta15 → 1.21.0-beta16

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

@@ -31023,7 +31023,6 @@
             this.debug = false;
             this.titleI18n = 'SOCIAL.USER_EVENT.NOTIFICATION.TITLE';
             this.disabled = false;
-            this._subscriptions = new rxjs.Subscription();
             this._logPrefix = '[user-event-notification] ';
             this._readEvent = new i0.EventEmitter();
         }
@@ -31050,31 +31049,8 @@
                         case 1:
                             _b.sent();
                             // listen login/logout
-                            this._loginSubscription = this.accountService.onLogin.subscribe(function () { return __awaiter(_this, void 0, void 0, function () {
-                                var count;
-                                var _this = this;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
-                                        case 0: return [4 /*yield*/, this.userEventService.count(undefined)];
-                                        case 1:
-                                            count = _b.sent();
-                                            if (this.debug)
-                                                console.debug(this._logPrefix + "Receiving user events count", count);
-                                            this.markForCheck();
-                                            // Then listen changes
-                                            return [2 /*return*/, this.userEventService.listenCountChanges(undefined).subscribe(function (count) {
-                                                    if (_this.debug)
-                                                        console.debug(_this._logPrefix + "Receiving new user events count", count);
-                                                    _this.markForCheck();
-                                                })];
-                                    }
-                                });
-                            }); });
-                            this._subscriptions.add(this._loginSubscription);
-                            this._subscriptions.add(this.accountService.onLogout.subscribe(function () {
-                                if (_this._loginSubscription)
-                                    _this._subscriptions.remove(_this._loginSubscription);
-                            }));
+                            this.accountService.onLogin.subscribe(function () { return _this.onLogin(); });
+                            this.accountService.onLogout.subscribe(function () { return _this.onLogout(); });
                             // Subscribe to read event
                             this._readEvent.subscribe(function (value) {
                                 // default: mark event as read
@@ -31113,14 +31089,41 @@
                 });
             });
         };
-        UserEventNotificationComponent.prototype.markForCheck = function () {
-            this.cd.markForCheck();
-        };
         UserEventNotificationComponent.prototype.ngOnDestroy = function () {
             if (this.debug) {
                 console.debug(this._logPrefix + "Destroying");
             }
-            this._subscriptions.unsubscribe();
+            this.onLogout();
+        };
+        UserEventNotificationComponent.prototype.onLogin = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var count;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.userEventService.count(undefined)];
+                        case 1:
+                            count = _b.sent();
+                            if (this.debug)
+                                console.debug(this._logPrefix + "Receiving user events count", count);
+                            this.markForCheck();
+                            // Then listen changes
+                            this._listenSubscription = this.userEventService.listenCountChanges(undefined).subscribe(function (count) {
+                                if (_this.debug)
+                                    console.debug(_this._logPrefix + "Receiving new user events count", count);
+                                _this.markForCheck();
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        UserEventNotificationComponent.prototype.onLogout = function () {
+            var _a;
+            (_a = this._listenSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        };
+        UserEventNotificationComponent.prototype.markForCheck = function () {
+            this.cd.markForCheck();
         };
         return UserEventNotificationComponent;
     }());