MOBILE-3320 routes: Refactor module routes config

src/addons/badges/badges.module.ts

@@ -33,9 +33,7 @@ const mainMenuHomeSiblingRoutes: Routes = [
 
 @NgModule({
     imports: [
-        CoreMainMenuTabRoutingModule.forChild({
+        CoreMainMenuTabRoutingModule.forChild(mainMenuHomeSiblingRoutes),
-            siblings: mainMenuHomeSiblingRoutes,
-        }),
     ],
     providers: [
         {

src/app/app-routing.module.ts

@@ -22,13 +22,27 @@ function buildAppRoutes(injector: Injector): Routes {
 }
 
 export type ModuleRoutes = { children: Routes; siblings: Routes };
+export type ModuleRoutesConfig = Routes | Partial<ModuleRoutes>;
 
-export function resolveModuleRoutes(injector: Injector, token: InjectionToken<Partial<ModuleRoutes>[]>): ModuleRoutes {
+export function resolveModuleRoutes(injector: Injector, token: InjectionToken<ModuleRoutesConfig[]>): ModuleRoutes {
-    const routes = injector.get(token, []);
+    const configs = injector.get(token, []);
+    const routes = configs.map(config => {
+        if (Array.isArray(config)) {
+            return {
+                children: [],
+                siblings: config,
+            };
+        }
 
         return {
-        children: CoreArray.flatten(routes.map(r => r.children || [])),
+            children: config.children || [],
-        siblings: CoreArray.flatten(routes.map(r => r.siblings || [])),
+            siblings: config.siblings || [],
+        };
+    });
+
+    return {
+        children: CoreArray.flatten(routes.map(r => r.children)),
+        siblings: CoreArray.flatten(routes.map(r => r.siblings)),
     };
 }
 

src/core/features/mainmenu/mainmenu-routing.module.ts

@@ -14,14 +14,14 @@
 
 import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
 
-import { ModuleRoutes } from '@/app/app-routing.module';
+import { ModuleRoutesConfig } from '@/app/app-routing.module';
 
 export const MAIN_MENU_ROUTES = new InjectionToken('MAIN_MENU_ROUTES');
 
 @NgModule()
 export class CoreMainMenuRoutingModule {
 
-    static forChild(routes: Partial<ModuleRoutes>): ModuleWithProviders<CoreMainMenuRoutingModule> {
+    static forChild(routes: ModuleRoutesConfig): ModuleWithProviders<CoreMainMenuRoutingModule> {
         return {
             ngModule: CoreMainMenuRoutingModule,
             providers: [

src/core/features/mainmenu/mainmenu-tab-routing.module.ts

@@ -15,7 +15,7 @@
 import { InjectionToken, Injector, ModuleWithProviders, NgModule } from '@angular/core';
 import { Route, Routes } from '@angular/router';
 
-import { ModuleRoutes, resolveModuleRoutes } from '@/app/app-routing.module';
+import { ModuleRoutesConfig, resolveModuleRoutes } from '@/app/app-routing.module';
 
 export const MAIN_MENU_TAB_ROUTES = new InjectionToken('MAIN_MENU_TAB_ROUTES');
 
@@ -35,7 +35,7 @@ export function buildTabMainRoutes(injector: Injector, mainRoute: Route): Routes
 @NgModule()
 export class CoreMainMenuTabRoutingModule {
 
-    static forChild(routes: Partial<ModuleRoutes>): ModuleWithProviders<CoreMainMenuTabRoutingModule> {
+    static forChild(routes: ModuleRoutesConfig): ModuleWithProviders<CoreMainMenuTabRoutingModule> {
         return {
             ngModule: CoreMainMenuTabRoutingModule,
             providers: [

src/core/features/mainmenu/pages/home/home-routing.module.ts

@@ -14,14 +14,14 @@
 
 import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
 
-import { ModuleRoutes } from '@/app/app-routing.module';
+import { ModuleRoutesConfig } from '@/app/app-routing.module';
 
 export const MAIN_MENU_HOME_ROUTES = new InjectionToken('MAIN_MENU_HOME_ROUTES');
 
 @NgModule()
 export class CoreMainMenuHomeRoutingModule {
 
-    static forChild(routes: Partial<ModuleRoutes>): ModuleWithProviders<CoreMainMenuHomeRoutingModule> {
+    static forChild(routes: ModuleRoutesConfig): ModuleWithProviders<CoreMainMenuHomeRoutingModule> {
         return {
             ngModule: CoreMainMenuHomeRoutingModule,
             providers: [

src/core/features/settings/settings.module.ts

@@ -41,7 +41,7 @@ const mainMenuMoreRoutes: Routes = [
 @NgModule({
     imports: [
         AppRoutingModule.forChild(appRoutes),
-        CoreMainMenuTabRoutingModule.forChild({ siblings: mainMenuMoreRoutes }),
+        CoreMainMenuTabRoutingModule.forChild(mainMenuMoreRoutes),
     ],
     providers: [
         {

src/core/features/user/user.module.ts

@@ -37,7 +37,7 @@ const routes: Routes = [
 
 @NgModule({
     imports: [
-        CoreMainMenuTabRoutingModule.forChild({ siblings: routes }),
+        CoreMainMenuTabRoutingModule.forChild(routes),
         CoreUserComponentsModule,
     ],
     providers: [