From c65047f61db4a81d8c8cd34f82424921013fd63e Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 5 Aug 2022 15:00:21 +0300
Subject: [PATCH] Add entities in app component in order to handle notification
 groups properly.

---
 src/app/app.component.html         | 2 +-
 src/app/app.component.ts           | 6 +++++-
 src/app/openaireLibrary            | 2 +-
 src/app/topic/topic.component.html | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index a768984..c3c7c0e 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -16,7 +16,7 @@
     </div>
     <bottom id="bottom" *ngIf="isFrontPage" [centered]="true" [properties]="properties" [showMenuItems]="true"></bottom>
     <role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type"></role-verification>
-    <notification-sidebar *ngIf="user && notificationGroupsInitialized"
+    <notification-sidebar *ngIf="user && notificationGroupsInitialized" [entities]="entities"
                           [user]="user" [availableGroups]="notificationGroups" service="monitor"></notification-sidebar>
   </div>
 </div>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index c8f17bf..8615780 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -38,6 +38,7 @@ export class AppComponent implements OnInit, OnDestroy {
   specialSideBarMenuItem: MenuItem = null;
   menuItems: RootMenuItem[] = [];
   notificationGroups: Option[] = [];
+  entities: string[];
   notificationGroupsInitialized: boolean = false;
   stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public stakeholderEntities = StakeholderEntities;
@@ -180,6 +181,7 @@ export class AppComponent implements OnInit, OnDestroy {
   }
   
   public setNotificationGroups() {
+    this.entities = this.stakeholderUtils.types.map(option => option.value);
     this.notificationGroups = [];
     if (Session.isPortalAdministrator(this.user)) {
       this.notificationGroups.push({value: Role.PORTAL_ADMIN, label: 'Portal Administrators'});
@@ -187,6 +189,8 @@ export class AppComponent implements OnInit, OnDestroy {
     for (let type of this.stakeholderUtils.types) {
       if (Session.isCurator(type.value, this.user) || Session.isPortalAdministrator(this.user)) {
         this.notificationGroups.push({value: Role.curator(type.value), label: type.label + ' Curators'});
+        this.notificationGroups.push({value: Role.typeManager(type.value), label: type.label + ' Managers'});
+        this.notificationGroups.push({value: Role.typeMember(type.value), label: type.label + ' Members'});
       }
     }
     this.subscriptions.push(this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL).subscribe(stakeholders => {
@@ -250,7 +254,7 @@ export class AppComponent implements OnInit, OnDestroy {
         this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools"));
       }
     }
-    this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'west'});
+    this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'});
     this.sideBarItems = items;
     this.hasSidebar = this.hasSidebar && this.sideBarItems.length > 0;
   }
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 3756f8d..460cbdf 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 3756f8df83aaa0c063d45b7f1c51798acac67961
+Subproject commit 460cbdfc9a3427181a7404012f179c604d74a7ca
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
index 53dd6a9..ec8c8ed 100644
--- a/src/app/topic/topic.component.html
+++ b/src/app/topic/topic.component.html
@@ -4,9 +4,9 @@
 			<a [routerLink]="'/admin/' + stakeholder.alias" class="uk-button uk-button-link uk-margin-left">
 				<h6 class="uk-flex uk-flex-middle uk-flex-center uk-margin-remove-bottom">
 					<div class="uk-width-auto">
-						<icon class="menu-icon" name="west" [flex]="true"></icon>
+						<icon class="menu-icon" name="west" [flex]="true" ratio="1.5"></icon>
 					</div>
-					<span class="uk-width-expand uk-text-truncate uk-margin-left"
+					<span class="uk-width-expand uk-text-truncate uk-margin-small-left"
 								[class.uk-hidden]="!open">Indicators</span>
 				</h6>
 			</a>