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

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

@@ -30197,6 +30197,38 @@
             enumerable: false,
             configurable: true
         });
+        AbstractUserEventService.prototype.ngOnStart = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            // Update component when refresh is need (=login events)
+                            this._subscriptions.add(rxjs.merge(this.accountService.onLogin, this.accountService.onLogout)
+                                .pipe(
+                            // Wait account service ready (can be restarted)
+                            operators.mergeMap(function () { return _this.accountService.ready(); }), operators.map(function () { return _this.accountService.isLogin(); }), operators.distinctUntilChanged())
+                                .subscribe(function (login) {
+                                if (login) {
+                                    _this.onLogin();
+                                }
+                                else {
+                                    _this.onLogout();
+                                }
+                            }));
+                            // First attempt if account is ready
+                            return [4 /*yield*/, this.accountService.ready()];
+                        case 1:
+                            // First attempt if account is ready
+                            _b.sent();
+                            if (this.accountService.isLogin()) {
+                                setTimeout(function () { return _this.onLogin(); });
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         AbstractUserEventService.prototype.ngOnDestroy = function () {
             this._subscriptions.unsubscribe();
         };
@@ -30233,7 +30265,7 @@
                 },
                 arrayFieldName: 'data',
                 error: { code: SocialErrorCodes.LOAD_USER_EVENTS_ERROR, message: 'SOCIAL.ERROR.LOAD_USER_EVENTS_ERROR' },
-                fetchPolicy: (options === null || options === void 0 ? void 0 : options.fetchPolicy) || "cache-first"
+                fetchPolicy: (options === null || options === void 0 ? void 0 : options.fetchPolicy) || 'cache-first'
             })
                 .pipe(operators.map(function (res) {
                 var data = ((res === null || res === void 0 ? void 0 : res.data) || []).map(function (value) { return _this.processUserEvent(value, _this); });
@@ -30241,8 +30273,6 @@
                     console.debug("" + _this._logPrefix + data.length + " user events loaded in " + (Date.now() - now) + "ms");
                     now = null;
                 }
-                // const unreadCount = this.unreadEvents(data);
-                // this._count$.next(unreadCount);
                 // Must re-order because of listenChanges result will add new event at the end
                 data = EntityUtils.sort(data, page.sortBy, page.sortDirection);
                 return {
@@ -30266,7 +30296,7 @@
         AbstractUserEventService.prototype.count = function (filter, options) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var res, total;
+                var res;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -30289,10 +30319,7 @@
                                 })];
                         case 1:
                             res = _b.sent();
-                            total = res.total;
-                            // update count
-                            this._count$.next(total);
-                            return [2 /*return*/, total];
+                            return [2 /*return*/, res.total];
                     }
                 });
             });
@@ -30356,8 +30383,6 @@
                     query: withContent ? _this.queries.loadAllWithContent : _this.queries.loadAll,
                     data: updatedData
                 });
-                // update count
-                // this._count$.next(this.unreadEvents(updatedData));
                 return updatedData;
             }));
         };
@@ -30522,7 +30547,37 @@
                 this.listeners = [];
             this.listeners.push(listener);
         };
+        AbstractUserEventService.prototype.resetCount = function () {
+            this._count$.next(undefined);
+        };
         /* -- protected methods -- */
+        AbstractUserEventService.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.count(undefined)];
+                        case 1:
+                            count = _b.sent();
+                            if (this._debug)
+                                console.debug(this._logPrefix + "Receiving user events count", count);
+                            // Update count
+                            this._count$.next(count);
+                            // Then listen changes
+                            this._listenSubscription = this.listenCountChanges(undefined).subscribe(function (count) {
+                                if (_this._debug)
+                                    console.debug(_this._logPrefix + "Receiving new user events count", count);
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        AbstractUserEventService.prototype.onLogout = function () {
+            var _a;
+            (_a = this._listenSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+        };
         AbstractUserEventService.prototype.processUserEvent = function (source, that) {
             var e_2, _b;
             that = that || this;
@@ -31015,11 +31070,10 @@
     };
 
     var UserEventNotificationComponent = /** @class */ (function () {
-        function UserEventNotificationComponent(userEventService, accountService, popoverController, cd) {
+        function UserEventNotificationComponent(userEventService, accountService, popoverController) {
             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;
@@ -31038,26 +31092,17 @@
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            if (isNil(this.userEventService)) {
-                                console.warn(this._logPrefix + "No service injected");
-                                this.disabled = true;
-                                return [2 /*return*/];
-                            }
-                            return [4 /*yield*/, this.accountService.ready()];
-                        case 1:
-                            _b.sent();
-                            // listen login/logout
-                            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
-                                _this.userEventService.markAsRead(value);
-                            });
-                            return [2 /*return*/];
+                    if (isNil(this.userEventService)) {
+                        console.warn(this._logPrefix + "No service injected");
+                        this.disabled = true;
+                        return [2 /*return*/];
                     }
+                    // Subscribe to read event
+                    this._readEvent.subscribe(function (value) {
+                        // default: mark event as read
+                        _this.userEventService.markAsRead(value);
+                    });
+                    return [2 /*return*/];
                 });
             });
         };
@@ -31066,19 +31111,22 @@
                 var popover;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.popoverController.create({
-                                component: UserEventNotificationList,
-                                componentProps: {
-                                    debug: this.debug,
-                                    titleI18n: this.titleI18n,
-                                    readEvent: this._readEvent
-                                },
-                                backdropDismiss: true,
-                                keyboardClose: true,
-                                event: event,
-                                translucent: true,
-                                cssClass: 'popover-large'
-                            })];
+                        case 0:
+                            // Reset count
+                            this.userEventService.resetCount();
+                            return [4 /*yield*/, this.popoverController.create({
+                                    component: UserEventNotificationList,
+                                    componentProps: {
+                                        debug: this.debug,
+                                        titleI18n: this.titleI18n,
+                                        readEvent: this._readEvent
+                                    },
+                                    backdropDismiss: true,
+                                    keyboardClose: true,
+                                    event: event,
+                                    translucent: true,
+                                    cssClass: 'popover-large'
+                                })];
                         case 1:
                             popover = _b.sent();
                             return [4 /*yield*/, popover.present()];
@@ -31093,37 +31141,6 @@
             if (this.debug) {
                 console.debug(this._logPrefix + "Destroying");
             }
-            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;
     }());
@@ -31138,8 +31155,7 @@
     UserEventNotificationComponent.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [UserEventServiceToken,] }] },
         { type: AccountService },
-        { type: i1$5.PopoverController },
-        { type: i0.ChangeDetectorRef }
+        { type: i1$5.PopoverController }
     ]; };
     UserEventNotificationComponent.propDecorators = {
         debug: [{ type: i0.Input }],
@@ -31157,7 +31173,6 @@
             _this.translate = translate;
             _this.environment = environment;
             _this.userEvents = [];
-            _this.count$ = new rxjs.BehaviorSubject(0);
             return _this;
         }
         UserEventTestService.prototype.fromObject = function (source) {
@@ -31167,15 +31182,8 @@
             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);
         };
-        Object.defineProperty(UserEventTestService.prototype, "userEventCount", {
-            get: function () {
-                return this.count$.asObservable();
-            },
-            enumerable: false,
-            configurable: true
-        });
         UserEventTestService.prototype.asFilter = function (filter) {
             return filter;
         };