@sumaris-net/ngx-components 0.25.12 → 0.25.13

package/package.json

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

package/public_api.d.ts

@@ -56,6 +56,7 @@ export * from './src/app/shared/pipes/maps.pipe';
 export * from './src/app/shared/pipes/string.pipes';
 export * from './src/app/shared/pipes/translate-context.pipe';
 export * from './src/app/shared/pipes/ng-init.pipe';
+export * from './src/app/shared/pipes/form.pipes';
 export * from './src/app/shared/audio/audio';
 export * from './src/app/shared/file/file.service';
 export * from './src/app/shared/services/startable-service.class';
@@ -64,6 +65,7 @@ export * from './src/app/shared/services/memory-entity-service.class';
 export * from './src/app/shared/services/progress-bar.service';
 export * from './src/app/shared/services/translate-context.service';
 export * from './src/app/shared/services/job.utils';
+export * from './src/app/shared/validator/form-error-adapter.class';
 export * from './src/app/shared/types';
 export * from './src/app/shared/dates';
 export * from './src/app/shared/functions';
@@ -105,7 +107,6 @@ export * from './src/app/core/services/pipes/account.pipes';
 export * from './src/app/core/services/pipes/department-to-string.pipe';
 export * from './src/app/core/services/pipes/person-to-string.pipe';
 export * from './src/app/core/services/pipes/usage-mode.pipes';
-export * from './src/app/core/form/form-error-translate.pipe';
 export * from './src/app/vendor';
 export * from './src/app/core/services/platform.service';
 export * from './src/app/core/services/network.service';
@@ -128,7 +129,6 @@ export * from './src/app/core/form/form.class';
 export * from './src/app/core/form/form.utils';
 export * from './src/app/core/form/form-buttons-bar.component';
 export * from './src/app/core/form/list.form';
-export * from './src/app/core/form/form-error.adapter';
 export * from './src/app/core/form/properties.form';
 export * from './src/app/core/table/table.class';
 export * from './src/app/core/table/table.utils';

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, IFormI18nService } from '../form/form-error.adapter';
+import { FormErrorAdapter, IFormPathTranslateService } 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 {
+export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormPathTranslateService {
     protected route: ActivatedRoute;
     protected router: Router;
     protected platform: Platform | PlatformService;
@@ -55,7 +55,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     private _filter?;
     private _initialized;
     private _subscription;
-    private _dataSourceloadingSubscription;
+    private _dataSourceLoadingSubscription;
     private _cellValueChangesDefs;
     protected _enabled: boolean;
     protected _destroy$: Subject<unknown>;
@@ -70,7 +70,6 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     displayedColumns: string[];
     totalRowCount: number | null;
     visibleRowCount: number;
-    i18nService: IFormI18nService;
     loadingSubject: BehaviorSubject<boolean>;
     savingSubject: BehaviorSubject<boolean>;
     dirtySubject: BehaviorSubject<boolean>;
@@ -291,6 +290,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     doRefresh(event?: CompletableEvent): void;
     getCurrentColumns(): ColumnItem[];
     escapeEditingRow(event?: Event, row?: TableElement<T>): void;
+    translateFormControlPath(path: string): string;
     protected editRow(event: Event | undefined, row: TableElement<T>, opts?: {
         focusColumn?: string;
     }): boolean;
@@ -356,8 +356,6 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
         separator?: string;
         recursive?: boolean;
     }): string;
-    protected getI18nFieldName(fieldName: string): string;
-    protected getI18nError(errorKey: string, errorContent?: any): string;
     protected setError(value: string, opts?: {
         emitEvent?: boolean;
     }): void;

package/src/app/{core/form/form-error-translate.pipe.d.ts → shared/pipes/form.pipes.d.ts}

@@ -1,6 +1,6 @@
 import { PipeTransform } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FormErrorAdapter, FormErrorAdapterOptions } from './form-error.adapter';
+import { FormErrorAdapter, FormErrorAdapterOptions } from '../validator/form-error-adapter.class';
 export declare class FormErrorTranslatePipe implements PipeTransform {
     private adapter;
     constructor(adapter: FormErrorAdapter);

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

@@ -0,0 +1,22 @@
+import { InjectionToken } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { FormGroup } from '@angular/forms';
+import { ObjectMap } from '../types';
+export declare const APP_FORM_ERROR_I18N_KEYS: InjectionToken<ObjectMap<string>>;
+export interface IFormPathTranslateService {
+    translateFormControlPath: (controlPath: string) => string;
+}
+export interface FormErrorAdapterOptions {
+    i18nPrefix?: string;
+    pathTranslateService?: IFormPathTranslateService;
+    separator?: string;
+    recursive?: boolean;
+}
+export declare class FormErrorAdapter implements IFormPathTranslateService {
+    private translate;
+    private readonly errorI18nKeys;
+    constructor(translate: TranslateService, errorI18nKeys: ObjectMap<string>);
+    translateFormErrors(form: FormGroup, opts?: FormErrorAdapterOptions): string;
+    translateFormControlPath(path: string, opts?: FormErrorAdapterOptions): string;
+    translateError(errorKey: string, errorContent?: any): any;
+}

package/src/app/shared/validator/validators.d.ts

@@ -1,7 +1,7 @@
 import { AbstractControl, FormControl, ValidationErrors, ValidatorFn } from '@angular/forms';
 import { Moment, unitOfTime } from 'moment';
 export declare class SharedValidators {
-    static I18N_ERROR_KEYS: {
+    static readonly I18N_ERROR_KEYS: {
         required: string;
         min: string;
         max: string;
@@ -37,8 +37,6 @@ export declare class SharedValidators {
     static dateRangeStart(endDateFieldName: string, msg?: string): ValidatorFn;
     static copyParentErrors(errorNames?: string[]): ValidatorFn;
     static clearError(control: AbstractControl, errorCode: string): void;
-    static translateError(translateFn: (key: string, obj?: any) => string, errorKey: string, errorContent?: any): string;
-    static translateErrorKey(): void;
 }
 export declare class SharedFormGroupValidators {
     static dateRange(startDateField: string, endDateField: string, msg?: string): ValidatorFn;