Merge branch 'vnext' into dmdimitrov/query-builder-sql-sample

Author: gedinakova

azure-devops/templates/cd-template.yml

@@ -190,7 +190,6 @@ steps:
       git config --global user.email "[email protected]"
       git config --global credential.helper store
       echo "https://x-access-token:$(GITHUB_TOKEN)@github.com" > ~/.git-credentials
-      git add .
       git commit -m "Automated repository update"
     displayName: Commit changes
     condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
@@ -204,3 +203,4 @@ steps:
     inputs:
       script: git push
       workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
+    continueOnError: true

igniteui-live-editing-samples

@@ -71,7 +71,7 @@
     "express": "^4.18.2",
     "file-saver": "^2.0.2",
     "hammerjs": "^2.0.8",
-    "igniteui-angular": "^19.1.1",
+    "igniteui-angular": "19.1.3",
     "igniteui-angular-charts": "^19.0.1",
     "igniteui-angular-core": "^19.0.1",
     "igniteui-angular-extras": "^19.1.2",

package-lock.json

@@ -57,7 +57,7 @@ export class HastDuplicateLayouts implements PipeTransform {
     imports: [IgxGridComponent, IgxConditionalFormattingDirective, IgxChartIntegrationDirective, IgxContextMenuDirective, IgxBadgeComponent, IgxColumnComponent, IgxCellTemplateDirective, NgClass, IgxDividerDirective, DockSlotComponent, DecimalPipe, TitleCasePipe, CurrencyPipe, FilterTypePipe, HastDuplicateLayouts],
     schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
-export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit  {
+export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit {
     @ViewChild('grid', { read: IgxGridComponent, static: true })
     public grid: IgxGridComponent;
 
@@ -121,16 +121,10 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit
         this.cdr.detectChanges();
 
         this.grid.rangeSelected.subscribe(range => {
-            this.grid.columns.forEach((column) => {
-                if (column.selected) {
-                    column.selected = false;
-                }
-            });
             this.createChartCommonLogic();
         });
 
         this.grid.columnSelectionChanging.pipe(debounceTime(100)).subscribe((args: IColumnSelectionEventArgs) => {
-            this.grid.clearCellSelection();
             this.createChartCommonLogic();
         });
     }
@@ -232,7 +226,7 @@ export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit
     }
 
     private clearViewContainer(viewContainerRef: ViewContainerRef) {
-        for (let i = viewContainerRef.length -1; i >= 0; i--) {
+        for (let i = viewContainerRef.length - 1; i >= 0; i--) {
             const viewRef = viewContainerRef.get(i);
             if (viewRef) {
                 const componentInstance = (viewRef as any).context;

package.json

@@ -42,4 +42,4 @@ export class GridDynamicChartDataComponent implements OnInit, AfterViewInit {
     public formatCurrency(value: number) {
         return '$' + value.toFixed(3);
     }
-}
+}

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts

@@ -51,5 +51,6 @@ export const interactionsRoutesData = {
     '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-template-sample': { displayName: 'Query Builder Template Sample', parentName: 'Query Builder' },
-    'query-builder-sql-sample': { displayName: 'Query Builder SQL Sample', parentName: 'Query Builder' }
+    'query-builder-sql-sample': { displayName: 'Query Builder SQL Sample', parentName: 'Query Builder' },
+    'query-builder-request-sample': { displayName: 'Query Builder Request Sample', parentName: 'Query Builder' },
 };

projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts

@@ -24,6 +24,7 @@ import { QueryBuilderSample1Component } from './query-builder/query-builder-samp
 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 { QueryBuilderSqlSampleComponent } from './query-builder/query-builder-sql-sample/query-builder-sql-sample.component';
+import { QueryBuilderRequestSampleComponent } from './query-builder/query-builder-request-sample/query-builder-request-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';
@@ -310,5 +311,10 @@ export const InteractionsRoutes: Routes = [
         component: QueryBuilderSqlSampleComponent,
         data: interactionsRoutesData['query-builder-sql-sample'],
         path: 'query-builder-sql-sample'
+    },
+    {
+        component: QueryBuilderRequestSampleComponent,
+        data: interactionsRoutesData['query-builder-request-sample'],
+        path: 'query-builder-request-sample'
     }
 ];

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

@@ -0,0 +1,11 @@
+<div class="wrapper">
+    <igx-query-builder #queryBuilder
+        [entities]="entities"
+        [(expressionTree)]="expressionTree"
+        (expressionTreeChange)="onChange()">
+    </igx-query-builder>
+
+    <div class="output-area">
+        <igx-grid #grid [data]="data" [autoGenerate]="true"></igx-grid>
+    </div>
+</div>

src/app/interactions/interactions.routes.ts

@@ -0,0 +1,11 @@
+.wrapper{
+    margin: 10px;
+    height: 100%;
+    overflow-y: auto;
+}
+
+.output-area{
+    box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.75);
+    border-radius: 4px;
+    margin: 0 20px 20px 20px;
+}