Skip to content

Commit

Permalink
fix(IgxPivotDateDimension): Add null check. (#14707)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MayaKirova
MayaKirova authored Aug 29, 2024
1 parent 9792b4d commit 648b747
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 30 deletions.
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-dimensions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class IgxPivotDateDimension implements IPivotDimension {
constructor(inBaseDimension: IPivotDimension = null, inOptions: IPivotDateDimensionOptions = {}) {
this._baseDimension = inBaseDimension;
this._options = inOptions;
this.enabled = inBaseDimension.enabled;
this.enabled = inBaseDimension?.enabled;
if (this.baseDimension && this.options) {
this.initialize(this.baseDimension, this.options);
}
Expand Down
82 changes: 53 additions & 29 deletions projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1226,8 +1226,8 @@ describe('IgxPivotGrid #pivotGrid', () => {
expected = ['Uruguay', 'USA', 'Bulgaria'];
expect(colHeaders).toEqual(expected);
const expectedExpressions: ISortingExpression[] = [
{ dir: SortingDirection.None, fieldName: 'All', strategy: DefaultPivotSortingStrategy.instance()},
{ dir: SortingDirection.None, fieldName: 'ProductCategory', strategy: DefaultPivotSortingStrategy.instance()},
{ dir: SortingDirection.None, fieldName: 'All', strategy: DefaultPivotSortingStrategy.instance() },
{ dir: SortingDirection.None, fieldName: 'ProductCategory', strategy: DefaultPivotSortingStrategy.instance() },
{ dir: SortingDirection.Desc, fieldName: 'Country', strategy: DefaultPivotSortingStrategy.instance() }
];
expect(pivotGrid.dimensionsSortingExpressionsChange.emit).toHaveBeenCalledWith(expectedExpressions);
Expand Down Expand Up @@ -1265,8 +1265,8 @@ describe('IgxPivotGrid #pivotGrid', () => {
expected = ['Uruguay', 'USA', 'Bulgaria'];
expect(colHeaders).toEqual(expected);
const expectedExpressions: ISortingExpression[] = [
{ dir: SortingDirection.None, fieldName: 'All', strategy: DefaultPivotSortingStrategy.instance()},
{ dir: SortingDirection.None, fieldName: 'ProductCategory', strategy: DefaultPivotSortingStrategy.instance()},
{ dir: SortingDirection.None, fieldName: 'All', strategy: DefaultPivotSortingStrategy.instance() },
{ dir: SortingDirection.None, fieldName: 'ProductCategory', strategy: DefaultPivotSortingStrategy.instance() },
{ dir: SortingDirection.Desc, fieldName: 'Country', strategy: DefaultPivotSortingStrategy.instance() }
];
expect(pivotGrid.dimensionsSortingExpressionsChange.emit).toHaveBeenCalledWith(expectedExpressions);
Expand Down Expand Up @@ -2012,7 +2012,31 @@ describe('IgxPivotGrid #pivotGrid', () => {
expect(pivotGrid.values.map(x => x.member)).toEqual(['UnitPrice', 'UnitsSold']);
expect(pivotGrid.values.map(x => x.enabled)).toEqual([true, true]);
});

it('should allow creating IgxPivotDateDimension with no base dimension and setting it later.', () => {
const pivotGrid = fixture.componentInstance.pivotGrid;
const dateDimension = new IgxPivotDateDimension();
dateDimension.memberName = 'Date';
dateDimension.enabled = true;
dateDimension.baseDimension = {
memberName: 'Date',
enabled: true,
};
dateDimension.options = {
fullDate: true,
months: false,
total: false,
years: true,
quarters: false
}
pivotGrid.pivotConfiguration.rows = [dateDimension];
pivotGrid.pipeTrigger++;
fixture.detectChanges();

expect(pivotGrid.rowList.length).toBe(10);
});
});

});

describe('IgxPivotGrid complex hierarchy #pivotGrid', () => {
Expand Down Expand Up @@ -2655,12 +2679,12 @@ describe('IgxPivotGrid #pivotGrid', () => {

//check rows
const rows = pivotGrid.rowList.toArray();
expect(rows.length).toBe(4);
const expectedHeaders = ['Accessories', 'Bikes', 'Clothing', 'Components'];
const rowHeaders = fixture.debugElement.queryAll(
By.directive(IgxPivotRowDimensionHeaderComponent));
const rowDimensionHeaders = rowHeaders.map(x => x.componentInstance.column.header);
expect(rowDimensionHeaders).toEqual(expectedHeaders);
expect(rows.length).toBe(4);
const expectedHeaders = ['Accessories', 'Bikes', 'Clothing', 'Components'];
const rowHeaders = fixture.debugElement.queryAll(
By.directive(IgxPivotRowDimensionHeaderComponent));
const rowDimensionHeaders = rowHeaders.map(x => x.componentInstance.column.header);
expect(rowDimensionHeaders).toEqual(expectedHeaders);

// check columns
const colHeaders = pivotGrid.columns.filter(x => x.level === 0).map(x => x.header);
Expand All @@ -2673,7 +2697,7 @@ describe('IgxPivotGrid #pivotGrid', () => {

});

it('should allow formatting based on additional record and column data',() => {
it('should allow formatting based on additional record and column data', () => {
pivotGrid.pivotConfiguration = {
columns: [
{
Expand All @@ -2696,7 +2720,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
},
enabled: true,
formatter: (value, rowData: IPivotGridRecord, columnData: IPivotGridColumn) => {
return rowData.dimensionValues.get('ProductCategory') + '/' + columnData.dimensionValues.get('City')+':' + value;
return rowData.dimensionValues.get('ProductCategory') + '/' + columnData.dimensionValues.get('City') + ':' + value;
}
}
]
Expand Down Expand Up @@ -2848,7 +2872,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
const layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
const contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));

// check each dimension from hierarchy is on another column.
const rowDimensionCol1 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 1);
Expand All @@ -2871,19 +2895,19 @@ describe('IgxPivotGrid #pivotGrid', () => {

const rowDimensionCol4 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 4);
const rowDimensionHeadersCol4 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 4)
.map(x => x.componentInstance.rowDimensionColumn.header);
.map(x => x.componentInstance.rowDimensionColumn.header);
dimensions = rowDimensionCol4.map(x => x.componentInstance.dimension);
expect(dimensions.every(x => x.memberName === "ProductCategory")).toBeTruthy();
expect(rowDimensionHeadersCol4).toEqual(["Bikes", "Clothing", "Accessories",
"Clothing", "Clothing", "Components", "Components"]);
"Clothing", "Clothing", "Components", "Components"]);
});

it("should horizontally expand/collapse on a single dimension hierarchy.", () => {
fixture.detectChanges();
let layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
let contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));

// collapse All Products
let rowDimensionCol3 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 3)[0];
Expand All @@ -2898,24 +2922,24 @@ describe('IgxPivotGrid #pivotGrid', () => {
layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));
rowDimensionCol3 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 3)[0];
expect(rowDimensionCol3.componentInstance.layout.colStart).toEqual(3);
expect(rowDimensionCol3.componentInstance.layout.colEnd).toEqual(5);

// check icon is updated
expander = rowDimensionCol3.query(By.directive(IgxIconComponent));
expect(expander.nativeElement.innerText).toBe("chevron_right");
expect(expander.nativeElement.innerText).toBe("chevron_right");

// toggle All Products
// toggle All Products
expander.nativeElement.click();
fixture.detectChanges();

// check cell is no longer merged.
layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));
rowDimensionCol3 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 3)[0];
expect(rowDimensionCol3.componentInstance.layout.colStart).toEqual(3);
expect(rowDimensionCol3.componentInstance.layout.colEnd).toEqual(4);
Expand All @@ -2925,14 +2949,14 @@ describe('IgxPivotGrid #pivotGrid', () => {

it("should collapse fully the last dimension if all parent dimensions get collapsed.", () => {
pivotGrid.data = [{
ProductCategory: 'Clothing', UnitPrice: 12.81, SellerName: 'Stanley Brooker',
Country: 'Bulgaria', City: 'Plovdiv', Date: '01/01/2012', UnitsSold: 282
}];
ProductCategory: 'Clothing', UnitPrice: 12.81, SellerName: 'Stanley Brooker',
Country: 'Bulgaria', City: 'Plovdiv', Date: '01/01/2012', UnitsSold: 282
}];
fixture.detectChanges();
let layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
let contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));

const rowDimensionsCol3 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 3);
let rowDimensionsCol4 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 4);
Expand All @@ -2945,7 +2969,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
layoutContainer = fixture.debugElement.query(
By.directive(IgxPivotRowDimensionMrlRowComponent));
contentRowHeaders = layoutContainer.queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));
rowDimensionsCol4 = contentRowHeaders.filter(y => y.componentInstance.layout.colStart === 4);
// nothing is now on column 4 since all are collapsed.
expect(rowDimensionsCol4.length).toBe(0);
Expand Down Expand Up @@ -2976,7 +3000,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
const contentRowHeaders = layoutContainers[0].queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
const summaryRowHeaders = layoutContainers[1].queryAll(
By.directive(IgxPivotRowDimensionContentComponent));
By.directive(IgxPivotRowDimensionContentComponent));

// check first column of data contains summary
const summaryRowHeader = summaryRowHeaders.map(x => x.componentInstance.rowDimensionColumn.header);
Expand Down Expand Up @@ -3103,7 +3127,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
fixture.detectChanges();

GridFunctions.verifyHeaderIsFocused(row0Col0.parent);
let activeCells = fixture.debugElement.queryAll(By.css(`${ACTIVE_CELL_CSS_CLASS}`));
let activeCells = fixture.debugElement.queryAll(By.css(`${ACTIVE_CELL_CSS_CLASS}`));
expect(activeCells.length).toBe(1);

UIInteractions.triggerKeyDownEvtUponElem('ArrowRight', row0Col0.nativeElement);
Expand Down Expand Up @@ -3217,7 +3241,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
const productRowContents = rowHeaders.filter(x => x.componentInstance.column.field === "ProductCategory");
const productRowContentsHeaders = productRowContents.map(x => x.componentInstance.column.header);

expect(productRowContentsHeaders).toEqual( ['ProductCategory', 'Accessories', 'Bikes', 'Clothing', 'Components']);
expect(productRowContentsHeaders).toEqual(['ProductCategory', 'Accessories', 'Bikes', 'Clothing', 'Components']);

const sortIcon = productsHeaderColumn.querySelectorAll('igx-icon')[0];
sortIcon.click();
Expand All @@ -3229,7 +3253,7 @@ describe('IgxPivotGrid #pivotGrid', () => {
By.directive(IgxPivotRowDimensionHeaderComponent));
const updatedProductRowContents = rowHeaders.filter(x => x.componentInstance.column.field === "ProductCategory");
const updatedProductRowContentsHeaders = updatedProductRowContents.map(x => x.componentInstance.column.header);
expect(updatedProductRowContentsHeaders).toEqual( ['ProductCategory', 'Components', 'Clothing', 'Bikes', 'Accessories']);
expect(updatedProductRowContentsHeaders).toEqual(['ProductCategory', 'Components', 'Clothing', 'Bikes', 'Accessories']);
});

it("should allow select/deselect the correct rows on row header click.", () => {
Expand Down

0 comments on commit 648b747

Please sign in to comment.