fix some of the errors.

Author: MKirova

package-lock.json

@@ -1,20 +1,12 @@
 
-import { GridType } from '../grids/common/grid.interface';
-import { IgxPivotGridComponent } from '../grids/pivot-grid/pivot-grid.component';
-import { IPivotDimension, IPivotKeys, IPivotValue, PivotDimensionType } from '../grids/pivot-grid/pivot-grid.interface';
+import { GridType, PivotGridType } from '../grids/common/grid.interface';
+import { IPivotDimension, IPivotDimensionStrategy, IPivotKeys, IPivotValue, PivotDimensionType } from '../grids/pivot-grid/pivot-grid.interface';
 import { PivotUtil } from '../grids/pivot-grid/pivot-util';
 import { FilteringStrategy } from './filtering-strategy';
 import { GridColumnDataType } from './data-util';
-import { DefaultSortingStrategy, ISortingStrategy, SortingDirection } from './sorting-strategy';
+import { DefaultSortingStrategy, SortingDirection } from './sorting-strategy';
 import { parseDate } from '../core/utils';
 
-export interface IPivotDimensionStrategy {
-    process(collection: any,
-        dimensions: IPivotDimension[],
-        values: IPivotValue[],
-        pivotKeys?: IPivotKeys): any[];
-}
-
 export class NoopPivotDimensionsStrategy implements IPivotDimensionStrategy {
     private static _instance: NoopPivotDimensionsStrategy = null;
 
@@ -168,7 +160,7 @@ export class DimensionValuesFilteringStrategy extends FilteringStrategy {
     }
 
     protected getFieldValue(rec: any, fieldName: string, isDate: boolean = false, isTime: boolean = false,
-         grid?: IgxPivotGridComponent): any {
+         grid?: PivotGridType): any {
         const config = grid.pivotConfiguration;
         const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
         const enabledDimensions = allDimensions.filter(x => x && x.enabled);
@@ -190,9 +182,9 @@ export class DefaultPivotSortingStrategy extends DefaultSortingStrategy {
                 valueResolver: (obj: any, key: string, isDate?: boolean) => any,
                 isDate?: boolean,
                 isTime?: boolean,
-                grid?: GridType) {
+                grid?: PivotGridType) {
         const key = fieldName;
-        const config = (grid as any).pivotConfiguration;
+        const config = grid.pivotConfiguration;
         const allDimensions = config.rows.concat(config.columns).concat(config.filters).filter(x => x !== null);
         const enabledDimensions = allDimensions.filter(x => x && x.enabled);
         this.dimension = PivotUtil.flatten(enabledDimensions).find(x => x.memberName === key);

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

@@ -1,4 +1,5 @@
 import { IBaseEventArgs } from '../core/utils';
+import { GridType } from '../grids/common/grid.interface';
 
 export enum SortingDirection {
     None = 0,
@@ -21,7 +22,8 @@ export interface ISortingStrategy {
         ignoreCase: boolean,
         valueResolver: (obj: any, key: string, isDate?: boolean) => any,
         isDate?: boolean,
-        isTime?: boolean
+        isTime?: boolean,
+        grid?: GridType
     ) => any[];
 }
 
@@ -73,8 +75,8 @@ export class DefaultSortingStrategy implements ISortingStrategy {
         isDate: boolean,
         isTime: boolean
     ) {
-        let a = valueResolver(obj1, key, isDate, isTime);
-        let b = valueResolver(obj2, key, isDate, isTime);
+        let a = valueResolver.call(this, obj1, key, isDate, isTime);
+        let b = valueResolver.call(this, obj2, key, isDate, isTime);
         if (ignoreCase) {
             a = a && a.toLowerCase ? a.toLowerCase() : a;
             b = b && b.toLowerCase ? b.toLowerCase() : b;

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

@@ -35,7 +35,6 @@ import { IForOfState, IgxGridForOfDirective } from '../../directives/for-of/for_
 import { OverlaySettings } from '../../services/overlay/utilities';
 import { IPinningConfig } from '../grid.common';
 import { IPivotConfiguration, IPivotDimension, IPivotValue } from '../pivot-grid/pivot-grid.interface';
-import { IgxColumnComponent } from '../columns/column.component';
 
 
 export const IGX_GRID_BASE = new InjectionToken<GridType>('IgxGridBaseToken');
@@ -624,7 +623,7 @@ export interface PivotGridType extends GridType {
     rowDimensions: IPivotDimension[];
     values: IPivotValue[];
     filterDimensions: IPivotDimension[];
-    dimensionDataColumns: IgxColumnComponent[];
+    dimensionDataColumns: ColumnType[];
     pivotRowWidths: number;
     setupColumns(): void;
     toggleRow(rowID: any): void;

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

@@ -147,7 +147,7 @@ export class IgxSorting implements IGridSortingStrategy {
         const column = grid?.getColumnByName(expr.fieldName);
         const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
         const isTime = column?.dataType === TIME_TYPE;
-        data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);
+        data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime, grid);
         if (expressionIndex === exprsLen - 1) {
             return data;
         }

projects/igniteui-angular/src/lib/grids/common/strategy.ts

@@ -27,11 +27,10 @@ import {
     ApplicationRef
 } from '@angular/core';
 import { IgxGridBaseDirective } from '../grid-base.directive';
-import { GridBaseAPIService } from '../api.service';
 import { IgxFilteringService } from '../filtering/grid-filtering.service';
 import { IgxGridSelectionService } from '../selection/selection.service';
 import { IgxForOfSyncService, IgxForOfScrollSyncService } from '../../directives/for-of/for_of.sync.service';
-import { GridType, RowType } from '../common/grid.interface';
+import { GridServiceType, GridType, IGX_GRID_BASE, IGX_GRID_SERVICE_BASE, RowType } from '../common/grid.interface';
 import { IgxGridCRUDService } from '../common/crud.service';
 import { IgxGridSummaryService } from '../summaries/grid-summary.service';
 import { IPivotConfiguration, IPivotDimension, IPivotKeys, PivotDimensionType } from './pivot-grid.interface';
@@ -62,6 +61,8 @@ import { DataUtil } from '../../data-operations/data-util';
 import { IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
 import { IgxGridTransaction } from '../common/types';
 import { SortingDirection } from '../../data-operations/sorting-strategy';
+import { IgxGridAPIService } from '../grid/grid-api.service';
+import { GridBaseAPIService } from '../api.service';
 
 let NEXT_ID = 0;
 const MINIMUM_COLUMN_WIDTH = 200;
@@ -75,7 +76,7 @@ const MINIMUM_COLUMN_WIDTH = 200;
         IgxGridSummaryService,
         IgxGridSelectionService,
         GridBaseAPIService,
-        { provide: IgxGridBaseDirective, useExisting: forwardRef(() => IgxPivotGridComponent) },
+        { provide: IGX_GRID_BASE, useExisting: IgxPivotGridComponent },
         { provide: IgxFilteringService, useClass: IgxPivotFilteringService },
         IgxPivotGridNavigationService,
         IgxForOfSyncService,
@@ -409,17 +410,17 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         public colResizingService: IgxColumnResizingService,
         gridAPI: GridBaseAPIService<IgxGridBaseDirective & GridType>,
         protected transactionFactory: IgxFlatTransactionFactory,
-        elementRef: ElementRef,
+        elementRef: ElementRef<HTMLElement>,
         zone: NgZone,
         @Inject(DOCUMENT) public document,
         cdr: ChangeDetectorRef,
         resolver: ComponentFactoryResolver,
         differs: IterableDiffers,
         viewRef: ViewContainerRef,
-        private _appRef: ApplicationRef,
-        private _moduleRef: NgModuleRef<any>,
-        private _factoryResolver: ComponentFactoryResolver,
-        private _injector: Injector,
+        appRef: ApplicationRef,
+        moduleRef: NgModuleRef<any>,
+        factoryResolver: ComponentFactoryResolver,
+        injector: Injector,
         navigation: IgxPivotGridNavigationService,
         filteringService: IgxFilteringService,
         @Inject(IgxOverlayService) protected overlayService: IgxOverlayService,
@@ -428,29 +429,29 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
         @Inject(LOCALE_ID) localeId: string,
         protected platform: PlatformUtil,
         @Optional() @Inject(IgxGridTransaction) protected _diTransactions?: TransactionService<Transaction, State>) {
-        super(
-            selectionService,
-            colResizingService,
-            gridAPI,
-            transactionFactory,
-            elementRef,
-            zone,
-            document,
-            cdr,
-            resolver,
-            differs,
-            viewRef,
-            _appRef,
-            _moduleRef,
-            _factoryResolver,
-            _injector,
-            navigation,
-            filteringService,
-            overlayService,
-            summaryService,
-            _displayDensityOptions,
-            localeId,
-            platform);
+            super(
+                selectionService,
+                colResizingService,
+                gridAPI,
+                transactionFactory,
+                elementRef,
+                zone,
+                document,
+                cdr,
+                resolver,
+                differs,
+                viewRef,
+                appRef,
+                moduleRef,
+                factoryResolver,
+                injector,
+                navigation,
+                filteringService,
+                overlayService,
+                summaryService,
+                _displayDensityOptions,
+                localeId,
+                platform);
     }
 
     /**

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

@@ -1,8 +1,15 @@
 import { GridColumnDataType } from '../../data-operations/data-util';
 import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
-import { IPivotDimensionStrategy } from '../../data-operations/pivot-strategy';
 import { SortingDirection } from '../../data-operations/sorting-strategy';
-import { IgxColumnComponent } from '../columns/column.component';
+import { ColumnType } from '../common/grid.interface';
+
+
+export interface IPivotDimensionStrategy {
+    process(collection: any,
+        dimensions: IPivotDimension[],
+        values: IPivotValue[],
+        pivotKeys?: IPivotKeys): any[];
+}
 
 export type PivotAggregation = (members: any[], data: any[]) => any;
 
@@ -64,7 +71,7 @@ export enum PivotDimensionType {
 }
 
 export interface IPivotDimensionData {
-    column: IgxColumnComponent;
+    column: ColumnType;
     dimension: IPivotDimension;
     prevDimensions: IPivotDimension[];
 }

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface.ts

@@ -1,9 +1,8 @@
 import {
     ChangeDetectionStrategy,
-    Component,
-    Input} from '@angular/core';
+    Component
+} from '@angular/core';
 import { IgxGridHeaderRowComponent } from '../headers/grid-header-row.component';
-import { IgxPivotRowComponent } from './pivot-row.component';
 
 /**
  *
@@ -19,6 +18,4 @@ import { IgxPivotRowComponent } from './pivot-row.component';
     templateUrl: './pivot-row-dimension-content.component.html'
 })
 export class IgxPivotRowDimensionContentComponent extends IgxGridHeaderRowComponent {
-    @Input()
-    public row: IgxPivotRowComponent;
 }

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-row-dimension-content.component.ts

@@ -8,7 +8,6 @@
             [width]="grid.pivotRowWidths"
             [unpinnedColumnCollection]="rowDimension"
             (scroll)="grid.preventHeaderScroll($event)"
-            [row]="this"
         >
         </igx-pivot-row-dimension-content>
     </div>