MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Wiki Activity

Fix a bug with active menu item on sidebar. Remove openaire.css from imports

This commit is contained in:
Konstantinos Triantafyllou 2022-06-27 15:52:14 +03:00
parent fc0df9bba7
commit 6b6e581239
6 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/app.component.ts
View File

@ -379,8 +379,8 @@ export class AppComponent implements OnInit, OnDestroy {
this.specialSideBarMenuItem = null;
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'));
this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, 'admin/monitor/admin-tools'));
this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, '/admin/admin-tools'));
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;
}

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 5e1fde78411e2913c3757534a073ace32a4eacf2
Subproject commit 4625ebf9674e4ffd185bcbee050737b99f690cc4

1
src/app/utils/adminDashboard.guard.ts
View File

@ -31,7 +31,6 @@ export class AdminDashboardGuard implements CanActivate, CanActivateChild {
res[0] && res[1] && (Session.isPortalAdministrator(res[0]) ||
Session.isCurator(res[1].type, res[0]) || Session.isManager(res[1].type, res[1].alias, res[0]))
),tap(authorized => {
console.log(authorized);
if(!authorized){
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_ADMIN, 'redirectUrl':path}});
}

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed
Subproject commit 1c7b42284c58024e7d51cb0ae7c5c27f997c646d

2
src/assets/dashboard-theme

@ -1 +1 @@
Subproject commit cd1a176ceb3aaa3493e16fc4d7ef67749655f351
Subproject commit d2afff99f1b7fd5e2f143191dc836bba56bdb8ca

4
src/styles.less
View File

@ -2,9 +2,5 @@
/* Import OpenAIRE theme*/
@import "~src/assets/openaire-theme/less/_import";
//@import "assets/openaire-theme/css/import.css";
//@import "assets/common-assets/library.css";
@import "assets/monitor-dashboard-custom";
@import "assets/print.css";
/* Deprecated */