From 130926a80f74a757e66d682f7b07d81549984f0a Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Sun, 3 Jul 2022 11:55:49 +0300
Subject: [PATCH] Add admin menu in admin/user-info. Fix a bug initializition
 of menu.

---
 src/app/app-routing.module.ts |  2 +-
 src/app/app.component.ts      | 10 ++++------
 src/assets/dashboard-theme    |  2 +-
 src/assets/openaire-theme     |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 84502ff..b908233 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -25,7 +25,7 @@ const routes: Routes = [
   {
     path: 'admin/user-info',
     loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule),
-    data: {hasSidebar: false}
+    data: {hasAdminMenu: true}
   },
   {
     path: 'admin/admin-tools',
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ea28bb8..0b98f4f 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -150,12 +150,10 @@ export class AppComponent implements OnInit, OnDestroy {
             this.loading = false;
           }
         } else {
-          if(this.stakeholder) {
-            LinksResolver.resetProperties();
-            this.stakeholderService.setStakeholder(null);
-            this.stakeholder = null;
-            this.buildMenu();
-          }
+          LinksResolver.resetProperties();
+          this.stakeholderService.setStakeholder(null);
+          this.stakeholder = null;
+          this.buildMenu();
           this.loading = false;
         }
       }
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 318b3cd..319eff1 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 318b3cdf42922d8b04400bb010733b78fcf1fe1c
+Subproject commit 319eff1cc355ffc4148cf20c4ba23e15fbc6a6f6
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 25f7f7d..cad1fb1 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 25f7f7dd34fae80d1e2e25935c2f2772c5800e70
+Subproject commit cad1fb199d5f45a9c4f276ea3192544e7e20d1fa