@sumaris-net/ngx-components 1.22.12 → 1.23.0-rc3

package/package.json

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

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

@@ -4,37 +4,30 @@ 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 { TableDataSourceConfig } 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';
-export declare interface AppTableDataServiceOptions<O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions> extends EntitiesServiceWatchOptions {
+export declare interface EntitiesTableServiceOptions 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 {
+export interface EntitiesTableDataSourceConfig<T extends Entity<T, ID>, ID = number, WO extends EntitiesTableServiceOptions = EntitiesServiceWatchOptions> extends TableDataSourceConfig {
     [key: string]: any;
-    prependNewElements?: boolean;
-    suppressErrors?: boolean;
-    keepOriginalDataAfterConfirm?: boolean;
     onRowCreated?: (row: TableElement<T>) => Promise<void> | void;
-    dataServiceOptions?: AppTableDataServiceOptions<O>;
+    dataServiceOptions?: WO;
     debug?: boolean;
 }
-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>;
-    private readonly _logTypeName;
-    private readonly _options;
-    protected readonly _debug: boolean;
+export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any, ID = number, WO extends EntitiesTableServiceOptions = EntitiesTableServiceOptions, V extends ValidatorService = ValidatorService, C extends EntitiesTableDataSourceConfig<T, ID, WO> = EntitiesTableDataSourceConfig<T, ID, WO>> extends TableDataSource<T, V, C> implements OnDestroy {
+    readonly dataService: IEntitiesService<T, F, WO>;
+    private readonly _entityName;
     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(): WO;
+    set serviceOptions(value: WO);
     get loaded(): boolean;
     get loading(): boolean;
     /**
@@ -46,28 +39,30 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
      * @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>);
+    constructor(dataType: new () => T, dataService: IEntitiesService<T, F, WO>, validatorService?: V, options?: C);
     ngOnDestroy(): void;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>): Observable<LoadResult<T>>;
+    protected updateDatasourceFromRows(rows: TableElement<T>[]): void;
     save(): Promise<boolean>;
     updateDatasource(data: T[], opts?: {
         emitEvent: boolean;
     }): void;
-    createNew(insertAt?: number): void;
     connect(collectionViewer: CollectionViewer): Observable<TableElement<T>[] | ReadonlyArray<TableElement<T>>>;
     disconnect(collectionViewer?: CollectionViewer): 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;
+    startEdit(row: TableElement<T>): boolean;
     handleError(error: any, message: string): Observable<LoadResult<T>>;
-    handleErrorPromise(error: any): void;
-    delete(id: number): void;
+    handleServiceError(error: any): void;
+    delete(id: number): boolean;
     deleteAll(rows: TableElement<T>[]): Promise<any>;
-    getRows(): Promise<TableElement<T>[]>;
-    asyncCreateNew(insertAt?: number): Promise<void>;
-    getData(): Promise<T[]>;
+    getRow(id: number): TableElement<T>;
+    getRows(): TableElement<T>[];
+    createNew(insertAt?: number, options?: {
+        editing: boolean;
+    }): Promise<TableElement<T> | undefined>;
+    getData(): T[];
     fetchMore(opts?: {
         emitEvent: boolean;
     }): Promise<boolean>;

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

@@ -1,6 +1,6 @@
 import { Injector } from '@angular/core';
 import { ValidatorService } from '@e-is/ngx-material-table';
-import { AppTableDataSourceOptions } from './entities-table-datasource.class';
+import { EntitiesTableDataSourceConfig } from './entities-table-datasource.class';
 import { AppTable } from './table.class';
 import { IEntity } from '../services/model/entity.model';
 import { InMemoryEntitiesService } from '../../shared/services/memory-entity-service.class';
@@ -13,7 +13,7 @@ export declare abstract class AppInMemoryTable<T extends IEntity<T, ID>, F = any
     canDelete: boolean;
     set value(data: T[]);
     get value(): T[];
-    protected constructor(injector: Injector, columns: string[], dataType: new () => T, memoryDataService: InMemoryEntitiesService<T, F, ID>, validatorService: ValidatorService, options?: AppTableDataSourceOptions<T, ID>, filter?: F);
+    protected constructor(injector: Injector, columns: string[], dataType: new () => T, memoryDataService: InMemoryEntitiesService<T, F, ID>, validatorService: ValidatorService, options?: EntitiesTableDataSourceConfig<T, ID>, filter?: F);
     ngOnInit(): void;
     setValue(value: T[], opts?: {
         emitEvent?: boolean;

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

@@ -251,6 +251,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     }): void;
     addRow(event?: Event, insertAt?: number, opts?: {
         focusColumn?: string;
+        editing?: boolean;
     }): boolean;
     save(opts?: {
         keepEditing?: boolean;
@@ -350,6 +351,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     protected generateTableId(): string;
     protected addRowToTable(insertAt?: number, opts?: {
         focusColumn?: string;
+        editing?: boolean;
     }): Promise<TableElement<T>>;
     protected registerCellValueChanges(name: string, formPath?: string, emitInitialValue?: boolean): Observable<any>;
     protected setShowColumn(columnName: string, show: boolean, opts?: {

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

@@ -35,12 +35,14 @@ export declare class TableTestPage extends AppTable<Referential, ReferentialFilt
     protected restoreFilter(): void;
     toggleTimer(): void;
     load(): void;
-    loadMore(event?: CustomEvent & {
+    fetchMore(event?: CustomEvent & {
         target?: EventTarget & {
             complete?: () => void;
         };
-    }): void;
-    save(): Promise<boolean>;
+    }): Promise<void>;
+    save(opts?: {
+        keepEditing?: boolean;
+    }): Promise<boolean>;
     clearControlValue(event: UIEvent, formControl: AbstractControl): boolean;
     applyFilterAndClosePanel(event?: UIEvent): void;
     resetFilter(event?: UIEvent): void;

package/src/app/shared/functions.d.ts

@@ -114,4 +114,10 @@ export declare class Beans {
     static isEmpty<T>(data: T, keys?: KeysEnum<T> | string[], opts?: {
         blankStringLikeEmpty?: boolean;
     }): boolean;
+    static collectById<T>(array: T[]): {
+        [key: string]: T;
+    };
+    static collectByProperty<T>(array: T[], propertyName: keyof T): {
+        [key: string]: T;
+    };
 }

package/src/app/shared/services/memory-entity-service.class.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { EntitiesService, EntitiesServiceWatchOptions, FilterFn, FilterFnFactory, IEntitiesService, LoadResult } from './entity-service.class';
+import { EntitiesService, EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, FilterFn, FilterFnFactory, IEntitiesService, LoadResult } from './entity-service.class';
 import { SortDirection } from '@angular/material/sort';
 import { OnDestroy } from '@angular/core';
 import { IEntity } from '../../core/services/model/entity.model';
@@ -36,6 +36,7 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
     setValue(data: T[], opts?: {
         emitEvent?: boolean;
     }): void;
+    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: F, opts?: EntitiesServiceLoadOptions): Promise<LoadResult<T>>;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filterData?: F, options?: any): Observable<LoadResult<T>>;
     saveAll(data: T[], options?: any): Promise<T[]>;
     deleteAll(dataToRemove: T[], options?: any): Promise<any>;