@sumaris-net/ngx-components 1.22.9 → 1.22.11-rc10

package/package.json

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

package/public_api.d.ts

@@ -171,7 +171,7 @@ export * from './src/app/social/user-event/user-event.module';
 export * from './src/app/social/user-event/user-event.model';
 export * from './src/app/social/user-event/user-event.fragments';
 export * from './src/app/social/user-event/user-event.service';
-export * from './src/app/social/user-event/notification/user-event-notification.component';
+export * from './src/app/social/user-event/notification/user-event-notification.icon';
 export * from './src/app/social/job/job.module';
 export * from './src/app/social/job/job.model';
 export * from './src/app/social/job/job.service';
@@ -206,3 +206,10 @@ export * from './src/app/core/table/testing/table.testing';
 export * from './src/app/core/text-popover/testing/text-popover.testing.module';
 export * from './src/app/core/text-popover/testing/text-popover.testing';
 export { suggestFromArray } from "./src/app/shared/services";
+export * from './src/app/social/social.testing.module';
+export * from './src/app/social/user-event/testing/user-event.testing.module';
+export * from './src/app/social/user-event/testing/user-event.testing';
+export * from './src/app/social/user-event/testing/user-event.testing.service';
+export * from './src/app/social/job/testing/job.testing.module';
+export * from './src/app/social/job/testing/job-progression.testing';
+export * from './src/app/social/job/testing/job-progression.testing.service';

package/src/app/shared/events.d.ts

@@ -24,4 +24,4 @@ export interface CompletableEvent extends Event {
  * @param element
  * @param threshold default to '15%'
  */
-export declare function fromScrollEndEvent(element: HTMLElement, threshold?: string): Observable<any>;
+export declare function fromScrollEndEvent(element: HTMLElement, threshold?: string, dueTime?: number): Observable<any>;

package/src/app/shared/services/entity-service.class.d.ts

@@ -38,6 +38,13 @@ export declare interface IEntityService<T, ID = any, LO = EntityServiceLoadOptio
     delete(data: T, opts?: any): Promise<any>;
     listenChanges(id: ID, opts?: any): Observable<T | undefined>;
 }
+export declare interface EntitiesServiceLoadOptions {
+    fetchPolicy?: FetchPolicy;
+    trash?: boolean;
+    withTotal?: boolean;
+    toEntity?: boolean;
+    [key: string]: any;
+}
 export declare interface EntitiesServiceWatchOptions {
     fetchPolicy?: WatchQueryFetchPolicy;
     trash?: boolean;

package/src/app/social/job/testing/job-progression.testing.d.ts

@@ -0,0 +1,11 @@
+import { JobProgressionComponent, JobProgressionOptions } from '../progression/job-progression.component';
+import { JobProgression } from '../job.model';
+export declare class JobProgressionTestingPage {
+    jobProgression: JobProgressionComponent;
+    nJob: number;
+    job: JobProgression;
+    options: JobProgressionOptions;
+    constructor();
+    incrementJob(value: number): void;
+    addJob(): void;
+}

package/src/app/social/job/testing/job-progression.testing.service.d.ts

@@ -0,0 +1,10 @@
+import { IJobProgressionService } from '../job.service';
+import { FetchPolicy } from '@apollo/client/core';
+import { Observable } from 'rxjs';
+import { JobProgression } from '../job.model';
+export declare class JobProgressionTestService implements IJobProgressionService {
+    listenChanges(id: number, options?: {
+        interval?: number;
+        fetchPolicy?: FetchPolicy;
+    }): Observable<JobProgression>;
+}

package/src/app/social/job/testing/job.testing.module.d.ts

@@ -0,0 +1,2 @@
+export declare class JobTestingModule {
+}

package/src/app/social/social.testing.module.d.ts

@@ -0,0 +1,4 @@
+import { TestingPage } from '../shared/testing/tests.page';
+export declare const SOCIAL_TESTING_PAGES: TestingPage[];
+export declare class SocialTestingModule {
+}

package/src/app/social/user-event/notification/{user-event-notification.component.d.ts → user-event-notification.icon.d.ts}

@@ -4,14 +4,15 @@ import { PopoverController } from '@ionic/angular';
 import { IUserEventService } from '../user-event.service';
 import { IUserEvent, IUserEventFilter } from '../user-event.model';
 import { AccountService } from '../../../core/services/account.service';
-export declare class UserEventNotificationComponent implements OnInit, OnDestroy {
+export declare class AppUserEventNotificationIcon implements OnInit, OnDestroy {
     userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>;
     protected accountService: AccountService;
     protected popoverController: PopoverController;
     debug: boolean;
     titleI18n: string;
     disabled: boolean;
-    get count(): Observable<number>;
+    filter: any;
+    get countChanges(): Observable<number>;
     private _logPrefix;
     private _readEvent;
     private _readEvents;

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

@@ -1,30 +1,55 @@
-import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnDestroy, OnInit, QueryList } from '@angular/core';
 import { IUserEvent, IUserEventFilter, UserEventAction } from '../user-event.model';
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { PopoverController } from '@ionic/angular';
+import { IonContent, IonItem, PopoverController } from '@ionic/angular';
 import { IUserEventService } from '../user-event.service';
+import { LocalSettingsService } from '../../../core/services/local-settings.service';
+import { FetchMoreFn, LoadResult } from '../../../shared/services/entity-service.class';
+import { SortDirection } from '@angular/material/sort';
 export interface UserEventNotificationListOptions {
     debug?: boolean;
     titleI18n?: string;
     readEvent?: EventEmitter<IUserEvent<any>>;
     readEvents?: EventEmitter<IUserEvent<any>[]>;
 }
-export declare class UserEventNotificationList implements OnInit, OnDestroy, UserEventNotificationListOptions {
+export declare class UserEventNotificationList<E extends IUserEvent<any> = IUserEvent<any>> implements OnInit, OnDestroy, UserEventNotificationListOptions {
     protected cd: ChangeDetectorRef;
     protected popoverController: PopoverController;
-    userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>;
+    protected settings: LocalSettingsService;
+    userEventService: IUserEventService<E, IUserEventFilter<any>>;
+    protected subscriptions: Subscription;
+    protected _fetchMoreFn: FetchMoreFn<LoadResult<E>>;
+    protected _fetchingMore: boolean;
+    protected _fetchMoreSubscription: Subscription;
     debug: boolean;
+    mobile: boolean;
     titleI18n: string;
-    readEvent: EventEmitter<IUserEvent<any>>;
-    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>>);
+    pageSize: number;
+    sortBy: string;
+    sortDirection: SortDirection;
+    filter: Partial<IUserEventFilter<any>>;
+    enableInfiniteScroll: boolean;
+    readEvent: EventEmitter<E>;
+    readEvents: EventEmitter<E[]>;
+    ionContent: IonContent;
+    ionItems: QueryList<IonItem>;
+    $items: BehaviorSubject<E[]>;
+    $itemCount: BehaviorSubject<number>;
+    get canFetchMore(): boolean;
+    constructor(cd: ChangeDetectorRef, popoverController: PopoverController, settings: LocalSettingsService, userEventService: IUserEventService<E, IUserEventFilter<any>>);
     ngOnInit(): void;
     ngOnDestroy(): void;
-    read(event: UIEvent, userEvent: IUserEvent<any>): void;
-    readAll(event: UIEvent): void;
-    executeAction(action: UserEventAction, userEvent: IUserEvent<any>): void;
+    click(event: UIEvent, userEvent: E): void;
+    isDefaultAction(action: UserEventAction): boolean;
+    markAsRead(event: UIEvent, userEvent: E): void;
+    markAllAsRead(event: UIEvent): void;
+    executeAction(event: UIEvent, action: UserEventAction, userEvent: IUserEvent<any>): Promise<void>;
     dismiss(): void;
+    fetchMore(event?: CustomEvent & {
+        target?: EventTarget & {
+            complete?: () => void;
+        };
+    }): Promise<void>;
+    _initInfiniteScroll(threshold?: string): Promise<void>;
     protected markForCheck(): void;
 }

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

@@ -0,0 +1,23 @@
+import { UserEvent } from '../user-event.model';
+import { Router } from '@angular/router';
+import { AlertController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { UserEventTestService } from './user-event.testing.service';
+import { AppUserEventNotificationIcon } from '../notification/user-event-notification.icon';
+export declare class UserEventTestingPage {
+    protected userEventService: UserEventTestService;
+    protected router: Router;
+    protected alertController: AlertController;
+    protected translateService: TranslateService;
+    notification: AppUserEventNotificationIcon;
+    constructor(userEventService: UserEventTestService, router: Router, alertController: AlertController, translateService: TranslateService);
+    protected customize(userEvent: UserEvent): void;
+    addNotification(): void;
+    addError(): void;
+    addWarning(): void;
+    addDebug(): void;
+    addNotificationWithLink(): void;
+    addNotificationWithAction(): void;
+    addNotificationWithDefaultAction(): void;
+    protected showMessage(text: string): Promise<void>;
+}

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

@@ -0,0 +1,2 @@
+export declare class UserEventTestingModule {
+}

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

@@ -1,4 +1,4 @@
-import { AbstractUserEventService, UserEventWatchOptions } from '../user-event.service';
+import { AbstractUserEventService, UserEventLoadOptions, UserEventWatchOptions } from '../user-event.service';
 import { IUserEvent, UserEvent, UserEventFilter } from '../user-event.model';
 import { Observable } from 'rxjs';
 import { GraphqlService } from '../../../core/graphql/graphql.service';
@@ -25,11 +25,12 @@ export declare class UserEventTestService extends AbstractUserEventService<UserE
     }): Promise<number>;
     delete(entity: any): Promise<any>;
     deleteAll(data: any[], opts?: any): Promise<any>;
-    listenChanges(filter: any, options?: UserEventWatchOptions & {
+    listenAllChanges(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>>;
+    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<any>, opts?: UserEventWatchOptions): Observable<LoadResult<any>>;
+    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<any>, opts?: UserEventLoadOptions): Promise<LoadResult<any>>;
 }

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

@@ -71,5 +71,6 @@ export interface UserEventAction {
     title?: string;
     color?: AppColors;
     iconRef?: IconRef;
+    default?: boolean;
     executeAction: (event: IUserEvent<any>) => any | Promise<any>;
 }

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

@@ -2,16 +2,19 @@ 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 { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { IUserEvent, IUserEventFilter } from './user-event.model';
 import { SortDirection } from '@angular/material/sort';
-import { EntitiesServiceWatchOptions, EntityServiceLoadOptions, IEntitiesService, LoadResult, Page } from '../../shared/services/entity-service.class';
+import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceLoadOptions, IEntitiesService, LoadResult, Page } from '../../shared/services/entity-service.class';
 import { TranslateService } from '@ngx-translate/core';
 import { NetworkService } from '../../core/services/network.service';
 import { BaseGraphqlService, BaseGraphqlServiceOptions } from '../../core/services/base-graphql-service.class';
 import { Moment } from 'moment';
 import { IStartableService } from '../../shared/services/startable-service.class';
-export declare const USER_EVENT_SERVICE: InjectionToken<IUserEventService<any, any, UserEventWatchOptions>>;
+export declare const USER_EVENT_SERVICE: InjectionToken<IUserEventService<any, any, UserEventWatchOptions, UserEventLoadOptions>>;
+export declare interface UserEventLoadOptions extends EntitiesServiceLoadOptions {
+    withContent?: boolean;
+}
 export declare interface UserEventWatchOptions extends EntitiesServiceWatchOptions {
     withContent?: boolean;
 }
@@ -26,7 +29,7 @@ export interface IUserEventMutations {
     deleteByIds: any;
 }
 export interface IUserEventSubscriptions {
-    listenChanges: any;
+    listenAllChanges: any;
     listenCountChanges?: any;
 }
 export interface IUserEventListener<E extends IUserEvent<E>> {
@@ -39,8 +42,8 @@ export interface UserEventServiceOptions<Q extends IUserEventQueries = IUserEven
     mutations?: Partial<M>;
     subscriptions?: Partial<S>;
 }
-export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEventFilter<E>, WO extends UserEventWatchOptions = UserEventWatchOptions> extends IEntitiesService<E, F, WO>, IStartableService {
-    userEventCount: Observable<number>;
+export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEventFilter<E>, WO extends UserEventWatchOptions = UserEventWatchOptions, LO extends UserEventLoadOptions = UserEventLoadOptions> extends IEntitiesService<E, F, WO>, IStartableService {
+    countSubject: Observable<number>;
     add(entity: E): any;
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
@@ -49,7 +52,7 @@ export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEvent
         interval?: number;
         fetchPolicy?: FetchPolicy;
     }): Observable<number>;
-    listenChanges(filter: Partial<F>, options?: WO & {
+    listenAllChanges(filter: Partial<F>, options?: WO & {
         interval?: number;
         fetchPolicy?: FetchPolicy;
     }): Observable<E[]>;
@@ -59,7 +62,7 @@ export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEvent
     registerListener(listener: IUserEventListener<E>): any;
     resetCount(): any;
 }
-export declare abstract class AbstractUserEventService<E extends IUserEvent<E, any>, F extends IUserEventFilter<E, any>, WO extends UserEventWatchOptions = UserEventWatchOptions, Q extends IUserEventQueries = IUserEventQueries, M extends IUserEventMutations = IUserEventMutations, S extends IUserEventSubscriptions = IUserEventSubscriptions> 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, LO extends UserEventLoadOptions = UserEventLoadOptions, Q extends IUserEventQueries = IUserEventQueries, M extends IUserEventMutations = IUserEventMutations, S extends IUserEventSubscriptions = IUserEventSubscriptions> extends BaseGraphqlService<E, F> implements IUserEventService<E, F, WO, LO>, OnDestroy {
     protected graphql: GraphqlService;
     protected accountService: AccountService;
     protected network: NetworkService;
@@ -68,19 +71,20 @@ export declare abstract class AbstractUserEventService<E extends IUserEvent<E, a
     protected readonly queries: Q;
     protected readonly mutations: Partial<M>;
     protected readonly subscriptions: Partial<S>;
-    protected count$: BehaviorSubject<number>;
+    protected readonly _countSubject: BehaviorSubject<number>;
     protected resetCountDate: Moment;
     protected listeners: IUserEventListener<E>[];
     private _subscriptions;
     private _listenSubscription;
-    get userEventCount(): Observable<number>;
+    get countSubject(): Subject<number>;
     protected constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, options: UserEventServiceOptions<Q, M, S>);
     protected ngOnStart(): Promise<void>;
     ngOnDestroy(): void;
     abstract asFilter(filter: Partial<F>): F;
     abstract fromObject(source: any): E;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, options?: WO): Observable<LoadResult<E>>;
-    watchPage(page: Page, filter?: Partial<F>, options?: WO): Observable<LoadResult<E>>;
+    watchPage(page: Page, filter?: Partial<F>, opts?: WO): Observable<LoadResult<E>>;
+    loadPage(page: Page, filter?: Partial<F>, opts?: LO): Promise<LoadResult<E>>;
     add(entity: E): void;
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
@@ -89,7 +93,7 @@ export declare abstract class AbstractUserEventService<E extends IUserEvent<E, a
         interval?: number;
         fetchPolicy?: FetchPolicy;
     }): Observable<number>;
-    listenChanges(filter: Partial<F>, options?: WO & {
+    listenAllChanges(filter: Partial<F>, options?: WO & {
         interval?: number;
         fetchPolicy?: FetchPolicy;
     }): Observable<E[]>;

package/src/theme/_ngx-components.scss

@@ -1244,6 +1244,18 @@ ion-modal.stack-modal {
   --min-width: calc(min(500px, 80%));
 }
 
+.popover-notifications {
+  --max-height: calc(90vh - 20px /* footer height */);
+
+  ion-item {
+    --ion-item-background-color-hover: var(--ion-color-light);
+    &.unread {
+      --ion-item-background: rgba(var(--ion-color-secondary100-rgb), 0.2);
+      --ion-item-background-color-hover: rgba(var(--ion-color-secondary100-rgb), 0.3);
+    }
+  }
+}
+
 // --------------------------------------------------
 // Large button with icon floating on right
 // --------------------------------------------------