From 5ec26ce0cf6118333a151fe6e0514f54a0db6cee Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 15 Jul 2022 13:36:55 +0300 Subject: [PATCH] create Menu class for mapping AP response --- dashboard/menu/menu.component.ts | 4 ++-- services/help-content.service.ts | 4 ++-- sharedComponents/menu.ts | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dashboard/menu/menu.component.ts b/dashboard/menu/menu.component.ts index 007b798b..4622fef3 100644 --- a/dashboard/menu/menu.component.ts +++ b/dashboard/menu/menu.component.ts @@ -142,8 +142,8 @@ export class MenuComponent implements OnInit { this.subscriptions.push( this._helpContentService.getMenuItems(this.portal).subscribe( data => { - this.featuredMenuItems = data['featuredMenuItems']; - this.normalMenuItems = data['menuItems']; + this.featuredMenuItems = data.featuredMenuItems; + this.normalMenuItems = data.menuItems; this.getPages(); this.showLoading = false; }, diff --git a/services/help-content.service.ts b/services/help-content.service.ts index ebe2358d..f1ae5cfd 100644 --- a/services/help-content.service.ts +++ b/services/help-content.service.ts @@ -14,7 +14,7 @@ import {StatisticsDisplay, StatisticsSummary} from '../connect/statistics/statis import {CustomOptions} from './servicesUtils/customOptions.class'; import {catchError, map} from "rxjs/operators"; import {properties} from "../../../environments/environment"; -import {MenuItem, MenuItemExtended} from '../sharedComponents/menu'; +import {Menu, MenuItem, MenuItemExtended} from '../sharedComponents/menu'; @Injectable() export class HelpContentService { @@ -318,7 +318,7 @@ export class HelpContentService { // Menu Items getMenuItems(portalPid: string) { - return this.http.get>(properties.adminToolsAPIURL + properties.adminToolsPortalType + "/" + portalPid + "/menu/full") + return this.http.get(properties.adminToolsAPIURL + properties.adminToolsPortalType + "/" + portalPid + "/menu/full") .pipe(catchError(this.handleError)); } diff --git a/sharedComponents/menu.ts b/sharedComponents/menu.ts index c19f6d75..787741da 100644 --- a/sharedComponents/menu.ts +++ b/sharedComponents/menu.ts @@ -72,6 +72,14 @@ export class MenuItemExtended extends MenuItem { parentItemId: string; } +export class Menu { + portalPid: string; + isFeaturedMenuEnabled: boolean; + isMenuEnabled: boolean; + featuredMenuItems: MenuItemExtended[] = []; + menuItems: MenuItemExtended[] = []; +} + /** * @deprecated * */