From 1ea71548258a3c180f78131859bbcbabcc9a55ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=A4hnlein?= <S.Haehnlein@intershop.de>
Date: Mon, 9 Dec 2019 15:28:05 +0100
Subject: [PATCH] fix: account overview as root account page

---
 src/app/pages/account/account-page.module.ts             | 9 ++-------
 .../account-navigation/account-navigation.component.html | 2 +-
 .../account-navigation/account-navigation.component.ts   | 2 +-
 .../components/breadcrumb/breadcrumb.component.html      | 9 +++++++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/account/account-page.module.ts b/src/app/pages/account/account-page.module.ts
index a6344c12ea2..e6c5440baf3 100644
--- a/src/app/pages/account/account-page.module.ts
+++ b/src/app/pages/account/account-page.module.ts
@@ -38,8 +38,8 @@ const accountPageRoutes: Routes = [
         loadChildren: () => import('../account-order/account-order-page.module').then(m => m.AccountOrderPageModule),
       },
       {
-        path: 'overview',
-        data: { breadcrumbData: [{ key: 'account.overview.link' }] },
+        path: '',
+        data: { breadcrumbData: [] },
         component: AccountOverviewPageModule.component,
       },
       {
@@ -73,11 +73,6 @@ const accountPageRoutes: Routes = [
             m => m.QuoteRequestEditPageModule
           ),
       },
-      {
-        path: '',
-        pathMatch: 'full',
-        redirectTo: 'overview',
-      },
     ],
   },
 ];
diff --git a/src/app/pages/account/components/account-navigation/account-navigation.component.html b/src/app/pages/account/components/account-navigation/account-navigation.component.html
index fa8132d188b..a5ca4ae2148 100644
--- a/src/app/pages/account/components/account-navigation/account-navigation.component.html
+++ b/src/app/pages/account/components/account-navigation/account-navigation.component.html
@@ -7,7 +7,7 @@
         </li>
       </ng-container>
       <ng-template #unrestricted>
-        <li routerLinkActive="active">
+        <li routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }">
           <a [routerLink]="item.link" [attr.data-testing-id]="item.dataTestingId">{{
             item.localizationKey | translate
           }}</a>
diff --git a/src/app/pages/account/components/account-navigation/account-navigation.component.ts b/src/app/pages/account/components/account-navigation/account-navigation.component.ts
index 0409d4f177e..eb5cbb1eb4f 100644
--- a/src/app/pages/account/components/account-navigation/account-navigation.component.ts
+++ b/src/app/pages/account/components/account-navigation/account-navigation.component.ts
@@ -17,7 +17,7 @@ export class AccountNavigationComponent implements OnInit, OnChanges {
    * Manages the Account Navigation items.
    */
   navigationItems: { link: string; localizationKey: string; dataTestingId?: string; feature?: string }[] = [
-    { link: '/account/overview', localizationKey: 'account.my_account.link' },
+    { link: '/account', localizationKey: 'account.my_account.link' },
     { link: '/account/orders', localizationKey: 'account.order_history.link' },
     { link: '/account/addresses', localizationKey: 'account.saved_addresses.link', dataTestingId: 'addresses-link' },
     { link: '/account/profile', localizationKey: 'account.profile.link' },
diff --git a/src/app/shared/common/components/breadcrumb/breadcrumb.component.html b/src/app/shared/common/components/breadcrumb/breadcrumb.component.html
index 08ce8ac2023..6a82a0d6145 100644
--- a/src/app/shared/common/components/breadcrumb/breadcrumb.component.html
+++ b/src/app/shared/common/components/breadcrumb/breadcrumb.component.html
@@ -13,8 +13,13 @@
     >
 
     <li *ngIf="account" class="breadcrumbs-list">
-      <a class="breadcrumbs-list-link" routerLink="/account">{{ 'account.my_account.link' | translate }}</a
-      ><span class="breadcrumb-list-separator">{{ separator }}</span>
+      <ng-container *ngIf="!trail.length; else AccountLink">
+        {{ 'account.my_account.link' | translate }}
+      </ng-container>
+      <ng-template #AccountLink>
+        <a class="breadcrumbs-list-link" routerLink="/account">{{ 'account.my_account.link' | translate }}</a
+        ><span class="breadcrumb-list-separator">{{ separator }}</span>
+      </ng-template>
     </li>
 
     <li