Merge pull request #3318 from IgniteUI/vnext

Promote to prod

Author: hanastasov

.eslintrc.json

@@ -15,6 +15,9 @@
         ],
         "createDefaultProgram": true
       },
+      "plugins": [
+        "@typescript-eslint"
+      ],
       "extends": [
         "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates"

.github/workflows/build-app-crm.yml

@@ -49,7 +49,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

.github/workflows/build-app-lob.yml

@@ -54,7 +54,7 @@ jobs:
         run: npm config set ${{secrets.IG_SCOPE}}:_auth=${{secrets.IG_TOKEN}}
 
       - name: Install dependencies
-        run: npm ci
+        run: npm ci --legacy-peer-deps
 
       - name: Run lint
         run: npm run lint

azure-pipelines.yml

@@ -16,7 +16,8 @@ steps:
 
 - task: Npm@1
   inputs:
-    command: 'ci'
+    command: 'custom'
+    customCommand: 'install  --legacy-peer-deps'
     customEndpoint: 'public proget'
   env:
     AZURE_PIPELINES: "true"

live-editing/configs/CalendarConfigGenerator.ts

@@ -25,9 +25,9 @@ export class CalendarConfigGenerator implements IConfigGenerator {
         configs.push(new Config({
             component: 'CalendarSample2Component',
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxCalendarModule', 'IgxPrefixModule', 'IgxSelectModule', 'CalendarSample2Component'],
+                imports: ['IgxCalendarModule', 'IgxSelectModule', 'CalendarSample2Component'],
                 ngDeclarations: ['CalendarSample2Component'],
-                ngImports: ['IgxCalendarModule', 'IgxPrefixModule', 'IgxSelectModule']
+                ngImports: ['IgxCalendarModule', 'IgxSelectModule']
             }),
             shortenComponentPathBy: "/scheduling/calendar/"
         }));

live-editing/configs/ComboConfigGenerator.ts

@@ -138,6 +138,18 @@ export class ComboConfigGenerator implements IConfigGenerator {
             component: 'SimpleComboCascadingComponent'
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/services/remoteNwind.service.ts'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule',
+                    'HttpClientModule', 'RemoteNWindService', 'SimpleComboRemoteComponent'],
+                ngDeclarations: ['SimpleComboRemoteComponent'],
+                ngImports: ['IgxComboModule', 'IgxSimpleComboModule', 'IgxToastModule', 'HttpClientModule'],
+                ngProviders: ['RemoteNWindService']
+            }),
+            component: 'SimpleComboRemoteComponent'
+        }));
+
         configs.push(new Config({
             additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
             appModuleConfig: new AppModuleConfig({

live-editing/configs/ExportCsvConfigGenerator.ts

@@ -3,7 +3,9 @@ IgxGridModule,
 IgxTreeGridModule} from 'igniteui-angular';
 import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
 export class ExportCsvConfigGenerator implements IConfigGenerator {
-
+    public additionalImports = {
+        IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive'
+    };
 
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
@@ -19,19 +21,20 @@ export class ExportCsvConfigGenerator implements IConfigGenerator {
         }));
 
         configs.push(new Config({
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts'],
             component: 'CsvExportSample1Component',
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxGridModule', 'IgxCsvExporterService', 'CsvExportSample1Component'],
+                imports: ['IgxGridModule', 'IgxCsvExporterService', 'CsvExportSample1Component', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['CsvExportSample1Component'],
-                ngImports: ['IgxGridModule'],
+                ngImports: ['IgxGridModule', 'IgxPreventDocumentScrollModule'],
                 ngProviders: ['IgxCsvExporterService']
             }),
             shortenComponentPathBy: "/export-csv/"
         }));
 
         configs.push(new Config({
             component: 'TreeGridCsvExportSample1Component',
-            additionalFiles: ["/src/app/tree-grid/data/foods.ts"],
+            additionalFiles: ["/src/app/tree-grid/data/orders.ts"],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxTreeGridModule', 'IgxCsvExporterService', 'TreeGridCsvExportSample1Component'],
                 ngDeclarations: ['TreeGridCsvExportSample1Component'],

live-editing/configs/ExportExcelConfigGenerator.ts

@@ -5,12 +5,14 @@ import {
     IgxDropDownModule,
     IgxExcelExporterService,
     IgxGridModule,
-    IgxTreeGridModule
+    IgxTreeGridModule,
+    IgxToggleModule 
 } from 'igniteui-angular';
 import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
 export class ExportExcelConfigGenerator implements IConfigGenerator {
     public additionalImports = {
-        PasteHandler: '../../src/app/grid/grid-paste/paste-handler.directive'
+        PasteHandler: '../../src/app/grid/grid-paste/paste-handler.directive',
+        IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive'
     };
     public generateConfigs(): Config[] {
         const configs = new Array<Config>();
@@ -43,22 +45,22 @@ export class ExportExcelConfigGenerator implements IConfigGenerator {
                 '/src/app/grid/grid-paste/paste-handler.directive.ts'],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxGridModule', 'IgxExcelExporterService', 'GridPasteSampleComponent', 'IgxDropDownComponent',
-                    'IgxDropDownModule', 'IgxButtonModule', 'PasteHandler'],
+                    'IgxDropDownModule', 'IgxButtonModule', 'PasteHandler', 'IgxToggleModule','IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['GridPasteSampleComponent', 'PasteHandler'],
-                ngImports: ['IgxGridModule', 'IgxDropDownModule', 'IgxButtonModule'],
+                ngImports: ['IgxGridModule', 'IgxDropDownModule', 'IgxButtonModule', 'IgxToggleModule', 'IgxPreventDocumentScrollModule'],
                 ngProviders: ['IgxExcelExporterService']
             }),
             shortenComponentPathBy: '/grid-paste/'
         }));
 
         configs.push(new Config({
             component: 'TreeGridExcelExportSample1Component',
-            additionalFiles: ['/src/app/tree-grid/data/foods.ts'],
+            additionalFiles: ['/src/app/tree-grid/data/orders.ts', '/src/app/directives/prevent-scroll.directive.ts',],
             appModuleConfig: new AppModuleConfig({
                 imports: ['IgxTreeGridModule', 'IgxExcelExporterService', 'TreeGridExcelExportSample1Component',
-                    'IgxButtonModule'],
+                    'IgxButtonModule', 'IgxPreventDocumentScrollModule'],
                 ngDeclarations: ['TreeGridExcelExportSample1Component'],
-                ngImports: ['IgxTreeGridModule', 'IgxButtonModule'],
+                ngImports: ['IgxTreeGridModule', 'IgxButtonModule', 'IgxPreventDocumentScrollModule'],
                 ngProviders: ['IgxExcelExporterService']
             })
         }));