[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
This commit is contained in:
parent
758b838651
commit
78842d9e58
|
@ -64,15 +64,13 @@ const routes: Routes = [
|
||||||
path: 'admin-tools',
|
path: 'admin-tools',
|
||||||
loadChildren: './admin-tool/admin-tool-routing.module#AdminToolRoutingModule',
|
loadChildren: './admin-tool/admin-tool-routing.module#AdminToolRoutingModule',
|
||||||
resolve: {envSpecific: EnvironmentSpecificResolver},
|
resolve: {envSpecific: EnvironmentSpecificResolver},
|
||||||
data: {hasMiniMenu: true, isFrontPage: false}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
{ path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
|
{ path: 'theme', loadChildren: './openaireLibrary/utils/theme/theme.module#ThemeModule'},
|
||||||
{
|
{
|
||||||
path: '',
|
path: '',
|
||||||
loadChildren: './monitor/monitor.module#MonitorModule',
|
loadChildren: './monitor/monitor.module#MonitorModule',
|
||||||
resolve: {envSpecific: EnvironmentSpecificResolver},
|
resolve: {envSpecific: EnvironmentSpecificResolver},
|
||||||
data: {hasMiniMenu: true, isFrontPage: true}
|
data: {isFrontPage: true}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '**',
|
path: '**',
|
||||||
|
|
|
@ -27,7 +27,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
hasSidebar: boolean = false;
|
hasSidebar: boolean = false;
|
||||||
hasHeader: boolean = false;
|
hasHeader: boolean = false;
|
||||||
hasAdminMenu: boolean = false;
|
hasAdminMenu: boolean = false;
|
||||||
hasMiniMenu: boolean = false;
|
|
||||||
isFrontPage: boolean = false;
|
isFrontPage: boolean = false;
|
||||||
isDashboard: boolean = false;
|
isDashboard: boolean = false;
|
||||||
isViewPublic: boolean = false;
|
isViewPublic: boolean = false;
|
||||||
|
@ -100,10 +99,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.hasAdminMenu = hasAdminMenu;
|
this.hasAdminMenu = hasAdminMenu;
|
||||||
this.cdr.detectChanges();
|
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.subscriptions.push(this.layoutService.isFrontPage.subscribe(isFrontPage => {
|
||||||
this.isFrontPage = isFrontPage;
|
this.isFrontPage = isFrontPage;
|
||||||
this.cdr.detectChanges();
|
this.cdr.detectChanges();
|
||||||
|
@ -147,15 +142,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
this.buildMenu();
|
this.buildMenu();
|
||||||
this.loading = false;
|
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 {
|
} else {
|
||||||
this.buildMenu();
|
this.buildMenu();
|
||||||
|
@ -184,9 +170,6 @@ export class AppComponent implements OnInit, OnDestroy {
|
||||||
if (user) {
|
if (user) {
|
||||||
this.buildMenu();
|
this.buildMenu();
|
||||||
}
|
}
|
||||||
}, error => {
|
|
||||||
console.log("App couldn't fetch properties");
|
|
||||||
console.log(error);
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue