Merge branch 'master' of github.com:swimlane/ngx-datatable into release/16.1.0

Author: Hypercubed

package-lock.json

@@ -15,8 +15,8 @@
     "ci": "run-s lint prettier:ci test:ci",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "prettier": "prettier --write \"**/*.{js,ts,html,scss,css,md,json}\"",
-    "prettier:ci": "prettier --check \"**/*.{js,ts,html,scss,css,md,json}\"",
+    "prettier": "prettier --write \"{src,projects}/*.{js,ts,html,scss,css,md,json}\"",
+    "prettier:ci": "prettier --check \"{src,projects}/*.{js,ts,html,scss,css,md,json}\"",
     "build-docs": "cross-env NODE_ENV=production ng build --prod --base-href=\"/ngx-datatable/\"",
     "predeploy-docs": "npm run build-docs",
     "deploy-docs": "angular-cli-ghpages --dir ./dist/ngx-datatable",
@@ -48,7 +48,7 @@
     "@angular/cli": "~9.1.0",
     "@angular/compiler-cli": "~9.1.0",
     "@angular/language-service": "~9.1.0",
-    "@swimlane/prettier-config-swimlane": "^3.0.1",
+    "@swimlane/prettier-config-swimlane": "^3.0.2",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",

package.json

@@ -779,7 +779,7 @@ export class DataTableBodyComponent implements OnInit, OnDestroy {
     if (!expanded || !expanded.length) return -1;
 
     const rowId = this.rowIdentity(row);
-    return expanded.findIndex((r) => {
+    return expanded.findIndex(r => {
       const id = this.rowIdentity(r);
       return id === rowId;
     });

projects/swimlane/ngx-datatable/src/lib/components/body/body.component.ts

@@ -144,7 +144,7 @@ export class DataTableSelectionComponent {
     if (!selected || !selected.length) return -1;
 
     const rowId = this.rowIdentity(row);
-    return selected.findIndex((r) => {
+    return selected.findIndex(r => {
       const id = this.rowIdentity(r);
       return id === rowId;
     });

projects/swimlane/ngx-datatable/src/lib/components/body/selection.component.ts

@@ -9,12 +9,12 @@ export interface ISummaryColumn {
 }
 
 function defaultSumFunc(cells: any[]): any {
-  const cellsWithValues = cells.filter((cell) => !!cell);
+  const cellsWithValues = cells.filter(cell => !!cell);
 
   if (!cellsWithValues.length) {
     return null;
   }
-  if (cellsWithValues.some((cell) => typeof cell !== 'number')) {
+  if (cellsWithValues.some(cell => typeof cell !== 'number')) {
     return null;
   }
 
@@ -64,7 +64,7 @@ export class DataTableSummaryRowComponent implements OnChanges {
   }
 
   private updateInternalColumns() {
-    this._internalColumns = this.columns.map((col) => ({
+    this._internalColumns = this.columns.map(col => ({
       ...col,
       cellTemplate: col.summaryTemplate
     }));
@@ -74,9 +74,9 @@ export class DataTableSummaryRowComponent implements OnChanges {
     this.summaryRow = {};
 
     this.columns
-      .filter((col) => !col.summaryTemplate)
-      .forEach((col) => {
-        const cellsFromSingleColumn = this.rows.map((row) => row[col.prop]);
+      .filter(col => !col.summaryTemplate)
+      .forEach(col => {
+        const cellsFromSingleColumn = this.rows.map(row => row[col.prop]);
         const sumFunc = this.getSummaryFunction(col);
 
         this.summaryRow[col.prop] = col.pipe

projects/swimlane/ngx-datatable/src/lib/components/body/summary/summary-row.component.ts

@@ -700,7 +700,7 @@ export class DatatableComponent implements OnInit, DoCheck, AfterViewInit {
    * content has been fully initialized.
    */
   ngAfterContentInit() {
-    this.columnTemplates.changes.subscribe((v) => this.translateColumns(v));
+    this.columnTemplates.changes.subscribe(v => this.translateColumns(v));
     this.listenForColumnInputChanges();
   }
 
@@ -762,7 +762,7 @@ export class DatatableComponent implements OnInit, DoCheck, AfterViewInit {
     };
 
     // convert map back to a simple array of objects
-    return Array.from(map, (x) => addGroup(x[0], x[1]));
+    return Array.from(map, x => addGroup(x[0], x[1]));
   }
 
   /*
@@ -1015,7 +1015,7 @@ export class DatatableComponent implements OnInit, DoCheck, AfterViewInit {
    * The header triggered a column re-order event.
    */
   onColumnReorder({ column, newValue, prevValue }: any): void {
-    const cols = this._internalColumns.map((c) => {
+    const cols = this._internalColumns.map(c => {
       return { ...c };
     });
 
@@ -1128,12 +1128,12 @@ export class DatatableComponent implements OnInit, DoCheck, AfterViewInit {
   onTreeAction(event: any) {
     const row = event.row;
     // TODO: For duplicated items this will not work
-    const rowIndex = this._rows.findIndex((r) => r[this.treeToRelation] === event.row[this.treeToRelation]);
+    const rowIndex = this._rows.findIndex(r => r[this.treeToRelation] === event.row[this.treeToRelation]);
     this.treeAction.emit({ row, rowIndex });
   }
 
   ngOnDestroy() {
-    this._subscriptions.forEach((subscription) => subscription.unsubscribe());
+    this._subscriptions.forEach(subscription => subscription.unsubscribe());
   }
 
   /**

projects/swimlane/ngx-datatable/src/lib/components/datatable.component.ts

@@ -179,7 +179,7 @@ export class DataTableHeaderComponent implements OnDestroy {
     setTimeout(() => {
       // datatable component creates copies from columns on reorder
       // set dragging to false on new objects
-      const column = this._columns.find((c) => c.$$id === model.$$id);
+      const column = this._columns.find(c => c.$$id === model.$$id);
       if (column) {
         column.dragging = false;
       }

projects/swimlane/ngx-datatable/src/lib/components/header/header.component.ts

@@ -56,7 +56,7 @@ describe('OrderableDirective', () => {
 
     describe('when a draggable is removed', () => {
       function checkAllSubscriptionsForActiveObservers() {
-        const subs = directive.draggables.map((d) => {
+        const subs = directive.draggables.map(d => {
           expect(d.dragEnd.isStopped).toBe(false);
           expect(d.dragStart.isStopped).toBe(false);
 
@@ -66,7 +66,7 @@ describe('OrderableDirective', () => {
           };
         });
 
-        subs.forEach((sub) => {
+        subs.forEach(sub => {
           expect(sub.dragStart.length).toBe(1);
           expect(sub.dragEnd.length).toBe(1);
         });

projects/swimlane/ngx-datatable/src/lib/directives/orderable.directive.spec.ts

@@ -35,7 +35,7 @@ export class OrderableDirective implements AfterContentInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.draggables.forEach((d) => {
+    this.draggables.forEach(d => {
       d.dragStart.unsubscribe();
       d.dragging.unsubscribe();
       d.dragEnd.unsubscribe();

projects/swimlane/ngx-datatable/src/lib/directives/orderable.directive.ts

@@ -27,5 +27,5 @@ export function camelCase(str: string): string {
  * http://stackoverflow.com/questions/7225407/convert-camelcasetext-to-camel-case-text
  */
 export function deCamelCase(str: string): string {
-  return str.replace(/([A-Z])/g, (match) => ` ${match}`).replace(/^./, (match) => match.toUpperCase());
+  return str.replace(/([A-Z])/g, match => ` ${match}`).replace(/^./, match => match.toUpperCase());
 }