@sumaris-net/ngx-components 2.4.132 → 2.4.134

package/package.json

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

package/src/app/core/home/home.d.ts

@@ -11,13 +11,13 @@ import { ConfigService } from '../services/config.service';
 import { PlatformService } from '../services/platform.service';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { NetworkService } from '../services/network.service';
-import { MenuItem } from '../menu/menu.model';
+import { IMenuItem } from '../menu/menu.model';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { Environment } from '../../../environments/environment.class';
 import { HistoryPageReference } from '../services/model/history.model';
 import * as i0 from "@angular/core";
 export declare function getRandomImage(files: String[]): String;
-export declare const APP_HOME_BUTTONS: InjectionToken<MenuItem[]>;
+export declare const APP_HOME_BUTTONS: InjectionToken<IMenuItem[]>;
 export declare class HomePage implements OnDestroy {
     private accountService;
     private modalCtrl;
@@ -30,7 +30,7 @@ export declare class HomePage implements OnDestroy {
     settings: LocalSettingsService;
     protected environment: Environment;
     locales: LocaleConfig[];
-    buttons: MenuItem[];
+    buttons: IMenuItem[];
     private readonly _debug;
     private _started;
     private _subscription;
@@ -50,10 +50,10 @@ export declare class HomePage implements OnDestroy {
     contentStyle: any;
     pageHistory: HistoryPageReference[];
     offline: boolean;
-    $filteredButtons: BehaviorSubject<MenuItem[]>;
+    $filteredButtons: BehaviorSubject<IMenuItem[]>;
     readonly showAccountButton: boolean;
     get currentLocaleCode(): string;
-    constructor(accountService: AccountService, modalCtrl: ModalController, translate: TranslateService, toastController: ToastController, configService: ConfigService, platform: PlatformService, cd: ChangeDetectorRef, network: NetworkService, settings: LocalSettingsService, environment: Environment, locales: LocaleConfig[], buttons: MenuItem[]);
+    constructor(accountService: AccountService, modalCtrl: ModalController, translate: TranslateService, toastController: ToastController, configService: ConfigService, platform: PlatformService, cd: ChangeDetectorRef, network: NetworkService, settings: LocalSettingsService, environment: Environment, locales: LocaleConfig[], buttons: IMenuItem[]);
     ngOnDestroy(): void;
     login(): Promise<void>;
     register(): Promise<void>;

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

@@ -3,14 +3,13 @@ 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 { ConfigService } from '../services/config.service';
 import { PlatformService } from '../services/platform.service';
 import { MenuService, SplitPaneShowWhen } from './menu.service';
-import { MenuItem, MenuOptions } from './menu.model';
+import { IMenuItem, MenuOptions } from './menu.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RxStrategyNames } from '@rx-angular/cdk/render-strategies';
 import * as i0 from "@angular/core";
-export declare const APP_MENU_ITEMS: InjectionToken<MenuItem[]>;
+export declare const APP_MENU_ITEMS: InjectionToken<IMenuItem[]>;
 export declare const APP_MENU_OPTIONS: InjectionToken<MenuOptions>;
 export declare class MenuComponent implements OnInit {
     protected platformService: PlatformService;
@@ -20,14 +19,13 @@ export declare class MenuComponent implements OnInit {
     protected modalCtrl: ModalController;
     protected alertController: AlertController;
     protected translate: TranslateService;
-    protected configService: ConfigService;
     protected cd: ChangeDetectorRef;
     protected menuService: MenuService;
     protected router: Router;
     protected environment: any;
     protected route: ActivatedRoute;
     protected options: MenuOptions;
-    protected items: MenuItem[];
+    protected items: IMenuItem[];
     id: string;
     menuId: string;
     side: string;
@@ -44,13 +42,13 @@ export declare class MenuComponent implements OnInit {
     accountEmail: string;
     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, router: Router, environment: any, route: ActivatedRoute, // Modal editor give 'null'
-    options: MenuOptions, items: MenuItem[]);
+    constructor(platformService: PlatformService, accountService: AccountService, navController: NavController, menu: MenuController, modalCtrl: ModalController, alertController: AlertController, translate: TranslateService, cd: ChangeDetectorRef, menuService: MenuService, router: Router, environment: any, route: ActivatedRoute, // Modal editor give 'null'
+    options: MenuOptions, items: IMenuItem[]);
     ngOnInit(): Promise<void>;
     onLogin(account: Account): Promise<void>;
     onLogout(skipRedirect?: boolean): Promise<void>;
     logout(): Promise<void>;
-    trackByFn(index: number, item: MenuItem): string;
+    trackByFn(index: number, item: IMenuItem): string;
     enable(value: boolean): Promise<void>;
     open(): Promise<boolean>;
     close(): Promise<boolean>;
@@ -67,7 +65,7 @@ export declare class MenuComponent implements OnInit {
     }): void;
     protected detectChanges(): void;
     protected markForCheck(): void;
-    protected togglePinSubMenu(event: Event, item: MenuItem): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, [null, null, null, null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
+    protected togglePinned(event: Event, item: IMenuItem): void;
+    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"; "rxStrategy": "rxStrategy"; }, {}, never, ["*", "[headerBottomRight]"], false>;
 }

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

@@ -1,11 +1,10 @@
 import { UserProfileLabel } from '../services/model/person.model';
 import { Configuration } from '../services/model/config.model';
-import { IconRef } from '../../shared/types';
+import { AppColors, IconRef } from '../../shared/types';
 import { BehaviorSubject } from 'rxjs';
 import { MenuPathParam } from './menu.service';
 import { Account } from '../services/model/account.model';
-export interface MenuItem extends IconRef {
-    id?: number;
+export interface IMenuItem extends IconRef {
     title: string;
     path?: string;
     after?: string;
@@ -13,7 +12,7 @@ export interface MenuItem extends IconRef {
     action?: string | any;
     profile?: UserProfileLabel;
     exactProfile?: UserProfileLabel;
-    color?: string;
+    color?: string | AppColors;
     cssClass?: string;
     ifProperty?: string;
     titleProperty?: string;
@@ -28,7 +27,48 @@ export interface MenuItem extends IconRef {
         [key: string]: string;
     };
     pinned?: boolean;
-    $children?: BehaviorSubject<MenuItem[]>;
+    id?: number;
+    parent?: IMenuItem;
+    children?: IMenuItem[];
+}
+export declare class MenuItem implements IMenuItem {
+    id?: number;
+    parent?: MenuItem;
+    $children: BehaviorSubject<MenuItem[]>;
+    $title: BehaviorSubject<string>;
+    titleProperty?: string;
+    titleArgs?: {
+        [key: string]: string;
+    };
+    path?: string;
+    pathParams?: {
+        [key: string]: string;
+    };
+    parentPath?: string;
+    parentPathParams?: {
+        [key: string]: string;
+    };
+    after?: string;
+    before?: string;
+    action?: string | any;
+    profile?: UserProfileLabel;
+    exactProfile?: UserProfileLabel;
+    color?: string | AppColors;
+    cssClass?: string;
+    ifProperty?: string;
+    pinned?: boolean;
+    icon?: string;
+    matIcon?: string;
+    matSvgIcon?: string;
+    static fromObject(source: any): MenuItem;
+    fromObject(source: any): void;
+    asObject(): any;
+    get children(): MenuItem[];
+    set children(value: MenuItem[]);
+    get title(): string;
+    set title(value: string);
+    get detached(): boolean;
+    isPinned(): any;
 }
 export declare class MenuItems {
     /**
@@ -37,7 +77,21 @@ export declare class MenuItems {
      * @param mainItem
      * @param otherItem
      */
-    static isSame(mainItem: MenuItem, otherItem: MenuItem): boolean;
+    static isSame(mainItem: IMenuItem, otherItem: IMenuItem): boolean;
+    /**
+     * Compare, without checking the children and the title
+     *
+     * @param mainItem
+     * @param otherItem
+     */
+    static isSameIdOrPathAndParams(mainItem: IMenuItem, otherItem: IMenuItem): boolean;
+    /**
+     * Compare, without checking the children
+     *
+     * @param mainItem
+     * @param otherItem
+     */
+    static isSamePathAndParams(mainItem: IMenuItem, otherItem: IMenuItem): boolean;
     /**
      * All key/value of the mainParams should exist (and be equals) in the other params
      *
@@ -49,17 +103,19 @@ export declare class MenuItems {
     }, otherParams: {
         [key: string]: string;
     }): boolean;
-    static prepareItem(item: MenuItem): MenuItem;
-    static isParent(child: MenuItem, parent: MenuItem | MenuPathParam): boolean;
-    static checkIfVisible(item: MenuItem, account: Account, config: Configuration, opts?: {
+    static isParent(child: IMenuItem, parent: IMenuItem | MenuPathParam): boolean;
+    static checkIfVisible(item: IMenuItem, account: Account, config: Configuration, opts?: {
         isLogin?: boolean;
         debug?: boolean;
         logPrefix?: string;
     }): boolean;
-    static isPinned(item: MenuItem): any;
+    static checkIfSubMenuVisible(item: MenuItem, currentPathParam: MenuPathParam): boolean;
     static parsePathWithQuery(pathWithQuery: string): MenuPathParam;
-    static getUrl(item: MenuItem): string;
+    static getUrl(item: IMenuItem): string;
     static getUrlFromPathAndParams(path: string, params?: any): string;
+    static sortByParamOrIdComparator(paramName?: string): (n1: IMenuItem, n2: IMenuItem) => number;
+    static sortByTabOrId: (n1: IMenuItem, n2: IMenuItem) => number;
 }
 export declare class MenuOptions {
+    enableSubMenus?: boolean;
 }

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

@@ -4,9 +4,11 @@ import * as i2 from "./sub-menu-tab.directive";
 import * as i3 from "../../shared/shared.module";
 import * as i4 from "@angular/router";
 import * as i5 from "@rx-angular/template/for";
-import * as i6 from "@ngx-translate/core";
+import * as i6 from "@rx-angular/template/if";
+import * as i7 from "@rx-angular/template/let";
+import * as i8 from "@ngx-translate/core";
 export declare class AppMenuModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AppMenuModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AppMenuModule, [typeof i1.MenuComponent, typeof i2.SubMenuTabDirective], [typeof i3.SharedModule, typeof i4.RouterModule, typeof i5.ForModule, typeof i6.TranslateModule], [typeof i6.TranslateModule, typeof i1.MenuComponent, typeof i2.SubMenuTabDirective]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AppMenuModule, [typeof i1.MenuComponent, typeof i2.SubMenuTabDirective], [typeof i3.SharedModule, typeof i4.RouterModule, typeof i5.ForModule, typeof i6.IfModule, typeof i7.LetModule, typeof i8.TranslateModule], [typeof i8.TranslateModule, typeof i1.MenuComponent, typeof i2.SubMenuTabDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AppMenuModule>;
 }

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

@@ -1,20 +1,15 @@
 import { BehaviorSubject, Observable } from 'rxjs';
-import { MenuItem } from './menu.model';
+import { IMenuItem, MenuItem } from './menu.model';
 import { Router } from '@angular/router';
 import { Environment } from '../../../environments/environment.class';
 import { PlatformService } from '../services/platform.service';
 import { AccountService } from '../services/account.service';
 import { ConfigService } from '../services/config.service';
-import { Configuration } from '../services/model/config.model';
 import { Account } from '../services/model/account.model';
 import { StartableObservableService } from '../../shared/services/startable-observable-service.class';
 import * as i0 from "@angular/core";
 export declare type SplitPaneShowWhen = boolean | 'lg';
 export declare const DEFAULT_MENU_SHOW_WHEN: SplitPaneShowWhen;
-export interface AddSubMenuItemsOption {
-    skipIfExists?: boolean;
-    availableParents?: MenuItem[];
-}
 export interface MenuPathParam {
     path: string;
     params: {
@@ -36,28 +31,34 @@ export declare class MenuService extends StartableObservableService<MenuItem[]>
     private readonly _$splitPaneWhen;
     private readonly _$enabled;
     private readonly _$listenRoute;
-    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, staticItems?: MenuItem[]);
+    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, staticItems?: IMenuItem[]);
     get opened(): Observable<boolean>;
     get splitPaneWhen(): Observable<SplitPaneShowWhen>;
     get enabled(): Observable<boolean>;
     enable(value: boolean): void;
     setSplitPaneShowWhen(value: SplitPaneShowWhen): void;
     toggleSplitPaneWhen(): void;
+    loadOrCreate(source: Partial<IMenuItem>): MenuItem;
+    addSubMenuItems(sources: IMenuItem[], opts?: {
+        skipIfExists?: boolean;
+    }): Promise<MenuItem[]>;
+    addSubMenuItem(item: IMenuItem, opts?: {
+        skipIfExists?: boolean;
+    }): Promise<MenuItem>;
+    removeSubMenuItem(item: IMenuItem): Promise<MenuItem>;
+    togglePinned(source: IMenuItem): void;
     _markAsOpened(): void;
     _markAsClosed(): void;
-    addSubMenuItems(newItems: MenuItem[], opts?: AddSubMenuItemsOption): Promise<MenuItem[]>;
-    addSubMenuItem(newItem: MenuItem, opts?: AddSubMenuItemsOption): Promise<MenuItem>;
-    removeSubMenuItem(item: MenuItem): void;
-    detachSubMenuItem(pathParam: MenuPathParam): void;
     protected ngOnStart(): Promise<MenuItem[]>;
-    computeNewId(): number;
-    protected _addSubMenuItem(newItem: MenuItem, opts?: AddSubMenuItemsOption): MenuItem;
-    protected _loadMenuItems(config: Configuration | null, account: Account | null): Promise<MenuItem[]>;
-    protected _findExistingItem(item: MenuItem, items?: MenuItem[]): MenuItem;
-    protected _findParent(childItem: MenuItem, availableParents?: MenuItem[]): MenuItem;
-    protected _addMenuToParent(parent: MenuItem, child: MenuItem): void;
-    protected _detachStoreAndRestore(pathParam: MenuPathParam): void;
-    protected _detachSubMenus(currentPathParam: MenuPathParam, items?: MenuItem[], excludedItems?: MenuItem[]): MenuItem[];
+    private _loadMenuItems;
+    private _addSubMenuItems;
+    private _addSubMenuItem;
+    private _computeNewId;
+    private _detachSubMenuItems;
+    private _detachToParent;
+    private _findExistingItem;
+    private _findParent;
+    private _attachMenuToParent;
     static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, [null, null, null, null, null, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuService>;
 }

package/src/app/core/menu/sub-menu-tab.directive.d.ts

@@ -2,6 +2,7 @@ import { AfterViewInit, OnChanges, SimpleChanges } from '@angular/core';
 import { MatTab, MatTabGroup } from '@angular/material/tabs';
 import { Router } from '@angular/router';
 import { MenuService } from './menu.service';
+import { IconRef } from '../../shared/types';
 import * as i0 from "@angular/core";
 export declare class SubMenuTabDirective implements OnChanges, AfterViewInit {
     private menuService;
@@ -13,12 +14,16 @@ export declare class SubMenuTabDirective implements OnChanges, AfterViewInit {
     parentPath: string;
     path: string;
     subMenuTitle: string;
+    subMenuIcon: IconRef;
     private _menuItem;
+    private _debug;
     constructor(menuService: MenuService, tabGroup: MatTabGroup, tab: MatTab, router: Router);
     ngAfterViewInit(): void;
     ngOnChanges(changes: SimpleChanges): void;
-    private _computeMenuItem;
-    private _addItemToMenu;
+    private _removeToMenu;
+    private _addToMenu;
+    private get menuItem();
+    private get title();
     static ɵfac: i0.ɵɵFactoryDeclaration<SubMenuTabDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<SubMenuTabDirective, "[appSubMenuTab]", never, { "label": "label"; "disabled": "disabled"; "parentPath": "parentPath"; "path": "path"; "subMenuTitle": "subMenuTitle"; }, {}, never, never, false>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<SubMenuTabDirective, "[appSubMenuTab]", never, { "label": "label"; "disabled": "disabled"; "parentPath": "parentPath"; "path": "path"; "subMenuTitle": "subMenuTitle"; "subMenuIcon": "subMenuIcon"; }, {}, never, never, false>;
 }

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

@@ -2,18 +2,19 @@ import { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
 import { MenuService } from '../menu.service';
 import { AppTabEditor } from '../../form/entity/editor.class';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AlertController, IonToggle, NavController } from '@ionic/angular';
+import { AlertController, NavController } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
 import { Subject } from 'rxjs';
 import * as i0 from "@angular/core";
 export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnDestroy, AfterViewInit {
     protected menuService: MenuService;
-    toggleThird: IonToggle;
     protected logPrefix: string;
     protected childPath: string;
     protected thirdTabTitle: string;
     protected parentPath: string;
+    protected path: string;
     protected showOtherLinks: boolean;
+    protected showThirdTab: boolean;
     protected $title: Subject<string>;
     protected $secondTabTitle: Subject<string>;
     protected set title(value: string);
@@ -29,6 +30,8 @@ export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnD
     save(event: Event | undefined, options: any): Promise<boolean>;
     changeTitle(event?: UIEvent): void;
     changeSecondTabTitle(event?: UIEvent): void;
+    addSubMenuItem(event?: UIEvent): void;
+    addOutsideRouteSubMenuItem(event?: UIEvent, pinned?: boolean): void;
     protected enableMenu(value: boolean): void;
     protected toggleSplitPaneWhen(): void;
     protected initSubMenu(): Promise<void>;

package/src/app/core/settings/settings.page.d.ts

@@ -14,9 +14,9 @@ import { AlertController, NavController } from '@ionic/angular';
 import { Property } from '../../shared/types';
 import { CanLeave } from '../../shared/guard/component-dirty.guard';
 import { ISelectPeerModalOptions } from '../peer/select-peer.modal';
-import { MenuItem } from '../menu/menu.model';
+import { IMenuItem } from '../menu/menu.model';
 import * as i0 from "@angular/core";
-export declare const APP_SETTINGS_MENU_ITEMS: InjectionToken<MenuItem[]>;
+export declare const APP_SETTINGS_MENU_ITEMS: InjectionToken<IMenuItem[]>;
 export declare class SettingsPage extends AppForm<LocalSettings> implements OnInit, OnDestroy, CanLeave {
     protected platform: PlatformService;
     protected navController: NavController;
@@ -33,7 +33,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     mobile: boolean;
     saving: boolean;
     usageModes: UsageMode[];
-    menuItems: MenuItem[];
+    menuItems: IMenuItem[];
     propertyDefinitions: FormFieldDefinition[];
     propertyDefinitionsByKey: FormFieldDefinitionMap;
     propertyDefinitionsByIndex: {
@@ -44,7 +44,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     get accountInheritance(): boolean;
     get isLogin(): boolean;
     get propertiesForm(): UntypedFormArray;
-    constructor(injector: Injector, platform: PlatformService, navController: NavController, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: UntypedFormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[], menuItems?: MenuItem[]);
+    constructor(injector: Injector, platform: PlatformService, navController: NavController, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: UntypedFormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[], menuItems?: IMenuItem[]);
     ngOnInit(): Promise<void>;
     getPropertyDefinition(index: number): FormFieldDefinition;
     updatePropertyDefinition(index: number): FormFieldDefinition;
@@ -59,7 +59,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     cancel(event?: Event): Promise<void>;
     close(event?: Event): Promise<boolean>;
     clearCache(event?: Event): Promise<void>;
-    executeAction(event: Event, item: MenuItem): Promise<void>;
+    executeAction(event: Event, item: IMenuItem): Promise<void>;
     protected getValue(): Promise<LocalSettings>;
     protected getJsonValueToSave(): Promise<any>;
     protected markForCheck(): void;

package/src/theme/_ngx-components.scss

@@ -1308,7 +1308,8 @@ ion-modal.modal-fullscreen {
 }
 
 .popover-notifications {
-  --max-height: calc(90vh - 20px /* footer height */);
+  --popover-top: 0;
+  --max-height: calc(90vh - 40px /* header + footer height */ - var(--popover-top, 0px) - var(--offset-y, 0px));
 
   ion-item {
     --ion-item-background-color-hover: var(--ion-color-light);