From 550411b98a6223d4d4ba48af34d9233d8dfa4401 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 21 Sep 2022 00:08:20 +0300 Subject: [PATCH] [Monitor | new-theme]: app.component.ts: Removed deprecated RootMenuItem and used MenuItem instead. --- src/app/app.component.ts | 18 ++++++++---------- src/app/openaireLibrary | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0b229c6..5cdb0e7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,7 +2,7 @@ import {Component, ViewChild} from '@angular/core'; import {ActivatedRoute, NavigationEnd, Router} from '@angular/router'; import {EnvProperties} from './openaireLibrary/utils/properties/env-properties'; -import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu'; +import {MenuItem} from './openaireLibrary/sharedComponents/menu'; import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service'; import {Session, User} from './openaireLibrary/login/utils/helper.class'; import {UserManagementService} from "./openaireLibrary/services/user-management.service"; @@ -72,7 +72,7 @@ import {ResourcesService} from "./openaireLibrary/monitor/services/resources.ser }) export class AppComponent { userMenuItems: MenuItem[] = []; - menuItems: RootMenuItem [] = []; + menuItems: MenuItem [] = []; bottomMenuItems: MenuItem[] = []; properties: EnvProperties = properties; showMenu: boolean = false; @@ -151,17 +151,15 @@ export class AppComponent { public buildMenu() { this.menuItems = []; - this.menuItems.push({ - rootItem: new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}), - items: [] - }); + this.menuItems.push( + new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {}) + ); if(this.properties.environment !== 'production') { this.resourcesService.setResourcesDeprecated(this.menuItems); } - this.menuItems.push({ - rootItem: new MenuItem("about", "About", "", "/about", false, [], null, {}), - items: [] - }); + this.menuItems.push( + new MenuItem("about", "About", "", "/about", false, [], null, {}) + ); this.bottomMenuItems = [ new MenuItem("", "About", "https://beta.openaire.eu/project-factsheets", "", false, [], [], {}), new MenuItem("", "News - Events", "https://beta.openaire.eu/news-events", "", false, [], [], {}), diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 945cee4..4cec290 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 945cee4519a4f5b2c5e53dd5c069d4f038f987e6 +Subproject commit 4cec2907da5e1bf55cf59930c23dd9a45c569b89