Merge from develop last fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "monitor-dashboard",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",

server.ts

@@ -81,7 +81,7 @@ export function app() {
     }));
     if (userinfoRes.status === 200) {
       let user = new User(userinfoRes.data);
-      let stakeholderRes = (await axios.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent(req.params.alias), {
+      let stakeholderRes = (await axios.get<Stakeholder>(properties.monitorServiceAPIURL + 'stakeholder/' + encodeURIComponent(req.params.alias), {
         withCredentials: true,
         headers: headers
       }).catch(error => {

src/app/app.component.ts

@@ -89,7 +89,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
     super();
     this.initRouterParams(_route, event => {
       this.isBrowse = event.url.includes('browse');
-      this.isSearch = event.url.includes('search');
+      this.isSearch = event.url.includes('search/find');
     });
   }
 
@@ -224,7 +224,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
         this.notificationConfiguration.availableGroups.push({value: Role.typeMember(type.value), label: type.label + ' Members'});
       }
     }
-    this.subscriptions.push(this.stakeholderService.getMyStakeholders(this.properties.monitorServiceAPIURL).subscribe(manageStakeholder => {
+    this.subscriptions.push(this.stakeholderService.getMyStakeholders().subscribe(manageStakeholder => {
       let stakeholders = manageStakeholder.standalone;
       stakeholders.concat(manageStakeholder.umbrella);
       stakeholders.concat(manageStakeholder.dependent);
@@ -309,7 +309,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
     if(this.isChild) {
       return this.stakeholder.parent.alias + '/browse/' + this.stakeholder.type + '/';
     } else {
-      return '';
+      return '/';
     }
   }
   
@@ -443,6 +443,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
       this.resourcesService.setResources(this.menuItems, '', this.monitorLink);
       this.menuItems.push(new MenuItem("support", "Support", this.monitorLink + '/support/', "", false, [], null, {}, null, null, null, null, "_self"));
       this.menuItems.push(new MenuItem("about", "About", this.monitorLink + '/about/', "", false, [], null, {}, null, null, null, null, "_self"));
+      this.menuItems.push(new MenuItem("subscriptions", "Subscriptions", this.monitorLink + "/subscriptions", "", false, [], null, {}, null, null, null, null, "_self"));
       if (this.hasAdminMenu) {
         this.adminMenuItems = [];
         this.backItem = null;

src/app/monitor/monitor.component.html

@@ -55,7 +55,7 @@
                 <ng-template ngFor [ngForOf]="activeCategory.subCategories" let-subCategory>
                     <slider-tab *ngIf="hasPermission(subCategory.visibility)" [tabTitle]="subCategory.name"
                                 [queryParams]="queryParams" customClass="uk-text-uppercase"
-                                [routerLink]="['/', stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
+                                [routerLink]="[aliasPrefix, stakeholder.alias, activeTopic.alias, activeCategory.alias, subCategory.alias]"
                                 [active]="subCategory.alias === activeSubCategory.alias"></slider-tab>
                 </ng-template>
             </slider-tabs>

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 78bcd9c80a93073a3d5a6f157514589ab6547ff2
+Subproject commit 2b8725e1fbe954bbde4f75baee710f4cc7029255

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 014adfe4588975e499c72b284ce7368fc2cb5d14
+Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b