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

package/fesm2015/sumaris-net.ngx-components.js

@@ -25962,15 +25962,15 @@ class AbstractUserEventService extends BaseGraphqlService {
         this.mutations = mutations;
         this.subscriptions = subscriptions;
         this.environment = environment;
-        this._count$ = new BehaviorSubject(0);
-        this._subscriptions = new Subscription();
+        this.count$ = new BehaviorSubject(0);
         this.listeners = [];
+        this._subscriptions = new Subscription();
         this._logPrefix = '[user-event-service] ';
         // For DEV only
         this._debug = !(environment === null || environment === void 0 ? void 0 : environment.production);
     }
     get userEventCount() {
-        return this._count$.asObservable();
+        return this.count$.asObservable();
     }
     ngOnStart() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -26054,7 +26054,7 @@ class AbstractUserEventService extends BaseGraphqlService {
             data: entity
         });
         // Update count
-        this._count$.next(this._count$.value + 1);
+        this.count$.next(this.count$.value + 1);
     }
     count(filter, options) {
         var _a;
@@ -26086,6 +26086,8 @@ class AbstractUserEventService extends BaseGraphqlService {
         }
         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);
@@ -26101,7 +26103,7 @@ class AbstractUserEventService extends BaseGraphqlService {
             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;
         }));
     }
@@ -26176,9 +26178,15 @@ class AbstractUserEventService extends BaseGraphqlService {
     }
     save(entity, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.mutations.save) {
+                if (!this.mutations.saveAll)
+                    throw new Error('Not implemented');
+                const allData = yield this.saveAll([entity], options);
+                return allData === null || allData === void 0 ? void 0 : allData[0];
+            }
             this.fillDefaultProperties(entity);
             // Transform into json
-            const isNew = isNil(entity.id);
+            const withContent = !!entity.content;
             const json = entity.asObject();
             const now = Date.now();
             if (this._debug)
@@ -26197,39 +26205,87 @@ class AbstractUserEventService extends BaseGraphqlService {
                             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 })
+                            });
+                        }
                     }
                 }
             });
             return entity;
         });
     }
-    saveAll(data, opts) {
-        return Promise.all(data
-            .map(entity => this.save(entity, opts)));
+    saveAll(entities, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (isEmptyArray(entities))
+                return entities;
+            if (!this.mutations.saveAll) {
+                if (!this.mutations.save)
+                    throw new Error('Not implemented');
+                // Save one by one
+                return chainPromises(entities.map((entity) => () => this.save(entity, opts)));
+            }
+            // Transform into json
+            const json = entities.map(entity => {
+                this.fillDefaultProperties(entity);
+                return entity.asObject();
+            });
+            const now = Date.now();
+            if (this._debug)
+                console.debug(`${this._logPrefix}Saving user events...`, json);
+            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: (proxy, { data }) => {
+                    // Update entity
+                    const 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(entity => {
+                            const savedEntity = savedEntities.find((e) => 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
+                        });
+                    }
+                }
+            });
+            return entities;
+        });
     }
-    markAsRead(entity) {
+    markAsRead(entities) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Get onRead listeners
-            const onReadListeners = (this.listeners || []).filter(listener => !!listener.onRead).filter(listener => listener.accept(entity));
-            if (onReadListeners.length) {
-                for (const listener of onReadListeners) {
-                    yield listener.onRead(entity);
+            const userEventWithoutReadListeners = [];
+            for (const entity of (entities || [])) {
+                // Get onRead listeners
+                const onReadListeners = (this.listeners || []).filter(listener => !!listener.onRead).filter(listener => listener.accept(entity));
+                if (onReadListeners.length) {
+                    for (const listener of onReadListeners) {
+                        yield listener.onRead(entity);
+                    }
+                }
+                else {
+                    // Add to this list for default operation
+                    userEventWithoutReadListeners.push(entity);
                 }
             }
-            else {
-                // Use default
-                yield this.defaultMarkAsRead(entity);
-            }
+            // Use default
+            yield this.defaultMarkAsRead(userEventWithoutReadListeners);
         });
     }
     registerListener(listener) {
@@ -26238,7 +26294,8 @@ class AbstractUserEventService extends BaseGraphqlService {
         this.listeners.push(listener);
     }
     resetCount() {
-        this._count$.next(undefined);
+        this.count$.next(undefined);
+        this.resetCountDate = moment$6();
     }
     /* -- protected methods -- */
     onLogin() {
@@ -26248,12 +26305,9 @@ class AbstractUserEventService extends BaseGraphqlService {
             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(count => {
-                if (this._debug)
-                    console.debug(`${this._logPrefix}Receiving new user events count`, count);
-            });
+            this._listenSubscription = this.listenCountChanges(undefined).subscribe();
         });
     }
     onLogout() {
@@ -26278,19 +26332,26 @@ class AbstractUserEventService extends BaseGraphqlService {
         }
         return target;
     }
-    defaultMarkAsRead(userEvent) {
+    defaultMarkAsRead(userEvents) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!userEvent)
+            if (!userEvents)
                 throw new Error(`${this._logPrefix}Invalid event to save`);
+            if (!userEvents.length)
+                return;
             // set read date
-            userEvent.readDate = moment$6();
-            if (!userEvent.id || userEvent.id < 0) {
+            userEvents.forEach(userEvent => userEvent.readDate = moment$6());
+            // split local/remote entities
+            const localEntities = userEvents.filter(userEvent => !userEvent.id || userEvent.id < 0);
+            const remoteEntities = userEvents.filter(userEvent => userEvent.id > 0);
+            // save local entities
+            if (localEntities.length) {
                 if (this._debug)
                     console.debug(`${this._logPrefix}Save local user event`);
                 // TODO !!!!!!!!!!!!!
             }
-            else {
-                yield this.save(userEvent);
+            // save remote entities
+            if (remoteEntities.length) {
+                yield this.saveAll(remoteEntities);
             }
         });
     }
@@ -26666,12 +26727,19 @@ class UserEventNotificationList {
     ngOnDestroy() {
         this.subscriptions.unsubscribe();
     }
-    read($event, userEvent) {
+    read(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);
     }
+    readAll(event) {
+        var _a;
+        const unreadUserEvents = (this.userEvents.value || []).filter(value => !value.readDate);
+        if (!unreadUserEvents.length)
+            return;
+        (_a = this.readEvents) === null || _a === void 0 ? void 0 : _a.emit(unreadUserEvents);
+    }
     executeAction(action, userEvent) {
         // Execute then close popover
         action.executeAction(userEvent);
@@ -26687,7 +26755,7 @@ class UserEventNotificationList {
 UserEventNotificationList.decorators = [
     { type: 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: ChangeDetectionStrategy.OnPush,
                 styles: [":host(.popover-viewport){overflow-y:auto;-webkit-user-select:none;-moz-user-select:none;user-select:none}.unread{font-weight:700}"]
             },] }
@@ -26700,7 +26768,8 @@ UserEventNotificationList.ctorParameters = () => [
 UserEventNotificationList.propDecorators = {
     debug: [{ type: Input }],
     titleI18n: [{ type: Input }],
-    readEvent: [{ type: Output }]
+    readEvent: [{ type: Output }],
+    readEvents: [{ type: Output }]
 };
 
 class UserEventNotificationComponent {
@@ -26713,6 +26782,7 @@ class UserEventNotificationComponent {
         this.disabled = false;
         this._logPrefix = '[user-event-notification] ';
         this._readEvent = new EventEmitter();
+        this._readEvents = new EventEmitter();
     }
     get count() {
         var _a;
@@ -26728,6 +26798,9 @@ class UserEventNotificationComponent {
             // Subscribe to read event
             this._readEvent.subscribe(value => {
                 // default: mark event as read
+                this.userEventService.markAsRead([value]);
+            });
+            this._readEvents.subscribe(value => {
                 this.userEventService.markAsRead(value);
             });
         });
@@ -26741,7 +26814,8 @@ class UserEventNotificationComponent {
                 componentProps: {
                     debug: this.debug,
                     titleI18n: this.titleI18n,
-                    readEvent: this._readEvent
+                    readEvent: this._readEvent,
+                    readEvents: this._readEvents
                 },
                 backdropDismiss: true,
                 keyboardClose: true,
@@ -26794,7 +26868,7 @@ class UserEventTestService extends AbstractUserEventService {
         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);
     }
     asFilter(filter) {
         return filter;
@@ -26818,7 +26892,12 @@ class UserEventTestService extends AbstractUserEventService {
         return entity;
     }
     saveAll(data, opts) {
-        return Promise.resolve([]);
+        return __awaiter(this, void 0, void 0, function* () {
+            for (const entity of (data || [])) {
+                yield this.save(entity);
+            }
+            return Promise.resolve(this.userEvents);
+        });
     }
     watchAll(offset, size, sortBy, sortDirection, filter, options) {
         return of({ data: this.userEvents });