From 78842d9e588af6a978403143e41eeb7b46006d9c Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Thu, 14 Jan 2021 14:32:59 +0000 Subject: [PATCH] [Monitor Dashboard | Trunk]: Delete hasMiniMenu from app.component.ts and route data. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@60242 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app-routing.module.ts | 4 +--- src/app/app.component.ts | 17 ----------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ff817ca..f2feb1d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -64,15 +64,13 @@ const routes: Routes = [ path: 'admin-tools', loadChildren: './admin-tool/admin-tool-routing.module#AdminToolRoutingModule', resolve: {envSpecific: EnvironmentSpecificResolver}, - data: {hasMiniMenu: true, isFrontPage: false} }, - { path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'}, { path: '', loadChildren: './monitor/monitor.module#MonitorModule', resolve: {envSpecific: EnvironmentSpecificResolver}, - data: {hasMiniMenu: true, isFrontPage: true} + data: {isFrontPage: true} }, { path: '**', diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 31c00f5..9c73910 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -27,7 +27,6 @@ export class AppComponent implements OnInit, OnDestroy { hasSidebar: boolean = false; hasHeader: boolean = false; hasAdminMenu: boolean = false; - hasMiniMenu: boolean = false; isFrontPage: boolean = false; isDashboard: boolean = false; isViewPublic: boolean = false; @@ -100,10 +99,6 @@ export class AppComponent implements OnInit, OnDestroy { this.hasAdminMenu = hasAdminMenu; this.cdr.detectChanges(); })); - this.subscriptions.push(this.layoutService.hasMiniMenu.subscribe(hasMiniMenu => { - this.hasMiniMenu = hasMiniMenu; - this.cdr.detectChanges(); - })); this.subscriptions.push(this.layoutService.isFrontPage.subscribe(isFrontPage => { this.isFrontPage = isFrontPage; this.cdr.detectChanges(); @@ -147,15 +142,6 @@ export class AppComponent implements OnInit, OnDestroy { this.buildMenu(); this.loading = false; } - }, error => { - this.stakeholder = null; - LinksResolver.resetProperties(); - this.resetProperties(); - if (error && error.status && error.status === 404) { - this.navigateToError(); - } - this.buildMenu(); - this.loading = false; })); } else { this.buildMenu(); @@ -184,9 +170,6 @@ export class AppComponent implements OnInit, OnDestroy { if (user) { this.buildMenu(); } - }, error => { - console.log("App couldn't fetch properties"); - console.log(error); })); }