From 6302cce3e968582d8da09345c5198304b512c900 Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Wed, 4 Nov 2020 11:16:47 +0000 Subject: [PATCH] [Monitor Dashboard|Trunk] preview: move preview button to topic.component monitor.component, app update methods to show the profile based on the preview value and the visibility git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@59765 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/app.component.html | 3 +- src/app/app.component.ts | 48 ++++++++++++------------- src/app/monitor/monitor.component.ts | 27 +++----------- src/app/topic/indicators.component.html | 19 ---------- src/app/topic/topic.component.html | 28 +++++++++++++++ 5 files changed, 58 insertions(+), 67 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index ef29fc1..08ade81 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -13,7 +13,8 @@ [activeItem]="activeTopic?activeTopic.alias:null" [showHeader]=true [specialMenuItem]="specialSideBarMenuItem" [searchParams]="createSearchParameters()" - [headerUrl]="properties.domain + properties.baseLink" queryParamsHandling="preserve" + [headerUrl]="'https://' + (properties.environment == 'beta' ? 'beta.' : '') + + 'monitor.openaire.eu'" queryParamsHandling="preserve" > { - if (this.isPublicOrIsMember(topic.visibility)) { - let topicItem: MenuItem = new MenuItem(topic.alias, topic.name, "", ( - '/' + this.stakeholder.alias + '/' + topic.alias), - null, [], [], {}); - topicItem.icon = topic.icon; - items.push(topicItem); + if(this.isPublicOrIsMember(this.stakeholder.visibility)) { + this.stakeholder.topics.forEach((topic) => { + if (this.isPublicOrIsMember(topic.visibility)) { + let topicItem: MenuItem = new MenuItem(topic.alias, topic.name, "", ( + '/' + this.stakeholder.alias + '/' + topic.alias), + null, [], [], {}); + topicItem.icon = topic.icon; + items.push(topicItem); + } + }); + if (items.length === 0) { + items.push(new MenuItem('noTopics', 'No topics available yet', "", "", false, [], [], {})); } - }); - if (items.length === 0) { - items.push(new MenuItem('noTopics', 'No topics available yet', "", "", false, [], [], {})); + }else{ + let topicItem: MenuItem = new MenuItem("private", "Private Data", "","", null, [], [], {}); + items.push(topicItem); } this.sideBarItems = items; } @@ -238,8 +243,13 @@ export class AppComponent implements OnInit, OnDestroy { }); } - this.specialSideBarMenuItem = new MenuItem("search", "Search research outcomes", "", this.properties.searchLinkToResults, false, [], null, {}) - this.specialSideBarMenuItem.icon = ''; + + if(this.isPublicOrIsMember(this.stakeholder.visibility)) { + this.specialSideBarMenuItem = new MenuItem("search", "Search research outcomes", "", this.properties.searchLinkToResults, false, [], null, {}) + this.specialSideBarMenuItem.icon = ''; + }else{ + this.specialSideBarMenuItem =null; + } } else { this.menuHeader = { @@ -338,20 +348,10 @@ export class AppComponent implements OnInit, OnDestroy { } public isPublicOrIsMember(visibility: Visibility): boolean { - if (visibility == "PRIVATE") { - return false; - } - if (visibility == "PUBLIC") { - return true; - } else { - if (this.isViewPublic) { // preview for not members + if (visibility == "PRIVATE" || (this.isViewPublic && visibility != "PUBLIC")) { return false; - } else if (this.isManager(this.stakeholder)) { - // if user is member, return true - return true; } - return false; - } + return true; } createSearchParameters() { diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 8c30913..deed5ba 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -435,36 +435,17 @@ export class MonitorComponent implements OnInit, OnDestroy { } } - isAdmin(){ - return this.user && (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)); - } - public isPublicOrIsMember(visibility: Visibility): boolean { - if(visibility == "PRIVATE"){ - return false; - } - if (visibility == "PUBLIC") { - return true; - } else { - if (this.isViewPublic) { // preview for not members - return false; - } else if(this.isAdmin()) { - // if user is member, return true - return true; - } + if(visibility == "PRIVATE" || (this.isViewPublic && visibility != "PUBLIC")) { return false; } + return true; } public countSubCategoriesToShow(category:Category): number { let counter = 0; for (let sub of category.subCategories) { - if(sub.visibility != "PRIVATE") { - if (sub.visibility == "PUBLIC") { - // return true; - counter++; - }else if (this.isAdmin()) { - counter++; - } + if(this.isPublicOrIsMember(sub.visibility)) { + counter++; } } return counter; diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 205bd9b..9deb22b 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -1,23 +1,4 @@
-
-
- - - Preview - - -
- -
-
-
Number Indicators
diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index 7debf46..361dcb6 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -61,6 +61,34 @@
+
+
+ + + + +
+ +
+
+