@sumaris-net/ngx-components 1.21.0-beta2 → 1.21.0-beta22

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "1.21.0-beta2",
+  "version": "1.21.0-beta22",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/src/app/social/user-event/notification/user-event-notification.component.d.ts

@@ -1,5 +1,5 @@
-import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { OnDestroy, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
 import { PopoverController } from '@ionic/angular';
 import { IUserEventService } from '../user-event.service';
 import { IUserEvent, IUserEventFilter } from '../user-event.model';
@@ -8,18 +8,15 @@ export declare class UserEventNotificationComponent implements OnInit, OnDestroy
     userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>;
     protected accountService: AccountService;
     protected popoverController: PopoverController;
-    protected cd: ChangeDetectorRef;
     debug: boolean;
     titleI18n: string;
     disabled: boolean;
-    userEventsSubject: BehaviorSubject<IUserEvent<any, string, import("../user-event.model").EventLevel>[]>;
     get count(): Observable<number>;
-    private _subscriptions;
     private _logPrefix;
     private _readEvent;
-    constructor(userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>, accountService: AccountService, popoverController: PopoverController, cd: ChangeDetectorRef);
-    ngOnInit(): void;
+    private _readEvents;
+    constructor(userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>, accountService: AccountService, popoverController: PopoverController);
+    ngOnInit(): Promise<void>;
     showList(event: UIEvent): Promise<void>;
-    protected markForCheck(): void;
     ngOnDestroy(): void;
 }

package/src/app/social/user-event/notification/user-event-notification.list.d.ts

@@ -1,20 +1,30 @@
-import { EventEmitter, OnInit } from '@angular/core';
-import { IUserEvent, UserEventAction } from '../user-event.model';
-import { Observable, Subject } from 'rxjs';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { IUserEvent, IUserEventFilter, UserEventAction } from '../user-event.model';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { PopoverController } from '@ionic/angular';
+import { IUserEventService } from '../user-event.service';
 export interface UserEventNotificationListOptions {
+    debug?: boolean;
     titleI18n?: string;
-    userEvents?: Observable<IUserEvent<any>[]>;
     readEvent?: EventEmitter<IUserEvent<any>>;
+    readEvents?: EventEmitter<IUserEvent<any>[]>;
 }
-export declare class UserEventNotificationList implements OnInit, UserEventNotificationListOptions {
+export declare class UserEventNotificationList implements OnInit, OnDestroy, UserEventNotificationListOptions {
+    protected cd: ChangeDetectorRef;
     protected popoverController: PopoverController;
+    userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>;
+    debug: boolean;
     titleI18n: string;
-    userEvents: Subject<IUserEvent<any>[]>;
     readEvent: EventEmitter<IUserEvent<any>>;
-    constructor(popoverController: PopoverController);
+    readEvents: EventEmitter<IUserEvent<any>[]>;
+    userEvents: BehaviorSubject<IUserEvent<any, string, import("../user-event.model").EventLevel>[]>;
+    protected subscriptions: Subscription;
+    constructor(cd: ChangeDetectorRef, popoverController: PopoverController, userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>);
     ngOnInit(): void;
-    read($event: UIEvent, userEvent: IUserEvent<any>): void;
+    ngOnDestroy(): void;
+    read(event: UIEvent, userEvent: IUserEvent<any>): void;
+    readAll(event: UIEvent): void;
     executeAction(action: UserEventAction, userEvent: IUserEvent<any>): void;
     dismiss(): void;
+    protected markForCheck(): void;
 }

package/src/app/social/user-event/testing/user-event.testing.service.d.ts

@@ -0,0 +1,35 @@
+import { AbstractUserEventService, UserEventWatchOptions } from '../user-event.service';
+import { IUserEvent, UserEvent, UserEventFilter } from '../user-event.model';
+import { Observable } from 'rxjs';
+import { GraphqlService } from '../../../core/graphql/graphql.service';
+import { AccountService } from '../../../core/services/account.service';
+import { NetworkService } from '../../../core/services/network.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Environment } from '../../../../environments/environment.class';
+import { FetchPolicy } from '@apollo/client/core';
+import { EntityServiceLoadOptions, LoadResult } from '../../../shared/services/entity-service.class';
+import { SortDirection } from '@angular/material/sort';
+export declare class UserEventTestService extends AbstractUserEventService<UserEvent, UserEventFilter> {
+    protected graphql: GraphqlService;
+    protected accountService: AccountService;
+    protected network: NetworkService;
+    protected translate: TranslateService;
+    protected environment: Environment;
+    private userEvents;
+    constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, environment: Environment);
+    fromObject(source: any): UserEvent;
+    add(entity: IUserEvent<any>): void;
+    asFilter(filter: Partial<any>): any;
+    count(filter: any, options?: {
+        fetchPolicy?: FetchPolicy;
+    }): Promise<number>;
+    delete(entity: any): Promise<any>;
+    deleteAll(data: any[], opts?: any): Promise<any>;
+    listenChanges(filter: any, options?: UserEventWatchOptions & {
+        interval?: number;
+        fetchPolicy?: FetchPolicy;
+    }): Observable<any[]>;
+    save(entity: any, options?: EntityServiceLoadOptions): Promise<any>;
+    saveAll(data: any[], opts?: any): Promise<any[]>;
+    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<any>, options?: UserEventWatchOptions): Observable<LoadResult<any>>;
+}

package/src/app/social/user-event/user-event.model.d.ts

@@ -45,7 +45,7 @@ export declare class UserEvent extends Entity<UserEvent> implements IUserEvent<U
     asObject(opts?: EntityAsObjectOptions): any;
     fromObject(source: any): void;
 }
-export interface IUserEventFilter<E extends IUserEvent<E>, U = string, L = EventLevel> extends IEntityFilter<any, E> {
+export interface IUserEventFilter<E extends IUserEvent<E, U, L>, U = string, L = EventLevel> extends IEntityFilter<any, E> {
     types: string[];
     levels: L[];
     issuers: U[];

package/src/app/social/user-event/user-event.service.d.ts

@@ -2,7 +2,7 @@ import { InjectionToken, OnDestroy } from '@angular/core';
 import { FetchPolicy } from '@apollo/client/core';
 import { AccountService } from '../../core/services/account.service';
 import { GraphqlService } from '../../core/graphql/graphql.service';
-import { Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { IUserEvent, IUserEventFilter, UserEvent, UserEventFilter } from './user-event.model';
 import { SortDirection } from '@angular/material/sort';
 import { EntitiesServiceWatchOptions, EntityServiceLoadOptions, IEntitiesService, LoadResult, Page } from '../../shared/services/entity-service.class';
@@ -13,6 +13,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { NetworkService } from '../../core/services/network.service';
 import { BaseGraphqlService } from '../../core/services/base-graphql-service.class';
 import { Environment } from '../../../environments/environment.class';
+import { Moment } from 'moment';
 export declare const UserEventServiceToken: InjectionToken<IUserEventService<any, any, UserEventWatchOptions>>;
 export declare interface UserEventWatchOptions extends EntitiesServiceWatchOptions {
     withContent?: boolean;
@@ -24,10 +25,12 @@ export interface IUserEventQueries {
 }
 export interface IUserEventMutations {
     save: any;
+    saveAll?: any;
     deleteByIds: any;
 }
 export interface IUserEventSubscriptions {
     listenChanges: any;
+    listenCountChanges?: any;
 }
 export interface IUserEventListener<E extends IUserEvent<E>> {
     accept: (E: any) => boolean;
@@ -40,29 +43,37 @@ export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEvent
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
     }): Promise<number>;
+    listenCountChanges(filter: Partial<F>, options?: WO & {
+        interval?: number;
+        fetchPolicy?: FetchPolicy;
+    }): Observable<number>;
     listenChanges(filter: Partial<F>, options?: WO & {
         interval?: number;
         fetchPolicy?: FetchPolicy;
     }): Observable<E[]>;
     save(entity: E, options?: EntityServiceLoadOptions): Promise<E>;
     delete(entity: E): Promise<any>;
-    markAsRead(entity: E): any;
+    markAsRead(entities: E[]): any;
+    registerListener(listener: IUserEventListener<E>): any;
+    resetCount(): any;
 }
-export declare abstract class AbstractUserEventService<E extends IUserEvent<E>, F extends IUserEventFilter<E>, WO extends UserEventWatchOptions = UserEventWatchOptions> extends BaseGraphqlService<E, F> implements IUserEventService<E, F, WO>, OnDestroy {
+export declare abstract class AbstractUserEventService<E extends IUserEvent<E, any>, F extends IUserEventFilter<E, any>, WO extends UserEventWatchOptions = UserEventWatchOptions> extends BaseGraphqlService<E, F> implements IUserEventService<E, F, WO>, OnDestroy {
     protected graphql: GraphqlService;
     protected accountService: AccountService;
     protected network: NetworkService;
     protected translate: TranslateService;
-    protected toastController: ToastController;
     protected queries: IUserEventQueries;
     protected mutations: IUserEventMutations;
     protected subscriptions: IUserEventSubscriptions;
     protected environment: Environment;
-    private _count$;
-    protected _subscriptions: Subscription;
+    protected count$: BehaviorSubject<number>;
+    protected resetCountDate: Moment;
     protected listeners: IUserEventListener<E>[];
+    private _subscriptions;
+    private _listenSubscription;
     get userEventCount(): Observable<number>;
-    protected constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, toastController: ToastController, queries: IUserEventQueries, mutations: IUserEventMutations, subscriptions: IUserEventSubscriptions, environment: Environment);
+    protected constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, queries: IUserEventQueries, mutations: IUserEventMutations, subscriptions: IUserEventSubscriptions, environment: Environment);
+    protected ngOnStart(): Promise<void>;
     ngOnDestroy(): void;
     abstract asFilter(filter: Partial<F>): F;
     abstract fromObject(source: any): E;
@@ -72,6 +83,10 @@ export declare abstract class AbstractUserEventService<E extends IUserEvent<E>,
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
     }): Promise<number>;
+    listenCountChanges(filter: Partial<F>, options?: WO & {
+        interval?: number;
+        fetchPolicy?: FetchPolicy;
+    }): Observable<number>;
     listenChanges(filter: Partial<F>, options?: WO & {
         interval?: number;
         fetchPolicy?: FetchPolicy;
@@ -79,11 +94,16 @@ export declare abstract class AbstractUserEventService<E extends IUserEvent<E>,
     delete(entity: E): Promise<any>;
     deleteAll(entities: E[], opts?: any): Promise<any>;
     save(entity: E, options?: EntityServiceLoadOptions): Promise<E>;
-    saveAll(data: E[], opts?: any): Promise<E[]>;
-    markAsRead(entity: E): Promise<void>;
+    saveAll(entities: E[], opts?: any): Promise<E[]>;
+    markAsRead(entities: E[]): Promise<void>;
     registerListener(listener: IUserEventListener<E>): void;
-    protected processUserEvent(source: any): E;
-    protected defaultMarkAsRead(userEvent: E): Promise<void>;
+    resetCount(): void;
+    protected onLogin(): Promise<void>;
+    protected onLogout(): void;
+    protected startListenCountChanges(): void;
+    protected stopListenCountChanges(): void;
+    protected processUserEvent(source: any, that?: AbstractUserEventService<E, F>): E;
+    protected defaultMarkAsRead(userEvents: E[]): Promise<void>;
     protected defaultFilter(): F;
     protected defaultRecipient(): any;
     protected fillDefaultProperties(entity: E): void;

package/src/assets/i18n/en.json

@@ -389,7 +389,8 @@
     "USER_EVENT": {
       "NOTIFICATION": {
         "TITLE": "Notifications",
-        "EMPTY": "No notification"
+        "EMPTY": "No notification",
+        "READ_ALL": "Mark all as read"
       },
       "EVENT_TYPE": "Type",
       "CREATION_DATE": "Date/Time",

package/src/assets/i18n/fr.json

@@ -392,7 +392,8 @@
     "USER_EVENT": {
       "NOTIFICATION": {
         "TITLE": "Notifications",
-        "EMPTY": "Aucune notification"
+        "EMPTY": "Aucune notification",
+        "READ_ALL": "Marquer tout comme lu"
       },
       "EVENT_TYPE": "Type",
       "CREATION_DATE": "Date/Heure",

package/src/theme/_ngx-components.scss

@@ -402,6 +402,7 @@ ion-list,
 
   }
 
+  ion-row.ion-list-footer,
   ion-row.mat-select-footer,
   ion-row.mat-menu-footer,
   ion-row.mat-autocomplete-footer,

package/sumaris-net.ngx-components.d.ts

@@ -10,12 +10,13 @@ export { AccountValidatorService as ɵe } from './src/app/core/services/validato
 export { LocalSettingsValidatorService as ɵh } from './src/app/core/services/validator/local-settings.validator';
 export { UserSettingsValidatorService as ɵg } from './src/app/core/services/validator/user-settings.validator';
 export { isFocusableElement as ɵc } from './src/app/shared/focusable';
-export { MatBadgeIconTestPage as ɵo } from './src/app/shared/material/badge/badge-icon.test';
-export { DateTestPage as ɵm } from './src/app/shared/material/datetime/testing/mat-date.test';
+export { MatBadgeIconTestPage as ɵp } from './src/app/shared/material/badge/badge-icon.test';
+export { DateTestPage as ɵn } from './src/app/shared/material/datetime/testing/mat-date.test';
 export { MatNumpadDomService as ɵb } from './src/app/shared/material/numpad/numpad.dom-service';
-export { NumpadTestPage as ɵn } from './src/app/shared/material/numpad/testing/numpad.test';
+export { NumpadTestPage as ɵo } from './src/app/shared/material/numpad/testing/numpad.test';
 export { CustomReuseStrategy as ɵa } from './src/app/shared/shared-routing.module';
-export { ToastTestingPage as ɵq } from './src/app/shared/toast/toast.testing';
-export { ToastTestingModule as ɵp } from './src/app/shared/toast/toast.testing.module';
-export { JobProgressionList as ɵl } from './src/app/social/job/progression/job-progression.list';
+export { ToastTestingPage as ɵr } from './src/app/shared/toast/toast.testing';
+export { ToastTestingModule as ɵq } from './src/app/shared/toast/toast.testing.module';
+export { JobProgressionList as ɵm } from './src/app/social/job/progression/job-progression.list';
 export { UserEventNotificationList as ɵk } from './src/app/social/user-event/notification/user-event-notification.list';
+export { UserEventTestService as ɵl } from './src/app/social/user-event/testing/user-event.testing.service';