Merge branch 'vNext' into enhance-state-persistence-sample-vnext

Author: kdinev

angular.json

@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "sourceMap": false,
             "outputPath": "dist",
             "index": "src/index.html",
@@ -29,6 +30,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -46,6 +53,12 @@
               ]
             },
             "es5": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "tsConfig": "src/tsconfig-es5.app.json"
             }
           }

gulpfile.js

@@ -9,6 +9,13 @@ const tsNode = require('ts-node').register({
     }
 });
 
+// Workaround for require error with LiveEditingManager
+global['KeyboardEvent'] = null
+global['MouseEvent'] = null
+global['Event'] = null
+global['FocusEvent'] = null
+global['PointerEvent'] = null
+
 //  Workaround for exception with Excel samples running product code during generate-live-editing task.
 navigator = { language: "en-US" };
 

live-editing/configs/GridConfigGenerator.ts

@@ -27,7 +27,8 @@ import {
     IgxSnackbarModule,
     IgxSwitchModule,
     IgxToastModule,
-    IgxTooltipModule
+    IgxTooltipModule,
+    IgxTabsModule
 } from "igniteui-angular";
 // tslint:disable-next-line: max-line-length
 import { IgxSparklineCoreModule} from "igniteui-angular-charts/ES5/igx-sparkline-core-module";
@@ -79,6 +80,8 @@ import { GridCustomFilteringComponent } from "../../src/app/grid/grid-custom-fil
 import {
     GridCustomKBNavigationComponent
 } from "../../src/app/grid/grid-custom-kb-navigation/grid-custom-kb-navigation-sample.component";
+// tslint:disable-next-line: max-line-length
+import { CustomRemotePagingGridSample } from "../../src/app/grid/grid-custom-remote-paging-sample/custom-remote-paging-sample.component";
 import {
     GridCustomSummariesSelection
 } from "../../src/app/grid/grid-custom-summaries-selection/grid-custom-summaries-selection.component";
@@ -94,6 +97,7 @@ import {
 } from "../../src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component";
 import {
     GridExcelStyleFilteringLoadOnDemandComponent
+// tslint:disable-next-line: max-line-length
 } from "../../src/app/grid/grid-excel-style-filtering-load-on-demand/grid-excel-style-filtering-load-on-demand.component";
 import { RemoteValuesService } from "../../src/app/grid/grid-excel-style-filtering-load-on-demand/remoteValues.service";
 import {
@@ -209,6 +213,8 @@ import { RemoteServiceVirt } from "../../src/app/grid/services/remoteService";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
+import { GridMasterDetailSampleComponent } from '../../src/app/grid/grid-master-detail/grid-master-detail.component';
+import { IgxCategoryChartModule } from 'igniteui-angular-charts/ES5/igx-category-chart-module';
 
 export class GridConfigGenerator implements IConfigGenerator {
     public generateConfigs(): Config[] {
@@ -546,6 +552,20 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        // master-detail sample
+        configs.push(new Config({
+            component: GridMasterDetailSampleComponent,
+            additionalFiles: ["/src/app/grid-crm/grid-crm/data.ts"],
+            additionalDependencies: ["igniteui-angular-charts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [GridMasterDetailSampleComponent, IgxGridModule, IgxCategoryChartModule,
+                     IgxAvatarModule, IgxTabsModule],
+                ngDeclarations: [GridMasterDetailSampleComponent],
+                ngImports: [IgxGridModule, IgxIconModule],
+                ngProviders: []
+            })
+        }));
+
         configs.push(new Config({
             component: GridMovingStyledSampleComponent,
             additionalFiles: ["/src/app/grid/services/financialData.ts"],
@@ -681,6 +701,18 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: CustomRemotePagingGridSample,
+            additionalFiles: ["/src/app/grid/services/remotePagingService.ts"],
+            appModuleConfig: new AppModuleConfig({
+                imports: [CustomRemotePagingGridSample, IgxGridModule, RouterModule, HttpClientModule,
+                    RemotePagingService, IgxSelectModule],
+                ngDeclarations: [CustomRemotePagingGridSample],
+                ngImports: ["RouterModule.forRoot([])", IgxGridModule, HttpClientModule, IgxSelectModule],
+                ngProviders: [RemotePagingService]
+            })
+        }));
+
         configs.push(new Config({
             component: GridDisplayDensitySampleComponent,
             additionalFiles: ["/src/app/data/invoiceData.ts"],

live-editing/configs/GridFinjsConfigGenerator.ts

@@ -3,6 +3,7 @@ import {
     IgxButtonGroupModule,
     IgxButtonModule,
     IgxCsvExporterService,
+    IgxDialogModule,
     IgxExcelExporterService,
     IgxGridModule,
     IgxIconModule,
@@ -14,6 +15,7 @@ import {
 import { IgxCategoryChartModule } from "igniteui-angular-charts/ES5/igx-category-chart-module";
 import { FinJSDemoComponent } from "../../src/app/grid-finjs/grid-finjs-demo.component";
 import { LocalDataService } from "../../src/app/grid-finjs/localData.service";
+import { DependenciesType } from "../services/DependenciesType";
 import { AppModuleConfig } from "./core/AppModuleConfig";
 import { Config } from "./core/Config";
 import { IConfigGenerator } from "./core/IConfigGenerator";
@@ -24,17 +26,17 @@ export class GridFinjsConfigGenerator implements IConfigGenerator {
 
         configs.push(new Config({
             component: FinJSDemoComponent,
+            dependenciesType: DependenciesType.Charts,
             additionalFiles: ["/src/app/grid-finjs/localData.service.ts",
                 "/src/app/grid/services/financialData.ts"],
             appModuleConfig: new AppModuleConfig({
                 imports: [IgxCategoryChartModule,
                     IgxGridModule, IgxButtonGroupModule, IgxIconModule, IgxSliderModule, IgxToggleModule,
                     IgxButtonModule, IgxExcelExporterService, IgxCsvExporterService, IgxSwitchModule,
-                    IgxRippleModule, FinJSDemoComponent,
-                    LocalDataService],
+                    IgxRippleModule, FinJSDemoComponent, IgxDialogModule, LocalDataService],
                 ngDeclarations: [FinJSDemoComponent],
                 ngImports: [IgxGridModule, IgxButtonGroupModule, IgxIconModule, IgxSliderModule, IgxToggleModule,
-                    IgxButtonModule, IgxSwitchModule, IgxRippleModule, IgxGridModule],
+                    IgxButtonModule, IgxSwitchModule, IgxRippleModule, IgxCategoryChartModule, IgxDialogModule],
                 ngProviders: [LocalDataService, IgxExcelExporterService, IgxCsvExporterService]
             })
         }));