commit fe4059d4910f2a0dc402b37b952e0002568b9c63
author Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 11:15:18 2020 +0100
committer Martin Gardyan <martin.gardyan@pta.de> Tue Dec 01 11:15:18 2020 +0100
tree 2c53f5be2b3a493a84e095995342e8e5716363d4
parent 25b05fbe72c3de13a25a2bab44da56ed9f46d9d3

BugFixing: Routing to company.module, persons.module

src/app/app-routing.module.ts

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7277ba1..68bb192 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -25,7 +25,11 @@
     loadChildren: './pages/company/company.module#CompanyModule',
   },
   {
-    path: PATH.PERSONS,
+    path: `persons/${PATH.INTERNAL}`,
+    loadChildren: './pages/persons/persons.module#PersonsModule',
+  },
+  {
+    path: `persons/${PATH.EXTERNAL}`,
     loadChildren: './pages/persons/persons.module#PersonsModule',
   },
   {

src/app/pages/persons/persons.routing.module.ts

diff --git a/src/app/pages/persons/persons.routing.module.ts b/src/app/pages/persons/persons.routing.module.ts
index 1daf8e1..4a64ed3 100644
--- a/src/app/pages/persons/persons.routing.module.ts
+++ b/src/app/pages/persons/persons.routing.module.ts
@@ -12,31 +12,33 @@
  ********************************************************************************/
 import { ExternalPersonDetailsComponent } from '@pages/persons/external-person/external-person-details/external-person-details.component';
 import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { RouterModule, Routes, UrlSegment, UrlSegmentGroup } from '@angular/router';
 import { ExternalPersonResolver } from '@pages/persons/external-person/external-person.resolver';
 import { Globals } from '@shared/constants/globals';
 import { InternalPersonDetailsComponent } from '@pages/persons/internal-person/internal-person-details/internal-person-details.component';
 import { InternalPersonResolver } from '@pages/persons/internal-person/internal-person.resolver';
 
 const PATH = Globals.PATH;
-
+export function isInternal(url: UrlSegment[], group: UrlSegmentGroup) {
+  return group.segments[1].path.endsWith('internal') ? { consumed: url } : null;
+}
+export function isExternal(url: UrlSegment[], group: UrlSegmentGroup) {
+  return group.segments[1].path.endsWith('external') ? { consumed: url } : null;
+}
 const editPersonRoutes: Routes = [
-  { path: PATH.EXTERNAL, redirectTo: `${PATH.EXTERNAL}/:contactId`, pathMatch: 'full' },
-
-  { path: PATH.INTERNAL, redirectTo: `${PATH.INTERNAL}/:contactId`, pathMatch: 'full' },
   {
-    path: `${PATH.EXTERNAL}/:contactId`,
     component: ExternalPersonDetailsComponent,
     resolve: {
       externalPerson: ExternalPersonResolver,
     },
+    matcher: isExternal,
   },
   {
-    path: `${PATH.INTERNAL}/:contactId`,
     component: InternalPersonDetailsComponent,
     resolve: {
       internalPerson: InternalPersonResolver,
     },
+    matcher: isInternal,
   },
 ];