Skip to content

Commit bf3cb4b

Browse files
authored
Merge pull request #3664 from IgniteUI/vnext
Releasing new qb and tile manager samples on prod.
2 parents 06eeaba + 3cedb75 commit bf3cb4b

17 files changed

Lines changed: 643 additions & 37 deletions

live-editing/configs/QueryBuilderConfigGenerator.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { Config, IConfigGenerator} from 'igniteui-live-editing'
22
import { BaseAppConfig } from './BaseConfig';
33
export class QueryBuilderConfigGenerator implements IConfigGenerator {
4-
5-
64
public generateConfigs(): Config[] {
75
const configs = new Array<Config>();
86

@@ -25,6 +23,13 @@ export class QueryBuilderConfigGenerator implements IConfigGenerator {
2523
shortenComponentPathBy: "/interactions/query-builder/"
2624
}));
2725

26+
// configs.push(new Config({
27+
// component: 'QueryBuilderSqlSampleComponent',
28+
// additionalDependencies: ["sql-formatter"],
29+
// appConfig: BaseAppConfig,
30+
// shortenComponentPathBy: "/interactions/query-builder/"
31+
// })); // sql-formatter is not available in the live editing environment and cannot be enabled per config atm
32+
2833
return configs;
2934
}
3035
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Config, IConfigGenerator} from 'igniteui-live-editing'
2+
import { BaseAppConfig } from './BaseConfig';
3+
export class TileManagerConfigGenerator implements IConfigGenerator {
4+
5+
6+
public generateConfigs(): Config[] {
7+
const configs = new Array<Config>();
8+
9+
configs.push(new Config({
10+
component: 'TileManagerComponent',
11+
additionalDependencies: ["igniteui-webcomponents"],
12+
appConfig: BaseAppConfig,
13+
shortenComponentPathBy: "/layouts/tile-manager/"
14+
}));
15+
16+
return configs;
17+
}
18+
}

live-editing/generators/ConfigGenerators.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import { StepperConfigGenerator } from '../configs/StepperConfigGenerator';
6363
import { PaginationConfigGenerator } from '../configs/PaginationConfigGenerator';
6464
import { PivotGridConfigGenerator } from '../configs/PivotGridConfigGenerator';
6565
import { QueryBuilderConfigGenerator } from '../configs/QueryBuilderConfigGenerator';
66+
import { TileManagerConfigGenerator } from '../configs/TileManagerConfigGenerator';
6667

6768
export const CONFIG_GENERATORS =
6869
[
@@ -136,6 +137,7 @@ export const CONFIG_GENERATORS =
136137
TransactionsConfigGenerator,
137138
SplitterConfigGenerator,
138139
DockManagerConfigGenerator,
140+
TileManagerConfigGenerator,
139141
PaginationConfigGenerator,
140142
QueryBuilderConfigGenerator
141143
];

package-lock.json

Lines changed: 100 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,17 @@
7171
"express": "^4.18.2",
7272
"file-saver": "^2.0.2",
7373
"hammerjs": "^2.0.8",
74-
"igniteui-angular": "19.1.3",
74+
"igniteui-angular": "19.1.4",
7575
"igniteui-angular-charts": "^19.0.1",
7676
"igniteui-angular-core": "^19.0.1",
7777
"igniteui-angular-extras": "^19.1.2",
78-
"igniteui-angular-i18n": "^19.1.0",
78+
"igniteui-angular-i18n": "^19.1.4",
7979
"igniteui-dockmanager": "^1.16.0",
80-
"igniteui-live-editing": "^3.0.0",
81-
"igniteui-webcomponents": "^5.2.4",
80+
"igniteui-live-editing": "^3.0.2",
81+
"igniteui-webcomponents": "^5.3.0",
8282
"minireset.css": "0.0.6",
8383
"rxjs": "^7.8.2",
84+
"sql-formatter": "^15.4.11",
8485
"tslib": "^2.6.1",
8586
"zone.js": "~0.15.0"
8687
},

src/app/interactions/interactions-routes-data.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ export const interactionsRoutesData = {
5151
'query-builder-sample-1': { displayName: 'Query Builder Sample 1', parentName: 'Query Builder' },
5252
'query-builder-style': { displayName: 'Query Builder Style Sample', parentName: 'Query Builder' },
5353
'query-builder-template-sample': { displayName: 'Query Builder Template Sample', parentName: 'Query Builder' },
54+
'query-builder-sql-sample': { displayName: 'Query Builder SQL Sample', parentName: 'Query Builder' },
5455
'query-builder-request-sample': { displayName: 'Query Builder Request Sample', parentName: 'Query Builder' }
5556
};

src/app/interactions/interactions.routes.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { OverlayStylingComponent } from './overlay/overlay-styling/overlay-styli
2323
import { QueryBuilderSample1Component } from './query-builder/query-builder-sample-1/query-builder-sample-1.component';
2424
import { QueryBuilderStyleComponent } from './query-builder/query-builder-style/query-builder-style.component';
2525
import { QueryBuilderTemplateSampleComponent } from './query-builder/query-builder-template-sample/query-builder-template-sample.component';
26+
import { QueryBuilderSqlSampleComponent } from './query-builder/query-builder-sql-sample/query-builder-sql-sample.component';
2627
import { QueryBuilderRequestSampleComponent } from './query-builder/query-builder-request-sample/query-builder-request-sample.component';
2728
import { RippleSample2Component } from './ripple/ripple-sample-2/ripple-sample-2.component';
2829
import { RippleSample3Component } from './ripple/ripple-sample-3/ripple-sample-3.component';
@@ -306,6 +307,11 @@ export const InteractionsRoutes: Routes = [
306307
data: interactionsRoutesData['query-builder-template-sample'],
307308
path: 'query-builder-template-sample'
308309
},
310+
{
311+
component: QueryBuilderSqlSampleComponent,
312+
data: interactionsRoutesData['query-builder-sql-sample'],
313+
path: 'query-builder-sql-sample'
314+
},
309315
{
310316
component: QueryBuilderRequestSampleComponent,
311317
data: interactionsRoutesData['query-builder-request-sample'],

src/app/interactions/query-builder/query-builder-request-sample/query-builder-request-sample.component.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { HttpClient } from '@angular/common/http';
2-
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
2+
import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
33
import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IgxColumnComponent, IgxGridComponent, IgxQueryBuilderComponent } from 'igniteui-angular';
44

55
const API_ENDPOINT = 'https://data-northwind.indigo.design';
@@ -10,7 +10,7 @@ const API_ENDPOINT = 'https://data-northwind.indigo.design';
1010
templateUrl: 'query-builder-request-sample.component.html',
1111
imports: [IgxQueryBuilderComponent, IgxGridComponent, IgxColumnComponent]
1212
})
13-
export class QueryBuilderRequestSampleComponent implements OnInit {
13+
export class QueryBuilderRequestSampleComponent implements OnInit, AfterViewInit {
1414
@ViewChild('grid', { static: true })
1515
public grid: IgxGridComponent;
1616

@@ -56,18 +56,21 @@ export class QueryBuilderRequestSampleComponent implements OnInit {
5656

5757
const tree = new FilteringExpressionsTree(FilteringLogic.And, undefined, 'Orders', ['orderId', 'customerId', 'employeeId', 'shipperId', 'orderDate', 'requiredDate', 'shipVia', 'freight', 'shipName', 'completed']);
5858
this.expressionTree = tree;
59-
59+
}
60+
61+
public ngAfterViewInit(): void {
6062
this.onChange();
6163
}
6264

65+
6366
public onChange() {
6467
this.grid.isLoading = true;
6568
this.http.post(`${API_ENDPOINT}/QueryBuilder/ExecuteQuery`, this.expressionTree).subscribe(data =>{
6669
this.data = Object.values(data)[0];
6770
this.grid.isLoading = false;
71+
this.cdr.detectChanges();
72+
this.calculateColsInView();
6873
});
69-
this.cdr.detectChanges();
70-
this.calculateColsInView();
7174
}
7275

7376
private calculateColsInView() {

0 commit comments

Comments
 (0)