@sumaris-net/ngx-components 2.4.152 → 2.4.154

package/package.json

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

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

@@ -1,5 +1,4 @@
 import { EventEmitter } from '@angular/core';
-import { CryptoService } from './crypto.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Storage } from '@ionic/storage-angular';
 import { Peer } from './model/peer.model';
@@ -19,11 +18,10 @@ import { ConnectionType, NetworkEventType } from './network.types';
 import { ILoggingService } from '../../shared/logging/logger.model';
 import * as i0 from "@angular/core";
 export declare const PEER_URL_REGEXP: RegExp;
+export declare const NETWORK_DEFAULT_CONNECTION_TIMEOUT = 10000;
 export declare class NetworkService extends StartableObservableService<Peer, Peer> {
     private _document;
-    private platform;
     private modalCtrl;
-    private cryptoService;
     private storage;
     private settings;
     private cache;
@@ -43,13 +41,15 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     private readonly _timerRefreshCondition;
     private _deviceConnectionType;
     private _forceOffline;
+    private readonly _connectionTimeout;
     private _listeners;
     get online(): boolean;
     get offline(): boolean;
     get connectionType(): ConnectionType;
     get peer(): Peer;
     set peer(peer: Peer);
-    constructor(_document: any, platform: Platform, modalCtrl: ModalController, cryptoService: CryptoService, storage: Storage, settings: LocalSettingsService, cache: CacheService, http: HttpClient, environment: Environment, loggingService: ILoggingService, network: Network, translate: TranslateService, toastController: ToastController);
+    get connectionTimeout(): number;
+    constructor(_document: any, platform: Platform, modalCtrl: ModalController, storage: Storage, settings: LocalSettingsService, cache: CacheService, http: HttpClient, environment: Environment, loggingService: ILoggingService, network: Network, translate: TranslateService, toastController: ToastController);
     /**
      * Register to network event
      *
@@ -78,14 +78,14 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
      * @param peer
      * @param opts
      */
-    checkPeerAlive(peer?: string | Peer, opts?: {
-        checkCompatible?: boolean;
-        displayToast?: boolean;
-    }): Promise<NodeInfo>;
+    checkPeerAlive(peer?: string | Peer): Promise<NodeInfo>;
     checkPeerCompatible(peerInfo: NodeInfo, opts?: {
         showToast?: boolean;
     }): Promise<boolean>;
-    getNodeInfo(peer?: string | Peer): Promise<NodeInfo>;
+    getNodeInfo(peer?: string | Peer, opts?: {
+        nocache?: boolean;
+        timeout?: number;
+    }): Promise<NodeInfo>;
     getAppManifest(peer?: string | Peer, opts?: {
         nocache?: boolean;
     }): Promise<AppManifest | undefined>;
@@ -135,6 +135,7 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
         };
         responseType?: 'json';
         nocache?: boolean;
+        timeout?: number;
     }): Promise<T>;
     protected getUri(path: string): string;
     protected onDeviceConnectionChanged(connectionType?: string): void;
@@ -145,6 +146,6 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     protected showToast<T = any>(opts: ShowToastOptions): Promise<OverlayEventDetail<T>>;
     protected addListener<T = any>(name: NetworkEventType, callback: (data?: T) => Promise<void>): Subscription;
     protected emit<T = any>(name: NetworkEventType, data?: T): Promise<void[]>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<NetworkService, [null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<NetworkService, [null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<NetworkService>;
 }

package/src/app/shared/http/http.utils.d.ts

@@ -14,6 +14,7 @@ export declare class HttpUtils {
     }): Promise<string>;
     static getJson<T>(http: HttpClient, uri: string, opts?: {
         nocache?: boolean;
+        timeout?: number;
         headers?: HttpHeaders | {
             [header: string]: string | string[];
         };

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

@@ -23,13 +23,15 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
     debug: boolean;
     private _hiddenData;
     readonly dirtySubject: BehaviorSubject<boolean>;
-    private readonly savingSubject;
+    readonly savingSubject: BehaviorSubject<boolean>;
+    protected readonly sortByReplacement: {
+        [key: string]: string;
+    };
     private readonly _sortFn;
     private readonly _onLoad;
     private readonly _onSaveFn;
     private readonly _equalsFn;
     private readonly _filterFnFactory;
-    private readonly _sortByReplacement;
     set value(data: T[]);
     get value(): T[];
     get saving(): boolean;
@@ -39,7 +41,9 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
     protected ngOnStop(): Promise<void>;
     ngOnDestroy(): void;
     setValue(data: T[]): void;
-    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: F, opts?: EntitiesServiceLoadOptions): Promise<LoadResult<T>>;
+    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: F, opts?: EntitiesServiceLoadOptions & {
+        updateHiddenData?: boolean;
+    }): Promise<LoadResult<T>>;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filterData?: F, options?: any): Observable<LoadResult<T>>;
     saveAll(data: T[], options?: any): Promise<T[]>;
     deleteAll(dataToRemove: T[], options?: any): Promise<any>;

package/src/assets/manifest.json

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

package/src/environments/environment.class.d.ts

@@ -10,6 +10,7 @@ export declare class Environment {
     production: boolean;
     externalEnvironmentUrl?: string;
     baseUrl: string;
+    connectionTimeout?: number;
     sameUrlPeer?: boolean;
     defaultPeer?: {
         host: string;