@sumaris-net/ngx-components 18.2.1 → 18.2.3

package/package.json

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

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

@@ -101,7 +101,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     delete(entity: T, opts?: EntitySaveOptions | any): Promise<any>;
     listenChanges(id: ID, opts?: EntityServiceListenChangesOptions<T>): Observable<T>;
     copyIdAndUpdateDate(source: T, target: T): void;
-    fromObject(source: any, toEntity?: boolean | ((source: any) => T)): T;
+    fromObject(source: any, toEntity?: boolean | ((source: any, opts?: any) => T), opts?: any): T;
     asFilter(source: any): F;
     equals(d1: T, d2: T): boolean;
     isNew(data: T): boolean;
@@ -116,7 +116,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     isNewFn(data: T): boolean;
     protected ngOnStart(): Promise<void>;
     protected fillDefaultProperties(source: T): void;
-    protected fromObjects(sources: any[], toEntity?: boolean | ((source: any) => T)): T[];
+    protected fromObjects(sources: any[], toEntity?: boolean | ((source: any, opts?: any) => T), opts?: any): T[];
     protected asObject(source: T, opts?: EntityAsObjectOptions): any;
     protected getRefetchQueriesForMutation(opts?: EntitySaveOptions): ((result: FetchResult<{
         data: any;

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

@@ -6,7 +6,7 @@ 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 { LoadResult } from '../../../shared/services/entity-service.class';
 import { SortDirection } from '@angular/material/sort';
 import { UserEventTest, UserEventTestFilter } from './user-event.testing.model';
 import * as i0 from "@angular/core";
@@ -28,15 +28,14 @@ export declare class UserEventTestService extends AbstractUserEventService<UserE
     }): Promise<number>;
     delete(entity: any): Promise<any>;
     deleteAll(data: any[], opts?: any): Promise<any>;
-    listenAllChanges(filter: any, options?: UserEventWatchOptions & {
+    listenAllChanges(filter: any, options?: UserEventLoadOptions<UserEventTest> & {
         interval?: number;
-        fetchPolicy?: FetchPolicy;
     }): Observable<any[]>;
-    save(entity: any, options?: EntityServiceLoadOptions): Promise<any>;
+    save(entity: any, options?: UserEventLoadOptions<UserEventTest>): Promise<any>;
     saveAll(data: any[], opts?: any): Promise<any[]>;
     protected defaultRecipient(): 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>>;
+    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<any>, opts?: UserEventWatchOptions<UserEventTest>): Observable<LoadResult<any>>;
+    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<any>, opts?: UserEventLoadOptions<UserEventTest>): Promise<LoadResult<any>>;
     static ɵfac: i0.ɵɵFactoryDeclaration<UserEventTestService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<UserEventTestService>;
 }

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

@@ -14,11 +14,11 @@ import { IStartableService } from '../../shared/services/startable-service.class
 import { DocumentNode } from 'graphql/index';
 import { MutableWatchQueriesUpdatePolicy } from '../../core/services/base-entity-service.class';
 import * as i0 from "@angular/core";
-export declare const APP_USER_EVENT_SERVICE: InjectionToken<IUserEventService<any, any, number, UserEventWatchOptions, UserEventLoadOptions>>;
-export declare interface UserEventLoadOptions extends EntitiesServiceLoadOptions {
+export declare const APP_USER_EVENT_SERVICE: InjectionToken<IUserEventService<any, any, number, UserEventWatchOptions<any>, UserEventLoadOptions<any>>>;
+export declare interface UserEventLoadOptions<T> extends EntitiesServiceLoadOptions<T> {
     withContent?: boolean;
 }
-export declare interface UserEventWatchOptions extends EntitiesServiceWatchOptions {
+export declare interface UserEventWatchOptions<T> extends EntitiesServiceWatchOptions<T> {
     withContent?: boolean;
 }
 export interface IUserEventQueries {
@@ -46,28 +46,26 @@ export interface UserEventServiceOptions<Q extends IUserEventQueries = IUserEven
     subscriptions?: Partial<S>;
     watchQueriesUpdatePolicy?: MutableWatchQueriesUpdatePolicy;
 }
-export interface IUserEventService<E extends IUserEvent<E, ID>, F extends IUserEventFilter<E, ID>, ID = number, WO extends UserEventWatchOptions = UserEventWatchOptions, LO extends UserEventLoadOptions = UserEventLoadOptions> extends IEntitiesService<E, F, WO>, IStartableService {
+export interface IUserEventService<E extends IUserEvent<E, ID>, F extends IUserEventFilter<E, ID>, ID = number, WO extends UserEventWatchOptions<E> = UserEventWatchOptions<E>, LO extends UserEventLoadOptions<E> = UserEventLoadOptions<E>> extends IEntitiesService<E, F, WO>, IStartableService {
     countSubject: Observable<number>;
     add(entity: E): Promise<E>;
     load(id: ID, opts?: LO): Promise<E>;
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
     }): Promise<number>;
-    listenCountChanges(filter: Partial<F>, options?: WO & {
+    listenCountChanges(filter: Partial<F>, options?: Omit<LO, 'toEntity'> & {
         interval?: number;
-        fetchPolicy?: FetchPolicy;
     }): Observable<number>;
-    listenAllChanges(filter: Partial<F>, options?: WO & {
+    listenAllChanges(filter: Partial<F>, options?: LO & {
         interval?: number;
-        fetchPolicy?: FetchPolicy;
     }): Observable<E[]>;
-    save(entity: E, options?: EntityServiceLoadOptions): Promise<E>;
+    save(entity: E, options?: LO): Promise<E>;
     delete(entity: E): Promise<any>;
     markAllAsRead(entities: E[]): any;
     registerListener(listener: IUserEventListener<E, ID>): any;
     resetCount(): any;
 }
-export declare abstract class AbstractUserEventService<E extends IUserEvent<E, ID, any>, F extends IUserEventFilter<E, ID, any>, ID = number, WO extends UserEventWatchOptions = UserEventWatchOptions, LO extends UserEventLoadOptions = UserEventLoadOptions, Q extends IUserEventQueries = IUserEventQueries, M extends IUserEventMutations = IUserEventMutations, S extends IUserEventSubscriptions = IUserEventSubscriptions> extends BaseGraphqlService<E, F, ID> implements IUserEventService<E, F, ID, WO, LO>, OnDestroy {
+export declare abstract class AbstractUserEventService<E extends IUserEvent<E, ID, any>, F extends IUserEventFilter<E, ID, any>, ID = number, WO extends UserEventWatchOptions<E> = UserEventWatchOptions<E>, LO extends UserEventLoadOptions<E> = UserEventLoadOptions<E>, Q extends IUserEventQueries = IUserEventQueries, M extends IUserEventMutations = IUserEventMutations, S extends IUserEventSubscriptions = IUserEventSubscriptions> extends BaseGraphqlService<E, F, ID> implements IUserEventService<E, F, ID, WO, LO>, OnDestroy {
     protected graphql: GraphqlService;
     protected accountService: AccountService;
     protected network: NetworkService;
@@ -96,18 +94,15 @@ export declare abstract class AbstractUserEventService<E extends IUserEvent<E, I
     count(filter: Partial<F>, options?: {
         fetchPolicy?: FetchPolicy;
     }): Promise<number>;
-    listenCountChanges(filter: Partial<F>, options?: WO & {
+    listenCountChanges(filter: Partial<F>, options?: Omit<LO, 'toEntity'> & {
         interval?: number;
-        fetchPolicy?: FetchPolicy;
     }): Observable<number>;
-    listenAllChanges(filter: Partial<F>, opts?: WO & {
+    listenAllChanges(filter: Partial<F>, opts?: LO & {
         interval?: number;
-        fetchPolicy?: FetchPolicy;
-        toEntity?: boolean;
     }): Observable<E[]>;
     delete(entity: E): Promise<any>;
     deleteAll(entities: E[], opts?: any): Promise<any>;
-    save(entity: E, options?: EntityServiceLoadOptions): Promise<E>;
+    save(entity: E, options?: EntityServiceLoadOptions<E>): Promise<E>;
     saveAll(entities: E[], opts?: any): Promise<E[]>;
     markAllAsRead(entities: E[]): Promise<void>;
     registerListener(listener: IUserEventListener<E, ID>): void;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "18.2.1",
+  "version": "18.2.3",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{