chore(*): address review changes

Author: nrobakova

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.html

@@ -68,7 +68,7 @@
     <header class="igx-excel-filter__menu-header">
         <h4>{{ column.header || column.field }}</h4>
         <div *ngIf="grid.displayDensity!=='comfortable'" class="igx-excel-filter__menu-header-actions">
-            <button *ngIf="grid.columnSelection !== 'none' && column.selectable" igxButton="icon"
+            <button *ngIf="columnSelectable()" igxButton="icon"
             [displayDensity]="grid.displayDensity" (click)="onSelect()"
             tabindex="0" [ngClass]='selectedClass()'>
              <igx-icon fontSet="material">done</igx-icon>
@@ -108,7 +108,7 @@ <h4>{{ column.header || column.field }}</h4>
             <ng-container *ngTemplateOutlet="movingTemplate"></ng-container>
         </div>
 
-        <div *ngIf="grid.columnSelection !== 'none' && column.selectable && grid.displayDensity==='comfortable'">
+        <div *ngIf="columnSelectable() && grid.displayDensity==='comfortable'">
             <ng-container *ngTemplateOutlet="selectingTemplate"></ng-container>
         </div>
 

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.ts

@@ -40,6 +40,7 @@ import { ISelectionEventArgs, IgxDropDownComponent } from '../../../drop-down';
 import { IgxColumnComponent } from '../../columns/column.component';
 import { IgxGridBaseDirective } from '../../grid-base.directive';
 import { DisplayDensity } from '../../../core/density';
+import { GridSelectionMode } from '../../common/enums';
 
 /**
  * @hidden
@@ -436,13 +437,20 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
      */
     public onSelect() {
         if (!this.column.selected) {
-            this.grid.selectionService.selectColumn(this.column.field, this.grid.columnSelection === 'single');
+            this.grid.selectionService.selectColumn(this.column.field, this.grid.columnSelection === GridSelectionMode.single);
         } else {
             this.grid.selectionService.deselectColumn(this.column.field);
         }
         this.grid.notifyChanges();
     }
 
+    /**
+     * @hidden @internal
+     */
+    public columnSelectable() {
+        return this.grid.columnSelection !== GridSelectionMode.none && this.column.selectable;
+    }
+
     /**
      * @hidden @internal
      */

projects/igniteui-angular/src/lib/grids/headers/grid-header-group.component.ts

@@ -21,6 +21,7 @@ import { IgxGridHeaderComponent } from './grid-header.component';
 import { IgxGridFilteringCellComponent } from '../filtering/base/grid-filtering-cell.component';
 import { isIE } from '../../core/utils';
 import { GridType } from '../common/grid.interface';
+import { GridSelectionMode } from '../common/enums';
 
 const Z_INDEX = 9999;
 
@@ -250,8 +251,8 @@ export class IgxGridHeaderGroupComponent implements DoCheck {
     public groupClicked(event): void {
         const columnsToSelect = this.column.allChildren.filter(c => !c.hidden && c.selectable && !c.columnGroup).map(c => c.field);
         if (this.grid.columnSelection !== 'none' && columnsToSelect.length > 0 && !this.grid.filteringService.isFilterRowVisible) {
-            const clearSelection = this.grid.columnSelection === 'single' || !event.ctrlKey;
-            const rangeSelection = this.grid.columnSelection === 'multiple' && event.shiftKey;
+            const clearSelection = this.grid.columnSelection === GridSelectionMode.single || !event.ctrlKey;
+            const rangeSelection = this.grid.columnSelection === GridSelectionMode.multiple && event.shiftKey;
             if (!this.selected) {
                 this.grid.selectionService.selectColumns(columnsToSelect, clearSelection, rangeSelection, event);
             } else {

projects/igniteui-angular/src/lib/grids/headers/grid-header.component.ts

@@ -30,6 +30,7 @@ import { fadeIn, fadeOut } from '../../animations/main';
 import { AbsoluteScrollStrategy } from '../../services/overlay/scroll/absolute-scroll-strategy';
 import { GridType } from '../common/grid.interface';
 import { ExcelStylePositionStrategy } from '../filtering/excel-style/excel-style-position-strategy';
+import { GridSelectionMode } from '../common/enums';
 
 /**
  * @hidden
@@ -189,8 +190,8 @@ export class IgxGridHeaderComponent implements DoCheck, OnInit, OnDestroy {
                     this.grid.filteringService.filteredColumn = this.column;
                 }
             } else if (this.grid.columnSelection !== 'none' && this.column.selectable) {
-                const clearSelection = this.grid.columnSelection === 'single' || !event.ctrlKey;
-                const rangeSelection = this.grid.columnSelection === 'multiple' && event.shiftKey;
+                const clearSelection = this.grid.columnSelection === GridSelectionMode.single || !event.ctrlKey;
+                const rangeSelection = this.grid.columnSelection === GridSelectionMode.multiple && event.shiftKey;
 
                 if (!this.column.selected || (this.grid.selectionService.getSelectedColumns().length > 1 && clearSelection)) {
                     this.grid.selectionService.selectColumn(this.column.field, clearSelection, rangeSelection, event);