@sumaris-net/ngx-components 1.19.3 → 1.20.0-rc3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "1.19.3",
+  "version": "1.20.0-rc3",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -27,7 +27,7 @@
   },
   "engines": {
     "node": ">= 12.22.8",
-    "npm": ">= 8.3.0",
+    "npm": ">= 7.20.0",
     "yarn": ">= 1.22.0"
   },
   "cordova": {

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

@@ -46,6 +46,7 @@ export declare abstract class Entity<T extends Entity<T, ID, AO, FO>, ID = numbe
 export declare function isInstanceOf<T>(obj: any, constructor: new (...args: any[]) => T): obj is T;
 export declare abstract class EntityUtils {
     static isEntity<T extends IEntity<any>>(obj: T | any): obj is T;
+    static isNotEntity<T extends IEntity<any>>(obj: T | any): boolean;
     static isNotEmpty<T extends IEntity<any> | any>(obj: T, checkedAttribute: keyof T): boolean;
     static isEmpty<T extends IEntity<any> | any>(obj: T, checkedAttribute: keyof T): boolean;
     static equals<T extends IEntity<any> | any>(o1: T, o2: T, checkAttribute?: keyof T): boolean;

package/src/app/core/table/entities-table-datasource.class.d.ts

@@ -1,40 +1,35 @@
 import { TableDataSource, TableElement, ValidatorService } from '@e-is/ngx-material-table';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
 import { Entity, IEntity } from '../services/model/entity.model';
-import { OnDestroy } from '@angular/core';
 import { SortDirection } from '@angular/material/sort';
 import { CollectionViewer } from '@angular/cdk/collections';
 import { TableDataSourceOptions } from '@e-is/ngx-material-table/src/app/ngx-material-table/table-data-source';
 import { EntitiesServiceWatchOptions, FetchMoreFn, IEntitiesService, LoadResult } from '../../shared/services/entity-service.class';
+import { FormGroup } from '@angular/forms';
 export declare interface AppTableDataServiceOptions<O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends EntitiesServiceWatchOptions {
     [key: string]: any;
     saveOnlyDirtyRows?: boolean;
     readOnly?: boolean;
 }
-export declare class AppTableDataSourceOptions<T extends Entity<T, ID>, ID = number, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> implements TableDataSourceOptions {
-    [key: string]: any;
-    prependNewElements?: boolean;
-    suppressErrors?: boolean;
-    keepOriginalDataAfterConfirm?: boolean;
-    onRowCreated?: (row: TableElement<T>) => Promise<void> | void;
-    dataServiceOptions?: AppTableDataServiceOptions<O>;
+export interface AppTableDataSourceOptions<T extends Entity<T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends TableDataSourceOptions {
+    dataServiceOptions?: AppTableDataServiceOptions<WO>;
     debug?: boolean;
+    onRowCreated?: (row: TableElement<T>) => Promise<void> | void;
+    onRowValidator?: (validator: FormGroup) => Promise<void> | void;
+    [key: string]: any;
 }
-export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any, ID = number, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends TableDataSource<T> implements OnDestroy {
-    readonly dataService: IEntitiesService<T, F, O>;
+export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any, ID = number, V extends ValidatorService = ValidatorService, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions, O extends AppTableDataSourceOptions<T, ID, WO> = AppTableDataSourceOptions<T, ID, WO>> extends TableDataSource<T, V, O> {
+    readonly dataService: IEntitiesService<T, F, WO>;
     private readonly _logTypeName;
-    private readonly _options;
     protected readonly _debug: boolean;
     protected _creating: boolean;
     protected _saving: boolean;
-    protected _useValidator: boolean;
     protected _stopWatching$: Subject<any>;
     protected _editingRowCount: number;
     protected _fetchMoreFn: FetchMoreFn<LoadResult<T>>;
     loadingSubject: BehaviorSubject<boolean>;
-    get serviceOptions(): AppTableDataServiceOptions<O>;
-    set serviceOptions(value: AppTableDataServiceOptions<O>);
-    get options(): AppTableDataSourceOptions<T, ID, O>;
+    get serviceOptions(): AppTableDataServiceOptions<WO>;
+    set serviceOptions(value: AppTableDataServiceOptions<WO>);
     get loaded(): boolean;
     get loading(): boolean;
     /**
@@ -42,31 +37,33 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
      *
      * @param dataService A service to load and save data
      * @param dataType Type of data contained by the Table. If not specified, then `data` with at least one element must be specified.
-     * @param environment
      * @param validatorService Service that create instances of the FormGroup used to validate row fields.
      * @param config Additional configuration for table.
      */
-    constructor(dataType: new () => T, dataService: IEntitiesService<T, F, O>, validatorService?: ValidatorService, config?: AppTableDataSourceOptions<T, ID, O>);
-    ngOnDestroy(): void;
+    constructor(dataType: new () => T, dataService: IEntitiesService<T, F, WO>, validatorService?: V, config?: O);
+    disconnect(collectionViewer?: CollectionViewer): void;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>): Observable<LoadResult<T>>;
     save(): Promise<boolean>;
+    protected getDataFromRows(rows: TableElement<T>[], options?: {
+        originalData: boolean;
+        toEntity: boolean;
+    }): T[];
+    toEntity(data: T | any): T;
     updateDatasource(data: T[], opts?: {
         emitEvent: boolean;
-    }): void;
-    createNew(insertAt?: number): void;
-    connect(collectionViewer: CollectionViewer): Observable<TableElement<T>[] | ReadonlyArray<TableElement<T>>>;
-    disconnect(collectionViewer?: CollectionViewer): void;
+    }): Promise<void>;
     waitIdle(debounceTimeMs?: number): Promise<any>;
-    confirmCreate(row: TableElement<T>): boolean;
-    confirmEdit(row: TableElement<T>): boolean;
-    startEdit(row: TableElement<T>): void;
-    cancelOrDelete(row: TableElement<T>): void;
+    confirmCreate(row: TableElement<T>): Promise<boolean>;
+    confirmEdit(row: TableElement<T>): Promise<boolean>;
+    startEdit(row: TableElement<T>): Promise<boolean>;
+    cancel(row: TableElement<T>): Promise<boolean>;
     handleError(error: any, message: string): Observable<LoadResult<T>>;
     handleErrorPromise(error: any): void;
-    delete(id: number): void;
+    delete(id: number): Promise<boolean>;
     deleteAll(rows: TableElement<T>[]): Promise<any>;
     getRows(): Promise<TableElement<T>[]>;
-    asyncCreateNew(insertAt?: number): Promise<void>;
+    createNew(insertAt?: number): Promise<boolean>;
+    protected createRowValidator(): Promise<FormGroup>;
     getData(): Promise<T[]>;
     fetchMore(opts?: {
         emitEvent: boolean;

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

@@ -229,7 +229,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     }): void;
     confirmAndAdd(event?: Event, row?: TableElement<T>): boolean;
     confirmAndBackward(event?: Event, row?: TableElement<T>): boolean;
-    confirmAndForward(event?: Event, row?: TableElement<T>): boolean;
+    confirmAndForward(event?: Event, row?: TableElement<T>): Promise<boolean>;
     editRowById(event: Event | undefined, id: number, opts?: {
         focusColumn?: string;
     }): Promise<void>;
@@ -239,7 +239,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @param event
      * @param row
      */
-    confirmEditCreate(event?: Event, row?: TableElement<T>): boolean;
+    confirmEditCreate(event?: Event, row?: TableElement<T>): Promise<boolean>;
     cancelOrDelete(event: Event, row: TableElement<T>, opts?: {
         interactive?: boolean;
         keepEditing?: boolean;