@sumaris-net/ngx-components 2.4.134 → 2.4.136

package/package.json

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

package/public_api.d.ts

@@ -131,6 +131,7 @@ export * from './src/app/core/services/model/account.model';
 export * from './src/app/core/services/model/config.model';
 export * from './src/app/core/services/model/department.model';
 export * from './src/app/core/services/model/entity.model';
+export * from "./src/app/core/services/model/tree-item-entity.model";
 export * from './src/app/core/services/model/filter.model';
 export * from './src/app/core/services/model/history.model';
 export * from './src/app/core/services/model/model.enum';

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,16 +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 { 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;
@@ -24,8 +22,6 @@ export declare class MenuComponent implements OnInit {
     protected router: Router;
     protected environment: any;
     protected route: ActivatedRoute;
-    protected options: MenuOptions;
-    protected items: IMenuItem[];
     id: string;
     menuId: string;
     side: string;
@@ -42,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, 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>;
@@ -66,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, { 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

@@ -4,6 +4,8 @@ import { AppColors, IconRef } from '../../shared/types';
 import { BehaviorSubject } from 'rxjs';
 import { MenuPathParam } from './menu.service';
 import { Account } from '../services/model/account.model';
+import { Entity, EntityAsObjectOptions } from '../services/model/entity.model';
+import { ITreeItemEntity } from '../services/model/tree-item-entity.model';
 export interface IMenuItem extends IconRef {
     title: string;
     path?: string;
@@ -31,9 +33,10 @@ export interface IMenuItem extends IconRef {
     parent?: IMenuItem;
     children?: IMenuItem[];
 }
-export declare class MenuItem implements IMenuItem {
-    id?: number;
-    parent?: MenuItem;
+export declare class MenuItem extends Entity<MenuItem> implements IMenuItem, ITreeItemEntity<MenuItem> {
+    id: number;
+    parent: MenuItem;
+    parentId: number;
     $children: BehaviorSubject<MenuItem[]>;
     $title: BehaviorSubject<string>;
     titleProperty?: string;
@@ -60,14 +63,21 @@ export declare class MenuItem implements IMenuItem {
     icon?: string;
     matIcon?: string;
     matSvgIcon?: string;
-    static fromObject(source: any): MenuItem;
-    fromObject(source: any): void;
-    asObject(): any;
+    static fromObject(source: any, opts?: {
+        withChildren?: boolean;
+    }): MenuItem;
+    fromObject(source: any, opts?: {
+        withChildren?: boolean;
+    }): void;
+    asObject(opts?: {
+        withChildren?: boolean;
+    } & EntityAsObjectOptions): any;
     get children(): MenuItem[];
     set children(value: MenuItem[]);
     get title(): string;
     set title(value: string);
     get detached(): boolean;
+    get ancestor(): MenuItem;
     isPinned(): any;
 }
 export declare class MenuItems {
@@ -118,4 +128,5 @@ export declare class MenuItems {
 }
 export declare class MenuOptions {
     enableSubMenus?: boolean;
+    enableSubMenuIcon?: boolean;
 }

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

@@ -1,15 +1,18 @@
+import { EventEmitter, 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 { Account } from '../services/model/account.model';
 import { StartableObservableService } from '../../shared/services/startable-observable-service.class';
+import { LocalSettingsService } from '../services/local-settings.service';
 import * as i0 from "@angular/core";
 export declare type SplitPaneShowWhen = boolean | 'lg';
 export declare const DEFAULT_MENU_SHOW_WHEN: SplitPaneShowWhen;
+export declare const APP_MENU_ITEMS: InjectionToken<IMenuItem[]>;
+export declare const APP_MENU_OPTIONS: InjectionToken<MenuOptions>;
 export interface MenuPathParam {
     path: string;
     params: {
@@ -17,12 +20,14 @@ export interface MenuPathParam {
     };
 }
 export declare class MenuService extends StartableObservableService<MenuItem[]> {
-    protected platformService: PlatformService;
     protected configService: ConfigService;
+    protected settings: LocalSettingsService;
     protected accountService: AccountService;
     protected router: Router;
     protected environment: Environment;
+    protected options?: MenuOptions;
     readonly accountChanges: BehaviorSubject<Account>;
+    readonly pinnedEvent: EventEmitter<MenuItem>;
     private _staticItems;
     private _detachedSubItems;
     private _itemCounter;
@@ -30,21 +35,33 @@ 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(configService: ConfigService, settings: LocalSettingsService, 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;
+    get subItems(): MenuItem[];
+    private get _staticSubItems();
     enable(value: boolean): void;
+    enableSubMenu(value: boolean): void;
     setSplitPaneShowWhen(value: SplitPaneShowWhen): void;
     toggleSplitPaneWhen(): void;
-    loadOrCreate(source: Partial<IMenuItem>): MenuItem;
+    fromObject(source: any, opts?: {
+        withChildren?: boolean;
+        computeId?: boolean;
+        fillParent?: boolean;
+    }): MenuItem;
+    createSubMenu(source: Partial<IMenuItem>): MenuItem;
     addSubMenuItems(sources: IMenuItem[], opts?: {
         skipIfExists?: boolean;
     }): Promise<MenuItem[]>;
     addSubMenuItem(item: IMenuItem, opts?: {
         skipIfExists?: boolean;
     }): Promise<MenuItem>;
+    removeSubMenuItems(items: IMenuItem[]): Promise<MenuItem[]>;
     removeSubMenuItem(item: IMenuItem): Promise<MenuItem>;
     togglePinned(source: IMenuItem): void;
     _markAsOpened(): void;
@@ -54,11 +71,12 @@ export declare class MenuService extends StartableObservableService<MenuItem[]>
     private _addSubMenuItems;
     private _addSubMenuItem;
     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/sub-menu-tab.directive.d.ts

@@ -16,7 +16,7 @@ export declare class SubMenuTabDirective implements OnChanges, AfterViewInit {
     subMenuTitle: string;
     subMenuIcon: IconRef;
     private _menuItem;
-    private _debug;
+    private readonly _enable;
     constructor(menuService: MenuService, tabGroup: MatTabGroup, tab: MatTab, router: Router);
     ngAfterViewInit(): void;
     ngOnChanges(changes: SimpleChanges): void;

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

@@ -3,6 +3,7 @@ import { getPropertyByPath } from '../../../shared/functions';
 import { FilterFn } from '../../../shared/services/entity-service.class';
 import { ObjectMap, ObjectMapEntry, PropertiesArray, PropertiesMap } from '../../../shared/types';
 import { StoreObject } from '@apollo/client/core';
+import { TreeItemEntityUtils } from './tree-item-entity.model';
 export declare interface Cloneable<T> {
     clone(): T;
 }
@@ -22,11 +23,6 @@ export interface IEntity<T, ID = number, AO extends EntityAsObjectOptions = Enti
     asObject(opts?: AO): any;
     fromObject(source: any, opts?: FO): any;
 }
-export declare interface ITreeItemEntity<T extends IEntity<T, ID>, ID = number> {
-    parentId: ID;
-    parent: T;
-    children: T[];
-}
 export declare abstract class Entity<T extends Entity<T, ID, AO, FO>, ID = number, AO extends EntityAsObjectOptions = EntityAsObjectOptions, FO = any> implements IEntity<T, ID, AO, FO> {
     static TYPENAME: string;
     id: ID;
@@ -71,14 +67,14 @@ export declare abstract class EntityUtils {
      *
      * @param source
      */
-    static treeToArray<T extends ITreeItemEntity<any>>(source: T): T[];
-    static listOfTreeToArray<T extends ITreeItemEntity<any>>(sources: T[]): T[];
+    static treeToArray: typeof TreeItemEntityUtils.treeToArray;
+    static listOfTreeToArray: typeof TreeItemEntityUtils.listOfTreeToArray;
     /**
      * Fill parent attribute, of all children found in the tree
      *
      * @param source
      */
-    static treeFillParent<T extends ITreeItemEntity<any>>(source: T): T[];
+    static treeFillParent: typeof TreeItemEntityUtils.treeFillParent;
     static isLocal(entity: IEntity<any, any> | Entity<any, any>): boolean;
     static isRemote(entity: IEntity<any, any> | Entity<any, any>): boolean;
     static isLocalId(id: number): boolean;

package/src/app/core/services/model/tree-item-entity.model.d.ts

@@ -0,0 +1,53 @@
+import { IEntity } from './entity.model';
+import { FilterFn } from '../../../shared/services/entity-service.class';
+import { EntityFilter } from './filter.model';
+export declare interface ITreeItemEntity<T extends IEntity<T, ID>, ID = number> {
+    parentId: ID;
+    parent: T;
+    children: T[];
+}
+export declare class TreeItemEntityUtils {
+    static forward<T extends ITreeItemEntity<any>, ID = number>(node: T, filterFn?: FilterFn<T>, loopCount?: number): T;
+    static backward<T extends ITreeItemEntity<any>, ID = number>(node: T, filterFn?: FilterFn<T>, loopCount?: number): T;
+    static first<T extends ITreeItemEntity<any>>(node: T, filterFn?: FilterFn<T>): T;
+    static lastLeaf<T extends ITreeItemEntity<any>>(node: T, filterFn?: FilterFn<T>): T;
+    static findByFilter<T extends ITreeItemEntity<T> & IEntity<T>>(node: T, filter: EntityFilter<any, T>): T[];
+    /**
+     * Delete matches batches
+     *
+     * @param node
+     * @param filter
+     */
+    static deleteByFilter<T extends ITreeItemEntity<T> & IEntity<T>>(node: T, filter: EntityFilter<any, T>): T[];
+    static filterRecursively<T extends ITreeItemEntity<any>>(node: T, filterFn: (n: T) => boolean): T[];
+    static deleteRecursively<T extends ITreeItemEntity<any>>(node: T, filterFn: (n: T) => boolean): T[];
+    /**
+     * Visit each node, from root to leaf
+     *
+     * @param node
+     * @param action
+     */
+    static visit<T extends ITreeItemEntity<any>>(node: T, action: (T: any) => void): void;
+    /**
+     * Visit each node, from leaf to root
+     *
+     * @param node
+     * @param action
+     */
+    static visitInverse<T extends ITreeItemEntity<any>>(node: T, action: (T: any) => void): void;
+    /**
+     * Transform a batch entity tree into a array list. This method keep links parent/children.
+     *
+     * Method used to find batch without id (e.g. before local storage)
+     *
+     * @param source
+     */
+    static treeToArray<T extends ITreeItemEntity<any>>(source: T): T[];
+    static listOfTreeToArray<T extends ITreeItemEntity<any>>(sources: T[]): T[];
+    /**
+     * Fill parent attribute, of all children found in the tree
+     *
+     * @param source
+     */
+    static treeFillParent<T extends ITreeItemEntity<any>>(source: T): any;
+}

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
  */