@sumaris-net/ngx-components 1.23.16 → 1.23.18

package/package.json

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

package/public_api.d.ts

@@ -175,7 +175,8 @@ export * from './src/app/social/user-event/notification/user-event-notification.
 export * from './src/app/social/job/job.module';
 export * from './src/app/social/job/job.model';
 export * from './src/app/social/job/job.service';
-export * from './src/app/social/job/progression/job-progression.component';
+export * from './src/app/social/job/progression/job-progression.icon';
+export * from './src/app/social/job/progression/job-progression.list';
 export * from './src/app/social/message/message.module';
 export * from './src/app/social/message/message.model';
 export * from './src/app/social/message/message.service';

package/src/app/core/services/network.service.d.ts

@@ -13,12 +13,12 @@ import { CacheService } from 'ionic-cache';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { OverlayEventDetail } from '@ionic/core';
 import { AppManifest, NodeInfo } from './network.utils';
-import { StartableService } from '../../shared/services/startable-service.class';
+import { StartableObservableService } from '../../shared/services/startable-observable-service.class';
 export declare type ConnectionType = 'none' | 'wifi' | 'ethernet' | 'cell' | 'unknown';
 export declare type AuthTokenType = 'token' | 'basic' | 'basic-and-token';
 export declare function getConnectionType(type: Connection): ConnectionType;
 export declare type NetworkEventType = 'start' | 'peerChanged' | 'statusChanged' | 'resetCache' | 'beforeTryOnlineFinish';
-export declare class NetworkService extends StartableService<Peer> {
+export declare class NetworkService extends StartableObservableService<Peer, Peer> {
     private _document;
     private platform;
     private modalCtrl;
@@ -39,7 +39,6 @@ export declare class NetworkService extends StartableService<Peer> {
     private _timerSubscription;
     private readonly _timerRefreshPeriod;
     private readonly _timerRefreshCondition;
-    private _startingPeer;
     private _deviceConnectionType;
     private _forceOffline;
     private _listeners;
@@ -105,9 +104,9 @@ export declare class NetworkService extends StartableService<Peer> {
     clearCache(opts?: {
         emitEvent?: boolean;
     }): Promise<void>;
-    protected ngOnStart(): Promise<Peer>;
-    protected ngOnAfterStart(): Promise<void>;
-    protected ngOnStop(): Promise<void>;
+    protected ngOnStart(peer?: Peer): Promise<Peer>;
+    protected ngOnAfterStart(peer: Peer): Promise<void>;
+    protected ngOnStop(): void;
     /**
      * Try to restore peer from the local storage
      */
@@ -140,7 +139,6 @@ export declare class NetworkService extends StartableService<Peer> {
     }): Promise<T>;
     protected getUri(path: string): string;
     protected onDeviceConnectionChanged(connectionType?: string): void;
-    protected resetData(): void;
     /**
      * Get default peers, from environment
      */

package/src/app/core/table/entities-table-datasource.class.d.ts

@@ -24,8 +24,8 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
     protected _debug: boolean;
     protected _creating: boolean;
     protected _saving: boolean;
-    protected _stopWatching$: Subject<any>;
     protected _fetchMoreFn: FetchMoreFn<LoadResult<T>>;
+    protected _stopWatchSubject: Subject<any>;
     loadingSubject: BehaviorSubject<boolean>;
     /**
      * @deprecated Use watchAllOptions or saveAllOptions
@@ -51,13 +51,21 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
      * @param config Additional configuration for table.
      */
     constructor(dataType: new () => T, dataService: IEntitiesService<T, F, WO>, validatorService?: V, options?: C);
+    /**
+     * @deprecated use disconnect
+     */
     ngOnDestroy(): void;
+    /**
+     * @deprecated use disconnect
+     */
+    close(): void;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>): Observable<LoadResult<T>>;
     protected updateDatasourceFromRows(rows: TableElement<T>[]): void;
     save(): Promise<boolean>;
     updateDatasource(data: T[], opts?: {
         emitEvent: boolean;
     }): void;
+    private viewer;
     connect(collectionViewer: CollectionViewer): Observable<TableElement<T>[] | ReadonlyArray<TableElement<T>>>;
     disconnect(collectionViewer?: CollectionViewer): void;
     waitIdle(debounceTimeMs?: number): Promise<any>;

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

@@ -4,7 +4,7 @@ import { SortDirection } from '@angular/material/sort';
 import { OnDestroy } from '@angular/core';
 import { IEntity } from '../../core/services/model/entity.model';
 import { WaitForOptions } from '../observables';
-import { StartableService } from './startable-service.class';
+import { StartableObservableService } from './startable-observable-service.class';
 export interface InMemoryEntitiesServiceOptions<T, F> {
     onSort?: (data: T[], sortBy?: string, sortDirection?: SortDirection) => T[];
     onLoad?: (data: T[]) => T[] | Promise<T[]>;
@@ -16,12 +16,11 @@ export interface InMemoryEntitiesServiceOptions<T, F> {
         [key: string]: string;
     };
 }
-export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any, ID = number, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends StartableService<T[]> implements IEntitiesService<T, F, O>, OnDestroy {
+export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any, ID = number, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends StartableObservableService<T[], T[]> implements IEntitiesService<T, F, O>, OnDestroy {
     protected dataType: new () => T;
     protected filterType: new () => F;
     debug: boolean;
     private _hiddenData;
-    private dataSubject;
     private readonly dirtySubject;
     private readonly savingSubject;
     private readonly _sortFn;
@@ -35,7 +34,7 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
     get saving(): boolean;
     get dirty(): boolean;
     constructor(dataType: new () => T, filterType: new () => F, options?: InMemoryEntitiesServiceOptions<T, F>);
-    protected ngOnStart(): Promise<T[]>;
+    protected ngOnStart(data?: T[]): Promise<T[]>;
     protected ngOnStop(): Promise<void>;
     ngOnDestroy(): void;
     setValue(data: T[]): void;
@@ -53,6 +52,7 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
      */
     get count(): number;
     get hiddenCount(): number;
+    waitIdle(opts?: WaitForOptions): Promise<void>;
     protected filter(data: T[], _filter: F, hiddenData: T[]): T[];
     protected connect(): Observable<LoadResult<T>>;
     protected waitWhileSaving(opts?: WaitForOptions): Promise<void>;

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

@@ -0,0 +1,33 @@
+import { BehaviorSubject, Subject, Subscription } from 'rxjs';
+import { IStartableService } from './startable-service.class';
+/**
+ * Same as StartableService, bu with a dataSubject instead of a simple 'data' property
+ */
+export declare abstract class StartableObservableService<T = any, O = any> implements IStartableService<T> {
+    readonly dataSubject: BehaviorSubject<T>;
+    readonly startSubject: Subject<T>;
+    readonly stopSubject: Subject<void>;
+    protected _debug: boolean;
+    protected _startByReadyFunction: boolean;
+    private _started;
+    private _startPromise;
+    private _startPrerequisite;
+    private _subscription;
+    protected constructor(prerequisiteService?: {
+        ready: () => Promise<any>;
+    });
+    start(opts?: O): Promise<T>;
+    ready(): Promise<T>;
+    stop(): Promise<void>;
+    restart(opts?: O): Promise<T>;
+    get started(): boolean;
+    get starting(): boolean;
+    get stopped(): boolean;
+    protected get data(): T;
+    protected set data(value: T);
+    protected registerSubscription(sub: Subscription): Subscription;
+    protected unregisterSubscription(sub: Subscription): void;
+    protected unsubscribe(): void;
+    protected ngOnStop(): Promise<void> | void;
+    protected abstract ngOnStart(opts?: O): Promise<T>;
+}

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

@@ -5,9 +5,9 @@ export interface IStartableService<T = any> {
     stop(): Promise<void>;
     ready(): Promise<T>;
 }
-export declare abstract class StartableService<T = any> implements IStartableService<T> {
-    startSubject: Subject<T>;
-    stopSubject: Subject<void>;
+export declare abstract class StartableService<T = any, O = any> implements IStartableService<T> {
+    readonly startSubject: Subject<T>;
+    readonly stopSubject: Subject<void>;
     protected _debug: boolean;
     protected _startByReadyFunction: boolean;
     protected _data: T;
@@ -18,15 +18,16 @@ export declare abstract class StartableService<T = any> implements IStartableSer
     protected constructor(prerequisiteService?: {
         ready: () => Promise<any>;
     });
-    start(): Promise<T>;
+    start(opts?: O): Promise<T>;
+    ready(): Promise<T>;
     stop(): Promise<void>;
-    restart(): Promise<T>;
+    restart(opts?: O): Promise<T>;
     get started(): boolean;
     get starting(): boolean;
-    ready(): Promise<T>;
+    get stopped(): boolean;
     protected registerSubscription(sub: Subscription): Subscription;
     protected unregisterSubscription(sub: Subscription): void;
     protected unsubscribe(): void;
-    protected ngOnStop(): Promise<void>;
-    protected abstract ngOnStart(): Promise<T>;
+    protected ngOnStop(): Promise<void> | void;
+    protected abstract ngOnStart(opts?: O): Promise<T>;
 }

package/src/app/social/job/job.service.d.ts

@@ -4,9 +4,12 @@ import { BaseGraphqlService } from '../../core/services/base-graphql-service.cla
 import { GraphqlService } from '../../core/graphql/graphql.service';
 import { Environment } from '../../../environments/environment.class';
 import { Observable } from 'rxjs';
-import { FetchPolicy } from '@apollo/client/core';
-export declare const JobProgressionServiceToken: InjectionToken<JobProgressionService>;
+import { FetchPolicy, WatchQueryFetchPolicy } from '@apollo/client/core';
+export declare const APP_JOB_PROGRESSION_SERVICE: InjectionToken<JobProgressionService>;
 export interface IJobProgressionService {
+    watchAll(): Observable<JobProgression[]>;
+    addJob(id: number, job?: JobProgression): any;
+    removeJob(id: number): any;
     listenChanges(id: number, options?: {
         interval?: number;
         fetchPolicy?: FetchPolicy;
@@ -16,6 +19,11 @@ export declare class JobProgressionService extends BaseGraphqlService<JobProgres
     protected graphql: GraphqlService;
     protected environment: Environment;
     constructor(graphql: GraphqlService, environment: Environment);
+    watchAll(options?: {
+        fetchPolicy?: WatchQueryFetchPolicy;
+    }): Observable<JobProgression[]>;
+    addJob(id: number, job?: JobProgression): void;
+    removeJob(id: number): void;
     listenChanges(id: number, options?: {
         interval?: number;
         fetchPolicy?: FetchPolicy;

package/src/app/social/job/progression/{job-progression.component.d.ts → job-progression.icon.d.ts}

@@ -10,13 +10,14 @@ export interface JobProgressionOptions {
     autoRemove: boolean;
     autoRemoveDelay: number;
 }
-export declare class JobProgressionComponent implements OnInit, OnDestroy {
+export declare class JobProgressionIcon implements OnInit, OnDestroy {
     protected jobProgressionService: IJobProgressionService;
     protected popoverController: PopoverController;
     protected cd: ChangeDetectorRef;
     debug: boolean;
     titleI18n: string;
     options: JobProgressionOptions;
+    autoHide: boolean;
     jobFinished: EventEmitter<number>;
     visible: boolean;
     disabled: boolean;
@@ -24,7 +25,6 @@ export declare class JobProgressionComponent implements OnInit, OnDestroy {
     mode: ProgressSpinnerMode;
     value: number;
     jobProgressions: JobProgression[];
-    protected autoHide: boolean;
     protected autoHideDelay: number;
     protected autoRemove: boolean;
     protected autoRemoveDelay: number;
@@ -34,7 +34,7 @@ export declare class JobProgressionComponent implements OnInit, OnDestroy {
     private _logPrefix;
     constructor(jobProgressionService: IJobProgressionService, popoverController: PopoverController, cd: ChangeDetectorRef);
     ngOnInit(): void;
-    addJob(id: number): void;
+    addJob(id: number, job?: JobProgression): void;
     removeJob(id: number): void;
     getProgression(id: number): JobProgression | undefined;
     updateValue(): void;

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

@@ -1,11 +1,14 @@
-import { JobProgressionComponent, JobProgressionOptions } from '../progression/job-progression.component';
+import { JobProgressionIcon, JobProgressionOptions } from '../progression/job-progression.icon';
 import { JobProgression } from '../job.model';
+import { JobProgressionService } from '../job.service';
 export declare class JobProgressionTestingPage {
-    jobProgression: JobProgressionComponent;
-    nJob: number;
+    protected jobProgressionService: JobProgressionService;
+    jobProgressionIcon: JobProgressionIcon;
+    jobId: number;
     job: JobProgression;
     options: JobProgressionOptions;
-    constructor();
+    constructor(jobProgressionService: JobProgressionService);
     incrementJob(value: number): void;
     addJob(): void;
+    private createJob;
 }

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

@@ -3,6 +3,10 @@ import { FetchPolicy } from '@apollo/client/core';
 import { Observable } from 'rxjs';
 import { JobProgression } from '../job.model';
 export declare class JobProgressionTestService implements IJobProgressionService {
+    private jobsSubject;
+    addJob(id: number, job?: JobProgression): void;
+    removeJob(id: number): void;
+    watchAll(): Observable<JobProgression[]>;
     listenChanges(id: number, options?: {
         interval?: number;
         fetchPolicy?: FetchPolicy;

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

@@ -1,5 +1,5 @@
 import { InjectionToken } from '@angular/core';
-import { JobProgressionOptions } from './job/progression/job-progression.component';
+import { JobProgressionOptions } from './job/progression/job-progression.icon';
 export interface SocialModuleOptions {
     showUserEventNotification: boolean;
     showJobProgression: boolean;

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

@@ -1,22 +1,25 @@
-import { OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, 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';
 import { AccountService } from '../../../core/services/account.service';
-export declare class AppUserEventNotificationIcon implements OnInit, OnDestroy {
+export declare class UserEventNotificationIcon implements OnInit, OnDestroy {
     userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>;
     protected accountService: AccountService;
     protected popoverController: PopoverController;
+    private cd;
     debug: boolean;
     titleI18n: string;
     disabled: boolean;
     filter: any;
+    autoHide: boolean;
+    visible: boolean;
     get countChanges(): Observable<number>;
     private _logPrefix;
     private _readEvent;
     private _readEvents;
-    constructor(userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>, accountService: AccountService, popoverController: PopoverController);
+    constructor(userEventService: IUserEventService<IUserEvent<any>, IUserEventFilter<any>>, accountService: AccountService, popoverController: PopoverController, cd: ChangeDetectorRef);
     ngOnInit(): Promise<void>;
     showList(event: UIEvent): Promise<void>;
     ngOnDestroy(): void;

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

@@ -3,7 +3,7 @@ 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';
+import { UserEventNotificationIcon } from '../notification/user-event-notification.icon';
 import { UserEventTest } from './user-event.testing.model';
 export declare class UserEventTestingPage implements OnDestroy {
     protected userEventService: UserEventTestService;
@@ -11,7 +11,7 @@ export declare class UserEventTestingPage implements OnDestroy {
     protected alertController: AlertController;
     protected translateService: TranslateService;
     private _timerSubscription;
-    notification: AppUserEventNotificationIcon;
+    notification: UserEventNotificationIcon;
     get timerStarted(): boolean;
     constructor(userEventService: UserEventTestService, router: Router, alertController: AlertController, translateService: TranslateService);
     ngOnDestroy(): void;

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

@@ -11,7 +11,7 @@ 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, UserEventLoadOptions>>;
+export declare const APP_USER_EVENT_SERVICE: InjectionToken<IUserEventService<any, any, UserEventWatchOptions, UserEventLoadOptions>>;
 export declare interface UserEventLoadOptions extends EntitiesServiceLoadOptions {
     withContent?: boolean;
 }

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

@@ -2,19 +2,19 @@
  * Generated bundle index. Do not edit.
  */
 export * from './public_api';
-export { AppUpdateOfflineModeCard as ɵi } from './src/app/core/offline/update-offline-mode-card.component';
-export { RegisterForm as ɵd } from './src/app/core/register/form/form-register';
-export { RegisterModal as ɵf } from './src/app/core/register/modal/modal-register';
-export { AccountValidatorService as ɵe } from './src/app/core/services/validator/account.validator';
-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 { AppUpdateOfflineModeCard as ɵj } from './src/app/core/offline/update-offline-mode-card.component';
+export { RegisterForm as ɵe } from './src/app/core/register/form/form-register';
+export { RegisterModal as ɵg } from './src/app/core/register/modal/modal-register';
+export { AccountValidatorService as ɵf } from './src/app/core/services/validator/account.validator';
+export { LocalSettingsValidatorService as ɵi } from './src/app/core/services/validator/local-settings.validator';
+export { UserSettingsValidatorService as ɵh } from './src/app/core/services/validator/user-settings.validator';
+export { isFocusableElement as ɵd } from './src/app/shared/focusable';
 export { MatBadgeIconTestPage as ɵn } from './src/app/shared/material/badge/badge-icon.test';
 export { DateTestPage as ɵl } 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 ɵm } from './src/app/shared/material/numpad/testing/numpad.test';
+export { StartableObservableService as ɵc } from './src/app/shared/services/startable-observable-service.class';
 export { CustomReuseStrategy as ɵa } from './src/app/shared/shared-routing.module';
 export { ToastTestingPage as ɵp } from './src/app/shared/toast/toast.testing';
 export { ToastTestingModule as ɵo } from './src/app/shared/toast/toast.testing.module';
-export { JobProgressionList as ɵk } from './src/app/social/job/progression/job-progression.list';
-export { UserEventNotificationList as ɵj } from './src/app/social/user-event/notification/user-event-notification.list';
+export { UserEventNotificationList as ɵk } from './src/app/social/user-event/notification/user-event-notification.list';