Merge pull request #2353 from IgniteUI/zkolev/vnext-11-0-0

Update to [email protected]
IgniteUI · Nov 13, 2020 · 7c7b351 · 7c7b351
2 parents 3dc3e35 + fcaf83f
commit 7c7b351
Show file tree

Hide file tree

Showing 147 changed files with 3,179 additions and 4,046 deletions.
diff --git a/.github/workflows/build-app-lob.yml b/.github/workflows/build-app-lob.yml
@@ -0,0 +1,34 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master, vNext, rkaraivanov/toolbar-samples ]
+  pull_request:
+    branches: [ master, vNext, rkaraivanov/toolbar-samples ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run lint
+        run: npm run lint
+
+      - name: 'Generate live editing and build samples'
+        run: npm run build:app-lob
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
diff --git a/angular.json b/angular.json
@@ -38,7 +38,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": false,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -153,7 +152,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
@@ -257,5 +255,8 @@
     "@schematics/angular:directive": {
       "prefix": "app"
     }
+  },
+  "cli": {
+    "analytics": false
   }
-}
+}
diff --git a/live-editing/configs/GridConfigGenerator.ts b/live-editing/configs/GridConfigGenerator.ts
@@ -9,7 +9,6 @@ IgxButtonGroupModule,
 IgxButtonModule,
 IgxCheckboxModule,
 IgxChipsModule,
-IgxColumnHidingModule,
 IgxComboModule,
 IgxCsvExporterService,
 IgxDatePickerModule,
@@ -244,10 +243,9 @@ export class GridConfigGenerator implements IConfigGenerator {
             component: 'GridColumnHidingSampleComponent',
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/data/customers.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: ['HttpClientModule', 'IgxGridModule', 'IgxRadioModule',
-                    'IgxColumnHidingModule', 'GridColumnHidingSampleComponent', 'IgxPreventDocumentScrollModule'],
+                imports: ['HttpClientModule', 'IgxGridModule', 'IgxRadioModule', 'GridColumnHidingSampleComponent', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['GridColumnHidingSampleComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxRadioModule', 'IgxColumnHidingModule', 'HttpClientModule'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxRadioModule', 'HttpClientModule'],
                 ngProviders: []
             })
         }));
@@ -404,10 +402,10 @@ export class GridConfigGenerator implements IConfigGenerator {
             component: 'GridToolbarSample2Component',
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/grid/services/data.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: ['GridToolbarSample2Component', 'IgxAvatarModule', 'IgxGridModule',
+                imports: ['GridToolbarSample2Component', 'IgxAvatarModule', 'IgxGridModule', 'IgxSwitchModule',
                     'IgxExcelExporterService', 'IgxCsvExporterService', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['GridToolbarSample2Component'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxAvatarModule', 'IgxGridModule'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxAvatarModule', 'IgxGridModule', 'IgxSwitchModule'],
                 ngProviders: ['IgxExcelExporterService', 'IgxCsvExporterService']
             })
         }));

diff --git a/live-editing/configs/HierarchicalGridConfigGenerator.ts b/live-editing/configs/HierarchicalGridConfigGenerator.ts
@@ -23,6 +23,7 @@ IgxToggleModule} from 'igniteui-angular';
 import {AppModuleConfig} from './core/AppModuleConfig';
 import {Config} from './core/Config';
 import {IConfigGenerator} from './core/IConfigGenerator';
+import {Router, RouterModule} from '@angular/router'
 export class HierarchicalGridConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
@@ -412,9 +413,9 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxHierarchicalGridModule', 'HGridToolbarOptionsSampleComponent', 'IgxPreventDocumentScrollModule'],
+                imports: ['IgxHierarchicalGridModule', 'HGridToolbarOptionsSampleComponent', 'IgxPreventDocumentScrollModule', 'IgxSwitchModule'],
                 ngDeclarations: ['HGridToolbarOptionsSampleComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule']
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxSwitchModule']
             }),
             component: 'HGridToolbarOptionsSampleComponent'
         }));
@@ -718,16 +719,23 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HGridRemotePagingDefaultTemplateComponent'
         }));
 
-        configs.push(new Config({
-            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
+        const hGridSaveStateSampleConfig = new Config({
+            additionalFiles: [
+            "/src/app/directives/prevent-scroll.directive.ts", 
+            "/src/app/hierarchical-grid/data.ts",
+            "/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts",
+            "/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html"
+            ],
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule'],
+                imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule', 'Router', 'RouterModule'],
                 ngDeclarations: ['HGridSaveStateComponent', 'HGridAboutComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HttpClientModule',
-                    "RouterModule.forRoot([\{component: 'HGridAboutComponent', path: 'hGrid-state-about'},\{component: 'HGridSaveStateComponent', path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])]"]
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 
+                    "RouterModule.forRoot([\{component: HGridAboutComponent, path: 'hGrid-state-about'},\{component: HGridSaveStateComponent, path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])"]
             }),
             component: 'HGridSaveStateComponent'
-        }));
+        });
+        hGridSaveStateSampleConfig.usesRouting = true;
+        configs.push(hGridSaveStateSampleConfig);
 
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],

diff --git a/live-editing/configs/TreeGridConfigGenerator.ts b/live-editing/configs/TreeGridConfigGenerator.ts
@@ -5,7 +5,6 @@ IgxButtonGroupModule,
 IgxButtonModule,
 IgxCheckboxModule,
 IgxChipsModule,
-IgxColumnHidingModule,
 IgxCsvExporterService,
 IgxDatePickerModule,
 IgxDialogModule,
@@ -121,9 +120,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/employees-flat-detailed.ts"],
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridColumnHidingSampleComponent', 'IgxRadioModule', 'IgxColumnHidingModule'],
+                imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridColumnHidingSampleComponent', 'IgxRadioModule'],
                 ngDeclarations: ['TreeGridColumnHidingSampleComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxRadioModule', 'IgxColumnHidingModule']
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxRadioModule']
             }),
             component: 'TreeGridColumnHidingSampleComponent',
             shortenComponentPathBy: "/tree-grid/"
@@ -396,9 +395,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/tree-grid/data/employees-flat-avatars.ts"],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'TreeGridToolbarSample1Component', 'IgxAvatarModule',
-                    'IgxExcelExporterService', 'IgxCsvExporterService'],
+                    'IgxExcelExporterService', 'IgxCsvExporterService', 'IgxSwitchModule'],
                 ngDeclarations: ['TreeGridToolbarSample1Component'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxAvatarModule'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxAvatarModule', 'IgxSwitchModule'],
                 ngProviders: ['IgxExcelExporterService', 'IgxCsvExporterService']
             }),
             component: 'TreeGridToolbarSample1Component',