Skip to content

Commit 62b8807

Browse files
authored
Merge branch 'master' into dpetev/control-flow-test-track-leftovers
2 parents 3c9c1eb + 2023999 commit 62b8807

26 files changed

+338
-306
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
16+
branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master, 19.0.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
19+
branches: [ master, 19.1.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
2020
schedule:
2121
- cron: '33 4 * * 4'
2222

.vscode/settings.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"javascript.preferences.quoteStyle": "single",
44
"typescript.preferences.quoteStyle": "single",
55
"cSpell.words": [
6+
"aria-describedby",
7+
"aria-haspopup",
8+
"aria-labelledby",
69
"ghostclass",
10+
"groupable",
11+
"groupby",
12+
"maxlength",
713
"ungroup"
814
]
9-
}
15+
}

SECURITY.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
| Version | Supported |
66
| -------- | ------------------ |
7-
| 19.0.x | :white_check_mark: |
7+
| 19.1.x | :white_check_mark: |
8+
| 19.0.x | :x: |
89
| 18.2.x | :white_check_mark: |
910
| 18.1.x | :x: |
1011
| 18.0.x | :x: |

projects/igniteui-angular/src/lib/drop-down/drop-down.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ describe('IgxDropDown ', () => {
926926
});
927927
});
928928
});
929-
describe('Virtualisation tests', () => {
929+
describe('Virtualization tests', () => {
930930
let scroll: IgxForOfDirective<any>;
931931
let items;
932932
configureTestSuite();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ export class IgxGridExcelStyleFilteringComponent extends BaseFilteringComponent
549549
const lowerCaseFilterValues = new Set(Array.from(expr.expression.searchVal).map((value: string) => value.toLowerCase()));
550550

551551
this.grid.data.forEach(item => {
552-
if (lowerCaseFilterValues.has(item[this.column.field]?.toLowerCase())) {
552+
if (typeof item[this.column.field] === "string" && lowerCaseFilterValues.has(item[this.column.field]?.toLowerCase())) {
553553
expr.expression.searchVal.add(item[this.column.field]);
554554
}
555555
});

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { Subject, fromEvent } from 'rxjs';
1818
import { SortingDirection } from '../../data-operations/sorting-strategy';
1919
import { IGridEditDoneEventArgs, IGridEditEventArgs, IgxColumnComponent } from '../public_api';
2020

21-
const DEBOUNCETIME = 30;
21+
const DEBOUNCE_TIME = 30;
2222
const CELL_CSS_CLASS = '.igx-grid__td';
2323
const CELL_CSS_CLASS_NUMBER_FORMAT = '.igx-grid__td--number';
2424
const CELL_CLASS_IN_EDIT_MODE = 'igx-grid__td--editing';
@@ -469,7 +469,7 @@ describe('IgxGrid - Cell Editing #grid', () => {
469469

470470
UIInteractions.triggerKeyDownEvtUponElem('ArrowDown', inputElem, true);
471471
fixture.detectChanges();
472-
await wait(DEBOUNCETIME);
472+
await wait(DEBOUNCE_TIME);
473473

474474
inputElem = document.activeElement as HTMLInputElement;
475475
expect(cell.editMode).toBeTruthy();
@@ -499,7 +499,7 @@ describe('IgxGrid - Cell Editing #grid', () => {
499499

500500
UIInteractions.triggerKeyDownEvtUponElem('ArrowUp', inputElem, true);
501501
fixture.detectChanges();
502-
await wait(DEBOUNCETIME);
502+
await wait(DEBOUNCE_TIME);
503503

504504
inputElem = document.activeElement as HTMLInputElement;
505505
expect(cell.editMode).toBeTruthy();
@@ -524,7 +524,7 @@ describe('IgxGrid - Cell Editing #grid', () => {
524524

525525
UIInteractions.triggerKeyDownEvtUponElem('arrowright', inputElem, true);
526526
fixture.detectChanges();
527-
await wait(DEBOUNCETIME);
527+
await wait(DEBOUNCE_TIME);
528528

529529
const displayContainer = parseInt(virtRow.dc.instance._viewContainer.element.nativeElement.style.left, 10);
530530
expect(cell.editMode).toBeTruthy();
@@ -551,7 +551,7 @@ describe('IgxGrid - Cell Editing #grid', () => {
551551
expect(cellElem.classList.contains(CELL_CLASS_IN_EDIT_MODE)).toBe(true);
552552
const virtRowStyle = parseInt(virtRow.dc.instance._viewContainer.element.nativeElement.style.left, 10);
553553
UIInteractions.triggerKeyDownEvtUponElem('ArrowLeft', inputElem, fixture);
554-
await wait(DEBOUNCETIME);
554+
await wait(DEBOUNCE_TIME);
555555
fixture.detectChanges();
556556

557557
inputElem = document.activeElement as HTMLInputElement;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ describe('IgxGrid - multi-column headers #grid', () => {
352352

353353
GridFunctions.verifyGroupIsExpanded(fixture, secondGroup);
354354

355-
GridFunctions.verifyColumnIsHidden(grid.getColumnByName('PostlCode'), false, 6);
355+
GridFunctions.verifyColumnIsHidden(grid.getColumnByName('PostalCode'), false, 6);
356356

357357
// delete another column
358358
fixture.componentInstance.columnGroups[1].columns = fixture.componentInstance.columnGroups[1].columns.splice(2);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
4141
]
4242
});
4343
}));
44-
44+
4545
describe('General tests - ', () => {
4646
let fix: ComponentFixture<IgxGridAdvancedFilteringComponent>;
4747
let grid: IgxGridComponent;
@@ -434,13 +434,13 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
434434
grid.openAdvancedFilteringDialog();
435435
fix.detectChanges();
436436

437-
// Verfiy there is a root group with 'And' operator line and 2 children.
437+
// Verify there is a root group with 'And' operator line and 2 children.
438438
const rootGroup = QueryBuilderFunctions.getQueryBuilderTreeRootGroup(fix);
439439
expect(rootGroup).not.toBeNull();
440440
QueryBuilderFunctions.verifyOperatorLine(QueryBuilderFunctions.getQueryBuilderTreeRootGroupOperatorLine(fix) as HTMLElement, 'and');
441441
expect(QueryBuilderFunctions.getQueryBuilderTreeChildItems(rootGroup as HTMLElement).length).toBe(2);
442442

443-
// Verify the contnet of the first child (expression) of the root group.
443+
// Verify the content of the first child (expression) of the root group.
444444
QueryBuilderFunctions.verifyExpressionChipContent(fix, [1], 'Downloads', 'Greater Than', '100');
445445

446446
// Verify the content of the second child (group) of the root group.
@@ -1225,11 +1225,11 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
12251225
tick(100);
12261226
fix.detectChanges();
12271227

1228-
1228+
12291229
// Populate edit inputs.
12301230
QueryBuilderFunctions.selectColumnInEditModeExpression(fix, 1); // Select 'ProductName' column.
12311231
QueryBuilderFunctions.selectOperatorInEditModeExpression(fix, 0); // Select 'Contains' operator.
1232-
1232+
12331233
let input = QueryBuilderFunctions.getQueryBuilderValueInput(fix).querySelector('input');
12341234
UIInteractions.clickAndSendInputElementValue(input, 'angular', fix); // Type filter value.
12351235
// Commit the populated expression.
@@ -1278,7 +1278,7 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => {
12781278
grid = fix.componentInstance.grid;
12791279
fix.detectChanges();
12801280
}));
1281-
1281+
12821282
it('Should allow hosting Advanced Filtering dialog outside of the grid.', fakeAsync(() => {
12831283
// Add a root 'and' group.
12841284
QueryBuilderFunctions.clickQueryBuilderInitialAddConditionBtn(fix, 0);

0 commit comments

Comments
 (0)