@sumaris-net/ngx-components 0.25.20 → 0.26.0

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Injector, OnDestroy } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { AccountService } from '../services/account.service';
 import { Account } from '../services/model/account.model';
@@ -6,15 +6,12 @@ import { UserSettingsValidatorService } from '../services/validator/user-setting
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { AccountValidatorService } from '../services/validator/account.validator';
 import { AppForm } from '../form/form.class';
-import { Moment } from 'moment';
-import { DateAdapter } from '@angular/material/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FormFieldDefinition } from '../../shared/form/field.model';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { LocaleConfig } from '../services/model/settings.model';
 import { Router } from '@angular/router';
 export declare class AccountPage extends AppForm<Account> implements OnDestroy {
-    protected dateAdapter: DateAdapter<Moment>;
     protected router: Router;
     formBuilder: FormBuilder;
     accountService: AccountService;
@@ -35,7 +32,7 @@ export declare class AccountPage extends AppForm<Account> implements OnDestroy {
     latLongFormats: ("DD" | "DDMM" | "DDMMSS")[];
     saving: boolean;
     submitted: boolean;
-    constructor(dateAdapter: DateAdapter<Moment>, router: Router, formBuilder: FormBuilder, accountService: AccountService, validatorService: AccountValidatorService, settingsValidatorService: UserSettingsValidatorService, translate: TranslateService, settings: LocalSettingsService, cd: ChangeDetectorRef, locales: any);
+    constructor(injector: Injector, router: Router, formBuilder: FormBuilder, accountService: AccountService, validatorService: AccountValidatorService, settingsValidatorService: UserSettingsValidatorService, translate: TranslateService, settings: LocalSettingsService, cd: ChangeDetectorRef, locales: any);
     ngOnDestroy(): void;
     onLogin(account: Account): void;
     onLogout(): void;

package/src/app/core/auth/form/form-auth.d.ts

@@ -1,12 +1,10 @@
-import { ChangeDetectorRef, EventEmitter, OnInit } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, Injector, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { ModalController } from '@ionic/angular';
 import { AuthData } from '../../services/account.service';
 import { NetworkService } from '../../services/network.service';
 import { LocalSettingsService } from '../../services/local-settings.service';
 import { PlatformService } from '../../services/platform.service';
-import { DateAdapter } from '@angular/material/core';
-import { Moment } from 'moment';
 import { AppForm } from '../../form/form.class';
 import { ConfigService } from '../../services/config.service';
 export declare class AuthForm extends AppForm<AuthData> implements OnInit {
@@ -27,7 +25,7 @@ export declare class AuthForm extends AppForm<AuthData> implements OnInit {
         onlySelf?: boolean;
         emitEvent?: boolean;
     }): void;
-    constructor(platform: PlatformService, dateAdapter: DateAdapter<Moment>, formBuilder: FormBuilder, settings: LocalSettingsService, configService: ConfigService, modalCtrl: ModalController, network: NetworkService, cd: ChangeDetectorRef, environment: any);
+    constructor(injector: Injector, platform: PlatformService, formBuilder: FormBuilder, settings: LocalSettingsService, configService: ConfigService, modalCtrl: ModalController, network: NetworkService, cd: ChangeDetectorRef, environment: any);
     ngOnInit(): void;
     cancel(): void;
     doSubmit(event?: UIEvent): void;

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

@@ -9,6 +9,7 @@ import { EntityServiceLoadOptions, IEntityService } from '../../shared/services/
 import { DateFormatPipe } from '../../shared/pipes/date-format.pipe';
 import { HistoryPageReference } from '../services/model/history.model';
 import { WaitForOptions } from '../../shared/observables';
+import { FormErrorAdapter } from '../../shared/validator/form-error-adapter.class';
 export declare class AppEditorOptions extends AppTabEditorOptions {
     autoLoad?: boolean;
     autoLoadDelay?: number;
@@ -37,6 +38,7 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
     protected dateFormat: DateFormatPipe;
     protected cd: ChangeDetectorRef;
     protected settings: LocalSettingsService;
+    protected formErrorAdapter: FormErrorAdapter;
     data: T;
     saving: boolean;
     hasRemoteListener: boolean;
@@ -66,7 +68,6 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
     /**
      * Load data from the snapshot route
      *
-     * @param route
      * @protected
      */
     protected loadFromRoute(): Promise<void>;
@@ -107,7 +108,13 @@ export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends
     updateTabIndex(tabIndex?: number): void;
     saveAndClose(event: Event, options?: any): Promise<boolean>;
     close(event: Event): Promise<boolean | void>;
-    save(event?: Event, options?: any): Promise<boolean>;
+    /**
+     * Save the editor, by calling the dataService.save().
+     * Ensure that editor if valid. If not, display an error
+     * @param event
+     * @param opts
+     */
+    save(event?: Event, opts?: any): Promise<boolean>;
     /**
      * Save data (if dirty and valid), and return it. Otherwise, return nil value.
      */

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

@@ -1,27 +1,27 @@
-import { EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import { EventEmitter, Injector, OnDestroy, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { Moment } from 'moment';
-import { DateAdapter } from '@angular/material/core';
 import { Subscription } from 'rxjs';
-import { DateFormatPipe } from '../../shared/pipes/date-format.pipe';
 import { IAppForm } from './form.utils';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete';
 import { WaitForOptions } from '../../shared/observables';
-export declare abstract class AppForm<T> implements IAppForm, OnInit, OnDestroy {
-    protected dateAdapter: DateAdapter<Moment> | DateFormatPipe;
-    protected settings?: LocalSettingsService;
-    private _subscription;
-    private _form;
-    protected _enable: boolean;
-    protected _loading: boolean;
+import { FormErrorAdapter, FormErrorTranslatorOptions, IFormControlPathTranslator } from '../../shared/validator/form-error-adapter.class';
+export declare abstract class AppForm<T> implements IAppForm, OnInit, OnDestroy, IFormControlPathTranslator {
     autocompleteHelper: MatAutocompleteConfigHolder;
     autocompleteFields: {
         [key: string]: MatAutocompleteFieldConfig;
     };
     error: string;
+    protected settings: LocalSettingsService;
+    protected errorTranslator: FormErrorAdapter;
+    protected _enable: boolean;
+    protected _loading: boolean;
+    protected i18nFieldPrefix: string;
+    private _subscription;
+    private _form;
     debug: boolean;
     tabindex: number;
+    errorTranslatorOptions: FormErrorTranslatorOptions;
     get value(): any;
     set value(data: any);
     get dirty(): boolean;
@@ -44,7 +44,7 @@ export declare abstract class AppForm<T> implements IAppForm, OnInit, OnDestroy
     get form(): FormGroup;
     onCancel: EventEmitter<any>;
     onSubmit: EventEmitter<any>;
-    protected constructor(dateAdapter: DateAdapter<Moment> | DateFormatPipe, form?: FormGroup, settings?: LocalSettingsService);
+    protected constructor(injector: Injector, form?: FormGroup);
     ngOnInit(): void;
     ngOnDestroy(): void;
     cancel(): void;
@@ -98,6 +98,9 @@ export declare abstract class AppForm<T> implements IAppForm, OnInit, OnDestroy
         onlySelf?: boolean;
         emitEvent?: boolean;
     }): void;
+    translateControlPath(path: string): string;
+    protected getFormError(form: FormGroup, opts?: FormErrorTranslatorOptions): string;
+    protected getFieldName(path: string): string;
     protected registerSubscription(sub: Subscription): Subscription;
     protected registerAutocompleteField<T = any, F = any>(fieldName: string, opts?: MatAutocompleteFieldAddOptions<T, F>): MatAutocompleteFieldConfig<T, F>;
     protected markForCheck(): void;

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

@@ -8,7 +8,6 @@ import { AppForm } from './form.class';
 import { FormArrayHelper, FormArrayHelperOptions } from './form.utils';
 import { Property } from '../../shared/types';
 export declare class AppPropertiesForm<T = Property> extends AppForm<T[]> implements OnInit {
-    protected injector: Injector;
     protected formBuilder: FormBuilder;
     protected dateAdapter: DateAdapter<Moment>;
     protected settings: LocalSettingsService;

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

@@ -1,10 +1,8 @@
-import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Injector, OnDestroy, OnInit } from '@angular/core';
 import { AccountService } from '../services/account.service';
 import { LocaleConfig, LocalSettings, UsageMode } from '../services/model/settings.model';
 import { FormArray, FormBuilder } from '@angular/forms';
 import { AppForm } from '../form/form.class';
-import { Moment } from 'moment';
-import { DateAdapter } from '@angular/material/core';
 import { FormArrayHelper } from '../form/form.utils';
 import { TranslateService } from '@ngx-translate/core';
 import { LocalSettingsValidatorService } from '../services/validator/local-settings.validator';
@@ -17,7 +15,6 @@ import { Property } from '../../shared/types';
 import { Router } from '@angular/router';
 import { CanLeave } from '../../shared/guard/component-dirty.guard';
 export declare class SettingsPage extends AppForm<LocalSettings> implements OnInit, OnDestroy, CanLeave {
-    protected dateAdapter: DateAdapter<Moment>;
     protected platform: PlatformService;
     protected router: Router;
     protected validatorService: LocalSettingsValidatorService;
@@ -44,7 +41,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     get accountInheritance(): boolean;
     get isLogin(): boolean;
     get propertiesForm(): FormArray;
-    constructor(dateAdapter: DateAdapter<Moment>, platform: PlatformService, router: Router, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: FormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[]);
+    constructor(injector: Injector, platform: PlatformService, router: Router, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: FormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[]);
     ngOnInit(): Promise<void>;
     getPropertyDefinition(index: number): FormFieldDefinition;
     updatePropertyDefinition(index: number): FormFieldDefinition;

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

@@ -20,7 +20,7 @@ import { CompletableEvent } from '../../shared/events';
 import { ShowToastOptions } from '../../shared/toasts';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { LoadResult } from '../../shared/services/entity-service.class';
-import { FormErrorAdapter, FormErrorTranslateOptions, IFormControlPathTranslateService } from '../../shared/validator/form-error-adapter.class';
+import { FormErrorAdapter, FormErrorTranslatorOptions, IFormControlPathTranslator } from '../../shared/validator/form-error-adapter.class';
 export declare const SETTINGS_DISPLAY_COLUMNS = "displayColumns";
 export declare const SETTINGS_SORTED_COLUMN = "sortedColumn";
 export declare const SETTINGS_FILTER = "filter";
@@ -43,7 +43,7 @@ export interface IModalDetailOptions<T = any> {
     onDelete: (event: UIEvent, data: T) => Promise<boolean>;
 }
 export declare type SaveActionType = 'delete' | 'sort' | 'filter';
-export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormControlPathTranslateService {
+export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormControlPathTranslator {
     protected route: ActivatedRoute;
     protected router: Router;
     protected platform: Platform | PlatformService;
@@ -70,7 +70,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     displayedColumns: string[];
     totalRowCount: number | null;
     visibleRowCount: number;
-    translateErrorOptions: FormErrorTranslateOptions;
+    errorTranslatorOptions: FormErrorTranslatorOptions;
     loadingSubject: BehaviorSubject<boolean>;
     savingSubject: BehaviorSubject<boolean>;
     dirtySubject: BehaviorSubject<boolean>;
@@ -354,10 +354,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     protected resetError(opts?: {
         emitEvent?: boolean;
     }): void;
-    protected getRowError(row?: TableElement<T>, opts?: {
-        separator?: string;
-        recursive?: boolean;
-    }): string;
+    protected getRowError(row?: TableElement<T>, opts?: FormErrorTranslatorOptions): string;
     protected setError(value: string, opts?: {
         emitEvent?: boolean;
     }): void;

package/src/app/shared/pipes/form.pipes.d.ts

@@ -1,8 +1,8 @@
 import { PipeTransform } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FormErrorAdapter, FormErrorTranslateOptions } from '../validator/form-error-adapter.class';
+import { FormErrorAdapter, FormErrorTranslatorOptions } from '../validator/form-error-adapter.class';
 export declare class FormErrorTranslatePipe implements PipeTransform {
     private adapter;
     constructor(adapter: FormErrorAdapter);
-    transform(form: FormGroup, opts?: FormErrorTranslateOptions): string;
+    transform(form: FormGroup, opts?: FormErrorTranslatorOptions): string;
 }

package/src/app/shared/validator/form-error-adapter.class.d.ts

@@ -3,20 +3,20 @@ import { TranslateService } from '@ngx-translate/core';
 import { AbstractControl } from '@angular/forms';
 import { ObjectMap } from '../types';
 export declare const APP_FORM_ERROR_I18N_KEYS: InjectionToken<ObjectMap<string>>;
-export interface IFormControlPathTranslateService {
+export interface IFormControlPathTranslator {
     translateControlPath: (controlPath: string) => string;
 }
-export interface FormErrorTranslateOptions {
+export interface FormErrorTranslatorOptions {
     i18nPrefix?: string;
-    pathTranslateService?: IFormControlPathTranslateService;
+    controlPathTranslator?: IFormControlPathTranslator;
     separator?: string;
     recursive?: boolean;
 }
-export declare class FormErrorAdapter implements IFormControlPathTranslateService {
+export declare class FormErrorAdapter implements IFormControlPathTranslator {
     private translate;
     private readonly errorI18nKeys;
     constructor(translate: TranslateService, errorI18nKeys: ObjectMap<string>);
-    translateErrors(control: AbstractControl, opts?: FormErrorTranslateOptions): string;
-    translateControlPath(path: string, opts?: FormErrorTranslateOptions): string;
+    translateErrors(control: AbstractControl, opts?: FormErrorTranslatorOptions): string;
+    translateControlPath(path: string, opts?: FormErrorTranslatorOptions): string;
     translateError(errorKey: string, errorContent?: any): any;
 }