@sumaris-net/ngx-components 2.6.21 → 2.6.22

package/package.json

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

package/src/app/core/account/new-token.modal.d.ts

@@ -3,7 +3,6 @@ import { TokenScope, UserToken } from '../services/model/token.model';
 import { UntypedFormGroup } from '@angular/forms';
 import { Injector, OnInit } from '@angular/core';
 import { UserTokenValidatorService } from '../services/validator/user-token.validator';
-import { TranslateService } from '@ngx-translate/core';
 import { MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
 import { IAppForm } from '../form/form.utils';
 import { AccountService } from '../services/account.service';
@@ -14,7 +13,6 @@ export interface INewTokenModalOptions extends IEntityEditorModalOptions<UserTok
 }
 export declare class NewTokenModal extends AppEntityEditorModal<UserToken> implements OnInit, INewTokenModalOptions {
     private injector;
-    protected translate: TranslateService;
     protected validator: UserTokenValidatorService;
     protected accountService: AccountService;
     tokenForm: UntypedFormGroup;
@@ -23,7 +21,7 @@ export declare class NewTokenModal extends AppEntityEditorModal<UserToken> imple
     copiedLabel: string;
     tokenScopes: TokenScope[];
     existingNames: string[];
-    constructor(injector: Injector, translate: TranslateService, validator: UserTokenValidatorService, accountService: AccountService);
+    constructor(injector: Injector, validator: UserTokenValidatorService, accountService: AccountService);
     get valid(): boolean;
     get invalid(): boolean;
     ngOnInit(): void;

package/src/app/core/account/token.table.d.ts

@@ -1,4 +1,4 @@
-import { Injector, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Injector, OnInit } from '@angular/core';
 import { UntypedFormBuilder } from '@angular/forms';
 import { ValidatorService } from '@e-is/ngx-material-table';
 import { TokenScope, UserToken } from '../services/model/token.model';
@@ -9,9 +9,10 @@ export declare class UserTokenTable extends AppInMemoryTable<UserToken> implemen
     protected injector: Injector;
     protected formBuilder: UntypedFormBuilder;
     protected validatorService: ValidatorService;
+    protected cd: ChangeDetectorRef;
     protected tokenScopes: TokenScope[];
     useSticky: boolean;
-    constructor(injector: Injector, formBuilder: UntypedFormBuilder, validatorService: ValidatorService, environment: Environment, tokenScopes: TokenScope[]);
+    constructor(injector: Injector, formBuilder: UntypedFormBuilder, validatorService: ValidatorService, cd: ChangeDetectorRef, environment: Environment, tokenScopes: TokenScope[]);
     ngOnInit(): void;
     get value(): UserToken[];
     set value(data: UserToken[]);
@@ -20,6 +21,7 @@ export declare class UserTokenTable extends AppInMemoryTable<UserToken> implemen
     }): void;
     addToken(event: UIEvent): Promise<void>;
     display(scopes: TokenScope[]): string;
-    static ɵfac: i0.ɵɵFactoryDeclaration<UserTokenTable, [null, null, null, null, { optional: true; }]>;
+    protected markForCheck(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<UserTokenTable, [null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<UserTokenTable, "app-user-token-table", never, { "useSticky": "useSticky"; }, {}, never, never, false>;
 }

package/src/app/core/graphql/graphql.service.d.ts

@@ -1,22 +1,21 @@
-import { Observable } from 'rxjs';
-import { Apollo, ExtraSubscriptionOptions, QueryRef } from 'apollo-angular';
-import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, OperationVariables, TypePolicies, WatchQueryFetchPolicy } from '@apollo/client/core';
-import { ServiceError } from '../services/errors';
-import { InjectionToken } from '@angular/core';
-import { NetworkService } from '../services/network.service';
-import { EmptyObject } from './graphql.utils';
-import { Platform } from '@ionic/angular';
-import { IEntity } from '../services/model/entity.model';
-import { Resolvers } from '@apollo/client/core/types';
-import { HttpLink } from 'apollo-angular/http';
-import { ErrorPolicy, MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
-import { Cache } from '@apollo/client/cache/core/types/Cache';
-import { Environment } from '../../../environments/environment.class';
-import { CryptoService } from '../services/crypto.service';
-import { PropertiesMap } from '../../shared/types';
-import { StartableService } from '../../shared/services/startable-service.class';
-import { StorageService } from '../../shared/storage/storage.service';
-import { DocumentNode } from 'graphql';
+import { Observable } from "rxjs";
+import { Apollo, ExtraSubscriptionOptions, QueryRef } from "apollo-angular";
+import { ApolloCache, ApolloClient, FetchPolicy, MutationUpdaterFn, OperationVariables, TypePolicies, WatchQueryFetchPolicy } from "@apollo/client/core";
+import { ServiceError } from "../services/errors";
+import { InjectionToken } from "@angular/core";
+import { NetworkService } from "../services/network.service";
+import { EmptyObject } from "./graphql.utils";
+import { Platform } from "@ionic/angular";
+import { IEntity } from "../services/model/entity.model";
+import { Resolvers } from "@apollo/client/core/types";
+import { HttpLink } from "apollo-angular/http";
+import { ErrorPolicy, MutationBaseOptions } from "@apollo/client/core/watchQueryOptions";
+import { Cache } from "@apollo/client/cache/core/types/Cache";
+import { Environment } from "../../../environments/environment.class";
+import { PropertiesMap } from "../../shared/types";
+import { StartableService } from "../../shared/services/startable-service.class";
+import { StorageService } from "../../shared/storage/storage.service";
+import { DocumentNode } from "graphql";
 import * as i0 from "@angular/core";
 export interface WatchQueryOptions<V> {
     query: any;
@@ -50,7 +49,6 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
     private httpLink;
     private network;
     private storage;
-    private cryptoService;
     protected environment: Environment;
     private typePolicies;
     private fragments;
@@ -65,7 +63,7 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
     get client(): ApolloClient<any>;
     get cache(): ApolloCache<any>;
     get defaultFetchPolicy(): WatchQueryFetchPolicy;
-    constructor(platform: Platform, apollo: Apollo, httpLink: HttpLink, network: NetworkService, storage: StorageService, cryptoService: CryptoService, environment: Environment, typePolicies: TypePolicies, fragments: DocumentNode[]);
+    constructor(platform: Platform, apollo: Apollo, httpLink: HttpLink, network: NetworkService, storage: StorageService, environment: Environment, typePolicies: TypePolicies, fragments: DocumentNode[]);
     setAuthToken(token: string): Promise<void>;
     setAuthBasic(basic: string): Promise<void>;
     /**
@@ -144,6 +142,6 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
     private createAppErrorByCode;
     private getI18nErrorMessageByCode;
     private toAppError;
-    static ɵfac: i0.ɵɵFactoryDeclaration<GraphqlService, [null, null, null, null, null, null, null, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<GraphqlService, [null, null, null, null, null, null, { optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<GraphqlService>;
 }

package/src/app/core/services/model/token.model.d.ts

@@ -7,6 +7,7 @@ export declare class TokenScope {
 }
 export declare class UserToken extends Entity<UserToken> {
     static fromObject: (source: any, opts?: any) => UserToken;
+    static equals(t1: UserToken, t2: UserToken): boolean;
     pubkey: string;
     token: string;
     name: string;

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

@@ -18,13 +18,14 @@ 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 modalCtrl;
     private storage;
     private settings;
     private cache;
     private http;
-    private _document;
     protected environment: Environment;
     private loggingService;
     private translate;
@@ -40,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(platform: Platform, modalCtrl: ModalController, storage: Storage, settings: LocalSettingsService, cache: CacheService, http: HttpClient, _document: any, 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
      *
@@ -75,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>;
@@ -132,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;

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;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "2.6.21",
+  "version": "2.6.22",
   "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;