Skip to content

Commit 449cdb4

Browse files
committed
fix(tests, exports): fixing some grid exports and test imports
1 parent e2fc43e commit 449cdb4

File tree

125 files changed

+417
-433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+417
-433
lines changed

projects/igniteui-angular/calendar/src/calendar/days-view/days-view.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { By } from "@angular/platform-browser";
55
import { DateRangeDescriptor, DateRangeType } from 'igniteui-webcomponents';
66
import { ScrollDirection } from "../calendar";
77
import { CalendarDay } from 'igniteui-angular/core';
8-
import { UIInteractions } from '../../../../test-utils/ui-interactions.spec.ts';
8+
import { UIInteractions } from '../../../../test-utils/ui-interactions.spec';
99

1010
const TODAY = new Date(2024, 6, 12);
1111

projects/igniteui-angular/calendar/src/calendar/month-picker/month-picker.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing';
33
import { FormsModule } from '@angular/forms';
44
import { By } from '@angular/platform-browser';
55
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
6-
import { UIInteractions } from '../../../../test-utils/ui-interactions.spec.ts';
6+
import { UIInteractions } from '../../../../test-utils/ui-interactions.spec';
77
import { IgxMonthPickerComponent } from './month-picker.component';
88
import { IFormattingOptions, IgxCalendarView } from '../calendar';
99

projects/igniteui-angular/carousel/src/carousel/carousel.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
99
import { IgxSlideComponent } from './slide.component';
1010
import { IgxCarouselIndicatorDirective, IgxCarouselNextButtonDirective, IgxCarouselPrevButtonDirective } from './carousel.directives';
1111
import { CarouselIndicatorsOrientation, CarouselAnimationType } from './enums';
12-
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec.ts';
12+
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec';
1313

1414
describe('Carousel', () => {
1515
let fixture;

projects/igniteui-angular/chips/src/chips/chip.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import { IgxLabelDirective } from '../../../input-group/src/public_api';
88
import { IgxSuffixDirective } from '../../../input-group/src/public_api';
99
import { IgxIconComponent } from 'igniteui-angular/icon';
1010
import { getComponentSize } from 'igniteui-angular/core';
11-
import { ControlsFunction } from 'igniteui-angular/test-utils/controls-functions.spec.ts';
12-
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec.ts';
11+
import { ControlsFunction } from 'igniteui-angular/test-utils/controls-functions.spec';
12+
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec';
1313

1414
@Component({
1515
template: `

projects/igniteui-angular/chips/src/chips/chips-area.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IgxChipComponent } from './chip.component';
55
import { IgxChipsAreaComponent } from './chips-area.component';
66
import { IgxIconComponent } from 'igniteui-angular/icon';
77
import { IgxPrefixDirective } from 'igniteui-angular/input-group';
8-
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec.ts';
8+
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec';
99

1010

1111
@Component({

projects/igniteui-angular/combo/src/combo/combo.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
import { IgxComboFooterDirective, IgxComboHeaderDirective, IgxComboItemDirective } from './combo.directives';
2626
import { IgxComboFilteringPipe, comboIgnoreDiacriticsFilter } from './combo.pipes';
2727
import { IgxDropDownItemBaseDirective } from '../../../drop-down/src/drop-down/drop-down-item.base';
28-
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec.ts';
28+
import { UIInteractions, wait } from 'igniteui-angular/test-utils/ui-interactions.spec';
2929

3030
const CSS_CLASS_COMBO = 'igx-combo';
3131
const CSS_CLASS_COMBO_DROPDOWN = 'igx-combo__drop-down';

projects/igniteui-angular/core/src/data-operations/data-util.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
IgxBooleanFilteringOperand
1919
} from './filtering-condition';
2020
import { IPagingState, PagingError } from './paging-state.interface';
21-
import { SampleTestData } from '../../../../test-utils/sample-test-data.spec.ts';
21+
import { SampleTestData } from '../../../test-utils/sample-test-data.spec';
2222
import { Transaction, TransactionType, HierarchicalTransaction } from '../services/public_api';
2323
import { DefaultDataCloneStrategy } from './data-clone-strategy';
2424

projects/igniteui-angular/core/src/data-operations/filtering-strategy.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { SortingDirection } from './sorting-strategy';
77
import { formatNumber, formatPercent, getLocaleCurrencyCode } from '@angular/common';
88
import type { IFilteringState } from './filtering-state.interface';
99
import { isTree } from './expressions-tree-util';
10-
import type { IgxHierarchicalGridComponent } from './grid-types';
1110
import { IgxSorting } from './grid-sorting-strategy';
1211

1312
const DateType = 'date';
@@ -99,7 +98,7 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {
9998
const column = grid && grid.getColumnByName(expression.fieldName);
10099
dataType = column?.dataType;
101100
} else if (grid.type === 'hierarchical') {
102-
const schema = (grid as IgxHierarchicalGridComponent).schema;
101+
const schema = grid.schema;
103102
const entityMatch = this.findEntityByName(schema, entity);
104103
dataType = entityMatch?.fields.find(f => f.field === expression.fieldName)?.dataType;
105104
}

projects/igniteui-angular/core/src/data-operations/grid-types.ts

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -396,22 +396,16 @@ export interface EntityType {
396396
childEntities?: EntityType[];
397397
}
398398

399-
/**
400-
* Stub type for ITreeGridRecord - minimal interface for typing in core
401-
*/
399+
/* marshalByValue */
402400
export interface ITreeGridRecord {
403401
key: any;
404402
data: any;
405403
children?: ITreeGridRecord[];
404+
/* blazorAlternateName: RecordParent */
406405
parent?: ITreeGridRecord;
407-
[key: string]: any;
408-
}
409-
410-
/**
411-
* Stub type for IgxHierarchicalGridComponent - minimal interface for typing in core
412-
*/
413-
export interface IgxHierarchicalGridComponent extends GridTypeBase {
414-
[key: string]: any;
406+
level?: number;
407+
isFilteredOutParent?: boolean;
408+
expanded?: boolean;
415409
}
416410

417411
/**

projects/igniteui-angular/core/src/services/csv/csv-exporter-grid.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ import { TestMethods } from '../exporter-common/test-methods.spec';
66
import { IgxCsvExporterService } from './csv-exporter';
77
import { CsvFileTypes, IgxCsvExporterOptions } from './csv-exporter-options';
88
import { CSVWrapper } from './csv-verification-wrapper.spec';
9-
import { IgxTreeGridPrimaryForeignKeyComponent } from '../../../../test-utils/tree-grid-components.spec.ts';
9+
import { IgxTreeGridPrimaryForeignKeyComponent } from '../../../../test-utils/tree-grid-components.spec';
1010
import { IgxTreeGridComponent } from '../../../../grids/src/grids/tree-grid/public_api';
1111
import { ReorderedColumnsComponent,
1212
GridIDNameJobTitleComponent,
1313
ProductsComponent,
1414
ColumnsAddedOnInitComponent,
15-
EmptyGridComponent } from '../../../../test-utils/grid-samples.spec.ts';
16-
import { SampleTestData } from '../../../../test-utils/sample-test-data.spec.ts';
15+
EmptyGridComponent } from '../../../../test-utils/grid-samples.spec';
16+
import { SampleTestData } from '../../../../test-utils/sample-test-data.spec';
1717
import { first } from 'rxjs/operators';
1818
import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy';
1919
import { IgxStringFilteringOperand, IgxNumberFilteringOperand } from '../../data-operations/filtering-condition';
2020
import { FilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
2121
import { FilteringLogic } from '../../data-operations/filtering-expression.interface';
2222
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
23-
import { wait } from '../../../../test-utils/ui-interactions.spec.ts';
23+
import { wait } from '../../../../test-utils/ui-interactions.spec';
2424
import { IgxPivotGridComponent } from '../../../../grids/src/grids/pivot-grid/pivot-grid.component';
25-
import { IgxPivotGridTestBaseComponent } from '../../../../test-utils/pivot-grid-samples.spec.ts';
25+
import { IgxPivotGridTestBaseComponent } from '../../../../test-utils/pivot-grid-samples.spec';
2626
import { IgxPivotNumericAggregate } from '../../../../grids/src/grids/pivot-grid/pivot-grid-aggregate';
2727

2828
describe('CSV Grid Exporter', () => {

0 commit comments

Comments
 (0)