From 10fa8af3cc61cf84187680171629d77772c32a4a Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Fri, 27 Sep 2024 21:37:10 +0300 Subject: [PATCH 1/9] sample(query-builder): add template sample in progress --- .../interactions/interactions-routes-data.ts | 3 +- .../interactions-routing.module.ts | 6 ++ src/app/interactions/interactions.module.ts | 1 + ...ery-builder-template-sample.component.html | 11 +++ ...ery-builder-template-sample.component.scss | 12 +++ ...query-builder-template-sample.component.ts | 98 +++++++++++++++++++ 6 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html create mode 100644 src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss create mode 100644 src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts diff --git a/src/app/interactions/interactions-routes-data.ts b/src/app/interactions/interactions-routes-data.ts index 4dfccd8360..99535f672e 100644 --- a/src/app/interactions/interactions-routes-data.ts +++ b/src/app/interactions/interactions-routes-data.ts @@ -49,5 +49,6 @@ export const interactionsRoutesData = { 'drag-dialog-sample': { displayName: 'Drag Dialog Sample', parentName: 'Drag and Drop'}, 'icons-sample': { displayName: 'Icons sample', parentName: 'Drag and Drop' }, 'query-builder-sample-1': { displayName: 'Query Builder Sample 1', parentName: 'Query Builder' }, - 'query-builder-style': { displayName: 'Query Builder Style Sample', parentName: 'Query Builder' } + 'query-builder-style': { displayName: 'Query Builder Style Sample', parentName: 'Query Builder' }, + 'query-builder-template-sample': { displayName: 'Query Builder Template Sample', parentName: 'Query Builder' } }; diff --git a/src/app/interactions/interactions-routing.module.ts b/src/app/interactions/interactions-routing.module.ts index ba5e9625d1..e65935b736 100644 --- a/src/app/interactions/interactions-routing.module.ts +++ b/src/app/interactions/interactions-routing.module.ts @@ -23,6 +23,7 @@ import { OverlayScrollSample2Component } from './overlay/overlay-scroll-2/overla import { OverlayStylingComponent } from './overlay/overlay-styling/overlay-styling.component'; import { QueryBuilderSample1Component } from './query-builder/query-builder-sample-1/query-builder-sample-1.component'; import { QueryBuilderStyleComponent } from './query-builder/query-builder-style/query-builder-style.component'; +import { QueryBuilderTemplateSampleComponent } from './query-builder/query-builder-template-sample/query-builder-template-sample.component'; import { RippleSample2Component } from './ripple/ripple-sample-2/ripple-sample-2.component'; import { RippleSample3Component } from './ripple/ripple-sample-3/ripple-sample-3.component'; import { RippleSample4Component } from './ripple/ripple-sample-4/ripple-sample-4.component'; @@ -299,6 +300,11 @@ export const interactionsRoutes: Routes = [ component: QueryBuilderStyleComponent, data: interactionsRoutesData['query-builder-style'], path: 'query-builder-style' + }, + { + component: QueryBuilderTemplateSampleComponent, + data: interactionsRoutesData['query-builder-template-sample'], + path: 'query-builder-template-sample' } ]; diff --git a/src/app/interactions/interactions.module.ts b/src/app/interactions/interactions.module.ts index f9dbd02955..d342c26377 100644 --- a/src/app/interactions/interactions.module.ts +++ b/src/app/interactions/interactions.module.ts @@ -47,6 +47,7 @@ import { OverlayScrollSample2Component } from './overlay/overlay-scroll-2/overla import { OverlayStylingComponent } from './overlay/overlay-styling/overlay-styling.component'; import { QueryBuilderSample1Component } from './query-builder/query-builder-sample-1/query-builder-sample-1.component'; import { QueryBuilderStyleComponent } from './query-builder/query-builder-style/query-builder-style.component'; +import { QueryBuilderTemplateSampleComponent } from './query-builder/query-builder-template-sample/query-builder-template-sample.component'; import { RippleSample2Component } from './ripple/ripple-sample-2/ripple-sample-2.component'; import { RippleSample3Component } from './ripple/ripple-sample-3/ripple-sample-3.component'; import { RippleSample4Component } from './ripple/ripple-sample-4/ripple-sample-4.component'; diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html new file mode 100644 index 0000000000..a18b54b256 --- /dev/null +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html @@ -0,0 +1,11 @@ +
+ + + + +
+ 
{{ printExpressionTree(queryBuilder.expressionTree) }}
+
+
diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss new file mode 100644 index 0000000000..13abda223d --- /dev/null +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss @@ -0,0 +1,12 @@ +.wrapper{ + margin: 10px; +} + +.output-area{ + overflow-y: auto; + height: 200px; + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 2px 1px -1px rgba(0, 0, 0, 0.12); + margin-top: 15px; + border-radius: 4px; + padding-left: 16px; +} \ No newline at end of file diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts new file mode 100644 index 0000000000..220e71c0f4 --- /dev/null +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts @@ -0,0 +1,98 @@ +import { Component, OnInit } from '@angular/core'; +import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IgxQueryBuilderComponent, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand } from 'igniteui-angular'; + +@Component({ + selector: 'app-query-builder-template-sample', + styleUrls: ['./query-builder-template-sample.component.scss'], + templateUrl: 'query-builder-template-sample.component.html' +}) +export class QueryBuilderTemplateSampleComponent implements OnInit { + public entities: any[]; + public companiesFields: any[]; + public ordersFields: any[]; + public expressionTree: IExpressionTree; + + public ngOnInit(): void { + this.companiesFields = [ + { field: "ID", dataType: "string" }, + { field: "CompanyName", dataType: "string" }, + { field: "ContactName", dataType: "string" }, + { field: "Employees", dataType: "number" }, + { field: "ContactTitle", dataType: "string" }, + { field: "DateCreated", dataType: "date" }, + { field: "TimeCreated", dataType: "time" }, + { field: "Address", dataType: "string" }, + { field: "City", dataType: "string" }, + { field: "Region", dataType: "string" }, + { field: "PostalCode", dataType: "string" }, + { field: "Phone", dataType: "string" }, + { field: "Fax", dataType: "string" }, + { field: "Contract", dataType: "boolean" } + ]; + + this.ordersFields = [ + { field: "CompanyID", dataType: "string" }, + { field: "OrderID", dataType: "number" }, + { field: "EmployeeId", dataType: "number" }, + { field: "OrderDate", dataType: "date" }, + { field: "RequiredDate", dataType: "date" }, + { field: "ShippedDate", dataType: "date" }, + { field: "ShipVia", dataType: "number" }, + { field: "Freight", dataType: "number" }, + { field: "ShipName", dataType: "string" }, + { field: "ShipCity", dataType: "string" }, + { field: "ShipPostalCode", dataType: "string" }, + { field: "ShipCountry", dataType: "string" }, + { field: "Region", dataType: "string" } + ]; + + this.entities = [ + { + name: "Companies", + fields: this.companiesFields + }, + { + name: "Orders", + fields: this.ordersFields + } + ]; + + const innerTree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Companies', ['ID']); + innerTree.filteringOperands.push({ + fieldName: 'Employees', + condition: IgxNumberFilteringOperand.instance().condition('greaterThan'), + conditionName: 'greaterThan', + searchVal: 100 + }); + innerTree.filteringOperands.push({ + fieldName: 'Contact', + condition: IgxBooleanFilteringOperand.instance().condition('true'), + conditionName: 'true' + }); + + const tree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Orders', ['*']); + tree.filteringOperands.push({ + fieldName: 'CompanyID', + condition: IgxStringFilteringOperand.instance().condition('in'), + conditionName: 'in', + searchTree: innerTree + }); + tree.filteringOperands.push({ + fieldName: 'OrderDate', + condition: IgxDateFilteringOperand.instance().condition('before'), + conditionName: 'before', + searchVal: new Date('2024-01-01T00:00:00.000Z') + }); + tree.filteringOperands.push({ + fieldName: 'ShippedDate', + condition: IgxDateFilteringOperand.instance().condition('null'), + conditionName: 'null' + }); + + this.expressionTree = tree; + } + + public printExpressionTree(tree: IExpressionTree) { + return tree ? JSON.stringify(tree, null, 2) : 'Please add an expression!'; + } +} \ No newline at end of file From fca27d58fd9a36794443038ecdea3403ac9db641 Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Mon, 30 Sep 2024 17:50:15 +0300 Subject: [PATCH 2/9] sample(query-builder): add new template functionality --- src/app/interactions/interactions.module.ts | 9 +++++++-- .../query-builder-template-sample.component.html | 13 +++++++++++++ .../query-builder-template-sample.component.ts | 3 ++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/app/interactions/interactions.module.ts b/src/app/interactions/interactions.module.ts index d342c26377..07527abf88 100644 --- a/src/app/interactions/interactions.module.ts +++ b/src/app/interactions/interactions.module.ts @@ -21,7 +21,9 @@ import { IgxSwitchModule, IgxToggleModule, IgxTooltipModule, - IgxIconButtonDirective + IgxIconButtonDirective, + IgxSelectComponent, + IgxSelectItemComponent, } from 'igniteui-angular'; import { LayoutsModule } from '../layouts/layouts.module'; import { DialogSample1Component } from './dialog/dialog-sample-1/dialog-sample-1.component'; @@ -110,6 +112,7 @@ import { TooltipStyleComponent } from './tooltip/tooltip-style/tooltip-style.com TickLabelsTemplateComponent, QueryBuilderSample1Component, QueryBuilderStyleComponent, + QueryBuilderTemplateSampleComponent, RippleSample2Component, RippleSample3Component, RippleSample4Component, @@ -161,7 +164,9 @@ import { TooltipStyleComponent } from './tooltip/tooltip-style/tooltip-style.com IgxComboModule, IgxListModule, LayoutsModule, - IgxIconButtonDirective + IgxIconButtonDirective, + IgxSelectComponent, + IgxSelectItemComponent ], providers: [IgxOverlayService] }) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html index a18b54b256..f7563414e7 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html @@ -4,6 +4,19 @@ [expressionTree]="expressionTree"> + + @if (selectedField?.field === 'Id' && selectedCondition === 'equals'){ + + {{ c }} + + } @else { + + } + 
{{ printExpressionTree(queryBuilder.expressionTree) }}
diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts index 220e71c0f4..c6366b4287 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IgxQueryBuilderComponent, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand } from 'igniteui-angular'; +import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IgxBooleanFilteringOperand, IgxDateFilteringOperand, IgxNumberFilteringOperand, IgxStringFilteringOperand } from 'igniteui-angular'; @Component({ selector: 'app-query-builder-template-sample', @@ -11,6 +11,7 @@ export class QueryBuilderTemplateSampleComponent implements OnInit { public companiesFields: any[]; public ordersFields: any[]; public expressionTree: IExpressionTree; + public options: string[] = ['one', 'two', 'three']; public ngOnInit(): void { this.companiesFields = [ From 08a7ecfcc195e1e5e0b0dae9dbd7f8460822147b Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Mon, 30 Sep 2024 18:38:56 +0300 Subject: [PATCH 3/9] sample(query-builder): add template sample done --- src/app/interactions/interactions.module.ts | 6 +- ...ery-builder-template-sample.component.html | 19 +++-- ...query-builder-template-sample.component.ts | 72 +++++++------------ 3 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/app/interactions/interactions.module.ts b/src/app/interactions/interactions.module.ts index 07527abf88..28589afcf4 100644 --- a/src/app/interactions/interactions.module.ts +++ b/src/app/interactions/interactions.module.ts @@ -24,6 +24,8 @@ import { IgxIconButtonDirective, IgxSelectComponent, IgxSelectItemComponent, + IgxRadioComponent, + IgxRadioGroupDirective } from 'igniteui-angular'; import { LayoutsModule } from '../layouts/layouts.module'; import { DialogSample1Component } from './dialog/dialog-sample-1/dialog-sample-1.component'; @@ -166,7 +168,9 @@ import { TooltipStyleComponent } from './tooltip/tooltip-style/tooltip-style.com LayoutsModule, IgxIconButtonDirective, IgxSelectComponent, - IgxSelectItemComponent + IgxSelectItemComponent, + IgxRadioComponent, + IgxRadioGroupDirective ], providers: [IgxOverlayService] }) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html index f7563414e7..dcb825165f 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html @@ -2,18 +2,27 @@ - + + search - @if (selectedField?.field === 'Id' && selectedCondition === 'equals'){ - - {{ c }} + @if (selectedField?.field === 'Region' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){ + + {{ reg.text }} - } @else { + } + @else if (selectedField?.field === 'OrderStatus' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){ + + + {{stat.text}} + + + } + @else { } diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts index c6366b4287..659eda1763 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts @@ -11,26 +11,23 @@ export class QueryBuilderTemplateSampleComponent implements OnInit { public companiesFields: any[]; public ordersFields: any[]; public expressionTree: IExpressionTree; - public options: string[] = ['one', 'two', 'three']; + public regionOptions = [ + {text: 'Central North America', value: 'CNA'}, + {text: 'Central Europe', value: 'CEU'}, + {text: 'Mediterranean region', value: 'MED'}, + {text: 'Central Asia', value: 'CAS'}, + {text: 'South Asia', value: 'SAS'}, + {text: 'Western Africa', value: 'WAF'}, + {text: 'Amazonia', value: 'AMZ'}, + {text: 'Southern Africa', value: 'SAF'}, + {text: 'Northern Australia', value: 'NAU'}]; - public ngOnInit(): void { - this.companiesFields = [ - { field: "ID", dataType: "string" }, - { field: "CompanyName", dataType: "string" }, - { field: "ContactName", dataType: "string" }, - { field: "Employees", dataType: "number" }, - { field: "ContactTitle", dataType: "string" }, - { field: "DateCreated", dataType: "date" }, - { field: "TimeCreated", dataType: "time" }, - { field: "Address", dataType: "string" }, - { field: "City", dataType: "string" }, - { field: "Region", dataType: "string" }, - { field: "PostalCode", dataType: "string" }, - { field: "Phone", dataType: "string" }, - { field: "Fax", dataType: "string" }, - { field: "Contract", dataType: "boolean" } - ]; + public statusOptions = [ + {text: 'New', value: 1}, + {text: 'Shipped', value: 2}, + {text: 'Delivered', value: 3}]; + public ngOnInit(): void { this.ordersFields = [ { field: "CompanyID", dataType: "string" }, { field: "OrderID", dataType: "number" }, @@ -44,39 +41,29 @@ export class QueryBuilderTemplateSampleComponent implements OnInit { { field: "ShipCity", dataType: "string" }, { field: "ShipPostalCode", dataType: "string" }, { field: "ShipCountry", dataType: "string" }, - { field: "Region", dataType: "string" } + { field: "Region", dataType: "string" }, + { field: "OrderStatus", dataType: "number" } ]; this.entities = [ - { - name: "Companies", - fields: this.companiesFields - }, { name: "Orders", fields: this.ordersFields } ]; - const innerTree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Companies', ['ID']); - innerTree.filteringOperands.push({ - fieldName: 'Employees', - condition: IgxNumberFilteringOperand.instance().condition('greaterThan'), - conditionName: 'greaterThan', - searchVal: 100 - }); - innerTree.filteringOperands.push({ - fieldName: 'Contact', - condition: IgxBooleanFilteringOperand.instance().condition('true'), - conditionName: 'true' - }); - const tree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Orders', ['*']); tree.filteringOperands.push({ - fieldName: 'CompanyID', - condition: IgxStringFilteringOperand.instance().condition('in'), - conditionName: 'in', - searchTree: innerTree + fieldName: 'Region', + condition: IgxStringFilteringOperand.instance().condition('equals'), + conditionName: 'equals', + searchVal: 'CNA' + }); + tree.filteringOperands.push({ + fieldName: 'OrderStatus', + condition: IgxNumberFilteringOperand.instance().condition('equals'), + conditionName: 'equals', + searchVal: 1 }); tree.filteringOperands.push({ fieldName: 'OrderDate', @@ -84,11 +71,6 @@ export class QueryBuilderTemplateSampleComponent implements OnInit { conditionName: 'before', searchVal: new Date('2024-01-01T00:00:00.000Z') }); - tree.filteringOperands.push({ - fieldName: 'ShippedDate', - condition: IgxDateFilteringOperand.instance().condition('null'), - conditionName: 'null' - }); this.expressionTree = tree; } From 8308ac6d37d4cab7602627bf051853c5aa589b36 Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Thu, 3 Oct 2024 11:06:21 +0300 Subject: [PATCH 4/9] chore(query-builder) sample remove header icon --- .../query-builder-template-sample.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html index dcb825165f..bbf451c3a5 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html @@ -3,7 +3,6 @@ [entities]="entities" [expressionTree]="expressionTree"> - search Date: Fri, 4 Oct 2024 11:03:01 +0300 Subject: [PATCH 5/9] chore(query-builder): test template sample cleanup --- .../query-builder-template-sample.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html index bbf451c3a5..8f6081c9f0 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.html @@ -15,14 +15,14 @@ } @else if (selectedField?.field === 'OrderStatus' && (selectedCondition === 'equals' || selectedCondition === 'doesNotEqual')){ - - + + {{stat.text}} } @else { - + } From 89a8adade6c246fdda235da9b41ae25405ea29a9 Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Wed, 9 Oct 2024 15:05:58 +0300 Subject: [PATCH 6/9] fix(query-builder): fix changed to shorter word to fit in docfx sample width --- .../query-builder-template-sample.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts index 659eda1763..b89e9973d9 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.ts @@ -25,7 +25,7 @@ export class QueryBuilderTemplateSampleComponent implements OnInit { public statusOptions = [ {text: 'New', value: 1}, {text: 'Shipped', value: 2}, - {text: 'Delivered', value: 3}]; + {text: 'Done', value: 3}]; public ngOnInit(): void { this.ordersFields = [ From 001598474b6da02db61fb766c21103b3a26b5a77 Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Wed, 9 Oct 2024 15:27:20 +0300 Subject: [PATCH 7/9] chore(query-builder): changed igniteui-angular version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 20df3130c8..0662836950 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "bootstrap": "5.3.2", "file-saver": "^2.0.2", "hammerjs": "^2.0.8", - "igniteui-angular": "^18.1.7", + "igniteui-angular": "18.2.0-beta.1", "igniteui-angular-charts": "^18.0.0", "igniteui-angular-core": "^18.0.0", "igniteui-angular-extras": "^18.0.5", From f89dc3c80c50b5018996cdbe0bbe9c0a17eda2b9 Mon Sep 17 00:00:00 2001 From: "INFRAGISTICS\\IPetrov" Date: Wed, 9 Oct 2024 15:28:14 +0300 Subject: [PATCH 8/9] chore(query-builder): changed igniteui-angular version --- package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 94eb98301f..5581fe9c5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "bootstrap": "5.3.2", "file-saver": "^2.0.2", "hammerjs": "^2.0.8", - "igniteui-angular": "^18.1.7", + "igniteui-angular": "18.2.0-beta.1", "igniteui-angular-charts": "^18.0.0", "igniteui-angular-core": "^18.0.0", "igniteui-angular-extras": "^18.0.5", @@ -12796,13 +12796,13 @@ ] }, "node_modules/igniteui-angular": { - "version": "18.1.8", - "resolved": "https://registry.npmjs.org/igniteui-angular/-/igniteui-angular-18.1.8.tgz", - "integrity": "sha512-25OpjJ/Gejx44q5VcSFVU41DwIxHViEs8Y430T0l95rvQ+WwXDRPmPFMLBf0LkHT8gvMIR7NFMcdjAlwd8A1qA==", + "version": "18.2.0-beta.1", + "resolved": "https://registry.npmjs.org/igniteui-angular/-/igniteui-angular-18.2.0-beta.1.tgz", + "integrity": "sha512-XnczRMESWXla9fQu9/zbfopIT852kbXigTdnXovGdSxoAgyoeFe2Lrw/VFMPIY09DF40kOD8o9ZePlCPIIvXHw==", "dependencies": { "@igniteui/material-icons-extended": "^3.0.0", "fflate": "^0.8.1", - "igniteui-theming": "^11.0.0", + "igniteui-theming": "^14.2.0-beta.2", "igniteui-trial-watermark": "^3.0.2", "lodash-es": "^4.17.21", "tslib": "^2.3.0", @@ -12892,11 +12892,11 @@ "integrity": "sha512-7zDG3xFPYqcjyOCdR9JuiDh+xX3pJEMqMP2qVV/3t1NjeojcZEWEaYW8OKzDzowEttPrj7UnjAqxXOIMbRTz6Q==" }, "node_modules/igniteui-theming": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-11.0.0.tgz", - "integrity": "sha512-t2hRgFBcS4QQFzgPwp3V8d5CFgLFWN9GY0GqnoBdTmtHQEm+2hbzrxgA//akUkO7g5Z6WEp5Y4WWaRkPJVy1HQ==", + "version": "14.2.0-beta.3", + "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-14.2.0-beta.3.tgz", + "integrity": "sha512-2xfjcJ+JCBYBzvSkI+yYDuRrLcY2KdEwtcTGBQRAMifwkJydzTPwVUqMOABB5LFUp/K58vIZ2Fz+oMF2d+XCbQ==", "peerDependencies": { - "sass": "^1.58.1" + "sass": "^1.69.5" } }, "node_modules/igniteui-trial-watermark": { From bacd7c1b0b3cde67e7085ac9c45cae6fe7a02b74 Mon Sep 17 00:00:00 2001 From: igdmdimitrov Date: Fri, 11 Oct 2024 12:33:39 +0300 Subject: [PATCH 9/9] chore(*): add temp fix for radio-group height --- .../query-builder-template-sample.component.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss index 13abda223d..a8e0461bd1 100644 --- a/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss +++ b/src/app/interactions/query-builder/query-builder-template-sample/query-builder-template-sample.component.scss @@ -9,4 +9,12 @@ margin-top: 15px; border-radius: 4px; padding-left: 16px; +} + +igx-radio-group{ + height: 40px; +} + +.igx-radio-group .igx-radio:not(:last-of-type) { + margin-inline-end: 0; } \ No newline at end of file