Skip to content

Commit 6bd789c

Browse files
Merge pull request #3747 from IgniteUI/bpachilova/fix-routing-configs-3623
fix(*): configure routing after migration to standalone
2 parents 7686060 + 113cb4b commit 6bd789c

File tree

15 files changed

+132
-26
lines changed

15 files changed

+132
-26
lines changed

live-editing/configs/BaseConfig.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ export const BaseAppConfig = {
77
providers: [
88
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
99
],
10-
router: false
11-
}
10+
routesConfig: {
11+
router: false
12+
}
13+
}

live-editing/configs/GridCRMConfigGenerator.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
2626
],
2727
providers: [
2828
{ 'provider': 'provideAnimations()', 'import': '@angular/platform-browser/animations' }
29-
],
30-
router: true
29+
]
3130
}
3231
/*appConfig: BaseAppConfig*/
3332

live-editing/configs/GridConfigGenerator.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,11 +452,17 @@ export class GridConfigGenerator implements IConfigGenerator {
452452
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts',
453453
'/src/app/grid/grid-save-state/localData.ts',
454454
'/src/app/grid/grid-save-state/about.component.ts',
455-
'/src/app/grid/grid-save-state/about.component.html'
455+
'/src/app/grid/grid-save-state/about.component.html',
456+
'/src/app/grid/grid-save-state/routes.ts'
456457
],
457-
appConfig: BaseAppConfig
458+
appConfig: {
459+
...BaseAppConfig,
460+
routesConfig: {
461+
router: true,
462+
routesImportPath: './grid/grid-save-state/routes'
463+
}
464+
}
458465
});
459-
gridSaveStateSampleConfig.usesRouting = true;
460466
configs.push(gridSaveStateSampleConfig);
461467

462468
configs.push(new Config({

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/naming-convention */
22
/* eslint-disable max-len */
3-
import {ReactiveFormsModule} from '@angular/forms';
3+
import { ReactiveFormsModule } from '@angular/forms';
44
import { HttpClientModule } from '@angular/common/http';
55
import {
66
IgxActionStripModule,
@@ -517,12 +517,18 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
517517
'/src/app/data/singersData.ts',
518518
'/src/app/hierarchical-grid/models.ts',
519519
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts',
520-
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html'
520+
'/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html',
521+
'/src/app/hierarchical-grid/hierarchical-grid-save-state/routes.ts'
521522
],
522-
appConfig: BaseAppConfig,
523+
appConfig: {
524+
...BaseAppConfig,
525+
routesConfig: {
526+
router: true,
527+
routesImportPath: './hierarchical-grid/hierarchical-grid-save-state/routes'
528+
}
529+
},
523530
component: 'HGridSaveStateComponent'
524531
});
525-
hGridSaveStateSampleConfig.usesRouting = true;
526532
configs.push(hGridSaveStateSampleConfig);
527533

528534
configs.push(new Config({

live-editing/configs/PivotGridConfigGenerator.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,21 @@ export class PivotGridConfigGenerator implements IConfigGenerator {
4242
}));
4343

4444
configs.push(new Config({
45-
additionalFiles:
45+
additionalFiles:
4646
[
4747
'/src/app/directives/prevent-scroll.directive.ts',
4848
'/src/app/data/dataToAnalyze.ts',
4949
'/src/app/pivot-grid/pivot-state-persistence/about.component.ts',
5050
'/src/app/pivot-grid/pivot-state-persistence/about.component.html',
51+
'/src/app/pivot-grid/pivot-state-persistence/routes.ts'
5152
],
52-
appConfig: BaseAppConfig,
53+
appConfig: {
54+
...BaseAppConfig,
55+
routesConfig: {
56+
router: true,
57+
routesImportPath: './pivot-grid/pivot-state-persistence/routes'
58+
}
59+
},
5360
component: 'PivotGridStatePersistenceSampleComponent'
5461
}));
5562

live-editing/configs/TabBarConfigGenerator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export class TabBarConfigGenerator implements IConfigGenerator {
3737
"/src/app/layouts/tabbar/views/view3/view3.component.ts",
3838
"/src/app/layouts/tabbar/views/view3/view3.component.html"
3939
],
40-
/* TODO: Adding the correct router config needs to be done separately */
41-
appConfig: { ...BaseAppConfig, ...{ router: true }},
40+
/* Note: the Tabbar samples are not used anymore */
41+
appConfig: { ...BaseAppConfig, ...{ routesConfig: { router: true } }},
4242
shortenComponentPathBy: "/layouts/tabbar/"
4343
}));
4444

live-editing/configs/TabsConfigGenerator.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,16 @@ export class TabsConfigGenerator implements IConfigGenerator {
4545
"/src/app/layouts/tabs/views/view2/view2.component.ts",
4646
"/src/app/layouts/tabs/views/view2/view2.component.html",
4747
"/src/app/layouts/tabs/views/view3/view3.component.ts",
48-
"/src/app/layouts/tabs/views/view3/view3.component.html"
48+
"/src/app/layouts/tabs/views/view3/view3.component.html",
49+
"/src/app/layouts/tabs/tabs-sample-4/routes.ts"
4950
],
50-
/* TODO: Adding the correct router config needs to be done separately */
51-
appConfig: { ...BaseAppConfig, ...{ router: true }},
51+
appConfig: {
52+
...BaseAppConfig,
53+
routesConfig: {
54+
router: true,
55+
routesImportPath: './tabs-sample-4/routes'
56+
}
57+
},
5258
shortenComponentPathBy: "/layouts/tabs/"
5359
}));
5460

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,12 +672,19 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
672672
'/src/app/directives/prevent-scroll.directive.ts',
673673
'/src/app/tree-grid/tree-grid-save-state/data.ts',
674674
'/src/app/tree-grid/tree-grid-save-state/about.component.ts',
675-
'/src/app/tree-grid/tree-grid-save-state/about.component.html'],
676-
appConfig: BaseAppConfig,
675+
'/src/app/tree-grid/tree-grid-save-state/about.component.html',
676+
'/src/app/tree-grid/tree-grid-save-state/routes.ts'
677+
],
678+
appConfig: {
679+
...BaseAppConfig,
680+
routesConfig: {
681+
router: true,
682+
routesImportPath: './tree-grid-save-state/routes'
683+
}
684+
},
677685
component: 'TGridSaveStateComponent',
678686
shortenComponentPathBy: '/tree-grid/'
679687
});
680-
treeGridSaveStateSampleConfig.usesRouting = true;
681688
configs.push(treeGridSaveStateSampleConfig);
682689

683690
configs.push(new Config({

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"igniteui-angular-extras": "^20.0.0",
7979
"igniteui-angular-i18n": "^20.1.4",
8080
"igniteui-dockmanager": "^1.17.0",
81-
"igniteui-live-editing": "^3.1.1",
81+
"igniteui-live-editing": "^3.2.0",
8282
"igniteui-webcomponents": "^6.2.0",
8383
"minireset.css": "0.0.6",
8484
"postcss": "^8.5.5",

0 commit comments

Comments
 (0)