@sumaris-net/ngx-components 2.4.117 → 2.4.119

package/package.json

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

package/src/app/core/form/buttons/form-buttons-bar.component.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter, OnDestroy } from '@angular/core';
 import { Hotkeys } from '../../../shared/hotkeys/hotkeys.service';
 import { MenuService } from '../../menu/menu.service';
+import { PredefinedColors } from '@ionic/core';
 import * as i0 from "@angular/core";
 export declare abstract class FormButtonsBarToken {
     abstract onCancel: EventEmitter<Event>;
@@ -9,18 +10,29 @@ export declare abstract class FormButtonsBarToken {
     abstract onBack: EventEmitter<Event>;
 }
 export declare class FormButtonsBarComponent implements FormButtonsBarToken, OnDestroy {
-    private hotkeys;
     menu: MenuService;
     private _subscription;
     disabled: boolean;
     disabledCancel: boolean;
     classList: string;
+    saveButtonColor: PredefinedColors;
+    backText: string;
+    cancelText: string;
+    nextText: string;
+    showBack: boolean;
+    showCancel: boolean;
+    showNext: boolean;
+    showSave: boolean;
+    showSaveAndClose: boolean;
+    showSaveAndNext: boolean;
     onCancel: EventEmitter<Event>;
     onSave: EventEmitter<Event>;
     onNext: EventEmitter<Event>;
     onBack: EventEmitter<Event>;
+    onSaveAndClose: EventEmitter<Event>;
+    onSaveAndNext: EventEmitter<Event>;
     constructor(hotkeys: Hotkeys, menu: MenuService);
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FormButtonsBarComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<FormButtonsBarComponent, "app-form-buttons-bar", never, { "disabled": "disabled"; "disabledCancel": "disabledCancel"; "classList": "classList"; }, { "onCancel": "onCancel"; "onSave": "onSave"; "onNext": "onNext"; "onBack": "onBack"; }, never, ["*", "[slot=end]"], false>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<FormButtonsBarComponent, "app-form-buttons-bar", never, { "disabled": "disabled"; "disabledCancel": "disabledCancel"; "classList": "classList"; "saveButtonColor": "saveButtonColor"; "backText": "backText"; "cancelText": "cancelText"; "nextText": "nextText"; "showBack": "showBack"; "showCancel": "showCancel"; "showNext": "showNext"; "showSave": "showSave"; "showSaveAndClose": "showSaveAndClose"; "showSaveAndNext": "showSaveAndNext"; }, { "onCancel": "onCancel"; "onSave": "onSave"; "onNext": "onNext"; "onBack": "onBack"; "onSaveAndClose": "onSaveAndClose"; "onSaveAndNext": "onSaveAndNext"; }, never, ["*", "[slot=end]"], false>;
 }

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

@@ -67,7 +67,7 @@ export declare class HomePage implements OnDestroy {
     protected onSettingsChanged(settings: LocalSettings): void;
     protected onLogin(account: Account): void;
     protected onLogout(): void;
-    protected refreshButtons(): void;
+    protected refreshButtons(account?: Account): void;
     protected markForCheck(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<HomePage, [null, null, null, null, null, null, null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<HomePage, "app-page-home", never, {}, {}, never, never, false>;

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

@@ -1,12 +1,14 @@
 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";
+import { BehaviorSubject } from 'rxjs';
+import { MenuPathParam } from './menu.service';
+import { Account } from '../services/model/account.model';
 export interface MenuItem extends IconRef {
     title: string;
     path?: string;
+    after?: string;
+    before?: string;
     action?: string | any;
     profile?: UserProfileLabel;
     exactProfile?: UserProfileLabel;
@@ -44,7 +46,7 @@ export declare class MenuItems {
         [key: string]: string;
     }): boolean;
     static isParent(child: MenuItem, parent: MenuItem | MenuPathParam): boolean;
-    static checkIfVisible(item: MenuItem, accountService: AccountService, config: Configuration, opts?: {
+    static checkIfVisible(item: MenuItem, account: Account, config: Configuration, opts?: {
         isLogin?: boolean;
         debug?: boolean;
         logPrefix?: string;

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

@@ -1,23 +1,20 @@
 import { EventEmitter } from '@angular/core';
-import { BehaviorSubject, Observable, Subject } from 'rxjs';
+import { BehaviorSubject, Observable } 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 { Configuration } from '../services/model/config.model';
 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 interface AddSubMenuItemsOption {
-    skipIfExists: boolean;
-}
-export interface AddSubMenuItems {
-    items: MenuItem[];
-    opts?: AddSubMenuItemsOption;
+    skipIfExists?: boolean;
+    availableParents?: MenuItem[];
 }
 export interface MenuPathParam {
     path: string;
@@ -25,43 +22,37 @@ export interface MenuPathParam {
         [key: string]: string;
     };
 }
-export declare class MenuService extends StartableService<MenuItem[], any> {
+export declare class MenuService extends StartableService<BehaviorSubject<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;
+    get $items(): BehaviorSubject<MenuItem[]>;
+    private _staticItems;
     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[]);
+    constructor(platformService: PlatformService, configService: ConfigService, accountService: AccountService, router: Router, environment: Environment, staticItems?: MenuItem[]);
     get opened(): Observable<boolean>;
     get splitPaneWhen(): Observable<SplitPaneShowWhen>;
     get enabled(): Observable<boolean>;
-    toggle(): void;
     enable(value: boolean): void;
     setSplitPaneShowWhen(value: SplitPaneShowWhen): void;
     toggleSplitPaneWhen(): void;
     _markAsOpened(): void;
     _markAsClosed(): void;
     addSubMenuItems(newItems: MenuItem[], opts?: AddSubMenuItemsOption): Promise<void>;
-    protected ngOnStart(): Promise<MenuItem[]>;
-    protected refreshMenuItems(): void;
+    protected ngOnStart(): Promise<BehaviorSubject<MenuItem[]>>;
+    protected loadMenuItems(config: Configuration, account: Account): Promise<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 findParent(childItem: MenuItem, availableParents?: 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

@@ -7,7 +7,7 @@ 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;
+    initSubMenu(): Promise<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

@@ -4,8 +4,8 @@ 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 { 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;
@@ -27,7 +27,9 @@ export declare class MenuTestingPage extends AppTabEditor implements OnInit, OnD
     reload(): Promise<void>;
     save(event: Event | undefined, options: any): Promise<boolean>;
     protected toggleThird(): void;
-    protected initSubMenu(): void;
+    protected enableMenu(value: boolean): void;
+    protected toggleSplitPaneWhen(): void;
+    protected initSubMenu(): Promise<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/services/model/account.model.d.ts

@@ -1,5 +1,5 @@
 import { UserSettings } from './settings.model';
-import { Person } from './person.model';
+import { Person, UserProfileLabel } from './person.model';
 import { EntityAsObjectOptions } from './entity.model';
 /**
  * A user account
@@ -16,4 +16,10 @@ export declare class Account extends Person<Account> {
     asPerson(): Person;
     get displayName(): string;
 }
+export declare abstract class AccountUtils {
+    static accountToString: typeof accountToString;
+    static hasMinProfile(account: Account | null, userProfile: UserProfileLabel): boolean;
+    static hasExactProfile(account: Account | null, label: UserProfileLabel): boolean;
+    static hasProfileAndIsEnable(account: Account | null, userProfile: UserProfileLabel): boolean;
+}
 export declare function accountToString(data: Account): string;

package/src/assets/i18n/fr.json

@@ -33,6 +33,8 @@
     "BTN_SAVE": "Sauvegarder",
     "BTN_SAVE_WITH_SHORTCUT": "<u>S</u>auvegarder",
     "BTN_SAVE_WITH_SHORTCUT_HELP": "Sauvegarder (Ctrl+S)",
+    "BTN_SAVE_AND_CLOSE": "Sauvegarder et fermer",
+    "BTN_SAVE_AND_NEXT": "Sauvegarder et suivant",
     "BTN_FILTER": "Filtrer",
     "BTN_RELOAD": "Recharger",
     "BTN_REFRESH": "Rafraichir",