From c709432365fc7ee20198856c34cb19546a861f97 Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Wed, 16 Oct 2019 13:23:39 +0000 Subject: [PATCH] [Monitor]: Redirect to subcategory if no overview. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@57393 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/monitor/monitor.component.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 8e95003..d7a5d87 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -14,7 +14,6 @@ import {StakeholderService} from "../services/stakeholder.service"; import {Category, IndicatorPath, Stakeholder, SubCategory, Topic} from "../utils/entities/stakeholder"; import {MenuItem, RootMenuItem, SideMenuItem} from "../openaireLibrary/sharedComponents/menu"; import {StatisticsService} from "../utils/services/statistics.service"; -import {response} from "express"; @Component({ selector: 'monitor', @@ -118,12 +117,17 @@ export class MonitorComponent { (subCategory.alias === params['subCategory'] && subCategory.isPublic && subCategory.isActive))[0]; } else { this.activeSubCategory = this.activeCategory.subCategories.filter(subCategory => - subCategory.isPublic && subCategory.isActive)[0]; + !subCategory.alias && subCategory.isPublic && subCategory.isActive)[0]; } if (this.activeSubCategory) { this.setSideBar(); this.setIndicators(); return; + } else { + let subCategory: SubCategory = this.activeCategory.subCategories.filter( subCategory => + subCategory.isPublic && subCategory.isActive)[0]; + this.navigateTo(this.stakeholder.alias, this.activeTopic.alias, this.activeCategory.alias, subCategory.alias); + return; } } }