@den4ik92/ng2-smart-table 1.0.5 → 1.0.7

package/lib/components/tbody/tbody.component.d.ts

@@ -20,7 +20,6 @@ export declare class Ng2SmartTableTbodyComponent {
     userClickedRow: EventEmitter<any>;
     editRowSelect: EventEmitter<any>;
     multipleSelectRow: EventEmitter<any>;
-    rowHover: EventEmitter<any>;
     isMultiSelectVisible: boolean;
     showActionColumnLeft: boolean;
     showActionColumnRight: boolean;
@@ -33,6 +32,7 @@ export declare class Ng2SmartTableTbodyComponent {
     get tableColumnsCount(): number;
     ngOnChanges(): void;
     getVisibleCells(cells: Array<Cell>): Array<Cell>;
+    protected trackByIdOrIndex(index: any, item: any): string | number;
     static ɵfac: i0.ɵɵFactoryDeclaration<Ng2SmartTableTbodyComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<Ng2SmartTableTbodyComponent, "[ng2-st-tbody]", never, { "grid": "grid"; "source": "source"; "deleteConfirm": "deleteConfirm"; "editConfirm": "editConfirm"; "rowClassFunction": "rowClassFunction"; }, { "save": "save"; "cancel": "cancel"; "edit": "edit"; "editCancel": "editCancel"; "delete": "delete"; "custom": "custom"; "edited": "edited"; "userSelectRow": "userSelectRow"; "userClickedRow": "userClickedRow"; "editRowSelect": "editRowSelect"; "multipleSelectRow": "multipleSelectRow"; "rowHover": "rowHover"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<Ng2SmartTableTbodyComponent, "[ng2-st-tbody]", never, { "grid": "grid"; "source": "source"; "deleteConfirm": "deleteConfirm"; "editConfirm": "editConfirm"; "rowClassFunction": "rowClassFunction"; }, { "save": "save"; "cancel": "cancel"; "edit": "edit"; "editCancel": "editCancel"; "delete": "delete"; "custom": "custom"; "edited": "edited"; "userSelectRow": "userSelectRow"; "userClickedRow": "userClickedRow"; "editRowSelect": "editRowSelect"; "multipleSelectRow": "multipleSelectRow"; }, never, never, false, never>;
 }

package/lib/lib/data-source/data-source.d.ts

@@ -1,35 +1,36 @@
 import { Subject } from 'rxjs';
 import { Observable } from 'rxjs';
-export declare abstract class DataSource {
-    protected onChangedSource: Subject<any>;
+import { SmartTableFilterConf, SmartTableOnChangedEvent, SmartTableOnChangedEventType, SmartTablePagingItem, SmartTableSortItem } from '../interfaces/smart-table.models';
+export declare abstract class DataSource<T = any> {
+    protected onChangedSource: Subject<SmartTableOnChangedEvent<any>>;
     protected onAddedSource: Subject<any>;
     protected onUpdatedSource: Subject<any>;
     protected onRemovedSource: Subject<any>;
-    abstract getAll(): Promise<any>;
-    abstract getElements(): Promise<any>;
-    abstract getSort(): any;
-    abstract getFilter(): any;
-    abstract getPaging(): any;
+    abstract getAll(): Promise<T[]>;
+    abstract getElements(): Promise<T[]>;
+    abstract getSort(): SmartTableSortItem[];
+    abstract getFilter(): SmartTableFilterConf;
+    abstract getPaging(): SmartTablePagingItem;
     abstract count(): number;
     refresh(): void;
-    load(data: Array<any>): Promise<any>;
-    onChanged(): Observable<any>;
+    load<T>(data: Array<T>): Promise<true>;
+    onChanged(): Observable<SmartTableOnChangedEvent>;
     onAdded(): Observable<any>;
     onUpdated(): Observable<any>;
     onRemoved(): Observable<any>;
-    prepend(element: any): Promise<any>;
-    append(element: any): Promise<any>;
-    add(element: any): Promise<any>;
-    remove(element: any): Promise<any>;
-    update(element: any, values: any): Promise<any>;
-    empty(): Promise<any>;
+    prepend(element: T): Promise<true>;
+    append(element: T): Promise<true>;
+    add(element: T): Promise<true>;
+    remove(element: T): Promise<true>;
+    update(element: T, values: any): Promise<true>;
+    empty(): Promise<true>;
     setSort(conf: Array<any>, doEmit?: boolean): void;
     setFilter(conf: Array<any>, andOperator?: boolean, doEmit?: boolean): void;
     addFilter(fieldConf: {}, andOperator?: boolean, doEmit?: boolean): void;
     setPaging(page: number, perPage: number, doEmit?: boolean): void;
     setPage(page: number, doEmit?: boolean): void;
-    protected emitOnRemoved(element: any): void;
-    protected emitOnUpdated(element: any): void;
-    protected emitOnAdded(element: any): void;
-    protected emitOnChanged(action: string): void;
+    protected emitOnRemoved(element: T): void;
+    protected emitOnUpdated(element: T): void;
+    protected emitOnAdded(element: T): void;
+    protected emitOnChanged(action: SmartTableOnChangedEventType): void;
 }

package/lib/lib/data-source/local/local.data-source.d.ts

@@ -1,23 +1,24 @@
 import { DataSource } from '../data-source';
-export declare class LocalDataSource extends DataSource {
-    protected data: Array<any>;
-    protected filteredAndSorted: Array<any>;
-    protected sortConf: Array<any>;
-    protected filterConf: any;
-    protected pagingConf: any;
-    constructor(data?: Array<any>);
-    load(data: Array<any>): Promise<any>;
-    prepend(element: any): Promise<any>;
-    append(element: any): Promise<any>;
-    add(element: any): Promise<any>;
-    remove(element: any): Promise<any>;
-    update(element: any, values: any): Promise<any>;
-    find(element: any): Promise<any>;
-    getElements(): Promise<any>;
-    getFilteredAndSorted(): Promise<any>;
-    getAll(): Promise<any>;
+import { SmartTableFilterConf, SmartTableFilterItem, SmartTablePagingItem, SmartTableSortItem } from '../../interfaces/smart-table.models';
+export declare class LocalDataSource<T = any> extends DataSource<T> {
+    protected data: T[];
+    protected filteredAndSorted: T[];
+    protected sortConf: SmartTableSortItem[];
+    protected filterConf: SmartTableFilterConf;
+    protected pagingConf: SmartTablePagingItem;
+    constructor(data?: T[]);
+    load(data: any): Promise<true>;
+    prepend(element: T): Promise<true>;
+    append(element: T): Promise<true>;
+    add(element: T): Promise<true>;
+    remove(element: T): Promise<true>;
+    update(element: T, values: T): Promise<true>;
+    find(element: T): Promise<T>;
+    getElements(): Promise<T[]>;
+    getFilteredAndSorted(): Promise<T[]>;
+    getAll(): Promise<T[]>;
     reset(silent?: boolean): void;
-    empty(): Promise<any>;
+    empty(): Promise<true>;
     count(): number;
     /**
      *
@@ -29,7 +30,7 @@ export declare class LocalDataSource extends DataSource {
      * @param doEmit
      * @returns {LocalDataSource}
      */
-    setSort(conf: Array<any>, doEmit?: boolean): LocalDataSource;
+    setSort(conf: SmartTableSortItem[], doEmit?: boolean): LocalDataSource;
     /**
      *
      * Array of conf objects
@@ -41,15 +42,15 @@ export declare class LocalDataSource extends DataSource {
      * @param doEmit
      * @returns {LocalDataSource}
      */
-    setFilter(conf: Array<any>, andOperator?: boolean, doEmit?: boolean): LocalDataSource;
-    addFilter(fieldConf: any, andOperator?: boolean, doEmit?: boolean): LocalDataSource;
+    setFilter(conf: SmartTableFilterItem[], andOperator?: boolean, doEmit?: boolean): LocalDataSource;
+    addFilter(fieldConf: SmartTableFilterItem, andOperator?: boolean, doEmit?: boolean): LocalDataSource;
     setPaging(page: number, perPage: number, doEmit?: boolean): LocalDataSource;
     setPage(page: number, doEmit?: boolean): LocalDataSource;
-    getSort(): any;
-    getFilter(): any;
-    getPaging(): any;
-    protected prepareData(data: Array<any>): Array<any>;
-    protected sort(data: Array<any>): Array<any>;
-    protected filter(data: Array<any>): Array<any>;
-    protected paginate(data: Array<any>): Array<any>;
+    getSort(): SmartTableSortItem[];
+    getFilter(): SmartTableFilterConf;
+    getPaging(): SmartTablePagingItem;
+    protected prepareData(data: T[]): T[];
+    protected sort(data: T[]): T[];
+    protected filter(data: T[]): T[];
+    protected paginate(data: T[]): T[];
 }

package/lib/lib/data-source/local/local.filter.d.ts

@@ -1,4 +1,4 @@
 export declare function filterValues(value: string, search: string): boolean;
 export declare class LocalFilter {
-    static filter(data: Array<any>, field: string, search: string, customFilter?: Function): Array<any>;
+    static filter(data: any[], field: string, search: string, customFilter?: Function): any[];
 }

package/lib/lib/interfaces/smart-table.models.d.ts

@@ -40,7 +40,6 @@ export interface SmartTableSettings<T extends ObjectAny = any> {
         id?: string;
         class?: string;
     };
-    addable?: boolean;
     noDataMessage?: string;
     columns: {
         [key in keyof T]?: SmartTableColumn<T>;
@@ -74,7 +73,8 @@ interface SmartTableDefaultColumn<T> {
     editable?: boolean;
     hide?: boolean;
     sort?: boolean;
-    sortDirection?: 'desc' | 'asc' | false;
+    addable?: boolean;
+    sortDirection?: SmartTableSortDirection | false;
     editor?: SmartTableEditorAndFilter;
     filter?: SmartTableEditorAndFilter | false;
     compareFunction?: (itemA: T, itemB: T) => number;
@@ -125,6 +125,17 @@ export interface SmartTableEditorCheckbox {
 export interface SmartTableFilterItem {
     field: string;
     search: string;
+    filter?: any;
+}
+export interface SmartTablePagingItem {
+    page: number;
+    perPage: number;
+}
+export type SmartTableSortDirection = 'asc' | 'desc';
+export interface SmartTableSortItem {
+    field: string;
+    direction: SmartTableSortDirection;
+    compare?: any;
 }
 interface SmartTableDefaultEvent<T> {
     confirm: Deferred;
@@ -149,4 +160,30 @@ export interface SmartTableCreateConfirm<T = any> extends Omit<SmartTableDefault
 export interface ObjectStringString {
     [key: string]: string;
 }
+export declare enum SmartTableOnChangedEventName {
+    'load' = "load",
+    'paging' = "paging",
+    'update' = "update",
+    'page' = "page",
+    'filter' = "filter",
+    'empty' = "empty",
+    'sort' = "sort",
+    'add' = "add",
+    'remove' = "remove",
+    'append' = "append",
+    'prepend' = "prepend",
+    'refresh' = "refresh"
+}
+export type SmartTableOnChangedEventType = 'load' | 'prepend' | 'append' | 'update' | 'empty' | 'paging' | 'page' | 'filter' | 'sort' | 'add' | 'remove' | 'refresh';
+export interface SmartTableOnChangedEvent<T extends ObjectAny = any> {
+    action: SmartTableOnChangedEventType;
+    elements: T[];
+    filter: SmartTableFilterConf;
+    paging: SmartTablePagingItem;
+    sort: SmartTableSortItem[];
+}
+export interface SmartTableFilterConf {
+    filters: SmartTableFilterItem[];
+    andOperator: boolean;
+}
 export {};

package/lib/ng2-smart-table.component.d.ts

@@ -30,7 +30,6 @@ export declare class Ng2SmartTableComponent implements OnChanges {
     ngOnChanges(changes: {
         [propertyName: string]: SimpleChange;
     }): void;
-    onRowHover(row: Row): void;
     multipleSelectRow(row: Row): void;
     onSelectAllRows(): void;
     onSelectRow(row: Row, state: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@den4ik92/ng2-smart-table",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Angular Smart Table",
   "author": "Den4ik92",
   "license": "MIT",