Skip to content

Commit ca93b31

Browse files
IMinchev64IMinchev64
authored
Merge branch 'master' into iminchev/pinned-filtering-cell-border-21.1.x
2 parents 605e7fa + 331eada commit ca93b31

File tree

18 files changed

+186
-50
lines changed

18 files changed

+186
-50
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Some of the Angular chart types included are: [Polar chart](https://www.infragis
8787
|dock manager|:white_check_mark:||[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/dock-manager)|9.1.0|[Commercial](/LICENSE)|suffix|:white_check_mark:|[Readme](projects/igniteui-angular/input-group/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/input-group)|5.3.0|[MIT](/LICENSE)
8888
|drop down|:white_check_mark:|[Readme](projects/igniteui-angular/drop-down/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/drop-down)|6.1.0|[MIT](/LICENSE)|text-highlight|:white_check_mark:|[Readme](projects/igniteui-angular/directives/src/directives/text-highlight/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/texthighlight)|6.0.0|[MIT](/LICENSE)
8989
|expansion panel|:white_check_mark:|[Readme](projects/igniteui-angular/expansion-panel/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/expansion-panel)|6.2.0|[MIT](/LICENSE)|toggle|:white_check_mark:|[Readme](projects/igniteui-angular/directives/src/directives/toggle/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/toggle)|6.2.0|[MIT](/LICENSE)
90-
|grid|:white_check_mark:|[Readme](projects/igniteui-angular/grids/grid/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/grid)|5.1.0|[MIT](/LICENSE)|tooltip|:white_check_mark:|[Readme](projects/igniteui-angular/directives/src/directives/tooltip/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/tooltip)|6.2.0|[MIT](/LICENSE)
90+
|grid|:white_check_mark:|[Readme](projects/igniteui-angular/grids/grid/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/grid/grid)|5.1.0|[Commercial](/LICENSE)|tooltip|:white_check_mark:|[Readme](projects/igniteui-angular/directives/src/directives/tooltip/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/tooltip)|6.2.0|[MIT](/LICENSE)
9191
|hierarchical grid|:white_check_mark:|[Readme](projects/igniteui-angular/grids/hierarchical-grid/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/hierarchicalgrid/hierarchical-grid)|7.2.0|[Commercial](/LICENSE)|**Others**|**Status**||**License**|
9292
|icon|:white_check_mark:|[Readme](projects/igniteui-angular/icon/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/icon)|2.0.0|[MIT](/LICENSE)
9393
|icon button|:white_check_mark:|[Readme](projects/igniteui-angular/icon/README.md)|[Docs](https://www.infragistics.com/products/ignite-ui-angular/angular/components/icon-button)|17.1.0|[MIT](/LICENSE)|Animations|:white_check_mark:|[Readme](projects/igniteui-angular/animations/README.md)||2.0.0|[MIT](/LICENSE)|

‎SECURITY.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44

55
| Version | Supported |
66
| -------- | ------------------ |
7-
| 19.1.x | :white_check_mark: |
7+
| 21.0.x | :white_check_mark: |
8+
| 20.1.x | :white_check_mark: |
9+
| 20.0.x | :x: |
10+
| 19.2.x | :white_check_mark: |
11+
| 19.1.x | :x: |
812
| 19.0.x | :x: |
913
| 18.2.x | :white_check_mark: |
1014
| 18.1.x | :x: |
1115
| 18.0.x | :x: |
1216
| 17.2.x | :white_check_mark: |
13-
| 17.1.x | :x: |
14-
| 17.0.x | :x: |
15-
| 16.1.x | :white_check_mark: |
16-
| 16.0.x | :x: |
17-
| 15.1.x | :white_check_mark: |
18-
| < 15.1.x | :x: |
17+
| <= 17.1.x| :x: |
1918

2019
## Reporting a Vulnerability
2120

‎projects/igniteui-angular-elements/src/analyzer/config.template.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { IgxQueryBuilderComponent } from '../../../igniteui-angular/query-builder';
12
import { IgxGridComponent } from '../../../igniteui-angular/grids/grid';
23
import { IgxHierarchicalGridComponent } from '../../../igniteui-angular/grids/hierarchical-grid';
34
import { IgxPivotDataSelectorComponent, IgxPivotGridComponent } from '../../../igniteui-angular/grids/pivot-grid';
@@ -8,5 +9,6 @@ export const registerComponents = [
89
IgxHierarchicalGridComponent,
910
IgxTreeGridComponent,
1011
IgxPivotGridComponent,
11-
IgxPivotDataSelectorComponent
12+
IgxPivotDataSelectorComponent,
13+
IgxQueryBuilderComponent
1214
];

‎projects/igniteui-angular-elements/src/analyzer/elements.config.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { IgxQueryBuilderComponent } from "../../../igniteui-angular/query-builder";
12
import { IgxGridComponent } from "../../../igniteui-angular/grids/grid";
23
import { IgxHierarchicalGridComponent } from "../../../igniteui-angular/grids/hierarchical-grid";
34
import {
@@ -12,6 +13,7 @@ import { IgxPaginatorToken } from "../../../igniteui-angular/paginator/src/pagin
1213
import { IgxColumnGroupComponent } from "../../../igniteui-angular/grids/core/src/columns/column-group.component";
1314
import { IgxColumnComponent } from "../../../igniteui-angular/grids/core/src/columns/column.component";
1415
import { IgxColumnLayoutComponent } from "../../../igniteui-angular/grids/core/src/columns/column-layout.component";
16+
import { IgxQueryBuilderHeaderComponent } from "../../../igniteui-angular/query-builder/src/query-builder/query-builder-header.component";
1517
import { IgxGridEditingActionsComponent } from "../../../igniteui-angular/grids/core/src/grid-actions/grid-editing-actions.component";
1618
import { IgxActionStripActionsToken } from "../../../igniteui-angular/core/src/grid-column-actions/token";
1719
import { IgxGridPinningActionsComponent } from "../../../igniteui-angular/grids/core/src/grid-actions/grid-pinning-actions.component";
@@ -32,6 +34,7 @@ export const registerComponents = [
3234
IgxTreeGridComponent,
3335
IgxPivotGridComponent,
3436
IgxPivotDataSelectorComponent,
37+
IgxQueryBuilderComponent,
3538
];
3639

3740
//// WARNING: Code below this line is auto-generated and any modifications will be overwritten
@@ -829,6 +832,29 @@ export var registerConfig = [
829832
"selectRowOnClick",
830833
],
831834
},
835+
{
836+
component: IgxQueryBuilderComponent,
837+
selector: "igc-query-builder",
838+
parents: [],
839+
contentQueries: [],
840+
additionalProperties: [],
841+
methods: ["canCommit", "commit", "discard"],
842+
templateProps: ["searchValueTemplate"],
843+
boolProps: [
844+
"showEntityChangeDialog",
845+
"disableEntityChange",
846+
"disableReturnFieldsChange",
847+
],
848+
},
849+
{
850+
component: IgxQueryBuilderHeaderComponent,
851+
selector: "igc-query-builder-header",
852+
parents: [IgxQueryBuilderComponent],
853+
contentQueries: [],
854+
additionalProperties: [],
855+
methods: [],
856+
boolProps: ["showLegend"],
857+
},
832858
{
833859
component: IgxRowIslandComponent,
834860
selector: "igc-row-island",

‎projects/igniteui-angular-elements/src/app/components.ts‎

Lines changed: 77 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,71 +12,124 @@ import { IgxTreeGridComponent } from 'igniteui-angular/grids/tree-grid';
1212
import { IgxHierarchicalGridComponent, IgxRowIslandComponent } from 'igniteui-angular/grids/hierarchical-grid';
1313
import { IgxPivotDataSelectorComponent, IgxPivotGridComponent } from 'igniteui-angular/grids/pivot-grid';
1414
import { GridType, IgxColumnComponent, IgxColumnGroupComponent, IgxColumnLayoutComponent, IgxGridEditingActionsComponent, IgxGridPinningActionsComponent, IgxGridToolbarActionsComponent, IgxGridToolbarAdvancedFilteringComponent, IgxGridToolbarComponent, IgxGridToolbarExporterComponent, IgxGridToolbarHidingComponent, IgxGridToolbarPinningComponent, IgxGridToolbarTitleComponent } from 'igniteui-angular/grids/core';
15+
import { IgxQueryBuilderComponent, IgxQueryBuilderHeaderComponent } from 'igniteui-angular/query-builder';
1516

1617
// force-create icon service, TODO: move to initializer or register/define mechanic to avoid side-effect?
1718
const _iconBroadcast: IgxIconBroadcastService = injector.get(IgxIconBroadcastService);
1819

1920
const grid = createIgxCustomElement(IgxGridComponent, { injector, registerConfig });
20-
const IgcGridComponent = withRegister(grid, () => { registerComponent(IgcGridComponent) });
21+
const IgcGridComponent = withRegister(grid, () => {
22+
registerComponent(IgcGridComponent)
23+
});
2124

2225
const treeGrid = createIgxCustomElement(IgxTreeGridComponent, { injector, registerConfig });
23-
const IgcTreeGridComponent = withRegister(treeGrid, () => { registerComponent(IgcTreeGridComponent) });
26+
const IgcTreeGridComponent = withRegister(treeGrid, () => {
27+
registerComponent(IgcTreeGridComponent)
28+
});
2429

2530
const hGrid = createIgxCustomElement(IgxHierarchicalGridComponent, { injector, registerConfig });
26-
const IgcHierarchicalGridComponent = withRegister(hGrid, () => { registerComponent(IgcHierarchicalGridComponent) });
31+
const IgcHierarchicalGridComponent = withRegister(hGrid, () => {
32+
registerComponent(IgcHierarchicalGridComponent)
33+
});
2734

2835
const pivot = createIgxCustomElement(IgxPivotGridComponent, { injector, registerConfig });
29-
const IgcPivotGridComponent = withRegister(pivot, () => { registerComponent(IgcPivotGridComponent) });
36+
const IgcPivotGridComponent = withRegister(pivot, () => {
37+
registerComponent(IgcPivotGridComponent)
38+
});
3039

3140
const pivotDataSelector = createIgxCustomElement(IgxPivotDataSelectorComponent, { injector, registerConfig });
32-
const IgcPivotDataSelectorComponent = withRegister(pivotDataSelector, () => { registerComponent(IgcPivotDataSelectorComponent) });
41+
const IgcPivotDataSelectorComponent = withRegister(pivotDataSelector, () => {
42+
registerComponent(IgcPivotDataSelectorComponent)
43+
});
3344

3445
const rowIsland = createIgxCustomElement(IgxRowIslandComponent, { injector, registerConfig });
35-
const IgcRowIslandComponent = withRegister(rowIsland, () => { registerComponent(IgcRowIslandComponent) });
46+
const IgcRowIslandComponent = withRegister(rowIsland, () => {
47+
registerComponent(IgcRowIslandComponent)
48+
});
3649

3750
const columnGroup = createIgxCustomElement(IgxColumnGroupComponent, { injector, registerConfig });
38-
const IgcColumnGroupComponent = withRegister(columnGroup, () => { registerComponent(IgcColumnGroupComponent) });
51+
const IgcColumnGroupComponent = withRegister(columnGroup, () => {
52+
registerComponent(IgcColumnGroupComponent)
53+
});
3954

4055
const columnLayout = createIgxCustomElement(IgxColumnLayoutComponent, { injector, registerConfig });
41-
const IgcColumnLayoutComponent = withRegister(columnLayout, () => { registerComponent(IgcColumnLayoutComponent) });
56+
const IgcColumnLayoutComponent = withRegister(columnLayout, () => {
57+
registerComponent(IgcColumnLayoutComponent)
58+
});
4259

4360
const column = createIgxCustomElement(IgxColumnComponent, { injector, registerConfig });
44-
const IgcColumnComponent = withRegister(column, () => { registerComponent(IgcColumnComponent) });
61+
const IgcColumnComponent = withRegister(column, () => {
62+
registerComponent(IgcColumnComponent)
63+
});
4564

4665
const paginator = createIgxCustomElement(IgxPaginatorComponent, { injector, registerConfig });
47-
const IgcPaginatorComponent = withRegister(paginator, () => { registerComponent(IgcPaginatorComponent) });
66+
const IgcPaginatorComponent = withRegister(paginator, () => {
67+
registerComponent(IgcPaginatorComponent)
68+
});
4869

4970
const toolbar = createIgxCustomElement(IgxGridToolbarComponent, { injector, registerConfig });
50-
const IgcGridToolbarComponent = withRegister(toolbar, () => { registerComponent(IgcGridToolbarComponent) });
71+
const IgcGridToolbarComponent = withRegister(toolbar, () => {
72+
registerComponent(IgcGridToolbarComponent)
73+
});
5174

5275
const actionStrip = createIgxCustomElement(IgxActionStripComponent, { injector, registerConfig });
53-
const IgcActionStripComponent = withRegister(actionStrip, () => { registerComponent(IgcActionStripComponent) });
76+
const IgcActionStripComponent = withRegister(actionStrip, () => {
77+
registerComponent(IgcActionStripComponent)
78+
});
5479

5580
const statePersistance = createIgxCustomElement(IgxGridStateComponent, { injector, registerConfig });
56-
const IgcGridStateComponent = withRegister(statePersistance, () => { registerComponent(IgcGridStateComponent) });
81+
const IgcGridStateComponent = withRegister(statePersistance, () => {
82+
registerComponent(IgcGridStateComponent)
83+
});
5784

5885
const editingActions = createIgxCustomElement(IgxGridEditingActionsComponent, { injector, registerConfig });
59-
const IgcGridEditingActionsComponent = withRegister(editingActions, () => { registerComponent(IgcGridEditingActionsComponent) });
86+
const IgcGridEditingActionsComponent = withRegister(editingActions, () => {
87+
registerComponent(IgcGridEditingActionsComponent)
88+
});
6089
const pinningActions = createIgxCustomElement(IgxGridPinningActionsComponent, { injector, registerConfig });
61-
const IgcGridPinningActionsComponent = withRegister(pinningActions, () => { registerComponent(IgcGridPinningActionsComponent) });
90+
const IgcGridPinningActionsComponent = withRegister(pinningActions, () => {
91+
registerComponent(IgcGridPinningActionsComponent)
92+
});
6293

6394
const toolbarTitle = createIgxCustomElement(IgxGridToolbarTitleComponent, { injector, registerConfig });
64-
const IgcGridToolbarTitleComponent = withRegister(toolbarTitle, () => { registerComponent(IgcGridToolbarTitleComponent) });
95+
const IgcGridToolbarTitleComponent = withRegister(toolbarTitle, () => {
96+
registerComponent(IgcGridToolbarTitleComponent)
97+
});
6598

6699
const toolbarActions = createIgxCustomElement(IgxGridToolbarActionsComponent, { injector, registerConfig });
67-
const IgcGridToolbarActionsComponent = withRegister(toolbarActions, () => { registerComponent(IgcGridToolbarActionsComponent) });
100+
const IgcGridToolbarActionsComponent = withRegister(toolbarActions, () => {
101+
registerComponent(IgcGridToolbarActionsComponent)
102+
});
68103

69104
const toolbarHiding = createIgxCustomElement(IgxGridToolbarHidingComponent, { injector, registerConfig });
70-
const IgcGridToolbarHidingComponent = withRegister(toolbarHiding, () => { registerComponent(IgcGridToolbarHidingComponent) });
105+
const IgcGridToolbarHidingComponent = withRegister(toolbarHiding, () => {
106+
registerComponent(IgcGridToolbarHidingComponent)
107+
});
71108

72109
const toolbarPinning = createIgxCustomElement(IgxGridToolbarPinningComponent, { injector, registerConfig });
73-
const IgcGridToolbarPinningComponent = withRegister(toolbarPinning, () => { registerComponent(IgcGridToolbarPinningComponent) });
110+
const IgcGridToolbarPinningComponent = withRegister(toolbarPinning, () => {
111+
registerComponent(IgcGridToolbarPinningComponent)
112+
});
74113

75114
const toolbarExport = createIgxCustomElement(IgxGridToolbarExporterComponent, { injector, registerConfig });
76-
const IgcGridToolbarExporterComponent = withRegister(toolbarExport, () => { registerComponent(IgcGridToolbarExporterComponent) });
115+
const IgcGridToolbarExporterComponent = withRegister(toolbarExport, () => {
116+
registerComponent(IgcGridToolbarExporterComponent)
117+
});
77118

78119
const toolbarFilter = createIgxCustomElement(IgxGridToolbarAdvancedFilteringComponent, { injector, registerConfig });
79-
const IgcGridToolbarAdvancedFilteringComponent = withRegister(toolbarFilter, () => { registerComponent(IgcGridToolbarAdvancedFilteringComponent) });
120+
const IgcGridToolbarAdvancedFilteringComponent = withRegister(toolbarFilter, () => {
121+
registerComponent(IgcGridToolbarAdvancedFilteringComponent)
122+
});
123+
124+
const queryBuilder = createIgxCustomElement(IgxQueryBuilderComponent, { injector, registerConfig });
125+
const IgcQueryBuilderComponent = withRegister(queryBuilder, () => {
126+
registerComponent(IgcQueryBuilderComponent)
127+
});
128+
129+
const queryBuilderHeader = createIgxCustomElement(IgxQueryBuilderHeaderComponent, { injector, registerConfig });
130+
const IgcQueryBuilderHeaderComponent = withRegister(queryBuilderHeader, () => {
131+
registerComponent(IgcQueryBuilderHeaderComponent)
132+
});
80133

81134
export {
82135
IgcGridComponent,
@@ -100,6 +153,8 @@ export {
100153
IgcGridToolbarPinningComponent,
101154
IgcGridToolbarExporterComponent,
102155
IgcGridToolbarAdvancedFilteringComponent,
156+
IgcQueryBuilderComponent,
157+
IgcQueryBuilderHeaderComponent
103158
}
104159

105160
// TODO: Custom elements JSON as well
@@ -111,5 +166,6 @@ declare global {
111166
'igc-tree-grid': NgElement & WithProperties<IgxTreeGridElement>;
112167
'igc-paginator': NgElement & WithProperties<IgxPaginatorComponent>;
113168
'igc-grid-state': NgElement & WithProperties<IgxGridStateComponent>;
169+
'igc-query-builder': NgElement & WithProperties<IgxQueryBuilderComponent>;
114170
}
115171
}

‎projects/igniteui-angular-elements/src/themes/_variables.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ $allowed: (
3636
igx-paginator,
3737
igx-action-strip,
3838
igx-grid-toolbar,
39-
igx-pivot-data-selector
39+
igx-pivot-data-selector,
40+
igx-query-builder
4041
);

‎projects/igniteui-angular-elements/src/utils/define-all.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import {
2121
IgcGridToolbarPinningComponent,
2222
IgcGridToolbarExporterComponent,
2323
IgcGridToolbarAdvancedFilteringComponent,
24+
IgcQueryBuilderComponent,
25+
IgcQueryBuilderHeaderComponent
2426
} from '../app/components';
2527

2628
export function defineAllComponents() {
@@ -46,5 +48,7 @@ export function defineAllComponents() {
4648
IgcGridToolbarPinningComponent,
4749
IgcGridToolbarExporterComponent,
4850
IgcGridToolbarAdvancedFilteringComponent,
51+
IgcQueryBuilderComponent,
52+
IgcQueryBuilderHeaderComponent
4953
);
5054
}

‎projects/igniteui-angular/date-picker/src/date-picker/date-picker.component.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ describe('IgxDatePicker', () => {
969969
},
970970
element: {
971971
nativeElement: jasmine.createSpyObj('mockElement',
972-
['focus', 'blur', 'click', 'addEventListener', 'removeEventListener'])
972+
['focus', 'blur', 'click', 'addEventListener', 'removeEventListener', 'querySelector'])
973973
}
974974
} as any;
975975
mockInputDirective = {
@@ -1030,6 +1030,7 @@ describe('IgxDatePicker', () => {
10301030

10311031
datePicker = TestBed.inject(IgxDatePickerComponent);
10321032
(datePicker as any).inputGroup = mockInputGroup;
1033+
(mockInputGroup.element.nativeElement.querySelector as jasmine.Spy).and.returnValue(mockInputGroup.element.nativeElement);
10331034
(datePicker as any).inputDirective = mockInputDirective;
10341035
(datePicker as any).dateTimeEditor = mockDateEditor;
10351036
(datePicker as any).viewContainerRef = viewsContainerRef;

‎projects/igniteui-angular/date-picker/src/date-picker/date-picker.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ export class IgxDatePickerComponent extends PickerBaseDirective implements Contr
462462
}
463463

464464
private get inputGroupElement(): HTMLElement {
465-
return this.inputGroup?.element.nativeElement;
465+
return this.inputGroup?.element.nativeElement.querySelector('.igx-input-group__bundle');
466466
}
467467

468468
private get dateValue(): Date {

‎projects/igniteui-angular/date-picker/src/date-range-picker/date-range-picker.component.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1922,10 +1922,11 @@ describe('IgxDateRangePicker', () => {
19221922
fixture.detectChanges();
19231923

19241924
const overlayContent = document.getElementsByClassName(CSS_CLASS_OVERLAY_CONTENT)[0] as HTMLElement;
1925+
const expectedTarget = dateRange.element.nativeElement.querySelector('.igx-input-group__bundle');
19251926
expect(AutoPositionStrategy.prototype.position).toHaveBeenCalledTimes(1);
19261927
expect(AutoPositionStrategy.prototype.position)
19271928
.toHaveBeenCalledWith(overlayContent, jasmine.anything(), document,
1928-
jasmine.anything(), dateRange.element.nativeElement);
1929+
jasmine.anything(), expectedTarget);
19291930
}));
19301931
it('Should the weekStart property takes precedence over locale.', fakeAsync(() => {
19311932
fixture = TestBed.createComponent(DateRangeCustomComponent);

0 commit comments

Comments
 (0)