Merge branch 'vNext' into sivanova/snackbar-refactoring

Author: kdinev

angular.json

@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'Ubuntu 16.04'
+  vmImage: 'ubuntu-latest'
 
 steps:
 

azure-pipelines.yml

@@ -42,7 +42,7 @@ gulp.task("generate-live-editing", async () => {
 });
 
 gulp.task("overwrite-package-json", (done) => {
-    const packagesPaths = ["./node_modules/igniteui-angular-charts/package.json", "./node_modules/igniteui-angular-core/package.json", "./node_modules/igniteui-angular-excel/package.json", "./node_modules/igniteui-angular-gauges/package.json", "./node_modules/igniteui-angular-spreadsheet/package.json"];
+    const packagesPaths = ["./node_modules/igniteui-angular-charts/package.json", "./node_modules/igniteui-angular-core/package.json"];
     packagesPaths.forEach((packagePath) => {
         const package = require(packagePath);
         fs.writeFileSync(packagePath, JSON.stringify(package));

gulpfile.js

@@ -38,8 +38,11 @@ import * as ThemingRouting from '../src/app/theming/theming-routing.module';
 import { ThemingModule } from '../src/app/theming/theming.module';
 import * as TreeGridRouting from '../src/app/tree-grid/tree-grid-routing.module';
 import { TreeGridModule } from '../src/app/tree-grid/tree-grid.module';
+// eslint-disable-next-line max-len
 import * as GridFinJSDockManagerRoutingModule from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager-routing.module';
 import { GridFinJSDockManagerModule } from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.module';
+import { PaginationModule } from '../src/app/pagination/pagination.module';
+import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
 
 export const MODULE_ROUTES = [
     {
@@ -106,6 +109,11 @@ export const MODULE_ROUTES = [
         module: ServicesModule,
         path: 'services',
         routes: ServicesRouting.servicesRoutes
+    },
+    {
+        module: PaginationModule,
+        path: 'pagination',
+        routes: PaginatorRouting.paginatorRoutes
     }
 ];
 

live-editing/Routes.ts

@@ -0,0 +1,50 @@
+import {
+    IgxAccordionModule,
+    IgxRadioModule,
+    IgxTimePickerModule,
+    IgxSliderModule,
+    IgxCheckboxModule,
+    IgxSwitchModule
+} from 'igniteui-angular';
+import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
+
+export class AccordionConfigGenerator implements IConfigGenerator {
+
+    public generateConfigs(): Config[] {
+        const configs = new Array<Config>();
+
+        configs.push(new Config({
+            component: 'AccordionSample1Component',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['AccordionSample1Component', 'IgxAccordionModule', 'IgxSwitchModule'],
+                ngDeclarations: ['AccordionSample1Component'],
+                ngImports: ['IgxAccordionModule', 'IgxSwitchModule']
+            }),
+            shortenComponentPathBy: '/layouts/accordion/'
+        }));
+
+        configs.push(new Config({
+            component: 'AccordionSample2Component',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['AccordionSample2Component', 'IgxAccordionModule', 'IgxSwitchModule'],
+                ngDeclarations: ['AccordionSample2Component'],
+                ngImports: ['IgxAccordionModule', 'IgxSwitchModule']
+            }),
+            shortenComponentPathBy: '/layouts/accordion/'
+        }));
+
+        configs.push(new Config({
+            component: 'AccordionSample3Component',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxCheckboxModule', 'IgxSliderModule',
+                    'IgxRadioModule', 'IgxTimePickerModule', 'AccordionSample3Component', 'IgxAccordionModule'],
+                ngDeclarations: ['AccordionSample3Component'],
+                ngImports: ['IgxCheckboxModule', 'IgxSliderModule',
+                    'IgxRadioModule', 'IgxTimePickerModule', 'IgxAccordionModule']
+            }),
+            shortenComponentPathBy: '/layouts/accordion/'
+        }));
+
+        return configs;
+    }
+}

live-editing/configs/AccordionConfigGenerator.ts

@@ -34,6 +34,18 @@ export class DateRangePickerConfigGenerator implements IConfigGenerator {
             })
         );
 
+        configs.push(
+            new Config({
+                component: 'DateRangePickerRangeButtonsComponent',
+                appModuleConfig: new AppModuleConfig({
+                    imports: ['IgxDateRangePickerModule', 'DateRangePickerRangeButtonsComponent'],
+                    ngDeclarations: ['DateRangePickerRangeButtonsComponent'],
+                    ngImports: ['IgxDateRangePickerModule']
+                }),
+                shortenComponentPathBy: "/scheduling/daterangepicker/"
+            })
+        );
+
         configs.push(
             new Config({
                 component: 'DateRangePickerStartEndComponent',

live-editing/configs/DateRangePickerConfigGenerator.ts

@@ -39,8 +39,6 @@ import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
 export class GridConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
-        GridWithTransactionsComponent: '../../src/app/grid/grid-batch-editing/grid-transaction.component',
-        GridWithTransactions2Component: '../../src/app/grid/grid-batchEditing-remotePaging/transaction.component',
         ContextmenuComponent: '../../src/app/grid/grid-contextmenu-sample/contextmenu/contextmenu.component',
         RemoteValuesService: '../../src/app/grid/grid-excel-style-filtering-load-on-demand/remoteValues.service',
         PlanetComponent: '../../src/app/grid/grid-row-drag/planet/planet.component',
@@ -49,7 +47,8 @@ export class GridConfigGenerator implements IConfigGenerator {
         RemoteFilteringService: '../../src/app/services/remoteFiltering.service',
         RemotePagingService: '../../src/app/services/remotePaging.service',
         RemoteServiceVirt: '../../src/app/services/remoteVirtualization.service',
-        FinancialDataService: '../../src/app/services/financial.service'
+        FinancialDataService: '../../src/app/services/financial.service',
+        CRUDService: '../../src/app/services/crud.service'
 };
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
@@ -504,6 +503,17 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: 'GridMultiColumnHeadersExportComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/customers.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['GridMultiColumnHeadersExportComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
+                ngDeclarations: ['GridMultiColumnHeadersExportComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
+                ngProviders: ['IgxExcelExporterService']
+            })
+        }));
+
         configs.push(new Config({
             component: 'RemotePagingGridSampleComponent',
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/remotePaging.service.ts'],
@@ -565,12 +575,11 @@ export class GridConfigGenerator implements IConfigGenerator {
         // Grid Batch Editing
         configs.push(new Config({
             component: 'GridBatchEditingSampleComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts',
-                '/src/app/grid/grid-batch-editing/grid-transaction.component.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['GridBatchEditingSampleComponent', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
-                    'IgxFocusModule', 'GridWithTransactionsComponent', 'IgxPreventDocumentScrollModule'],
-                ngDeclarations: ['GridBatchEditingSampleComponent', 'GridWithTransactionsComponent'],
+                    'IgxFocusModule', 'IgxPreventDocumentScrollModule'],
+                ngDeclarations: ['GridBatchEditingSampleComponent'],
                 ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
                     'IgxFocusModule']
             })
@@ -579,12 +588,11 @@ export class GridConfigGenerator implements IConfigGenerator {
         // Grid with Action Strip
         configs.push(new Config({
             component: 'GridActionStripSampleComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts',
-                '/src/app/grid/grid-batch-editing/grid-transaction.component.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts', '/src/app/data/utils.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['GridActionStripSampleComponent', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
-                    'IgxFocusModule', 'GridWithTransactionsComponent', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule'],
-                ngDeclarations: ['GridActionStripSampleComponent', 'GridWithTransactionsComponent'],
+                    'IgxFocusModule', 'IgxPreventDocumentScrollModule', 'IgxActionStripModule'],
+                ngDeclarations: ['GridActionStripSampleComponent'],
                 ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule', 'IgxActionStripModule',
                     'IgxFocusModule']
             })
@@ -777,7 +785,7 @@ export class GridConfigGenerator implements IConfigGenerator {
 
         configs.push(new Config({
             component: 'GridNestedDataBindComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/grid/grid-nested-data-binding/nestedData.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nested-employee-data.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['GridNestedDataBindComponent', 'IgxGridModule', 'IgxInputGroupModule', 'IgxExpansionPanelModule', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['GridNestedDataBindComponent'],
@@ -787,7 +795,7 @@ export class GridConfigGenerator implements IConfigGenerator {
 
         configs.push(new Config({
             component: 'GridNestedDataBindAminoacidComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/grid/grid-nested-data-binding-2/data.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/amino-data.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['GridNestedDataBindAminoacidComponent', 'IgxGridModule', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['GridNestedDataBindAminoacidComponent'],
@@ -897,6 +905,18 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: 'GridDropIndicatorComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts',
+                '/src/app/data/customers.ts'
+            ],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxGridModule', 'GridDropIndicatorComponent', 'IgxDragDropModule', 'IgxPreventDocumentScrollModule'],
+                ngDeclarations: ['GridDropIndicatorComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxDragDropModule']
+            })
+        }));
+
         configs.push(new Config({
             component: 'GridGroupByPagingSampleComponent',
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts',
@@ -1164,12 +1184,11 @@ export class GridConfigGenerator implements IConfigGenerator {
         // Grid Batch Editing with remote paging
         configs.push(new Config({
             component: 'RemotePagingBatchEditingComponent',
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/utils.ts',
-                '/src/app/grid/grid-batchEditing-remotePaging/transaction.component.ts', '/src/app/services/remotePaging.service.ts'],
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/utils.ts', '/src/app/services/remotePaging.service.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['RemotePagingBatchEditingComponent', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
-                    'GridWithTransactions2Component', 'RemotePagingService', 'HttpClientModule', 'IgxPreventDocumentScrollModule'],
-                ngDeclarations: ['RemotePagingBatchEditingComponent', 'GridWithTransactions2Component'],
+                    'RemotePagingService', 'HttpClientModule', 'IgxPreventDocumentScrollModule'],
+                ngDeclarations: ['RemotePagingBatchEditingComponent'],
                 ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxDialogModule', 'IgxButtonModule',
                     'HttpClientModule'],
                 ngProviders: ['RemotePagingService']
@@ -1271,6 +1290,39 @@ export class GridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            component: 'CRUDSampleComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/crud.service.ts',
+                '/src/app/data/invoiceData.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['CRUDSampleComponent', 'IgxActionStripModule', 'HttpClientModule', 'IgxGridModule', 'IgxPreventDocumentScrollModule', 'CRUDService'],
+                ngDeclarations: ['CRUDSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxActionStripModule', 'HttpClientModule'],
+                ngProviders: ['CRUDService']
+            })
+        }));
+
+        configs.push(new Config({
+            component: 'GridRowClassesComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: [ 'IgxGridModule', 'GridRowClassesComponent', 'IgxPreventDocumentScrollModule'],
+                ngDeclarations: ['GridRowClassesComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule']
+            })
+        }));
+
+        configs.push(new Config({
+            component: 'GridRowStylesComponent',
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/services/financial.service.ts',  '/src/app/data/financialData.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: [ 'IgxGridModule', 'GridRowStylesComponent', 'IgxPreventDocumentScrollModule', 'FinancialDataService'],
+                ngDeclarations: ['GridRowStylesComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule'],
+                ngProviders: ['FinancialDataService']
+            })
+        }));
+
         return configs;
     }
 }

live-editing/configs/GridConfigGenerator.ts

@@ -30,7 +30,6 @@ import { Router, RouterModule } from '@angular/router';
 export class HierarchicalGridConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
-        HierarchicalGridWithTransactionsComponent: '../../src/app/hierarchical-grid/hierarchical-grid-batch-editing/hierarchical-grid-transactions.component',
         RemoteValuesService: '../../src/app/services/remoteValues.service',
         HGridContextmenuComponent: '../../src/app/hierarchical-grid/hierarchical-grid-sorting/hgrid-contextmenu/hgrid-contextmenu.component',
         RemoteLoDService: '../../src/app/services/remote-lod.service'
@@ -95,13 +94,12 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
 
         configs.push(new Config({
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
-                '/src/app/hierarchical-grid/models.ts',
-                '/src/app/hierarchical-grid/hierarchical-grid-batch-editing/hierarchical-grid-transactions.component.ts'],
+                '/src/app/hierarchical-grid/models.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxHierarchicalGridModule', 'HGridBatchEditingSampleComponent',
-                    'HierarchicalGridWithTransactionsComponent', 'IgxButtonModule', 'IgxCheckboxModule',
+                    'IgxButtonModule', 'IgxCheckboxModule',
                     'IgxDatePickerModule', 'IgxGridModule', 'IgxDialogModule', 'IgxPreventDocumentScrollModule'],
-                ngDeclarations: ['HGridBatchEditingSampleComponent', 'HierarchicalGridWithTransactionsComponent'],
+                ngDeclarations: ['HGridBatchEditingSampleComponent'],
                 ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxButtonModule', 'IgxCheckboxModule',
                     'IgxDatePickerModule', 'IgxGridModule', 'IgxDialogModule']
             }),
@@ -414,6 +412,17 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HGridMultiHeadersStylingComponent'
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxHierarchicalGridModule', 'HGridMultiColumnHeadersExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
+                ngDeclarations: ['HGridMultiColumnHeadersExportComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
+                ngProviders: ['IgxExcelExporterService']
+            }),
+            component: 'HGridMultiColumnHeadersExportComponent'
+        }));
+
         configs.push(new Config({
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts'],
             appModuleConfig: new AppModuleConfig({
@@ -831,6 +840,26 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HierarchicalGridPagerSampleComponent'
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts'],
+            component: 'HGridRowClassesSampleComponent',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowClassesSampleComponent'],
+                ngDeclarations: ['HGridRowClassesSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
+            })
+        }));
+
+        configs.push(new Config({
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts'],
+            component: 'HGridRowStylesSampleComponent',
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridRowStylesSampleComponent'],
+                ngDeclarations: ['HGridRowStylesSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
+            })
+        }));
+
         return configs;
     }
 }