Merge pull request #3241 from IgniteUI/sorting-strategy-optional

feat(sorting): Making the strategy and ignoreCase optional again #2734

CHANGELOG.md

@@ -16,6 +16,10 @@ All notable changes for each version of this project will be documented in this
 - Updated package dependencies to Angular 7 ([#3000](https://github.com/IgniteUI/igniteui-angular/pull/3000))
 - Themes: Add dark schemas and mixins (PR [#3025](https://github.com/IgniteUI/igniteui-angular/pull/3025))
 
+## 6.2.3
+- `ISortingEpression`:
+    - The `ignoreCase` and `strategy` properties are moved back to optional, and the `DefaultSortingStrategy` is now injected by the `IgxSorting`, instead of being mandatory to pass to expressions.
+
 ## 6.2.2
 - `igx-checkbox`:
     - Added a new input property - `disableTransitions`. It allows disabling all CSS transitions on the `igx-checkbox` component for performance optimization.

projects/igniteui-angular/src/lib/data-operations/sorting-expression.interface.ts

@@ -12,6 +12,6 @@ export enum SortingDirection {
 export interface ISortingExpression {
    fieldName: string;
    dir: SortingDirection;
-   ignoreCase: boolean;
-   strategy: ISortingStrategy;
+   ignoreCase?: boolean;
+   strategy?: ISortingStrategy;
 }

projects/igniteui-angular/src/lib/data-operations/sorting-strategy.ts

@@ -108,6 +108,9 @@ export class IgxSorting {
             return data;
         }
         expr = expressions[expressionIndex];
+        if (!expr.strategy) {
+            expr.strategy = DefaultSortingStrategy.instance();
+        }
         data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue);
         if (expressionIndex === exprsLen - 1) {
             return data;

projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts

@@ -421,14 +421,14 @@ describe('IgxGrid - Cell component', () => {
                 UIInteractions.sendInput(editTemplate, 'Rick Gilmore');
                 await wait();
 
-                grid.sort({ fieldName: 'age', dir: SortingDirection.Desc, ignoreCase: false, strategy: DefaultSortingStrategy.instance() });
+                grid.sort({ fieldName: 'age', dir: SortingDirection.Desc, ignoreCase: false });
                 fixture.detectChanges();
 
                 expect(cell.gridAPI.get_cell_inEditMode(cell.gridID)).toBeNull();
             }));
 
             it('should update correct cell when sorting is applied', (async () => {
-                grid.sort( {fieldName: 'age',  dir: SortingDirection.Desc, ignoreCase: false, strategy: DefaultSortingStrategy.instance()});
+                grid.sort( {fieldName: 'age',  dir: SortingDirection.Desc, ignoreCase: false});
                 fixture.detectChanges();
 
                 const cell = grid.getCellByColumn(0, 'fullName');

projects/igniteui-angular/src/lib/grids/grid/column-group.spec.ts

@@ -1076,7 +1076,7 @@ describe('IgxGrid - multi-column headers', () => {
         tick();
         fixture.detectChanges();
         // Sort column
-        grid.sort({fieldName: 'CompanyName', dir: SortingDirection.Asc, ignoreCase: true, strategy: DefaultSortingStrategy.instance()});
+        grid.sort({fieldName: 'CompanyName', dir: SortingDirection.Asc, ignoreCase: true});
         fixture.detectChanges();
 
         // Verify columns and groups
@@ -1104,7 +1104,7 @@ describe('IgxGrid - multi-column headers', () => {
         expect(grid.getCellByColumn(4, 'Country').value).toEqual('Sweden');
 
         // sort column which is not in the view
-        grid.sort({fieldName: 'ContactName', dir: SortingDirection.Asc, ignoreCase: true, strategy: DefaultSortingStrategy.instance()});
+        grid.sort({fieldName: 'ContactName', dir: SortingDirection.Asc, ignoreCase: true});
         fixture.detectChanges();
 
         // Verify columns and groups

projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts

@@ -409,7 +409,7 @@ describe('IgxGrid - Column Moving', () => {
             fixture.detectChanges();
 
             // step 1 - group a column
-            grid.groupBy({ fieldName: 'ID', dir: SortingDirection.Desc, ignoreCase: false, strategy: DefaultSortingStrategy.instance() });
+            grid.groupBy({ fieldName: 'ID', dir: SortingDirection.Desc, ignoreCase: false });
             fixture.detectChanges();
 
             // step 2 - move a column

projects/igniteui-angular/src/lib/grids/grid/grid-selection.spec.ts

@@ -776,7 +776,7 @@ describe('IgxGrid - Row Selection', () => {
         expect(secondRow.isSelected).toBeTruthy();
         expect(grid.rowList.find((row) => row === firstRow)).toBeTruthy();
 
-        grid.sort({ fieldName: 'Column1', dir: SortingDirection.Desc, ignoreCase: true, strategy: DefaultSortingStrategy.instance() });
+        grid.sort({ fieldName: 'Column1', dir: SortingDirection.Desc, ignoreCase: true });
         fix.detectChanges();
 
         expect(firstRow.isSelected).toBeFalsy();
@@ -880,7 +880,7 @@ describe('IgxGrid - Row Selection', () => {
         const oldCellID = oldCell.cellID;
         oldCell.nativeElement.focus();
         oldCell.nativeElement.click();
-        grid.sort({ fieldName: 'UnitsInStock', dir: SortingDirection.Asc, ignoreCase: true, strategy: DefaultSortingStrategy.instance() });
+        grid.sort({ fieldName: 'UnitsInStock', dir: SortingDirection.Asc, ignoreCase: true });
         fixture.detectChanges();
         expect(grid.selectedCells).toBeDefined();
         expect(grid.selectedCells.length).toBe(1);