chore(ci): merge release/7.23 into the 4.14.0 pin branch

client/src/app/app.routing.ts

@@ -8,7 +8,15 @@ import { RouterModule, Routes } from '@angular/router'
 
 import { NotFoundComponent } from './not-found/not-found.component'
 
+import { DeployModule } from './deploy/deploy.module'
+import { EditorModule } from './editor/editor.module'
+import { HomeModule } from './home/home.module'
+import { LicensingModule } from './licensing/licensing.module'
+import { ReviewModule } from './review/review.module'
 import { ReviewRouteComponent } from './routes/review-route/review-route.component'
+import { StageModule } from './stage/stage.module'
+import { SystemModule } from './system/system.module'
+import { ViewerModule } from './viewer/viewer.module'
 
 /**
  * Defining routes
@@ -17,8 +25,7 @@ export const ROUTES: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
   {
     path: 'view',
-    loadChildren: () =>
-      import('./viewer/viewer.module').then((m) => m.ViewerModule)
+    loadChildren: () => ViewerModule
   },
   {
     /**
@@ -30,42 +37,36 @@ export const ROUTES: Routes = [
       { path: '', pathMatch: 'full', redirectTo: 'toapprove' },
       {
         path: '',
-        loadChildren: () =>
-          import('./review/review.module').then((m) => m.ReviewModule)
+        loadChildren: () => ReviewModule
       }
     ]
   },
   {
     path: 'licensing',
-    loadChildren: () =>
-      import('./licensing/licensing.module').then((m) => m.LicensingModule)
+    loadChildren: () => LicensingModule
   },
   {
     path: 'home',
-    loadChildren: () => import('./home/home.module').then((m) => m.HomeModule)
+    loadChildren: () => HomeModule
   },
   {
     /**
      * Load editor module with subroutes
      */
     path: 'editor',
-    loadChildren: () =>
-      import('./editor/editor.module').then((m) => m.EditorModule)
+    loadChildren: () => EditorModule
   },
   {
     path: 'stage',
-    loadChildren: () =>
-      import('./stage/stage.module').then((m) => m.StageModule)
+    loadChildren: () => StageModule
   },
   {
     path: 'system',
-    loadChildren: () =>
-      import('./system/system.module').then((m) => m.SystemModule)
+    loadChildren: () => SystemModule
   },
   {
     path: 'deploy',
-    loadChildren: () =>
-      import('./deploy/deploy.module').then((m) => m.DeployModule)
+    loadChildren: () => DeployModule
   },
   { path: '**', component: NotFoundComponent }
 ]

client/src/app/home/home-routing.module.ts

@@ -2,6 +2,8 @@ import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 import { HomeRouteComponent } from '../routes/home-route/home-route.component'
 import { HomeComponent } from './home.component'
+import { XLMapModule } from '../xlmap/xlmap.module'
+import { MultiDatasetModule } from '../multi-dataset/multi-dataset.module'
 
 const routes: Routes = [
   {
@@ -10,18 +12,8 @@ const routes: Routes = [
     children: [
       { path: '', pathMatch: 'full', redirectTo: 'tables' },
       { path: 'tables', component: HomeComponent },
-      {
-        path: 'excel-maps',
-        loadChildren: () =>
-          import('../xlmap/xlmap.module').then((m) => m.XLMapModule)
-      },
-      {
-        path: 'multi-load',
-        loadChildren: () =>
-          import('../multi-dataset/multi-dataset.module').then(
-            (m) => m.MultiDatasetModule
-          )
-      }
+      { path: 'excel-maps', loadChildren: () => XLMapModule },
+      { path: 'multi-load', loadChildren: () => MultiDatasetModule }
     ]
   }
 ]