@sumaris-net/ngx-components 18.2.25 → 18.2.26

package/package.json

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

package/src/app/core/peer/select-peer.modal.d.ts

@@ -1,12 +1,13 @@
 import { ChangeDetectorRef, EventEmitter, OnDestroy } from '@angular/core';
-import { ModalController, PopoverController } from '@ionic/angular';
+import { IonSearchbar, ModalController, PopoverController } from '@ionic/angular';
 import { Peer } from '../services/model/peer.model';
-import { Observable, Subject } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import { Environment } from '../../../environments/environment.class';
 import { TextPopoverOptions } from '../form/text-popover/text-popover.component';
 import { TranslateService } from '@ngx-translate/core';
 import { ILoggingService } from '../../shared/logging/logger.model';
+import { RxState } from '@rx-angular/state';
+import { NodeFeature } from '../services/model/node-feature.model';
 import * as i0 from "@angular/core";
 export interface ISelectPeerModalOptions {
     canCancel: boolean;
@@ -14,8 +15,21 @@ export interface ISelectPeerModalOptions {
     onRefresh: EventEmitter<Event>;
     showSetManuallyButton: boolean;
     selectedPeer?: string;
+    title?: string;
+    defaultPeers: Peer[];
+    showSearchBar?: boolean;
 }
-export declare class SelectPeerModal implements OnDestroy, ISelectPeerModalOptions {
+export interface ISelectPeerModalState {
+    defaultPeers: Peer[];
+    peers: Peer[];
+    filteredPeers: Peer[];
+    filteredPeersByFeatures: Peer[];
+    filteredPeerCount: number;
+    filteredFeaturesCount: number;
+    searchText: string;
+    selectedTabIndex: number;
+}
+export declare class SelectPeerModal extends RxState<ISelectPeerModalState> implements OnDestroy, ISelectPeerModalOptions {
     private modalCtrl;
     private popoverController;
     private translate;
@@ -25,21 +39,44 @@ export declare class SelectPeerModal implements OnDestroy, ISelectPeerModalOptio
     protected loggingService?: ILoggingService;
     private _subscription;
     private readonly _logger;
+    protected defaultPeers$: import("rxjs").Observable<Peer[]>;
+    protected peers$: import("rxjs").Observable<Peer[]>;
+    protected filteredPeers$: import("rxjs").Observable<Peer[]>;
+    protected filteredPeersByFeatures$: import("rxjs").Observable<Peer[]>;
+    protected filteredPeerCount$: import("rxjs").Observable<number>;
+    protected filteredFeaturesCount$: import("rxjs").Observable<number>;
     protected loading: boolean;
     protected mobile: boolean;
-    protected $peers: Subject<Peer[]>;
     protected peerMinVersion: string;
     protected peerDefaultPrefix: string;
+    protected enableSelectPeerByFeature: boolean;
+    protected collapsedPeers: {
+        [key: string]: boolean;
+    };
+    set peers(value: Peer[]);
+    get peers(): Peer[];
+    set searchText(value: string);
+    get searchText(): string;
+    set filteredPeers(value: Peer[]);
+    get filteredPeers(): Peer[];
+    set selectedTabIndex(value: number);
+    get selectedTabIndex(): number;
     selectedPeer: string;
+    title: string;
     canCancel: boolean;
     allowSelectDownPeer: boolean;
     showSetManuallyButton: boolean;
+    showSearchBar: boolean;
+    tabGroupAnimationDuration: '200ms';
     onRefresh: EventEmitter<Event>;
+    set defaultPeers(value: Peer[]);
+    searchbar: IonSearchbar;
     constructor(modalCtrl: ModalController, popoverController: PopoverController, translate: TranslateService, http: HttpClient, cd: ChangeDetectorRef, environment: Environment, loggingService?: ILoggingService);
-    set peers(peers: Observable<Peer[]>);
     cancel(): void;
     ngOnDestroy(): void;
     selectPeer(peer: Peer): void;
+    toggleSearchBar(): Promise<void>;
+    togglePeerFeatures(peerUrl: string): void;
     /**
      *  Check the min pod version, defined by the app
      *
@@ -48,13 +85,17 @@ export declare class SelectPeerModal implements OnDestroy, ISelectPeerModalOptio
     isCompatible(peer: Peer): boolean;
     refresh(event: Event): void;
     clickSetManually(event?: Event): Promise<void>;
+    protected clearLogo(peer: Peer | NodeFeature): void;
     refreshPeers(peers: Peer[]): Promise<void>;
     protected refreshPeer(peer: Peer): Promise<Peer>;
     protected openPeerUrlPopover(event: Event, opts?: Partial<TextPopoverOptions>): Promise<any>;
+    protected updateFilteredPeer(event: any): void;
     protected markForCheck(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SelectPeerModal, [null, null, null, null, null, null, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<SelectPeerModal, "select-peer-modal", never, { "selectedPeer": { "alias": "selectedPeer"; "required": false; }; "canCancel": { "alias": "canCancel"; "required": false; }; "allowSelectDownPeer": { "alias": "allowSelectDownPeer"; "required": false; }; "showSetManuallyButton": { "alias": "showSetManuallyButton"; "required": false; }; "onRefresh": { "alias": "onRefresh"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<SelectPeerModal, "select-peer-modal", never, { "selectedTabIndex": { "alias": "selectedTabIndex"; "required": false; }; "selectedPeer": { "alias": "selectedPeer"; "required": false; }; "title": { "alias": "title"; "required": false; }; "canCancel": { "alias": "canCancel"; "required": false; }; "allowSelectDownPeer": { "alias": "allowSelectDownPeer"; "required": false; }; "showSetManuallyButton": { "alias": "showSetManuallyButton"; "required": false; }; "showSearchBar": { "alias": "showSearchBar"; "required": false; }; "tabGroupAnimationDuration": { "alias": "tabGroupAnimationDuration"; "required": false; }; "onRefresh": { "alias": "onRefresh"; "required": false; }; "defaultPeers": { "alias": "defaultPeers"; "required": false; }; }, {}, never, never, false, never>;
+    static ngAcceptInputType_selectedTabIndex: unknown;
     static ngAcceptInputType_canCancel: unknown;
     static ngAcceptInputType_allowSelectDownPeer: unknown;
     static ngAcceptInputType_showSetManuallyButton: unknown;
+    static ngAcceptInputType_showSearchBar: unknown;
 }

package/src/app/core/peer/select-peer.module.d.ts

@@ -3,8 +3,10 @@ import * as i1 from "./select-peer.modal";
 import * as i2 from "../../shared/shared.module";
 import * as i3 from "@ngx-translate/core";
 import * as i4 from "../form/text-popover/text-popover.module";
+import * as i5 from "../services/pipes/pipes.module";
+import * as i6 from "@angular/forms";
 export declare class AppSelectPeerModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AppSelectPeerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AppSelectPeerModule, [typeof i1.SelectPeerModal], [typeof i2.SharedModule, typeof i3.TranslateModule, typeof i4.AppTextPopoverModule], [typeof i3.TranslateModule, typeof i1.SelectPeerModal]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AppSelectPeerModule, [typeof i1.SelectPeerModal], [typeof i2.SharedModule, typeof i3.TranslateModule, typeof i4.AppTextPopoverModule, typeof i5.CorePipesModule, typeof i6.FormsModule], [typeof i3.TranslateModule, typeof i1.SelectPeerModal]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AppSelectPeerModule>;
 }

package/src/app/core/services/config/core.config.d.ts

@@ -36,6 +36,7 @@ export declare const CORE_CONFIG_OPTIONS: Readonly<{
     FORM_FIELD_FOCUS_BACKGROUND_COLOR: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     FORM_FIELD_DISABLED_BACKGROUND_COLOR: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     ANDROID_INSTALL_URL: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
+    IOS_INSTALL_URL: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     DB_TIMEZONE: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     ACCOUNT_LAT_LONG_FORMAT_ENABLE: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     ACCOUNT_READONLY: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;

package/src/app/core/services/model/node-feature.model.d.ts

@@ -0,0 +1,14 @@
+import { Moment } from 'moment/moment';
+import { Cloneable, Entity, EntityAsObjectOptions } from './entity.model';
+export declare class NodeFeature extends Entity<NodeFeature> implements Cloneable<NodeFeature> {
+    static fromObject: (source: any, opts?: any) => NodeFeature;
+    label: string;
+    name: string;
+    description: string;
+    logo: string;
+    creationDate: Moment;
+    statusId: number;
+    validityStatusId: number;
+    asObject(options?: EntityAsObjectOptions): any;
+    fromObject(source: any): void;
+}

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

@@ -1,9 +1,11 @@
 import { Cloneable, Entity, EntityAsObjectOptions } from './entity.model';
+import { NodeFeature } from './node-feature.model';
 export declare class Peer extends Entity<Peer> implements Cloneable<Peer> {
     static fromObject: (source: any, opts?: any) => Peer;
     static parseUrl(peerUrl: string): Peer;
     static path(peer: Peer, ...paths: string[]): string;
     static equals(p1: Peer, p2: Peer): boolean;
+    static countAllFeatures(peers: Peer[]): number;
     dns: string;
     ipv4: string;
     ipv6: string;
@@ -17,6 +19,9 @@ export declare class Peer extends Entity<Peer> implements Cloneable<Peer> {
     softwareVersion: string;
     label: string;
     name: string;
+    registrationUri?: string;
+    registrationManager?: string;
+    features?: NodeFeature[];
     constructor();
     asObject(options?: EntityAsObjectOptions): any;
     fromObject(source: any): void;

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

@@ -1,10 +1,12 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Peer } from './model/peer.model';
+import { NodeFeature } from './model/node-feature.model';
 export interface NodeInfo {
     softwareName: string;
     softwareVersion: string;
     nodeLabel?: string;
     nodeName?: string;
+    features?: NodeFeature[];
 }
 export interface AppManifest {
     manifest_version: number;

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

@@ -147,6 +147,7 @@
   "CONFIGURATION": {
     "OPTIONS": {
       "ANDROID_INSTALL_URL": "Android > Install App URL",
+      "IOS_INSTALL_URL": "iOS > Install App URL",
       "DB_TIMEZONE": "Persistence > Database timezone (readonly option)",
       "LOGO": "Menu > Logo (max width 110px)",
       "FAVICON": "favicon",
@@ -474,8 +475,12 @@
       "OFFLINE": "Unreachable node",
       "SELECT_MODAL": {
         "TITLE": "Network nodes",
+        "STARTUP_TITLE": "Startup",
+        "TAB_NETWORK": "Databases",
+        "TAB_FEATURES": "Data collection programs",
         "BTN_SET_MANUALLY": "Define manually",
-        "HELP": "Please choose a network node to connect to:",
+        "NETWORK_HELP": "Please choose a <b>database</b> node to connect to:",
+        "FEATURES_HELP": "Please choose a <b>data collection program</b> you would like to participate in:",
         "NOT_COMPATIBLE_HELP": "Required version: v{{version}} or +"
       }
     },

package/src/assets/i18n/en.json

@@ -146,6 +146,7 @@
   "CONFIGURATION": {
     "OPTIONS": {
       "ANDROID_INSTALL_URL": "Android > Install App URL",
+      "IOS_INSTALL_URL": "iOS > Install App URL",
       "DB_TIMEZONE": "Persistence > Database timezone (readonly option)",
       "LOGO": "Menu > Logo (max width 110px)",
       "FAVICON": "favicon",
@@ -473,8 +474,12 @@
       "OFFLINE": "Unreachable node",
       "SELECT_MODAL": {
         "TITLE": "Network nodes",
+        "STARTUP_TITLE": "Startup",
+        "TAB_NETWORK": "Databases",
+        "TAB_FEATURES": "Data collection programmes",
         "BTN_SET_MANUALLY": "Define manually",
-        "HELP": "Please choose a network node to connect to:",
+        "NETWORK_HELP": "Please choose a <b>database</b> node to connect to:",
+        "FEATURES_HELP": "Please choose a <b>data collection programme</b> you would like to participate in:",
         "NOT_COMPATIBLE_HELP": "Required version: v{{version}} or +"
       }
     },

package/src/assets/i18n/fr.json

@@ -146,6 +146,7 @@
   "CONFIGURATION": {
     "OPTIONS": {
       "ANDROID_INSTALL_URL": "Android > URL d'installation App",
+      "IOS_INSTALL_URL": "iOS > URL d'installation App",
       "DB_TIMEZONE": "Persistance > Timezone de la base de données (option non modifiable)",
       "LOGO": "Menu > Logo (largeur max 110px)",
       "FAVICON": "favicon",
@@ -472,9 +473,13 @@
     "PEER": {
       "OFFLINE": "Nœud injoignable",
       "SELECT_MODAL": {
-        "TITLE": "Nœuds réseau",
+        "TITLE": "Sélection du nœud réseau",
+        "STARTUP_TITLE": "Démarrage",
+        "TAB_NETWORK": "Bases de données",
+        "TAB_FEATURES": "Programmes de collecte",
         "BTN_SET_MANUALLY": "Saisir manuellement",
-        "HELP": "Veuillez choisir un nœud réseau auquel vous connecter :",
+        "NETWORK_HELP": "Veuillez choisir la <b>base de données</b> à laquelle vous souhaitez vous connecter :",
+        "FEATURES_HELP": "Veuillez choisir un <b>programme de collecte ou d'expérimentation</b> auquel vous souhaitez participer :",
         "NOT_COMPATIBLE_HELP": "Version requise : v{{version}} ou +"
       }
     },

package/src/assets/manifest.json

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

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

@@ -32,6 +32,7 @@ export declare class Environment {
     }[];
     peerMinVersion?: string;
     peerDefaultPrefix?: string;
+    enableSelectPeerByFeature?: boolean;
     checkAppVersionIntervalInSeconds?: number;
     persistCache?: boolean;
     offline?: boolean;
@@ -41,6 +42,7 @@ export declare class Environment {
     defaultDepartmentId?: number;
     defaultAppName?: string;
     defaultAndroidInstallUrl?: string;
+    defaultIOSInstallUrl?: string;
     useHash?: boolean;
     allowDarkMode?: boolean;
     logging?: Partial<LoggingServiceConfig>;

package/src/theme/_ngx-components.scss

@@ -312,9 +312,10 @@ ion-list,
 // Define useful variable
 html.plt-ios {
   --ion-searchbar-height: 60px;
+  //--ion-toolbar-height: 58px;
 }
 html {
-  --ion-searchbar-height: 58px;
+  //--ion-searchbar-height: 58px;
 }
 
 ion-list,