From a9a0452632e29a91fdc084af85b2cc751a1e2119 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 8 Sep 2022 16:51:10 +0300
Subject: [PATCH] Fix manage stakeholders loading stuck in case of session
 expired.

---
 src/app/app.component.ts                                   | 7 ++++++-
 src/app/manageStakeholders/manageStakeholders.component.ts | 2 ++
 src/app/openaireLibrary                                    | 2 +-
 src/app/utils/adminDashboard.guard.ts                      | 3 +--
 src/assets/openaire-theme                                  | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8615780..7747558 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -170,12 +170,17 @@ export class AppComponent implements OnInit, OnDestroy {
       }
     }));
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
-      this.user = user;
       if (user) {
+        this.user = user;
         this.buildMenu();
         if (!this.notificationGroupsInitialized) {
           this.setNotificationGroups();
         }
+      } else if(this.user) {
+        this.user = user;
+        this.buildMenu();
+        this.notificationGroupsInitialized = false;
+        this.notificationGroups = [];
       }
     }));
   }
diff --git a/src/app/manageStakeholders/manageStakeholders.component.ts b/src/app/manageStakeholders/manageStakeholders.component.ts
index 6387325..c3ea4fb 100644
--- a/src/app/manageStakeholders/manageStakeholders.component.ts
+++ b/src/app/manageStakeholders/manageStakeholders.component.ts
@@ -86,6 +86,8 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
       this.displayStakeholders = res[1];
       this.alias = res[2];
       this.loading = false;
+    }, error => {
+      this.loading = false;
     }));
     
     this.subscriptions.push(UIkit.util.on(document, 'hidden', '#edit_modal', (): void => {
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 2261f4a..fa91943 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 2261f4ae6f8ea4a2d52aaf75c857e583bf913721
+Subproject commit fa919431d3be63fb4045d47083b3ba7cd6414e03
diff --git a/src/app/utils/adminDashboard.guard.ts b/src/app/utils/adminDashboard.guard.ts
index f9322d0..213717a 100644
--- a/src/app/utils/adminDashboard.guard.ts
+++ b/src/app/utils/adminDashboard.guard.ts
@@ -27,8 +27,7 @@ export class AdminDashboardGuard implements CanActivate, CanActivateChild {
   check(path: string, alias: string): Observable<boolean> | boolean {
     let errorCode = LoginErrorCodes.NOT_LOGIN;
     return zip(
-      this.userManagementService.getUserInfo(false)
-      ,this.stakeholderService.getStakeholder(alias)
+      this.userManagementService.getUserInfo() ,this.stakeholderService.getStakeholder(alias)
     ).pipe(take(1),map(res => {
       if(res[0]) {
         errorCode = LoginErrorCodes.NOT_ADMIN;
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index eb5739a..f085a90 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit eb5739ab8271aa71c8e58998ab88c61878f8788d
+Subproject commit f085a90973b216b89065848dba864e2d581acc84