Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions live-editing/configs/BaseConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ export const BaseAppConfig = {
providers: [
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
],
router: false
}
routesConfig: {
router: false
}
}
3 changes: 1 addition & 2 deletions live-editing/configs/GridCRMConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
],
providers: [
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
],
router: true
]
}
/*appConfig: BaseAppConfig*/

Expand Down
12 changes: 9 additions & 3 deletions live-editing/configs/GridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
14 changes: 10 additions & 4 deletions live-editing/configs/HierarchicalGridConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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({
Expand Down
11 changes: 9 additions & 2 deletions live-editing/configs/PivotGridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}));

Expand Down
4 changes: 2 additions & 2 deletions live-editing/configs/TabBarConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
}));

Expand Down
12 changes: 9 additions & 3 deletions live-editing/configs/TabsConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
}));

Expand Down
13 changes: 10 additions & 3 deletions live-editing/configs/TreeGridConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 13 additions & 0 deletions src/app/grid/grid-save-state/routes.ts
Original file line number Diff line number Diff line change
@@ -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'
}
];
13 changes: 13 additions & 0 deletions src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts
Original file line number Diff line number Diff line change
@@ -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'
}
];
21 changes: 21 additions & 0 deletions src/app/layouts/tabs/tabs-sample-4/routes.ts
Original file line number Diff line number Diff line change
@@ -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 }
]
}];
13 changes: 13 additions & 0 deletions src/app/pivot-grid/pivot-state-persistence/routes.ts
Original file line number Diff line number Diff line change
@@ -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'
}
];
13 changes: 13 additions & 0 deletions src/app/tree-grid/tree-grid-save-state/routes.ts
Original file line number Diff line number Diff line change
@@ -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'
}
];