Refactor data source (#65)

* refactor data source

Author: NachmanBerkowitz

projects/table-builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mx-table-builder",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "peerDependencies": {
     "@angular/common": "~11.0.0",
     "@angular/core": "~11.0.0",

projects/table-builder/src/lib/classes/GenericTableDataSource.ts

@@ -0,0 +1,15 @@
+import { Observable } from 'rxjs';
+import { orderBy } from 'lodash';
+import { direc } from '../components/generic-table/generic-table.component';
+import { MultiSortDirective } from '../directives/multi-sort.directive';
+import {MatTableObservableDataSource} from './MatTableObservableDataSource'
+
+export class GenericTableDataSource<T> extends MatTableObservableDataSource<T>
+{
+  constructor(dataSrc: Observable<T[]>)
+  {
+    super(dataSrc);
+    this.sortData = (data: {}[], sort: MultiSortDirective) =>
+      orderBy(data, sort.rules.map(r => r.active), sort.rules.map(r => r.direction as direc ));
+  }
+}

projects/table-builder/src/lib/classes/MatTableObservableDataSource.ts

@@ -1,16 +1,10 @@
 import { MatTableDataSource } from '@angular/material/table';
 import { Observable, Subscription } from 'rxjs';
-import { direc } from '../components/generic-table/generic-table.component';
-import { MultiSortDirective } from '../directives/multi-sort.directive';
-import { orderBy } from 'lodash';
 
 export class MatTableObservableDataSource<T> extends  MatTableDataSource<T> {
   subscription: Subscription;
   constructor(private dataSrc: Observable<T[]>) {
     super([]);
-    this.sortData = (data: T[], sort: MultiSortDirective) => !sort.rules ? 
-      super.sortData(data,sort)
-      : orderBy(data, sort.rules.map(r => r.active), sort.rules.map(r => r.direction as direc ));
   }
 
   connect() {

projects/table-builder/src/lib/components/generic-table/generic-table.component.ts

@@ -18,13 +18,13 @@ import { MatSort } from '@angular/material/sort';
 import { MatRowDef, MatTable } from '@angular/material/table';
 import { Observable } from 'rxjs';
 import * as _ from 'lodash';
-import { MatTableObservableDataSource } from '../../classes/MatTableObservableDataSource';
 import { SelectionModel } from '@angular/cdk/collections';
 import { TableStore } from '../../classes/table-store';
 import { tap, map, distinct } from 'rxjs/operators';
 import { ColumnBuilderComponent } from '../column-builder/column-builder.component';
 import { ColumnInfo } from '../table-container/table-container';
 import { Dictionary } from '../../interfaces/dictionary';
+import { GenericTableDataSource } from '../../classes/GenericTableDataSource';
 
 @Component({
   selector: 'tb-generic-table',
@@ -51,7 +51,7 @@ export class GenericTableComponent implements OnInit {
 
   currentColumns: string[];
   selection: SelectionModel<any>;
-  dataSource: MatTableObservableDataSource<any>;
+  dataSource: GenericTableDataSource<any>;
   keys: string [] = [];
   factory: ComponentFactory<ColumnBuilderComponent> ;
   injector: Injector;
@@ -107,7 +107,7 @@ export class GenericTableComponent implements OnInit {
   }
 
   createDataSource() {
-    this.dataSource = new MatTableObservableDataSource(
+    this.dataSource = new GenericTableDataSource(
       this.data$.pipe(tap((d) => this.selection.clear() ))
     );
     this.dataSource.sort = this.sort;