@sumaris-net/ngx-components 2.8.3-beta12 → 2.8.3-beta13

package/package.json

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

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

@@ -5,9 +5,9 @@ import { Account } from '../services/model/account.model';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { AccountValidatorService } from '../services/validator/account.validator';
 import { AppForm } from '../form/form.class';
+import { CanLeave } from '../form/form.utils';
 import { FormFieldDefinition } from '../../shared/form/field.model';
 import { LocaleConfig } from '../services/model/settings.model';
-import { CanLeave } from '../../shared/guard/component-dirty.guard';
 import { NetworkService } from '../services/network.service';
 import { MatTabGroup } from '@angular/material/tabs';
 import { ConfigService } from '../services/config.service';
@@ -57,7 +57,7 @@ export declare class AccountPage extends AppForm<Account> implements OnInit, OnD
     startListenChanges(): void;
     stopListenChanges(): void;
     sendConfirmationEmail(event: MouseEvent): Promise<boolean>;
-    save(event: any): Promise<boolean>;
+    save(event?: Event): Promise<boolean>;
     enable(opts?: {
         onlySelf?: boolean;
         emitEvent?: boolean;

package/src/app/core/form/entity/editor.class.d.ts

@@ -4,13 +4,12 @@ import { AlertController, IonContent, NavController, ToastController } from '@io
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
 import { FormButtonsBarToken } from '../buttons/form-buttons-bar.component';
-import { IAppForm, IAppFormGetter } from '../form.utils';
+import { CanLeave, CanSave, IAppForm, IAppFormGetter } from '../form.utils';
 import { ShowToastOptions } from '../../../shared/toast/toasts';
 import { ToolbarToken } from '../../../shared/toolbar/toolbar';
-import { CanLeave } from '../../../shared/guard/component-dirty.guard';
 import { AppFormContainer, IAppFormContainer } from '../form-container.class';
 import * as i0 from "@angular/core";
-export interface IAppEditor<T> extends CanLeave, IAppFormContainer<T> {
+export interface IAppEditor<T> extends IAppFormContainer<T>, CanSave, CanLeave {
     save(event?: Event, options?: any): Promise<boolean>;
     cancel(event?: Event): Promise<void>;
 }

package/src/app/core/form/form.utils.d.ts

@@ -76,9 +76,14 @@ export interface IAppForm<T = any> {
         emitEvent?: boolean;
     }): void;
 }
-export interface ICanSaveAppForm<T = any> extends IAppForm {
+export interface CanSave {
+    dirty: boolean;
+    valid: boolean;
     save(): Promise<boolean>;
 }
+export interface CanLeave extends CanSave {
+    cancel(event?: Event): Promise<void>;
+}
 /**
  * A form that do nothing
  */
@@ -340,7 +345,7 @@ export declare class AppFormUtils {
     static updateValueAndValidity: typeof updateValueAndValidity;
     static getFormErrors: typeof getFormErrors;
     static isForm(object: any): object is IAppForm;
-    static isCanSaveForm(object: any): object is ICanSaveAppForm;
+    static canSave(object: any): object is IAppForm & CanSave;
     static addValueInArray: typeof addValueInArray;
     static removeValueInArray: typeof removeValueInArray;
     static resizeArray: typeof resizeArray;

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

@@ -3,7 +3,7 @@ import { AccountService } from '../services/account.service';
 import { LocaleConfig, LocalSettings, UsageMode } from '../services/model/settings.model';
 import { UntypedFormArray, UntypedFormBuilder } from '@angular/forms';
 import { AppForm } from '../form/form.class';
-import { FormArrayHelper } from '../form/form.utils';
+import { CanLeave, FormArrayHelper } from '../form/form.utils';
 import { TranslateService } from '@ngx-translate/core';
 import { LocalSettingsValidatorService } from '../services/validator/local-settings.validator';
 import { PlatformService } from '../services/platform.service';
@@ -12,7 +12,6 @@ import { LocalSettingsService } from '../services/local-settings.service';
 import { FormFieldDefinition, FormFieldDefinitionMap } from '../../shared/form/field.model';
 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 { IMenuItem } from '../menu/menu.model';
 import * as i0 from "@angular/core";

package/src/app/core/table/async-table.class.d.ts

@@ -9,7 +9,7 @@ import { AlertController, ModalController, NavController, ToastController } from
 import { ActivatedRoute, Router } from '@angular/router';
 import { ColumnItem } from './table-select-columns.component';
 import { Location } from '@angular/common';
-import { IAppForm } from '../form/form.utils';
+import { CanSave, IAppForm } from '../form/form.utils';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
@@ -23,7 +23,7 @@ import { SaveActionType } from './table.model';
 import { AsyncTableElement } from '@e-is/ngx-material-table';
 import { EntitiesAsyncTableDataSource } from './entities-async-table-datasource.class';
 import * as i0 from "@angular/core";
-export declare abstract class AppAsyncTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormControlPathTranslator {
+export declare abstract class AppAsyncTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, CanSave, IFormControlPathTranslator {
     protected columns: string[];
     protected _dataSource?: EntitiesAsyncTableDataSource<T, F, ID>;
     private _filter?;

package/src/app/core/table/table.class.d.ts

@@ -9,7 +9,7 @@ import { AlertController, ModalController, NavController, ToastController } from
 import { ActivatedRoute, Router } from '@angular/router';
 import { ColumnItem } from './table-select-columns.component';
 import { Location } from '@angular/common';
-import { IAppForm } from '../form/form.utils';
+import { CanSave, IAppForm } from '../form/form.utils';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
@@ -23,7 +23,7 @@ import { SaveActionType } from './table.model';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatTable } from '@angular/material/table';
 import * as i0 from "@angular/core";
-export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormControlPathTranslator {
+export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, CanSave, IFormControlPathTranslator {
     protected columns: string[];
     protected _dataSource?: EntitiesTableDataSource<T, F, ID>;
     private _filter?;

package/src/app/shared/guard/component-dirty.guard.d.ts

@@ -1,13 +1,8 @@
 import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { AlertController } from '@ionic/angular';
+import { CanLeave } from '../../core/form/form.utils';
 import * as i0 from "@angular/core";
-export interface CanLeave {
-    dirty: boolean;
-    valid: boolean;
-    save(event?: Event, options?: any): Promise<boolean>;
-    cancel(event?: Event): Promise<void>;
-}
 export declare class ComponentDirtyGuard implements CanDeactivate<CanLeave> {
     protected translate: TranslateService;
     protected alertCtrl: AlertController;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "2.8.3-beta12",
+  "version": "2.8.3-beta13",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{