@sumaris-net/ngx-components 1.21.0-beta9 → 1.21.2

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

@@ -1,11 +1,9 @@
-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 { IUserEvent, IUserEventFilter, UserEvent, UserEventFilter } from './user-event.model';
+import { Observable } from 'rxjs';
+import { UserEvent, UserEventAction } from './user-event.model';
 import { SortDirection } from '@angular/material/sort';
-import { EntitiesServiceWatchOptions, EntityServiceLoadOptions, IEntitiesService, LoadResult, Page } from '../../shared/services/entity-service.class';
+import { EntitiesServiceWatchOptions, EntityServiceLoadOptions, FilterFn, IEntitiesService, LoadResult, Page } from '../../shared/services/entity-service.class';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { OverlayEventDetail } from '@ionic/core';
 import { ToastController } from '@ionic/angular';
@@ -13,90 +11,64 @@ 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';
-export declare const UserEventServiceToken: InjectionToken<IUserEventService<any, any, UserEventWatchOptions>>;
+import { EntityFilter } from '../../core/services/model/filter.model';
+export declare class UserEventFilter extends EntityFilter<UserEventFilter, UserEvent> {
+    static fromObject: (source: any, opts?: any) => UserEventFilter;
+    issuer: string;
+    recipient: string;
+    fromObject(source: any, opts?: any): void;
+    protected buildFilter(): FilterFn<UserEvent>[];
+}
 export declare interface UserEventWatchOptions extends EntitiesServiceWatchOptions {
     withContent?: boolean;
 }
-export interface IUserEventQueries {
-    loadAll: any;
-    loadAllWithContent: any;
-    count?: any;
-}
-export interface IUserEventMutations {
-    save: any;
-    deleteByIds: any;
-}
-export interface IUserEventSubscriptions {
-    listenChanges: any;
-}
-export interface IUserEventListener<E extends IUserEvent<E>> {
-    accept: (E: any) => boolean;
-    onReceived?: (E: any) => E | undefined;
-    onRead?: (E: any) => Promise<void> | void;
-}
-export interface IUserEventService<E extends IUserEvent<E>, F extends IUserEventFilter<E>, WO extends UserEventWatchOptions = UserEventWatchOptions> extends IEntitiesService<E, F, WO> {
-    userEventCount: Observable<number>;
-    add(entity: E): any;
-    count(filter: Partial<F>, options?: {
-        fetchPolicy?: FetchPolicy;
-    }): Promise<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;
-}
-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 queries: IUserEventQueries;
-    protected mutations: IUserEventMutations;
-    protected subscriptions: IUserEventSubscriptions;
-    protected environment: Environment;
-    private _count$;
-    protected _subscriptions: Subscription;
-    protected listeners: IUserEventListener<E>[];
-    get userEventCount(): Observable<number>;
-    protected constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, queries: IUserEventQueries, mutations: IUserEventMutations, subscriptions: IUserEventSubscriptions, environment: Environment);
-    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>>;
-    add(entity: E): void;
-    count(filter: Partial<F>, options?: {
-        fetchPolicy?: FetchPolicy;
-    }): Promise<number>;
-    listenChanges(filter: Partial<F>, options?: WO & {
-        interval?: number;
-        fetchPolicy?: FetchPolicy;
-    }): Observable<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>;
-    registerListener(listener: IUserEventListener<E>): void;
-    protected processUserEvent(source: any): E;
-    protected defaultMarkAsRead(userEvent: E): Promise<void>;
-    protected defaultFilter(): F;
-    protected defaultRecipient(): any;
-    protected fillDefaultProperties(entity: E): void;
-    protected unreadEvents(events: E[]): number;
-    protected copyIdAndUpdateDate(source: E, target: E): void;
+export interface UserEventActionDefinition extends UserEventAction<any> {
+    __typename: string;
 }
-export declare class UserEventService extends AbstractUserEventService<UserEvent, UserEventFilter> {
+export declare class UserEventService extends BaseGraphqlService<UserEvent, UserEventFilter> implements IEntitiesService<UserEvent, UserEventFilter, UserEventWatchOptions> {
     protected graphql: GraphqlService;
     protected accountService: AccountService;
     protected network: NetworkService;
     protected translate: TranslateService;
     protected toastController: ToastController;
     protected environment: Environment;
+    private _userEventActions;
     constructor(graphql: GraphqlService, accountService: AccountService, network: NetworkService, translate: TranslateService, toastController: ToastController, environment: Environment);
+    /**
+     *
+     * @param offset
+     * @param size
+     * @param sortBy
+     * @param sortDirection
+     * @param filter
+     * @param options
+     * @deprecated use watchPage() instead
+     */
+    watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: UserEventFilter, options?: UserEventWatchOptions): Observable<LoadResult<UserEvent>>;
+    watchPage(page: Page, filter?: Partial<UserEventFilter>, options?: UserEventWatchOptions): Observable<LoadResult<UserEvent>>;
+    saveAll(data: UserEvent[], options?: any): Promise<UserEvent[]>;
+    /**
+     * Save a userEvent entity
+     *
+     * @param entity
+     */
+    save(entity: UserEvent, options?: EntityServiceLoadOptions): Promise<UserEvent>;
+    /**
+     * Save many trips
+     *
+     * @param entities
+     * @param opts
+     */
+    deleteAll(entities: UserEvent[], opts?: {
+        trash?: boolean;
+    }): Promise<any>;
+    /**
+     * Delete userEvent entities
+     */
+    delete(data: UserEvent): Promise<any>;
+    listenChanges(id: number, options?: any): Observable<UserEvent | undefined>;
+    registerAction(definition: UserEventActionDefinition): void;
+    getActionsByTypename(typename: string): UserEventAction<any>[];
     showToastErrorWithContext(opts: {
         error?: any;
         message?: string;
@@ -104,8 +76,8 @@ export declare class UserEventService extends AbstractUserEventService<UserEvent
     }): Promise<void>;
     sendDataForDebug(data: any): Promise<UserEvent>;
     asFilter(filter: Partial<UserEventFilter>): UserEventFilter;
-    fromObject(source: any): UserEvent;
     protected convertObjectToString(data: any): string;
     protected showToast<T = any>(opts: ShowToastOptions): Promise<OverlayEventDetail<T>>;
     protected fillDefaultProperties(entity: UserEvent): void;
+    protected copyIdAndUpdateDate(source: UserEvent, target: UserEvent): void;
 }

package/src/app/social/user-event/user-events.table.d.ts

@@ -1,8 +1,8 @@
 import { ChangeDetectorRef, Injector, OnInit } from '@angular/core';
 import { TableElement } from '@e-is/ngx-material-table';
-import { IUserEventService } from './user-event.service';
+import { UserEventFilter, UserEventService } from './user-event.service';
 import { AccountService } from '../../core/services/account.service';
-import { UserEvent, UserEventAction, UserEventFilter } from './user-event.model';
+import { UserEvent, UserEventAction } from './user-event.model';
 import { Moment } from 'moment';
 import { AppTable } from '../../core/table/table.class';
 import { SortDirection } from '@angular/material/sort';
@@ -35,7 +35,7 @@ export interface UserEventIcon {
 }
 export declare class UserEventsTable extends AppTable<UserEvent, UserEventFilter> implements OnInit {
     protected accountService: AccountService;
-    protected service: IUserEventService<UserEvent, UserEventFilter>;
+    protected service: UserEventService;
     protected entities: EntitiesStorage;
     protected cd: ChangeDetectorRef;
     protected environment: any;
@@ -47,12 +47,12 @@ export declare class UserEventsTable extends AppTable<UserEvent, UserEventFilter
     withContent: boolean;
     defaultSortBy: string;
     defaultSortDirection: SortDirection;
-    constructor(injector: Injector, accountService: AccountService, service: IUserEventService<UserEvent, UserEventFilter>, entities: EntitiesStorage, cd: ChangeDetectorRef, environment: any);
+    constructor(injector: Injector, accountService: AccountService, service: UserEventService, entities: EntitiesStorage, cd: ChangeDetectorRef, environment: any);
     ngOnInit(): void;
     start(): Promise<void>;
     getIcon(source: UserEvent): UserEventIcon;
     getDetail(source: UserEvent): Partial<UserEventDetail<IEntity<any>> & {
-        actions: UserEventAction[];
+        actions: UserEventAction<any>[];
     }>;
-    doAction(action: UserEventAction, row: TableElement<UserEvent>): Promise<void>;
+    doAction(action: UserEventAction<any>, row: TableElement<UserEvent>): Promise<void>;
 }

package/src/assets/i18n/en-US.json

@@ -387,10 +387,6 @@
   },
   "SOCIAL": {
     "USER_EVENT": {
-      "NOTIFICATION": {
-        "TITLE": "Notifications",
-        "EMPTY": "No notification"
-      },
       "EVENT_TYPE": "Type",
       "CREATION_DATE": "Date/Time",
       "MESSAGE": "Message",
@@ -404,12 +400,6 @@
         "FEED": "Feed"
       }
     },
-    "JOB": {
-      "PROGRESSION": {
-        "TITLE": "Running tasks",
-        "EMPTY": "No running task"
-      }
-    },
     "MESSAGE": {
       "TYPE": "Message type",
       "RECIPIENTS": "Recipients",
@@ -426,11 +416,8 @@
     },
     "ERROR": {
       "LOAD_USER_EVENTS_ERROR": "Error while loading notifications",
-      "COUNT_USER_EVENT_ERROR": "Error while counting notifications",
       "SAVE_USER_EVENT_ERROR": "Error while saving user notification",
-      "SUBSCRIBE_USER_EVENTS_ERROR": "Error while listening user events changes",
-      "SEND_MESSAGE_ERROR": "Error while sending message",
-      "SUBSCRIBE_JOB_PROGRESSION_ERROR": "Error while listening job progression changes"
+      "SEND_MESSAGE_ERROR": "Error while sending message"
     },
     "INFO": {
       "MESSAGE_SENT": "Message <b>sent</b>"
@@ -519,7 +506,7 @@
     "SAVE_ENTITY_ERROR": "Error while saving",
     "SAVE_ENTITIES_ERROR": "Error while saving the list",
     "DELETE_ENTITY_ERROR": "Error while deleting. <small><br/>If the problem persists, please contact your administrator.</small>",
-    "SUBSCRIBE_ENTITY_ERROR": "Error while subscribing to remote changes",
+    "SUBSCRIBE_ENTITY_ERROR": "Error while subscribing to remte changes",
     "CONTROL_ENTITY_ERROR": "Error while checking data validity",
     "TERMINATE_ENTITY_ERROR": "Cannot terminate entry. <small><br/>If the problem persists, please contact your administrator.</small>",
     "VALIDATE_ENTITY_ERROR": "Error when validating data",

package/src/assets/i18n/en.json

@@ -387,10 +387,6 @@
   },
   "SOCIAL": {
     "USER_EVENT": {
-      "NOTIFICATION": {
-        "TITLE": "Notifications",
-        "EMPTY": "No notification"
-      },
       "EVENT_TYPE": "Type",
       "CREATION_DATE": "Date/Time",
       "MESSAGE": "Message",
@@ -404,12 +400,6 @@
         "FEED": "Feed"
       }
     },
-    "JOB": {
-      "PROGRESSION": {
-        "TITLE": "Running tasks",
-        "EMPTY": "No running task"
-      }
-    },
     "MESSAGE": {
       "TYPE": "Message type",
       "RECIPIENTS": "Recipients",
@@ -426,11 +416,8 @@
     },
     "ERROR": {
       "LOAD_USER_EVENTS_ERROR": "Error while loading notifications",
-      "COUNT_USER_EVENT_ERROR": "Error while counting notifications",
       "SAVE_USER_EVENT_ERROR": "Error while saving user notification",
-      "SUBSCRIBE_USER_EVENTS_ERROR": "Error while listening user events changes",
-      "SEND_MESSAGE_ERROR": "Error while sending message",
-      "SUBSCRIBE_JOB_PROGRESSION_ERROR": "Error while listening job progression changes"
+      "SEND_MESSAGE_ERROR": "Error while sending message"
     },
     "INFO": {
       "MESSAGE_SENT": "Message <b>sent</b>"
@@ -519,7 +506,7 @@
     "SAVE_ENTITY_ERROR": "Error while saving",
     "SAVE_ENTITIES_ERROR": "Error while saving the list",
     "DELETE_ENTITY_ERROR": "Error while deleting. <small><br/>If the problem persists, please contact your administrator.</small>",
-    "SUBSCRIBE_ENTITY_ERROR": "Error while subscribing to remote changes",
+    "SUBSCRIBE_ENTITY_ERROR": "Error while subscribing to remte changes",
     "CONTROL_ENTITY_ERROR": "Error while checking data validity",
     "TERMINATE_ENTITY_ERROR": "Cannot terminate entry. <small><br/>If the problem persists, please contact your administrator.</small>",
     "VALIDATE_ENTITY_ERROR": "Error when validating data",

package/src/assets/i18n/fr.json

@@ -390,10 +390,6 @@
   },
   "SOCIAL": {
     "USER_EVENT": {
-      "NOTIFICATION": {
-        "TITLE": "Notifications",
-        "EMPTY": "Aucune notification"
-      },
       "EVENT_TYPE": "Type",
       "CREATION_DATE": "Date/Heure",
       "MESSAGE": "Message",
@@ -407,12 +403,6 @@
         "FEED": "Actualité"
       }
     },
-    "JOB": {
-      "PROGRESSION": {
-        "TITLE": "Liste des tâches en cours",
-        "EMPTY": "Aucune tâche en cours"
-      }
-    },
     "MESSAGE": {
       "TYPE": "Type d'envoi",
       "RECIPIENTS": "Destinataires",
@@ -429,11 +419,8 @@
     },
     "ERROR": {
       "LOAD_USER_EVENTS_ERROR": "Erreur de chargement des notifications",
-      "COUNT_USER_EVENT_ERROR": "Erreur de comptage des notifications",
       "SAVE_USER_EVENT_ERROR": "Erreur de sauvegarde de la notification",
-      "SUBSCRIBE_USER_EVENTS_ERROR": "Erreur lors de l'abonnement aux notifications",
-      "SEND_MESSAGE_ERROR": "Erreur lors de l'envoi du message",
-      "SUBSCRIBE_JOB_PROGRESSION_ERROR": "Erreur lors de l'abonnement à la progression de tâche"
+      "SEND_MESSAGE_ERROR": "Erreur lors de l'envoi du message"
     },
     "INFO": {
       "MESSAGE_SENT": "Message <b>envoyé</b>"

package/src/theme/_ngx-components.scss

@@ -326,16 +326,10 @@ mat-option:not(:last-of-type) {
     margin-left: 8px;
   }
 }
-
-ion-list,
 .mat-select-panel,
 .mat-menu-panel,
 .mat-autocomplete-panel {
 
-  &.ion-list-popover {
-    padding: 0 !important;
-  }
-
   /* Avoid bad display, when opening panel for the first time  */
   &.ng-trigger-transformPanel {
     ion-searchbar.mat-select-header,
@@ -369,7 +363,6 @@ ion-list,
     }
   }
 
-  ion-row.ion-list-header,
   ion-row.mat-select-header,
   ion-row.mat-menu-header,
   ion-row.mat-autocomplete-header {

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

@@ -10,12 +10,10 @@ 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 ɵm } from './src/app/shared/material/badge/badge-icon.test';
+export { DateTestPage as ɵk } 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 ɵl } 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 { UserEventNotificationList as ɵk } from './src/app/social/user-event/notification/user-event-notification.list';
+export { ToastTestingPage as ɵo } from './src/app/shared/toast/toast.testing';
+export { ToastTestingModule as ɵn } from './src/app/shared/toast/toast.testing.module';