@sumaris-net/ngx-components 2.4.112 → 2.4.115

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "2.4.112",
+  "version": "2.4.115",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -9,17 +9,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@noble/ed25519": "^1.7.1",
+    "@noble/ed25519": "^1.7.3",
     "@rx-angular/cdk": "^14.0.0",
     "@rx-angular/state": "^14.0.0",
     "@rx-angular/template": "^14.0.0",
     "clone": "~2.1.2",
-    "tslib": "~2.3.1"
+    "tslib": "~2.6.2",
+    "@polkadot/util": "~12.5.1",
+    "@polkadot/util-crypto": "~12.5.1"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": "~14.2.11",
-    "@angular/compiler-cli": "~14.2.12",
-    "@apollo/client": "~3.7.16",
+    "@angular-devkit/build-angular": "~14.2.13",
+    "@angular/compiler-cli": "~14.3.0",
+    "@apollo/client": "~3.8.5",
     "@ionic/storage": "~3.0.6",
     "d3": "~7.6.1",
     "localforage": "~1.10.0",

package/public_api.d.ts

@@ -257,6 +257,9 @@ export * from './src/app/shared/image/gallery/testing/gallery.testing';
 export * from './src/app/shared/image/gallery/testing/gallery.testing.module';
 export * from './src/app/shared/audio/audio.testing';
 export * from './src/app/shared/audio/audio.testing.module';
+export * from './src/app/core/menu/testing/menu.testing';
+export * from './src/app/core/menu/testing/menu.testing.module';
+export * from './src/app/core/menu/testing/menu-other.testing';
 export * from './src/app/core/core.testing.module';
 export * from './src/app/core/services/testing/referential-filter.model';
 export * from './src/app/core/services/testing/referential.validator';

package/src/app/admin/services/person.service.d.ts

@@ -38,6 +38,11 @@ export declare class PersonService extends BaseEntityService<Person, PersonFilte
         progression?: BehaviorSubject<number>;
         maxProgression?: number;
     }): Promise<void>;
+    loadByPubkey(pubkey: string, opts?: {
+        [key: string]: any;
+        fetchPolicy?: FetchPolicy;
+        toEntity?: boolean;
+    }): Promise<Person>;
     protected asObject(source: Person | any): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<PersonService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PersonService>;

package/src/app/core/form/text-popover/text-popover.component.d.ts

@@ -19,6 +19,7 @@ export interface TextPopoverOptions {
     showHeader?: boolean;
     headerColor?: Color;
     headerButtons?: TextPopoverButton[];
+    showFooter?: boolean;
 }
 export interface TextPopoverButton {
     text?: string;
@@ -33,7 +34,7 @@ export interface TextPopoverButton {
 export declare class TextPopover implements OnInit, AfterViewInit, OnDestroy, TextPopoverOptions {
     protected popoverController: PopoverController;
     protected translate: TranslateService;
-    static show(ctrl: PopoverController, event: Event, opts: TextPopoverOptions, popoverOpts?: PopoverOptions): Promise<OverlayEventDetail>;
+    static show(ctrl: PopoverController, event: Event, opts: TextPopoverOptions, popoverOpts?: Partial<PopoverOptions>): Promise<OverlayEventDetail>;
     form: TextForm;
     showHeader: boolean;
     headerColor: Color;

package/src/app/core/menu/menu.component.d.ts

@@ -3,11 +3,11 @@ import { AlertController, IonSplitPane, MenuController, ModalController, NavCont
 import { Account } from '../services/model/account.model';
 import { AccountService } from '../services/account.service';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
 import { ConfigService } from '../services/config.service';
 import { PlatformService } from '../services/platform.service';
 import { MenuService, SplitPaneShowWhen } from './menu.service';
 import { MenuItem, MenuOptions } from './menu.model';
+import { ActivatedRoute } from '@angular/router';
 import * as i0 from "@angular/core";
 export declare const APP_MENU_ITEMS: InjectionToken<MenuItem[]>;
 export declare const APP_MENU_OPTIONS: InjectionToken<MenuOptions>;
@@ -23,17 +23,9 @@ export declare class MenuComponent implements OnInit {
     protected cd: ChangeDetectorRef;
     protected menuService: MenuService;
     protected environment: any;
+    protected route: ActivatedRoute;
     protected options: MenuOptions;
     protected items: MenuItem[];
-    private readonly _debug;
-    private _subscription;
-    private _config;
-    loading: boolean;
-    isLogin: boolean;
-    accountName: string;
-    accountAvatar: string;
-    accountEmail: string;
-    $items: BehaviorSubject<MenuItem[]>;
     id: string;
     menuId: string;
     side: string;
@@ -42,11 +34,24 @@ export declare class MenuComponent implements OnInit {
     appName: string;
     appVersion: string;
     splitPane: IonSplitPane;
-    constructor(platformService: PlatformService, accountService: AccountService, navController: NavController, menu: MenuController, modalCtrl: ModalController, alertController: AlertController, translate: TranslateService, configService: ConfigService, cd: ChangeDetectorRef, menuService: MenuService, environment: any, options: MenuOptions, items: MenuItem[]);
+    loading: boolean;
+    isLogin: boolean;
+    accountName: string;
+    accountAvatar: string;
+    accountEmail: string;
+    private readonly _$toggled;
+    private readonly _$opened;
+    private readonly _$splitPaneWhen;
+    private readonly _$enabled;
+    private readonly _debug;
+    private _subscription;
+    constructor(platformService: PlatformService, accountService: AccountService, navController: NavController, menu: MenuController, modalCtrl: ModalController, alertController: AlertController, translate: TranslateService, configService: ConfigService, cd: ChangeDetectorRef, menuService: MenuService, environment: any, route: ActivatedRoute, // Modal editor give 'null'
+    options: MenuOptions, items: MenuItem[]);
     ngOnInit(): Promise<void>;
     onLogin(account: Account): Promise<void>;
     onLogout(skipRedirect?: boolean): Promise<void>;
     logout(): Promise<void>;
+    trackByFn(index: number, menu: MenuItem): string;
     enable(value: boolean): Promise<void>;
     open(): Promise<boolean>;
     close(): Promise<boolean>;
@@ -55,8 +60,7 @@ export declare class MenuComponent implements OnInit {
     toggleSplitPaneShow(event?: Event): Promise<void>;
     doAction(action: string, event: Event): Promise<void>;
     onSwipeRight(event: any): boolean;
-    protected refreshMenuItems(): void;
     protected detectChanges(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, [null, null, null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, [null, null, null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MenuComponent, "app-menu", never, { "id": "id"; "menuId": "menuId"; "side": "side"; "contentId": "contentId"; "logo": "logo"; "appName": "appName"; "appVersion": "appVersion"; }, {}, never, ["*", "[headerBottomRight]"], false>;
 }

package/src/app/core/menu/menu.model.d.ts

@@ -2,6 +2,8 @@ import { UserProfileLabel } from '../services/model/person.model';
 import { Configuration } from '../services/model/config.model';
 import { AccountService } from '../services/account.service';
 import { IconRef } from '../../shared/types';
+import { BehaviorSubject } from "rxjs";
+import { MenuPathParam } from "./menu.service";
 export interface MenuItem extends IconRef {
     title: string;
     path?: string;
@@ -15,14 +17,41 @@ export interface MenuItem extends IconRef {
     titleArgs?: {
         [key: string]: string;
     };
-    children?: MenuItem[];
+    pathParams?: {
+        [key: string]: string;
+    };
+    parentPath?: string;
+    parentPathParams?: {
+        [key: string]: string;
+    };
+    $children?: BehaviorSubject<MenuItem[]>;
 }
 export declare class MenuItems {
+    /**
+     * Compare, without checking the children
+     * @param mainItem
+     * @param otherItem
+     */
+    static isSame(mainItem: MenuItem, otherItem: MenuItem): boolean;
+    /**
+     * All key/value of the mainParams should exist (and be equals) in the other params
+     * @param mainParams
+     * @param otherParams
+     */
+    static isSameParams(mainParams: {
+        [key: string]: string;
+    }, otherParams: {
+        [key: string]: string;
+    }): boolean;
+    static isParent(child: MenuItem, parent: MenuItem | MenuPathParam): boolean;
     static checkIfVisible(item: MenuItem, accountService: AccountService, config: Configuration, opts?: {
         isLogin?: boolean;
         debug?: boolean;
         logPrefix?: string;
     }): boolean;
+    static parsePathWithQuery(pathWithQuery: string): MenuPathParam;
+    static getUrl(item: MenuItem): string;
+    static getUrlFromPathAndParams(path: string, params?: any): string;
 }
 export declare class MenuOptions {
 }

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

@@ -1,12 +1,48 @@
-import { Observable } from 'rxjs';
+import { EventEmitter } from '@angular/core';
+import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { MenuItem } from './menu.model';
+import { Router } from '@angular/router';
+import { StartableService } from '../../shared/services/startable-service.class';
+import { Environment } from '../../../environments/environment.class';
+import { PlatformService } from '../services/platform.service';
+import { Moment } from 'moment';
+import { AccountService } from '../services/account.service';
+import { ConfigService } from '../services/config.service';
+import { Account } from '../services/model/account.model';
 import * as i0 from "@angular/core";
 export declare type SplitPaneShowWhen = boolean | 'lg';
 export declare const DEFAULT_MENU_SHOW_WHEN: SplitPaneShowWhen;
-export declare class MenuService {
+export interface AddSubMenuItemsOption {
+    skipIfExists: boolean;
+}
+export interface AddSubMenuItems {
+    items: MenuItem[];
+    opts?: AddSubMenuItemsOption;
+}
+export interface MenuPathParam {
+    path: string;
+    params: {
+        [key: string]: string;
+    };
+}
+export declare class MenuService extends StartableService<MenuItem[], any> {
+    protected platformService: PlatformService;
+    protected configService: ConfigService;
+    protected accountService: AccountService;
+    protected router: Router;
+    protected environment: Environment;
+    onLoginChange: Subject<Account>;
+    onUpdateMenu: EventEmitter<any>;
+    readonly $items: BehaviorSubject<MenuItem[]>;
+    protected lastAccountUpdateDate: Moment | string;
+    private _logPrefix;
+    private _config;
     private readonly _$toggled;
     private readonly _$opened;
     private readonly _$splitPaneWhen;
     private readonly _$enabled;
+    private get rootItems();
+    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, rootItems?: MenuItem[]);
     get opened(): Observable<boolean>;
     get splitPaneWhen(): Observable<SplitPaneShowWhen>;
     get enabled(): Observable<boolean>;
@@ -16,6 +52,16 @@ export declare class MenuService {
     toggleSplitPaneWhen(): void;
     _markAsOpened(): void;
     _markAsClosed(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, never>;
+    addSubMenuItems(newItems: MenuItem[], opts?: AddSubMenuItemsOption): Promise<void>;
+    protected ngOnStart(): Promise<MenuItem[]>;
+    protected refreshMenuItems(): void;
+    protected addSubMenuItem(newItem: MenuItem, opts?: AddSubMenuItemsOption): Promise<void>;
+    protected prepareItem(item: MenuItem): MenuItem;
+    protected findExistingItem(item: MenuItem, items?: MenuItem[]): MenuItem;
+    protected findParent(childItem: MenuItem, parentItems?: MenuItem[]): MenuItem;
+    protected addMenuToParent(parent: MenuItem, child: MenuItem): void;
+    protected detachSubMenus(currentPathParam: MenuPathParam, items?: MenuItem[], excludedItems?: MenuItem[]): MenuItem[];
+    protected isVisibleForRoute(item: MenuItem, currentPathParam: MenuPathParam): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, [null, null, null, null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuService>;
 }

package/src/app/core/menu/testing/menu-other.testing.d.ts

@@ -0,0 +1,13 @@
+import { MenuService } from '../menu.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AlertController, NavController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { MenuTestingPage } from './menu.testing';
+import * as i0 from "@angular/core";
+export declare class OtherMenuTestingPage extends MenuTestingPage {
+    constructor(route: ActivatedRoute, // Modal editor give 'null'
+    router: Router, navController: NavController, alertCtrl: AlertController, translate: TranslateService, menuService: MenuService);
+    initSubMenu(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<OtherMenuTestingPage, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<OtherMenuTestingPage, "app-testing-menu-other", never, {}, {}, never, never, false>;
+}

package/src/app/core/menu/testing/menu.testing.d.ts

@@ -0,0 +1,34 @@
+import { AfterViewInit, OnDestroy, OnInit, QueryList } from '@angular/core';
+import { MenuService } from '../menu.service';
+import { AppTabEditor } from '../../form/entity/editor.class';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AlertController, NavController } from '@ionic/angular';
+import { TranslateService } from '@ngx-translate/core';
+import { MatTab } from "@angular/material/tabs";
+import { Subject } from "rxjs";
+import * as i0 from "@angular/core";
+export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnDestroy, AfterViewInit {
+    protected menuService: MenuService;
+    static tabsChanges: Subject<MatTab[]>;
+    protected logPrefix: string;
+    protected childPath: string;
+    protected title: string;
+    protected secondTabTitle: string;
+    protected parentPath: string;
+    protected thirdTabTitle: any;
+    tabs: QueryList<MatTab>;
+    constructor(route: ActivatedRoute, // Modal editor give 'null'
+    router: Router, navController: NavController, alertCtrl: AlertController, translate: TranslateService, menuService: MenuService);
+    ngOnInit(): void;
+    ngAfterViewInit(): void;
+    ngOnDestroy(): void;
+    load(id?: number, options?: any): Promise<void>;
+    get isNewData(): boolean;
+    reload(): Promise<void>;
+    save(event: Event | undefined, options: any): Promise<boolean>;
+    protected toggleThird(): void;
+    protected initSubMenu(): void;
+    protected getFirstInvalidTabIndex(): number;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuTestingPage, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<MenuTestingPage, "app-testing-menu", never, {}, {}, never, never, false>;
+}

package/src/app/core/menu/testing/menu.testing.module.d.ts

@@ -0,0 +1,12 @@
+import * as i0 from "@angular/core";
+import * as i1 from "./menu.testing";
+import * as i2 from "./menu-other.testing";
+import * as i3 from "@angular/common";
+import * as i4 from "@angular/router";
+import * as i5 from "../menu.module";
+import * as i6 from "../../../shared/shared.module";
+export declare class MenuTestingModule {
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuTestingModule, never>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MenuTestingModule, [typeof i1.MenuTestingPage, typeof i2.OtherMenuTestingPage], [typeof i3.CommonModule, typeof i4.RouterModule, typeof i5.AppMenuModule, typeof i6.SharedModule], [typeof i4.RouterModule, typeof i1.MenuTestingPage, typeof i2.OtherMenuTestingPage]>;
+    static ɵinj: i0.ɵɵInjectorDeclaration<MenuTestingModule>;
+}

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

@@ -89,7 +89,7 @@ export declare class AccountService extends BaseGraphqlService<Account, any, num
     /**
      *
      * @param recorderDepartment
-     * @deprecated use ProgramRefService.canUserWriteDataForDepartment() instead
+     * @deprecated use ProgramRefService.canUserWriteEntity() instead
      */
     canUserWriteDataForDepartment(recorderDepartment: Referential | any): boolean;
     register(data: RegisterData): Promise<Account>;

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

@@ -1,13 +1,13 @@
-import { Params } from '@polkadot/util-crypto/scrypt/types';
+import { ScryptParams } from '@polkadot/util-crypto/scrypt/types';
 import { Keypair } from '@polkadot/util-crypto/types';
 import * as i0 from "@angular/core";
 export declare const ED25519_SEED_LENGTH = 32;
 export declare const SCRYPT_PARAMS: {
-    SIMPLE: Params;
-    DEFAULT: Params;
-    SECURE: Params;
-    HARDEST: Params;
-    EXTREME: Params;
+    SIMPLE: ScryptParams;
+    DEFAULT: ScryptParams;
+    SECURE: ScryptParams;
+    HARDEST: ScryptParams;
+    EXTREME: ScryptParams;
 };
 export { Keypair };
 export declare class CryptoService {
@@ -21,7 +21,7 @@ export declare class CryptoService {
      * @param password
      * @param scryptParams
      */
-    static scryptKeypair(salt: string, password: string, scryptParams?: Params): Promise<Keypair>;
+    static scryptKeypair(salt: string, password: string, scryptParams?: ScryptParams): Promise<Keypair>;
     /**
      * Sign a message, from a key pair
      */

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

@@ -29,7 +29,6 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     private http;
     protected environment: any;
     private loggingService;
-    private network;
     private translate;
     private toastController;
     onPeerChanges: import("rxjs").Observable<string>;
@@ -37,6 +36,7 @@ export declare class NetworkService extends StartableObservableService<Peer, Pee
     onResetNetworkCache: EventEmitter<any>;
     private readonly _mobile;
     private readonly _logger;
+    private readonly _network;
     private _timerSubscription;
     private readonly _timerRefreshPeriod;
     private readonly _timerRefreshCondition;

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

@@ -10,6 +10,7 @@ import { ShowToastOptions } from '../../shared/toast/toasts';
 import { TranslateService } from '@ngx-translate/core';
 import { AccountService } from './account.service';
 import { Observable } from 'rxjs';
+import { Environment } from '../../../environments/environment.class';
 import { ConfigService } from './config.service';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { Downloader, DownloadRequest } from '@ionic-native/downloader/ngx';
@@ -36,7 +37,7 @@ export declare class PlatformService extends StartableService {
     private configService;
     private cache;
     private audioProvider;
-    protected environment: any;
+    protected environment: Environment;
     private loggingService;
     private downloader;
     private _logger;
@@ -45,7 +46,7 @@ export declare class PlatformService extends StartableService {
     private _capacitor;
     private _android;
     private _ios;
-    constructor(ionicPlatform: Platform, cdkPlatform: CdkPlatform, toastController: ToastController, translate: TranslateService, dateAdapter: MomentDateAdapter, storageService: StorageService, entitiesStorage: EntitiesStorage, settings: LocalSettingsService, networkService: NetworkService, accountService: AccountService, configService: ConfigService, cache: CacheService, audioProvider: AudioProvider, environment: any, loggingService: ILoggingService, downloader: Downloader);
+    constructor(ionicPlatform: Platform, cdkPlatform: CdkPlatform, toastController: ToastController, translate: TranslateService, dateAdapter: MomentDateAdapter, storageService: StorageService, entitiesStorage: EntitiesStorage, settings: LocalSettingsService, networkService: NetworkService, accountService: AccountService, configService: ConfigService, cache: CacheService, audioProvider: AudioProvider, environment: Environment, loggingService: ILoggingService, downloader: Downloader);
     private _downloadingJobs;
     private checkAppVersionTimer;
     is(platformName: Platforms): boolean;

package/src/app/shared/shared.testing.module.d.ts

@@ -9,9 +9,10 @@ import * as i6 from "./upload-file/testing/upload-file.testing.module";
 import * as i7 from "./image/gallery/testing/gallery.testing.module";
 import * as i8 from "./audio/audio.testing.module";
 import * as i9 from "./storage/storage-explorer.module";
+import * as i10 from "../core/menu/testing/menu.testing.module";
 export declare const SHARED_TESTING_PAGES: TestingPage[];
 export declare class SharedTestingModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<SharedTestingModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedTestingModule, never, [typeof i1.CommonModule, typeof i2.IonicModule, typeof i3.TranslateModule, typeof i4.MaterialTestingModule, typeof i5.ToastTestingModule, typeof i6.UploadFileTestingModule, typeof i7.ImageGalleryTestingModule, typeof i8.AudioTestingModule, typeof i9.StorageExplorerModule], [typeof i4.MaterialTestingModule, typeof i5.ToastTestingModule, typeof i6.UploadFileTestingModule, typeof i7.ImageGalleryTestingModule, typeof i8.AudioTestingModule, typeof i9.StorageExplorerModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedTestingModule, never, [typeof i1.CommonModule, typeof i2.IonicModule, typeof i3.TranslateModule, typeof i4.MaterialTestingModule, typeof i5.ToastTestingModule, typeof i6.UploadFileTestingModule, typeof i7.ImageGalleryTestingModule, typeof i8.AudioTestingModule, typeof i9.StorageExplorerModule, typeof i10.MenuTestingModule], [typeof i4.MaterialTestingModule, typeof i5.ToastTestingModule, typeof i6.UploadFileTestingModule, typeof i7.ImageGalleryTestingModule, typeof i8.AudioTestingModule, typeof i9.StorageExplorerModule, typeof i10.MenuTestingModule]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<SharedTestingModule>;
 }

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

@@ -608,6 +608,7 @@
       "CREATION_DATE": "Creation date",
       "UPDATE_DATE": "Update date",
       "COMMENTS": "Comments",
+      "VALUES": "Enums",
       "GROUP_1": "Group 1",
       "GROUP_2": "Group 2",
       "STATUS_ID": "Status"

package/src/assets/i18n/en.json

@@ -608,6 +608,7 @@
       "CREATION_DATE": "Creation date",
       "UPDATE_DATE": "Update date",
       "COMMENTS": "Comments",
+      "VALUES": "Enums",
       "GROUP_1": "Group 1",
       "GROUP_2": "Group 2",
       "STATUS_ID": "Status"

package/src/assets/i18n/fr.json

@@ -601,6 +601,7 @@
       "CREATION_DATE": "Date création",
       "UPDATE_DATE": "Date MAJ",
       "COMMENTS": "Commentaires",
+      "VALUES": "Enums",
       "GROUP_1": "Groupe 1",
       "GROUP_2": "Groupe 2",
       "STATUS_ID": "Etat de saisie"