Merge branch 'master' of https://github.com/ghiscoding/Angular-Slickgrid

Author: Ghislain Beaulac

src/app/modules/angular-slickgrid/services/collection.service.spec.ts renamed to src/app/modules/angular-slickgrid/services/__tests__/collection.service.spec.ts

@@ -1,25 +1,20 @@
 import { TestBed } from '@angular/core/testing';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
-import { CollectionService } from './collection.service';
+import { CollectionService } from '../collection.service';
 import {
   CollectionFilterBy,
   CollectionSortBy,
   FilterMultiplePassType,
   OperatorType,
   Column,
   FieldType,
-} from './../models/index';
+} from '../../models/index';
 
 describe('CollectionService', () => {
   let collection = [];
   let translate: TranslateService;
   let service: CollectionService;
 
-  // stub some methods of the SlickGrid Grid instance
-  const gridStub = {
-    getOptions: jest.fn()
-  };
-
   beforeEach(() => {
     TestBed.configureTestingModule({
       providers: [CollectionService],

src/app/modules/angular-slickgrid/services/__tests__/gridState.service.spec.ts

@@ -1,5 +1,5 @@
-import { GridOption } from './../models/gridOption.interface';
-import { ResizerService } from './resizer.service';
+import { GridOption } from '../../models/gridOption.interface';
+import { ResizerService } from '../resizer.service';
 
 const DATAGRID_MIN_HEIGHT = 180;
 const DATAGRID_MIN_WIDTH = 300;

src/app/modules/angular-slickgrid/services/resizer.service.spec.ts renamed to src/app/modules/angular-slickgrid/services/__tests__/resizer.service.spec.ts

@@ -20,7 +20,7 @@ import {
   uniqueArray,
   uniqueObjectArray,
   unsubscribeAllObservables,
-} from './utilities';
+} from '../utilities';
 import * as moment from 'moment-mini';
 import { of, Subscription } from 'rxjs';
 

src/app/modules/angular-slickgrid/services/utilities.spec.ts renamed to src/app/modules/angular-slickgrid/services/__tests__/utilities.spec.ts

@@ -312,7 +312,7 @@ export class ExtensionService {
     }
   }
 
-  /** Translate the an array of items from an input key and assign to the output key */
+  /** Translate an array of items from an input key and assign translated value to the output key */
   private translateItems(items: any[], inputKey: string, outputKey: string) {
     for (const item of items) {
       if (item[inputKey]) {

src/app/modules/angular-slickgrid/services/extension.service.ts

@@ -16,7 +16,6 @@ import { SortService } from './sort.service';
 import { Subject, Subscription } from 'rxjs';
 
 // using external non-typed js libraries
-declare var $: any;
 declare var Slick: any;
 
 export class GridStateService {
@@ -63,6 +62,8 @@ export class GridStateService {
       }
     });
     this.subscriptions = [];
+    this._currentColumns = [];
+    this._columns = [];
   }
 
   /**
@@ -88,7 +89,7 @@ export class GridStateService {
    * @return current columns
    */
   getColumns(): Column[] {
-    return this._columns || this._grid.getColumns();
+    return this._columns;
   }
 
   /**
@@ -203,38 +204,6 @@ export class GridStateService {
     return null;
   }
 
-  /**
-   * Hook a SlickGrid Extension Event to a Grid State change event
-   * @param extension name
-   * @param grid
-   */
-  hookExtensionEventToGridStateChange(extensionName: ExtensionName, eventName: string) {
-    const extension = this.extensionService && this.extensionService.getExtensionByName(extensionName);
-
-    if (extension && extension.class && extension.class[eventName] && extension.class[eventName].subscribe) {
-      this._eventHandler.subscribe(extension.class[eventName], (e: Event, args: any) => {
-        const columns: Column[] = args && args.columns;
-        const currentColumns: CurrentColumn[] = this.getAssociatedCurrentColumns(columns);
-        this.onGridStateChanged.next({ change: { newValues: currentColumns, type: GridStateType.columns }, gridState: this.getCurrentGridState() });
-      });
-    }
-  }
-
-  /**
-   * Hook a Grid Event to a Grid State change event
-   * @param event name
-   * @param grid
-   */
-  hookSlickGridEventToGridStateChange(eventName: string, grid: any) {
-    if (grid && grid[eventName] && grid[eventName].subscribe) {
-      this._eventHandler.subscribe(grid[eventName], (e: Event, args: any) => {
-        const columns: Column[] = grid.getColumns();
-        const currentColumns: CurrentColumn[] = this.getAssociatedCurrentColumns(columns);
-        this.onGridStateChanged.next({ change: { newValues: currentColumns, type: GridStateType.columns }, gridState: this.getCurrentGridState() });
-      });
-    }
-  }
-
   resetColumns(columnDefinitions?: Column[]) {
     const columns: Column[] = columnDefinitions || this._columns;
     const currentColumns: CurrentColumn[] = this.getAssociatedCurrentColumns(columns);
@@ -289,11 +258,50 @@ export class GridStateService {
     );
 
     // Subscribe to ColumnPicker and/or GridMenu for show/hide Columns visibility changes
-    this.hookExtensionEventToGridStateChange(ExtensionName.columnPicker, 'onColumnsChanged');
-    this.hookExtensionEventToGridStateChange(ExtensionName.gridMenu, 'onColumnsChanged');
+    this.bindExtensionAddonEventToGridStateChange(ExtensionName.columnPicker, 'onColumnsChanged');
+    this.bindExtensionAddonEventToGridStateChange(ExtensionName.gridMenu, 'onColumnsChanged');
 
     // subscribe to Column Resize & Reordering
-    this.hookSlickGridEventToGridStateChange('onColumnsReordered', grid);
-    this.hookSlickGridEventToGridStateChange('onColumnsResized', grid);
+    this.bindSlickGridEventToGridStateChange('onColumnsReordered', grid);
+    this.bindSlickGridEventToGridStateChange('onColumnsResized', grid);
+  }
+
+  // --
+  // private methods
+  // ------------------
+
+  /**
+   * Bind a SlickGrid Extension Event to a Grid State change event
+   * @param extension name
+   * @param grid
+   */
+  private bindExtensionAddonEventToGridStateChange(extensionName: ExtensionName, eventName: string) {
+    const extension = this.extensionService && this.extensionService.getExtensionByName && this.extensionService.getExtensionByName(extensionName);
+    const slickEvent = extension && extension.addon && extension.addon[eventName];
+
+    if (slickEvent && slickEvent.subscribe) {
+      this._eventHandler.subscribe(slickEvent, (e: Event, args: any) => {
+        const columns: Column[] = args && args.columns;
+        const currentColumns: CurrentColumn[] = this.getAssociatedCurrentColumns(columns);
+        this.onGridStateChanged.next({ change: { newValues: currentColumns, type: GridStateType.columns }, gridState: this.getCurrentGridState() });
+      });
+    }
+  }
+
+  /**
+   * Bind a Grid Event to a Grid State change event
+   * @param event name
+   * @param grid
+   */
+  private bindSlickGridEventToGridStateChange(eventName: string, grid: any) {
+    const slickGridEvent = grid && grid[eventName];
+
+    if (slickGridEvent && slickGridEvent.subscribe) {
+      this._eventHandler.subscribe(slickGridEvent, (e: Event, args: any) => {
+        const columns: Column[] = grid.getColumns();
+        const currentColumns: CurrentColumn[] = this.getAssociatedCurrentColumns(columns);
+        this.onGridStateChanged.next({ change: { newValues: currentColumns, type: GridStateType.columns }, gridState: this.getCurrentGridState() });
+      });
+    }
   }
 }

src/app/modules/angular-slickgrid/services/gridState.service.ts

@@ -12,7 +12,7 @@ declare var $: any;
  * this is used in the CSV export
  * @param int nbSpaces: number of white spaces to create
  */
-export function addWhiteSpaces(nbSpaces): string {
+export function addWhiteSpaces(nbSpaces: number): string {
   let result = '';
 
   for (let i = 0; i < nbSpaces; i++) {
@@ -25,7 +25,7 @@ export function addWhiteSpaces(nbSpaces): string {
  * Create a in-memory div, set it's inner text(which jQuery automatically encodes)
  * then grab the encoded contents back out.  The div never exists on the page.
 */
-export function htmlDecode(encodedStr) {
+export function htmlDecode(encodedStr: string): string {
   const parser = new DOMParser;
   if (parser && parser.parseFromString) {
     const dom = parser.parseFromString(
@@ -42,7 +42,7 @@ export function htmlDecode(encodedStr) {
  * Create a in-memory div, set it's inner text(which jQuery automatically encodes)
  * then grab the encoded contents back out.  The div never exists on the page.
 */
-export function htmlEncode(inputValue: string) {
+export function htmlEncode(inputValue: string): string {
   const entityMap = {
     '&': '&amp;',
     '<': '&lt;',
@@ -157,9 +157,9 @@ export function findOrDefault(array: any[], logic: (item: any) => boolean, defau
   * @param minDecimal
   * @param maxDecimal
   */
-export function decimalFormatted(input: number | string, minDecimal?: number, maxDecimal?: number) {
+export function decimalFormatted(input: number | string, minDecimal?: number, maxDecimal?: number): string {
   if (isNaN(+input)) {
-    return input;
+    return input as string;
   }
 
   const minDec = (minDecimal === undefined) ? 2 : minDecimal;
@@ -204,12 +204,12 @@ export function formatNumber(input: number | string, minDecimal?: number, maxDec
 }
 
 /** From a dot (.) notation find and return a property within an object given a path */
-export function getDescendantProperty(obj: any, path: string) {
+export function getDescendantProperty(obj: any, path: string): any {
   return path.split('.').reduce((acc, part) => acc && acc[part], obj);
 }
 
 /** Get the browser's scrollbar width, this is different to each browser */
-export function getScrollBarWidth() {
+export function getScrollBarWidth(): number {
   const $outer = $('<div>').css({ visibility: 'hidden', width: 100, overflow: 'scroll' }).appendTo('body');
   const widthWithScroll = $('<div>').css({ width: '100%' }).appendTo($outer).outerWidth();
   $outer.remove();
@@ -512,7 +512,7 @@ export function mapOperatorByFieldType(fieldType: FieldType | string): OperatorT
 }
 
 /** Parse any input (bool, number, string) and return a boolean or False when not possible */
-export function parseBoolean(input: boolean | number | string) {
+export function parseBoolean(input: boolean | number | string): boolean {
   return /(true|1)/i.test(input + '');
 }
 
@@ -553,7 +553,7 @@ export function sanitizeHtmlToText(htmlString: string) {
  * @param inputStr
  * @returns string
  */
-export function titleCase(inputStr: string, caseEveryWords = false) {
+export function titleCase(inputStr: string, caseEveryWords = false): string {
   if (typeof inputStr === 'string') {
     if (caseEveryWords) {
       return inputStr.replace(/\w\S*/g, (outputStr) => {