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

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

@@ -30443,13 +30443,21 @@
         };
         AbstractUserEventService.prototype.save = function (entity, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var isNew, json, now;
+                var allData, withContent, json, now;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
+                            if (!!this.mutations.save) return [3 /*break*/, 2];
+                            if (!this.mutations.saveAll)
+                                throw new Error('Not implemented');
+                            return [4 /*yield*/, this.saveAll([entity], options)];
+                        case 1:
+                            allData = _b.sent();
+                            return [2 /*return*/, allData === null || allData === void 0 ? void 0 : allData[0]];
+                        case 2:
                             this.fillDefaultProperties(entity);
-                            isNew = isNil(entity.id);
+                            withContent = !!entity.content;
                             json = entity.asObject();
                             now = Date.now();
                             if (this._debug)
@@ -30469,75 +30477,167 @@
                                                 console.debug(_this._logPrefix + "User event saved in " + (Date.now() - now) + "ms", entity);
                                             _this.copyIdAndUpdateDate(savedEntity, entity);
                                             // Add to cache
-                                            if (isNew) {
-                                                _this.insertIntoMutableCachedQueries(proxy, {
-                                                    query: _this.queries.loadAll,
-                                                    data: Object.assign(Object.assign({}, savedEntity), { content: null })
-                                                });
+                                            if (withContent) {
                                                 _this.insertIntoMutableCachedQueries(proxy, {
                                                     query: _this.queries.loadAllWithContent,
                                                     data: savedEntity
                                                 });
                                             }
+                                            else {
+                                                _this.insertIntoMutableCachedQueries(proxy, {
+                                                    query: _this.queries.loadAll,
+                                                    data: Object.assign(Object.assign({}, savedEntity), { content: null })
+                                                });
+                                            }
                                         }
                                     }
                                 })];
-                        case 1:
+                        case 3:
                             _b.sent();
                             return [2 /*return*/, entity];
                     }
                 });
             });
         };
-        AbstractUserEventService.prototype.saveAll = function (data, opts) {
-            var _this = this;
-            return Promise.all(data
-                .map(function (entity) { return _this.save(entity, opts); }));
+        AbstractUserEventService.prototype.saveAll = function (entities, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var json, now;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (isEmptyArray(entities))
+                                return [2 /*return*/, entities];
+                            if (!this.mutations.saveAll) {
+                                if (!this.mutations.save)
+                                    throw new Error('Not implemented');
+                                // Save one by one
+                                return [2 /*return*/, chainPromises(entities.map(function (entity) { return function () { return _this.save(entity, opts); }; }))];
+                            }
+                            json = entities.map(function (entity) {
+                                _this.fillDefaultProperties(entity);
+                                return entity.asObject();
+                            });
+                            now = Date.now();
+                            if (this._debug)
+                                console.debug(this._logPrefix + "Saving user events...", json);
+                            return [4 /*yield*/, this.graphql.mutate({
+                                    mutation: this.mutations.saveAll,
+                                    variables: {
+                                        data: json
+                                    },
+                                    error: { code: SocialErrorCodes.SAVE_USER_EVENT_ERROR, message: 'SOCIAL.ERROR.SAVE_USER_EVENT_ERROR' },
+                                    update: function (proxy, _b) {
+                                        var data = _b.data;
+                                        // Update entity
+                                        var savedEntities = (data === null || data === void 0 ? void 0 : data.data) || [];
+                                        if (savedEntities.length) {
+                                            if (_this._debug)
+                                                console.debug(_this._logPrefix + "User events saved in " + (Date.now() - now) + "ms", savedEntities);
+                                            entities.forEach(function (entity) {
+                                                var savedEntity = savedEntities.find(function (e) { return EntityUtils.equals(e, entity, 'id'); });
+                                                _this.copyIdAndUpdateDate(savedEntity, entity);
+                                            });
+                                            // Add to cache (assuming all with content)
+                                            _this.insertIntoMutableCachedQueries(proxy, {
+                                                query: _this.queries.loadAllWithContent,
+                                                data: savedEntities
+                                            });
+                                        }
+                                    }
+                                })];
+                        case 1:
+                            _b.sent();
+                            return [2 /*return*/, entities];
+                    }
+                });
+            });
         };
-        AbstractUserEventService.prototype.markAsRead = function (entity) {
+        AbstractUserEventService.prototype.markAsRead = function (entities) {
             return __awaiter(this, void 0, void 0, function () {
-                var onReadListeners, onReadListeners_1, onReadListeners_1_1, listener, e_1_1;
-                var e_1, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var userEventWithoutReadListeners, _loop_1, this_1, _b, _c, entity, e_1_1;
+                var e_1, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
-                            onReadListeners = (this.listeners || []).filter(function (listener) { return !!listener.onRead; }).filter(function (listener) { return listener.accept(entity); });
-                            if (!onReadListeners.length) return [3 /*break*/, 9];
-                            _c.label = 1;
+                            userEventWithoutReadListeners = [];
+                            _loop_1 = function (entity) {
+                                var onReadListeners, onReadListeners_1, onReadListeners_1_1, listener, e_2_1;
+                                var e_2, _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
+                                        case 0:
+                                            onReadListeners = (this_1.listeners || []).filter(function (listener) { return !!listener.onRead; }).filter(function (listener) { return listener.accept(entity); });
+                                            if (!onReadListeners.length) return [3 /*break*/, 9];
+                                            _c.label = 1;
+                                        case 1:
+                                            _c.trys.push([1, 6, 7, 8]);
+                                            onReadListeners_1 = (e_2 = void 0, __values(onReadListeners)), onReadListeners_1_1 = onReadListeners_1.next();
+                                            _c.label = 2;
+                                        case 2:
+                                            if (!!onReadListeners_1_1.done) return [3 /*break*/, 5];
+                                            listener = onReadListeners_1_1.value;
+                                            return [4 /*yield*/, listener.onRead(entity)];
+                                        case 3:
+                                            _c.sent();
+                                            _c.label = 4;
+                                        case 4:
+                                            onReadListeners_1_1 = onReadListeners_1.next();
+                                            return [3 /*break*/, 2];
+                                        case 5: return [3 /*break*/, 8];
+                                        case 6:
+                                            e_2_1 = _c.sent();
+                                            e_2 = { error: e_2_1 };
+                                            return [3 /*break*/, 8];
+                                        case 7:
+                                            try {
+                                                if (onReadListeners_1_1 && !onReadListeners_1_1.done && (_b = onReadListeners_1.return)) _b.call(onReadListeners_1);
+                                            }
+                                            finally { if (e_2) throw e_2.error; }
+                                            return [7 /*endfinally*/];
+                                        case 8: return [3 /*break*/, 10];
+                                        case 9:
+                                            // Add to this list for default operation
+                                            userEventWithoutReadListeners.push(entity);
+                                            _c.label = 10;
+                                        case 10: return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            this_1 = this;
+                            _e.label = 1;
                         case 1:
-                            _c.trys.push([1, 6, 7, 8]);
-                            onReadListeners_1 = __values(onReadListeners), onReadListeners_1_1 = onReadListeners_1.next();
-                            _c.label = 2;
+                            _e.trys.push([1, 6, 7, 8]);
+                            _b = __values((entities || [])), _c = _b.next();
+                            _e.label = 2;
                         case 2:
-                            if (!!onReadListeners_1_1.done) return [3 /*break*/, 5];
-                            listener = onReadListeners_1_1.value;
-                            return [4 /*yield*/, listener.onRead(entity)];
+                            if (!!_c.done) return [3 /*break*/, 5];
+                            entity = _c.value;
+                            return [5 /*yield**/, _loop_1(entity)];
                         case 3:
-                            _c.sent();
-                            _c.label = 4;
+                            _e.sent();
+                            _e.label = 4;
                         case 4:
-                            onReadListeners_1_1 = onReadListeners_1.next();
+                            _c = _b.next();
                             return [3 /*break*/, 2];
                         case 5: return [3 /*break*/, 8];
                         case 6:
-                            e_1_1 = _c.sent();
+                            e_1_1 = _e.sent();
                             e_1 = { error: e_1_1 };
                             return [3 /*break*/, 8];
                         case 7:
                             try {
-                                if (onReadListeners_1_1 && !onReadListeners_1_1.done && (_b = onReadListeners_1.return)) _b.call(onReadListeners_1);
+                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                             }
                             finally { if (e_1) throw e_1.error; }
                             return [7 /*endfinally*/];
-                        case 8: return [3 /*break*/, 11];
-                        case 9: 
+                        case 8: 
                         // Use default
-                        return [4 /*yield*/, this.defaultMarkAsRead(entity)];
-                        case 10:
+                        return [4 /*yield*/, this.defaultMarkAsRead(userEventWithoutReadListeners)];
+                        case 9:
                             // Use default
-                            _c.sent();
-                            _c.label = 11;
-                        case 11: return [2 /*return*/];
+                            _e.sent();
+                            return [2 /*return*/];
                     }
                 });
             });
@@ -30547,11 +30647,13 @@
                 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)];
@@ -30562,10 +30664,7 @@
                             // 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);
-                            });
+                            this._listenSubscription = this.listenCountChanges(undefined).subscribe();
                             return [2 /*return*/];
                     }
                 });
@@ -30576,7 +30675,7 @@
             (_a = this._listenSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         };
         AbstractUserEventService.prototype.processUserEvent = function (source, that) {
-            var e_2, _b;
+            var e_3, _b;
             that = that || this;
             // Convert json source to IUserEvent
             var target = that.fromObject(source);
@@ -30595,33 +30694,41 @@
                     }
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (listeners_1_1 && !listeners_1_1.done && (_b = listeners_1.return)) _b.call(listeners_1);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_3) throw e_3.error; }
             }
             return target;
         };
-        AbstractUserEventService.prototype.defaultMarkAsRead = function (userEvent) {
+        AbstractUserEventService.prototype.defaultMarkAsRead = function (userEvents) {
             return __awaiter(this, void 0, void 0, function () {
+                var localEntities, remoteEntities;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            if (!userEvent)
+                            if (!userEvents)
                                 throw new Error(this._logPrefix + "Invalid event to save");
+                            if (!userEvents.length)
+                                return [2 /*return*/];
                             // set read date
-                            userEvent.readDate = moment$6();
-                            if (!(!userEvent.id || userEvent.id < 0)) return [3 /*break*/, 1];
-                            if (this._debug)
-                                console.debug(this._logPrefix + "Save local user event");
-                            return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, this.save(userEvent)];
-                        case 2:
+                            userEvents.forEach(function (userEvent) { return userEvent.readDate = moment$6(); });
+                            localEntities = userEvents.filter(function (userEvent) { return !userEvent.id || userEvent.id < 0; });
+                            remoteEntities = userEvents.filter(function (userEvent) { return userEvent.id > 0; });
+                            // save local entities
+                            if (localEntities.length) {
+                                if (this._debug)
+                                    console.debug(this._logPrefix + "Save local user event");
+                                // TODO !!!!!!!!!!!!!
+                            }
+                            if (!remoteEntities.length) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.saveAll(remoteEntities)];
+                        case 1:
                             _b.sent();
-                            _b.label = 3;
-                        case 3: return [2 /*return*/];
+                            _b.label = 2;
+                        case 2: return [2 /*return*/];
                     }
                 });
             });
@@ -31028,12 +31135,19 @@
         UserEventNotificationList.prototype.ngOnDestroy = function () {
             this.subscriptions.unsubscribe();
         };
-        UserEventNotificationList.prototype.read = function ($event, userEvent) {
+        UserEventNotificationList.prototype.read = function (event, userEvent) {
             var _a;
             if (userEvent === null || userEvent === void 0 ? void 0 : userEvent.readDate)
                 return;
             (_a = this.readEvent) === null || _a === void 0 ? void 0 : _a.emit(userEvent);
         };
+        UserEventNotificationList.prototype.readAll = function (event) {
+            var _a;
+            var unreadUserEvents = (this.userEvents.value || []).filter(function (value) { return !value.readDate; });
+            if (!unreadUserEvents.length)
+                return;
+            (_a = this.readEvents) === null || _a === void 0 ? void 0 : _a.emit(unreadUserEvents);
+        };
         UserEventNotificationList.prototype.executeAction = function (action, userEvent) {
             // Execute then close popover
             action.executeAction(userEvent);
@@ -31050,7 +31164,7 @@
     UserEventNotificationList.decorators = [
         { type: i0.Component, args: [{
                     selector: 'app-user-event-notification-list',
-                    template: "\n<ion-list class=\"ion-list-popover\">\n\n  <ion-row class=\"ion-list-header column\">\n    <ion-col>\n      <ion-label>{{titleI18n | translate}}</ion-label>\n    </ion-col>\n  </ion-row>\n\n  <ion-item *ngIf=\"!(userEvents | async)?.length\">\n    {{'SOCIAL.USER_EVENT.NOTIFICATION.EMPTY' | translate}}\n  </ion-item>\n  <ion-item\n    *ngFor=\"let userEvent of userEvents | async\"\n    (click)=\"read($event, userEvent)\"\n  >\n\n    <ion-avatar slot=\"start\">\n\n      <img *ngIf=\"userEvent.avatar; else avatarIcon\" src=\"{{ userEvent.avatar }}\">\n\n      <ng-template #avatarIcon>\n        <app-icon\n          *ngIf=\"userEvent.avatarIcon\"\n          [ref]=\"userEvent.avatarIcon\"\n          height=\"40\"\n          width=\"40\"\n        ></app-icon>\n      </ng-template>\n\n    </ion-avatar>\n\n    <ion-grid class=\"ion-no-margin ion-no-padding\">\n      <ion-row>\n        <ion-col>\n          <p [class.unread]=\"!userEvent.readDate\">\n            {{userEvent.message}}\n          </p>\n        </ion-col>\n      </ion-row>\n      <ion-row *ngIf=\"userEvent.actions?.length\">\n        <ion-col>\n          <p>\n            <span *ngFor=\"let action of userEvent.actions\">\n              <a\n                [style.margin-right.px]=\"8\"\n                [style.cursor]=\"'pointer'\"\n                (click)=\"executeAction(action, userEvent)\"\n              >\n                {{ '&#10142;&nbsp;' + action.name}}\n              </a>\n            </span>\n          </p>\n        </ion-col>\n      </ion-row>\n      <ion-row>\n        <ion-col>\n          <app-icon\n            *ngIf=\"userEvent.icon\"\n            [ref]=\"userEvent.icon\"\n            height=\"16\"\n            width=\"16\"\n            [style.vertical-align]=\"'sub'\"\n          ></app-icon>\n          <small>\n            <span>{{userEvent.creationDate|dateFromNow}}</span>\n            <span [style.color]=\"'gray'\">{{ ' | ' + (userEvent.creationDate|dateFormat:{time:true}) }}</span>\n          </small>\n        </ion-col>\n      </ion-row>\n    </ion-grid>\n  </ion-item>\n\n</ion-list>\n",
+                    template: "\n<ion-list class=\"ion-list-popover\">\n\n  <ion-row class=\"ion-list-header column\">\n    <ion-col>\n      <ion-label>{{titleI18n | translate}}</ion-label>\n    </ion-col>\n  </ion-row>\n\n  <ion-item *ngIf=\"!(userEvents | async)?.length\">\n    {{'SOCIAL.USER_EVENT.NOTIFICATION.EMPTY' | translate}}\n  </ion-item>\n  <ion-item\n    *ngFor=\"let userEvent of userEvents | async\"\n    (click)=\"read($event, userEvent)\"\n  >\n\n    <ion-avatar slot=\"start\">\n\n      <img *ngIf=\"userEvent.avatar; else avatarIcon\" src=\"{{ userEvent.avatar }}\">\n\n      <ng-template #avatarIcon>\n        <app-icon\n          *ngIf=\"userEvent.avatarIcon\"\n          [ref]=\"userEvent.avatarIcon\"\n          height=\"40\"\n          width=\"40\"\n        ></app-icon>\n      </ng-template>\n\n    </ion-avatar>\n\n    <ion-grid class=\"ion-no-margin ion-no-padding\">\n      <ion-row>\n        <ion-col>\n          <p [class.unread]=\"!userEvent.readDate\">\n            {{userEvent.message}}\n          </p>\n        </ion-col>\n      </ion-row>\n      <ion-row *ngIf=\"userEvent.actions?.length\">\n        <ion-col>\n          <p>\n            <span *ngFor=\"let action of userEvent.actions\">\n              <a\n                [style.margin-right.px]=\"8\"\n                [style.cursor]=\"'pointer'\"\n                (click)=\"executeAction(action, userEvent)\"\n              >\n                {{ '&#10142;&nbsp;' + action.name}}\n              </a>\n            </span>\n          </p>\n        </ion-col>\n      </ion-row>\n      <ion-row>\n        <ion-col>\n          <app-icon\n            *ngIf=\"userEvent.icon\"\n            [ref]=\"userEvent.icon\"\n            height=\"16\"\n            width=\"16\"\n            [style.vertical-align]=\"'sub'\"\n          ></app-icon>\n          <small>\n            <span>{{userEvent.creationDate|dateFromNow}}</span>\n            <span [style.color]=\"'gray'\">{{ ' | ' + (userEvent.creationDate|dateFormat:{time:true}) }}</span>\n          </small>\n        </ion-col>\n      </ion-row>\n    </ion-grid>\n  </ion-item>\n\n  <ion-row class=\"ion-list-footer column\">\n    <ion-col>\n      <a style=\"cursor: pointer\" (click)=\"readAll($event)\">{{'SOCIAL.USER_EVENT.NOTIFICATION.READ_ALL' | translate}}</a>\n    </ion-col>\n  </ion-row>\n\n</ion-list>\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
                     styles: [":host(.popover-viewport){overflow-y:auto;-webkit-user-select:none;-moz-user-select:none;user-select:none}.unread{font-weight:700}"]
                 },] }
@@ -31063,7 +31177,8 @@
     UserEventNotificationList.propDecorators = {
         debug: [{ type: i0.Input }],
         titleI18n: [{ type: i0.Input }],
-        readEvent: [{ type: i0.Output }]
+        readEvent: [{ type: i0.Output }],
+        readEvents: [{ type: i0.Output }]
     };
 
     var UserEventNotificationComponent = /** @class */ (function () {
@@ -31076,6 +31191,7 @@
             this.disabled = false;
             this._logPrefix = '[user-event-notification] ';
             this._readEvent = new i0.EventEmitter();
+            this._readEvents = new i0.EventEmitter();
         }
         Object.defineProperty(UserEventNotificationComponent.prototype, "count", {
             get: function () {
@@ -31097,6 +31213,9 @@
                     // Subscribe to read event
                     this._readEvent.subscribe(function (value) {
                         // default: mark event as read
+                        _this.userEventService.markAsRead([value]);
+                    });
+                    this._readEvents.subscribe(function (value) {
                         _this.userEventService.markAsRead(value);
                     });
                     return [2 /*return*/];
@@ -31108,19 +31227,23 @@
                 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,
+                                        readEvents: this._readEvents
+                                    },
+                                    backdropDismiss: true,
+                                    keyboardClose: true,
+                                    event: event,
+                                    translucent: true,
+                                    cssClass: 'popover-large'
+                                })];
                         case 1:
                             popover = _b.sent();
                             return [4 /*yield*/, popover.present()];
@@ -31167,7 +31290,6 @@
             _this.translate = translate;
             _this.environment = environment;
             _this.userEvents = [];
-            _this.count$ = new rxjs.BehaviorSubject(0);
             return _this;
         }
         UserEventTestService.prototype.fromObject = function (source) {
@@ -31177,15 +31299,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;
         };
@@ -31208,7 +31323,40 @@
             return entity;
         };
         UserEventTestService.prototype.saveAll = function (data, opts) {
-            return Promise.resolve([]);
+            return __awaiter(this, void 0, void 0, function () {
+                var _b, _c, entity, e_1_1;
+                var e_1, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            _e.trys.push([0, 5, 6, 7]);
+                            _b = __values((data || [])), _c = _b.next();
+                            _e.label = 1;
+                        case 1:
+                            if (!!_c.done) return [3 /*break*/, 4];
+                            entity = _c.value;
+                            return [4 /*yield*/, this.save(entity)];
+                        case 2:
+                            _e.sent();
+                            _e.label = 3;
+                        case 3:
+                            _c = _b.next();
+                            return [3 /*break*/, 1];
+                        case 4: return [3 /*break*/, 7];
+                        case 5:
+                            e_1_1 = _e.sent();
+                            e_1 = { error: e_1_1 };
+                            return [3 /*break*/, 7];
+                        case 6:
+                            try {
+                                if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
+                            }
+                            finally { if (e_1) throw e_1.error; }
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/, Promise.resolve(this.userEvents)];
+                    }
+                });
+            });
         };
         UserEventTestService.prototype.watchAll = function (offset, size, sortBy, sortDirection, filter, options) {
             return rxjs.of({ data: this.userEvents });