@sumaris-net/ngx-components 2.4.133 → 2.4.135

package/package.json

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

package/src/app/admin/users/users.d.ts

@@ -10,6 +10,7 @@ import { PersonFilter } from '../services/filter/person.filter';
 import { ConfigService } from '../../core/services/config.service';
 import { MatExpansionPanel } from '@angular/material/expansion';
 import { MessageService } from '../../social/message/message.service';
+import { MenuService } from '../../core/menu/menu.service';
 import * as i0 from "@angular/core";
 export declare class UsersPage extends AppTable<Person, PersonFilter> implements OnInit {
     protected accountService: AccountService;
@@ -17,6 +18,7 @@ export declare class UsersPage extends AppTable<Person, PersonFilter> implements
     protected configService: ConfigService;
     protected dataService: PersonService;
     protected messageService: MessageService;
+    protected menuService: MenuService;
     protected cd: ChangeDetectorRef;
     readonly canEdit: boolean;
     readonly canSendMessage: boolean;
@@ -29,10 +31,10 @@ export declare class UsersPage extends AppTable<Person, PersonFilter> implements
     set showUsernameColumn(value: boolean);
     set showUsernameExtranetColumn(value: boolean);
     useSticky: boolean;
-    constructor(injector: Injector, formBuilder: UntypedFormBuilder, accountService: AccountService, validatorService: ValidatorService, configService: ConfigService, dataService: PersonService, messageService: MessageService, cd: ChangeDetectorRef, environment: any);
+    constructor(injector: Injector, formBuilder: UntypedFormBuilder, accountService: AccountService, validatorService: ValidatorService, configService: ConfigService, dataService: PersonService, messageService: MessageService, menuService: MenuService, cd: ChangeDetectorRef, environment: any);
     filterExpansionPanel: MatExpansionPanel;
     get firstUserColumn(): string;
-    ngOnInit(): void;
+    ngOnInit(): Promise<void>;
     applyFilterAndClosePanel(event?: Event): void;
     resetFilter(event?: Event): void;
     protected restoreFilterOrLoad(): Promise<void>;

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

@@ -1,17 +1,14 @@
-import { ChangeDetectorRef, InjectionToken, OnInit } from '@angular/core';
+import { ChangeDetectorRef, OnInit } from '@angular/core';
 import { AlertController, IonSplitPane, MenuController, ModalController, NavController } from '@ionic/angular';
 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 { IMenuItem, MenuOptions } from './menu.model';
+import { IMenuItem } 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<IMenuItem[]>;
-export declare const APP_MENU_OPTIONS: InjectionToken<MenuOptions>;
 export declare class MenuComponent implements OnInit {
     protected platformService: PlatformService;
     protected accountService: AccountService;
@@ -20,14 +17,11 @@ 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: IMenuItem[];
     id: string;
     menuId: string;
     side: string;
@@ -44,8 +38,7 @@ 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: IMenuItem[]);
+    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);
     ngOnInit(): Promise<void>;
     onLogin(account: Account): Promise<void>;
     onLogout(skipRedirect?: boolean): Promise<void>;
@@ -68,6 +61,6 @@ export declare class MenuComponent implements OnInit {
     protected detectChanges(): void;
     protected markForCheck(): void;
     protected togglePinned(event: Event, item: IMenuItem): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, [null, null, null, null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuComponent, [null, null, null, null, null, null, null, null, null, null, null, { 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,6 +1,6 @@
 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';
@@ -12,7 +12,7 @@ export interface IMenuItem extends IconRef {
     action?: string | any;
     profile?: UserProfileLabel;
     exactProfile?: UserProfileLabel;
-    color?: string;
+    color?: string | AppColors;
     cssClass?: string;
     ifProperty?: string;
     titleProperty?: string;
@@ -28,11 +28,14 @@ export interface IMenuItem extends IconRef {
     };
     pinned?: boolean;
     id?: number;
+    parent?: IMenuItem;
     children?: IMenuItem[];
 }
 export declare class MenuItem implements IMenuItem {
     id?: number;
-    _title: string;
+    parent?: MenuItem;
+    $children: BehaviorSubject<MenuItem[]>;
+    $title: BehaviorSubject<string>;
     titleProperty?: string;
     titleArgs?: {
         [key: string]: string;
@@ -50,13 +53,13 @@ export declare class MenuItem implements IMenuItem {
     action?: string | any;
     profile?: UserProfileLabel;
     exactProfile?: UserProfileLabel;
-    color?: string;
+    color?: string | AppColors;
     cssClass?: string;
     ifProperty?: string;
     pinned?: boolean;
-    parent?: MenuItem;
-    $title: BehaviorSubject<string>;
-    $children: BehaviorSubject<MenuItem[]>;
+    icon?: string;
+    matIcon?: string;
+    matSvgIcon?: string;
     static fromObject(source: any): MenuItem;
     fromObject(source: any): void;
     asObject(): any;
@@ -65,6 +68,7 @@ export declare class MenuItem implements IMenuItem {
     get title(): string;
     set title(value: string);
     get detached(): boolean;
+    get ancestor(): any;
     isPinned(): any;
 }
 export declare class MenuItems {
@@ -110,6 +114,10 @@ export declare class MenuItems {
     static parsePathWithQuery(pathWithQuery: string): MenuPathParam;
     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;
+    enableSubMenuIcon?: boolean;
 }

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

@@ -1,19 +1,18 @@
+import { InjectionToken } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { IMenuItem, MenuItem } from './menu.model';
+import { IMenuItem, MenuItem, MenuOptions } 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;
-}
+export declare const APP_MENU_ITEMS: InjectionToken<IMenuItem[]>;
+export declare const APP_MENU_OPTIONS: InjectionToken<MenuOptions>;
 export interface MenuPathParam {
     path: string;
     params: {
@@ -26,6 +25,7 @@ export declare class MenuService extends StartableObservableService<MenuItem[]>
     protected accountService: AccountService;
     protected router: Router;
     protected environment: Environment;
+    protected options: MenuOptions;
     readonly accountChanges: BehaviorSubject<Account>;
     private _staticItems;
     private _detachedSubItems;
@@ -34,37 +34,42 @@ export declare class MenuService extends StartableObservableService<MenuItem[]>
     private readonly _$opened;
     private readonly _$splitPaneWhen;
     private readonly _$enabled;
+    private readonly _$subMenuEnabled;
     private readonly _$listenRoute;
-    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, staticItems?: IMenuItem[]);
+    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, options: MenuOptions, staticItems?: IMenuItem[]);
     get opened(): Observable<boolean>;
     get splitPaneWhen(): Observable<SplitPaneShowWhen>;
     get enabled(): Observable<boolean>;
+    get subMenuEnabled(): boolean;
+    get subMenuIconEnabled(): boolean;
     enable(value: boolean): void;
+    enableSubMenu(value: boolean): void;
     setSplitPaneShowWhen(value: SplitPaneShowWhen): void;
     toggleSplitPaneWhen(): void;
+    fromObject(source: any): MenuItem;
     loadOrCreate(source: Partial<IMenuItem>): MenuItem;
-    computeId(item: MenuItem): number;
-    computeNewId(): number;
-    _markAsOpened(): void;
-    _markAsClosed(): void;
     addSubMenuItems(sources: IMenuItem[], opts?: {
         skipIfExists?: boolean;
     }): Promise<MenuItem[]>;
     addSubMenuItem(item: IMenuItem, opts?: {
         skipIfExists?: boolean;
     }): Promise<MenuItem>;
-    removeSubMenuItem(item: IMenuItem): void;
-    unpinned(source: IMenuItem): void;
-    private _detachSubMenuItems;
-    private _detachToParent;
-    private _findExistingId;
+    removeSubMenuItems(items: IMenuItem[]): Promise<MenuItem[]>;
+    removeSubMenuItem(item: IMenuItem): Promise<MenuItem>;
+    togglePinned(source: IMenuItem): void;
+    _markAsOpened(): void;
+    _markAsClosed(): void;
     protected ngOnStart(): Promise<MenuItem[]>;
+    private _loadMenuItems;
     private _addSubMenuItems;
     private _addSubMenuItem;
-    protected _loadMenuItems(config: Configuration | null, account: Account | null): MenuItem[];
+    private _computeNewId;
+    private _removeSubMenuItem;
+    private _detachSubMenuItems;
+    private _detachToParent;
     private _findExistingItem;
     private _findParent;
     private _attachMenuToParent;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, [null, null, null, null, null, { optional: true; }]>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MenuService, [null, null, null, null, null, { optional: true; }, { optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<MenuService>;
 }

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

@@ -14,6 +14,7 @@ export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnD
     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);

package/src/app/shared/services/startable-observable-service.class.d.ts

@@ -1,5 +1,5 @@
-import { BehaviorSubject, Subject, Subscription } from 'rxjs';
-import { IStartableService } from './startable-service.class';
+import { BehaviorSubject, Subject, Subscription } from "rxjs";
+import { IStartableService } from "./startable-service.class";
 /**
  * Same as StartableService, but with a dataSubject instead of a simple 'data' property
  */

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);