Merge branch 'vnext' into apetrov/grid-advanced-excel-samples-vnext

Author: simeonoff

azure-devops/app-cd.yml

@@ -24,9 +24,9 @@ steps:
     fetchTags: true
 
   - task: NodeTool@0
-    displayName: Use Node 20.x
+    displayName: Use Node 22.x
     inputs:
-      versionSpec: 20.x
+      versionSpec: 22.x
 
   - task: PowerShell@2
     displayName: 'Replace with licensed angular-extras'

azure-devops/app-crm-cd-yml azure-devops/app-crm-cd.ymlazure-devops/app-crm-cd-yml renamed to azure-devops/app-crm-cd.yml

@@ -24,9 +24,9 @@ steps:
     fetchTags: true
 
   - task: NodeTool@0
-    displayName: Use Node 20.x
+    displayName: Use Node 22.x
     inputs:
-      versionSpec: 20.x
+      versionSpec: 22.x
 
   - task: PowerShell@2
     displayName: 'Replace with licensed angular-extras'

azure-devops/app-lob-cd.yml

@@ -24,9 +24,9 @@ steps:
     fetchTags: true
 
   - task: NodeTool@0
-    displayName: Use Node 20.x
+    displayName: Use Node 22.x
     inputs:
-      versionSpec: 20.x
+      versionSpec: 22.x
 
   - task: PowerShell@2
     displayName: 'Replace with licensed angular-extras'

live-editing/configs/BaseConfig.ts

@@ -7,5 +7,7 @@ export const BaseAppConfig = {
     providers: [
         { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
     ],
-    router: false
-}
+    routesConfig: {
+        router: false
+    }
+}

live-editing/configs/CarouselConfigGenerator.ts

@@ -41,6 +41,13 @@ export class CarouselConfigGenerator implements IConfigGenerator {
             shortenComponentPathBy: "/layouts/carousel/"
         }));
 
+        configs.push(new Config({
+            component: 'CarouselStylingSampleComponent',
+            additionalFiles: ["/src/app/layouts/carousel/carousel-styling-sample/layout.scss"],
+            appConfig: BaseAppConfig,
+            shortenComponentPathBy: "/layouts/carousel/"
+        }));
+        
         return configs;
     }
 }

live-editing/configs/GridCRMConfigGenerator.ts

@@ -26,8 +26,7 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
                 ],
                 providers: [
                     { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
-                ],
-                router: true
+                ]
             }
             /*appConfig: BaseAppConfig*/
 

live-editing/configs/GridConfigGenerator.ts

@@ -452,11 +452,17 @@ export class GridConfigGenerator implements IConfigGenerator {
             additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts',
                 '/src/app/grid/grid-save-state/localData.ts',
                 '/src/app/grid/grid-save-state/about.component.ts',
-                '/src/app/grid/grid-save-state/about.component.html'
+                '/src/app/grid/grid-save-state/about.component.html',
+                '/src/app/grid/grid-save-state/routes.ts'
             ],
-            appConfig: BaseAppConfig
+            appConfig: {
+                ...BaseAppConfig,
+                routesConfig: {
+                    router: true,
+                    routesImportPath: './grid/grid-save-state/routes'
+                }
+            }
         });
-        gridSaveStateSampleConfig.usesRouting = true;
         configs.push(gridSaveStateSampleConfig);
 
         configs.push(new Config({

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable max-len */
-import {ReactiveFormsModule} from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
 import {
     IgxActionStripModule,
@@ -517,12 +517,18 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
                 '/src/app/data/singersData.ts',
                 '/src/app/hierarchical-grid/models.ts',
                 '/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts',
-                '/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html'
+                '/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html',
+                '/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts'
             ],
-            appConfig: BaseAppConfig,
+            appConfig: {
+                ...BaseAppConfig,
+                routesConfig: {
+                    router: true,
+                    routesImportPath: './hierarchical-grid/hierarchical-grid-save-state/routes'
+                }
+            },
             component: 'HGridSaveStateComponent'
         });
-        hGridSaveStateSampleConfig.usesRouting = true;
         configs.push(hGridSaveStateSampleConfig);
 
         configs.push(new Config({

live-editing/configs/PivotGridConfigGenerator.ts

@@ -42,14 +42,21 @@ export class PivotGridConfigGenerator implements IConfigGenerator {
         }));
 
         configs.push(new Config({
-            additionalFiles: 
+            additionalFiles:
             [
                 '/src/app/directives/prevent-scroll.directive.ts',
                 '/src/app/data/dataToAnalyze.ts',
                 '/src/app/pivot-grid/pivot-state-persistence/about.component.ts',
                 '/src/app/pivot-grid/pivot-state-persistence/about.component.html',
+                '/src/app/pivot-grid/pivot-state-persistence/routes.ts'
             ],
-            appConfig: BaseAppConfig,
+             appConfig: {
+                ...BaseAppConfig,
+                routesConfig: {
+                    router: true,
+                    routesImportPath: './pivot-grid/pivot-state-persistence/routes'
+                }
+            },
             component: 'PivotGridStatePersistenceSampleComponent'
         }));
 

live-editing/configs/TabBarConfigGenerator.ts

@@ -37,8 +37,8 @@ export class TabBarConfigGenerator implements IConfigGenerator {
                 "/src/app/layouts/tabbar/views/view3/view3.component.ts",
                 "/src/app/layouts/tabbar/views/view3/view3.component.html"
             ],
-            /* TODO: Adding the correct router config needs to be done separately */
-            appConfig: { ...BaseAppConfig, ...{ router: true }},
+            /* Note: the Tabbar samples are not used anymore */
+            appConfig: { ...BaseAppConfig, ...{ routesConfig: { router: true } }},
             shortenComponentPathBy: "/layouts/tabbar/"
         }));