diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 8a88e77..02cb8e9 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -263,8 +263,9 @@ export class AppComponent implements OnInit, OnDestroy {
}
if (Session.isPortalAdministrator(this.user)) {
this.userMenuItems.push(new MenuItem("adminOptions", "Super Admin options", "", "/admin/admin-tools/portals", false, [], [], {}));
+ }
+ if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
this.userMenuItems.push(new MenuItem("monitorOptions", "Monitor portal options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}));
-
}
}
if (this.stakeholder) {
@@ -281,15 +282,20 @@ export class AppComponent implements OnInit, OnDestroy {
null, null, null, null),
items: []
});
- this.menuItems.push({
- rootItem: new MenuItem("methodology", "Methodology",
- "", "/" + this.stakeholder.alias + "/methodology", false, [], null, {}), items: [
- new MenuItem("methodology", "Terminology and construction",
- "", "/" + this.stakeholder.alias + "/methodology", false, [], null, {}),
- new MenuItem("methodology", "See how it works",
- "", "/" + this.stakeholder.alias + "/methodology", false, [], null, {}, null, "how"),
+ let indicatorsPage = {
+ rootItem: new MenuItem('resources', 'Resources', '', '', false, [], null, {}),
+ items: [
+ new MenuItem("methodology", "Methodology", "", "/" + this.stakeholder.alias + "/methodology", false, [], null, {}),
]
+ };
+ this.configurationService.isPageEnabled('monitor', "/indicators/" + this.stakeholder.type, 'monitor').subscribe(isEnabled => {
+ if(isEnabled) {
+ indicatorsPage.items.push(
+ new MenuItem("indicators-page", "Indicators", "", "/" + this.stakeholder.alias + "/indicators", false, [], null, {})
+ );
+ }
});
+ this.menuItems.push(indicatorsPage);
if (this.stakeholder.type === "funder") {
this.menuItems.push({
rootItem: new MenuItem("develop", "Develop",
@@ -368,6 +374,8 @@ export class AppComponent implements OnInit, OnDestroy {
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
if (Session.isPortalAdministrator(this.user)) {
this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin/admin-tools'));
+ }
+ if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)) {
this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, '/admin/monitor/admin-tools'));
}
this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 0;
diff --git a/src/app/monitor/monitor-routing.module.ts b/src/app/monitor/monitor-routing.module.ts
index c490e70..3abf452 100644
--- a/src/app/monitor/monitor-routing.module.ts
+++ b/src/app/monitor/monitor-routing.module.ts
@@ -16,6 +16,14 @@ import {OpenaireErrorPageComponent} from "../error/errorPage.component";
activeMenuItem: "dashboard"
}
},
+ {
+ path: ':stakeholder/indicators',
+ loadChildren: () => import('../openaireLibrary/monitor/indicators/indicators.module').then(m => m.IndicatorsModule),
+ canDeactivate: [PreviousRouteRecorder],
+ data: {
+ hasSidebar: false
+ }
+ },
{
path: ':stakeholder/develop',
loadChildren: () => import('../develop/develop.module').then(m => m.DevelopModule),
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 3eba038..e04d825 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 3eba03889355b91f4e335d1997e689ca379b4572
+Subproject commit e04d825c03fbb3114a88cd7b4de426b4976238bf
diff --git a/src/assets/monitor-dashboard-custom.less b/src/assets/monitor-dashboard-custom.less
index 47c5772..d2733b9 100644
--- a/src/assets/monitor-dashboard-custom.less
+++ b/src/assets/monitor-dashboard-custom.less
@@ -1,4 +1,4 @@
-.stakeholderPage {
+.monitor {
/* Import OpenAIRE theme*/
@import (multiple) "~src/assets/openaire-theme/less/_import";
@import (multiple) "~src/assets/common-assets/less/general";
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index 98b30a4..0e650a0 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit 98b30a43f1810bcdbc96f119f3f021a1d7872714
+Subproject commit 0e650a002b6f77957fcbe06b3609c8985c96dd2a