diff --git a/live-editing/configs/BaseConfig.ts b/live-editing/configs/BaseConfig.ts index d8f4d4f0dc..0aa9662bbf 100644 --- a/live-editing/configs/BaseConfig.ts +++ b/live-editing/configs/BaseConfig.ts @@ -7,5 +7,7 @@ export const BaseAppConfig = { providers: [ { 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' } ], - router: false -} \ No newline at end of file + routesConfig: { + router: false + } +} diff --git a/live-editing/configs/GridCRMConfigGenerator.ts b/live-editing/configs/GridCRMConfigGenerator.ts index dd0100d557..dd36ae0233 100644 --- a/live-editing/configs/GridCRMConfigGenerator.ts +++ b/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*/ diff --git a/live-editing/configs/GridConfigGenerator.ts b/live-editing/configs/GridConfigGenerator.ts index 4c27d5eeb9..450a500884 100644 --- a/live-editing/configs/GridConfigGenerator.ts +++ b/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({ diff --git a/live-editing/configs/HierarchicalGridConfigGenerator.ts b/live-editing/configs/HierarchicalGridConfigGenerator.ts index 7780d0d0cc..1b8d63c1ba 100644 --- a/live-editing/configs/HierarchicalGridConfigGenerator.ts +++ b/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({ diff --git a/live-editing/configs/PivotGridConfigGenerator.ts b/live-editing/configs/PivotGridConfigGenerator.ts index 1c451d3c14..a9676ce379 100644 --- a/live-editing/configs/PivotGridConfigGenerator.ts +++ b/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' })); diff --git a/live-editing/configs/TabBarConfigGenerator.ts b/live-editing/configs/TabBarConfigGenerator.ts index 10701008b4..597cd869a1 100644 --- a/live-editing/configs/TabBarConfigGenerator.ts +++ b/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/" })); diff --git a/live-editing/configs/TabsConfigGenerator.ts b/live-editing/configs/TabsConfigGenerator.ts index 2773942d7a..6a69385dd0 100644 --- a/live-editing/configs/TabsConfigGenerator.ts +++ b/live-editing/configs/TabsConfigGenerator.ts @@ -45,10 +45,16 @@ export class TabsConfigGenerator implements IConfigGenerator { "/src/app/layouts/tabs/views/view2/view2.component.ts", "/src/app/layouts/tabs/views/view2/view2.component.html", "/src/app/layouts/tabs/views/view3/view3.component.ts", - "/src/app/layouts/tabs/views/view3/view3.component.html" + "/src/app/layouts/tabs/views/view3/view3.component.html", + "/src/app/layouts/tabs/tabs-sample-4/routes.ts" ], - /* TODO: Adding the correct router config needs to be done separately */ - appConfig: { ...BaseAppConfig, ...{ router: true }}, + appConfig: { + ...BaseAppConfig, + routesConfig: { + router: true, + routesImportPath: './tabs-sample-4/routes' + } + }, shortenComponentPathBy: "/layouts/tabs/" })); diff --git a/live-editing/configs/TreeGridConfigGenerator.ts b/live-editing/configs/TreeGridConfigGenerator.ts index e1e847104a..afdaf948b6 100644 --- a/live-editing/configs/TreeGridConfigGenerator.ts +++ b/live-editing/configs/TreeGridConfigGenerator.ts @@ -672,12 +672,19 @@ export class TreeGridConfigGenerator implements IConfigGenerator { '/src/app/directives/prevent-scroll.directive.ts', '/src/app/tree-grid/tree-grid-save-state/data.ts', '/src/app/tree-grid/tree-grid-save-state/about.component.ts', - '/src/app/tree-grid/tree-grid-save-state/about.component.html'], - appConfig: BaseAppConfig, + '/src/app/tree-grid/tree-grid-save-state/about.component.html', + '/src/app/tree-grid/tree-grid-save-state/routes.ts' + ], + appConfig: { + ...BaseAppConfig, + routesConfig: { + router: true, + routesImportPath: './tree-grid-save-state/routes' + } + }, component: 'TGridSaveStateComponent', shortenComponentPathBy: '/tree-grid/' }); - treeGridSaveStateSampleConfig.usesRouting = true; configs.push(treeGridSaveStateSampleConfig); configs.push(new Config({ diff --git a/package-lock.json b/package-lock.json index 241cad0560..aacf991f72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "igniteui-angular-extras": "^20.0.0", "igniteui-angular-i18n": "^20.1.4", "igniteui-dockmanager": "^1.17.0", - "igniteui-live-editing": "^3.1.1", + "igniteui-live-editing": "^3.2.0", "igniteui-webcomponents": "^6.2.0", "minireset.css": "0.0.6", "postcss": "^8.5.5", @@ -12657,9 +12657,9 @@ "license": "Apache-2.0" }, "node_modules/igniteui-live-editing": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/igniteui-live-editing/-/igniteui-live-editing-3.1.1.tgz", - "integrity": "sha512-WyoNlXS5yazjfhRcv01HnvRIiTrCMHMmQ/Ko3eNDSijsZPQLtjckb9vcj6jDeowNyG+GT4d8hE/S6hEoYXTpUg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/igniteui-live-editing/-/igniteui-live-editing-3.2.0.tgz", + "integrity": "sha512-GfDDql8G9GjqtmmaDmB13fvqzaZtO34Db/hhJnYud8MThPq7oECl37jrzvRMxBSXRIFKpZ4SLPneb7UlWz93hA==", "license": "MIT" }, "node_modules/igniteui-theming": { diff --git a/package.json b/package.json index ab9eab0058..b80cb1a2b2 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "igniteui-angular-extras": "^20.0.0", "igniteui-angular-i18n": "^20.1.4", "igniteui-dockmanager": "^1.17.0", - "igniteui-live-editing": "^3.1.1", + "igniteui-live-editing": "^3.2.0", "igniteui-webcomponents": "^6.2.0", "minireset.css": "0.0.6", "postcss": "^8.5.5", diff --git a/src/app/grid/grid-save-state/routes.ts b/src/app/grid/grid-save-state/routes.ts new file mode 100644 index 0000000000..d9769b71ce --- /dev/null +++ b/src/app/grid/grid-save-state/routes.ts @@ -0,0 +1,13 @@ +import { Routes } from "@angular/router"; +import { AboutComponent } from "./about.component"; +import { GridSaveStateComponent } from "./grid-state.component"; + +export const routes: Routes = [ + { path: 'grid-about', component: AboutComponent }, + { path: 'grid-state', component: GridSaveStateComponent }, + { + path: '', + pathMatch: 'full', + redirectTo: 'grid-state' + } +]; diff --git a/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts b/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts new file mode 100644 index 0000000000..79a5970551 --- /dev/null +++ b/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts @@ -0,0 +1,13 @@ +import { Routes } from "@angular/router"; +import { HGridSaveStateComponent } from "./hGrid-state.component"; +import { HGridAboutComponent } from "./about.component"; + +export const routes: Routes = [ + { path: 'hGrid-state-about', component: HGridAboutComponent }, + { path: 'hGrid-state', component: HGridSaveStateComponent }, + { + path: '', + pathMatch: 'full', + redirectTo: 'hGrid-state' + } +]; diff --git a/src/app/layouts/tabs/tabs-sample-4/routes.ts b/src/app/layouts/tabs/tabs-sample-4/routes.ts new file mode 100644 index 0000000000..2ceec4061b --- /dev/null +++ b/src/app/layouts/tabs/tabs-sample-4/routes.ts @@ -0,0 +1,21 @@ +import { Routes } from "@angular/router"; +import { View1Component } from "../views/view1/view1.component"; +import { View2Component } from "../views/view2/view2.component"; +import { View3Component } from "../views/view3/view3.component"; +import { TabsSample4Component } from "./components/tabs-sample-4.component"; + +export const routes: Routes = [ + { + path: '', + pathMatch: 'full', + redirectTo: '/tabs-routing' + }, + { + path: 'tabs-routing', + component: TabsSample4Component, + children: [ + { path: 'view1', component: View1Component }, + { path: 'view2', component: View2Component }, + { path: 'view3', component: View3Component } + ] + }]; diff --git a/src/app/pivot-grid/pivot-state-persistence/routes.ts b/src/app/pivot-grid/pivot-state-persistence/routes.ts new file mode 100644 index 0000000000..f2a2b4e721 --- /dev/null +++ b/src/app/pivot-grid/pivot-state-persistence/routes.ts @@ -0,0 +1,13 @@ +import { Routes } from "@angular/router"; +import { PivotGridStatePersistenceSampleComponent } from "./pivot-grid-state-persistence-sample.component"; +import { PivotGridAboutComponent } from "./about.component"; + +export const routes: Routes = [ + { path: 'pivot-state-about', component: PivotGridAboutComponent }, + { path: 'pivot-grid-state-persistence', component: PivotGridStatePersistenceSampleComponent }, + { + path: '', + pathMatch: 'full', + redirectTo: 'pivot-grid-state-persistence' + } +]; diff --git a/src/app/tree-grid/tree-grid-save-state/routes.ts b/src/app/tree-grid/tree-grid-save-state/routes.ts new file mode 100644 index 0000000000..279b08be6d --- /dev/null +++ b/src/app/tree-grid/tree-grid-save-state/routes.ts @@ -0,0 +1,13 @@ +import { Routes } from "@angular/router"; +import { TGridAboutComponent } from "./about.component"; +import { TGridSaveStateComponent } from "./tGrid-state.component"; + +export const routes: Routes = [ + { path: 'tree-grid-state-about', component: TGridAboutComponent }, + { path: 'tree-grid-state', component: TGridSaveStateComponent }, + { + path: '', + pathMatch: 'full', + redirectTo: 'tree-grid-state' + } +];