Merge pull request 'Merge Angular 16 Irish Monitor to develop' (#33) from angular-16-irish-monitor into develop

Reviewed-on: #33

claims/claim-utils/service/searchOrcid.service.ts

@@ -21,14 +21,38 @@ export class SearchOrcidService {
     let url = properties.searchOrcidURL + term + '/record';
 
     return this.http.get(url, { headers: headers })
-                //.map(res => res.json()['person'])
+      //.map(res => res.json()['person'])
-                 .pipe(map(res => res['person']))
+      .pipe(map(res => res['person']))
-                 .pipe(map(res => [res['name']['given-names'],
+      .pipe(map(res => [res['name']['given-names'],
-                             res['name']['family-name'],
+        res['name']['family-name'],
-                             res['name']]))
+        res['name'], res['name']['institution-name']]))
-                .pipe(map(res => SearchOrcidService.parseOrcidAuthor(res, authorIds, authors, addId)));
-    }
 
+      .pipe(map(res => SearchOrcidService.parseOrcidAuthor(res, authorIds, authors, addId)));
+  }
+  searchOrcidSingleAuthor(term: string, properties: EnvProperties, addId): any {
+
+    //var headers = new Headers();
+    //headers.append('Accept', 'application/orcid+json');
+    let headers = new HttpHeaders({'Accept': 'application/orcid+json'});
+
+    let url ="https://pub.orcid.org/v3.0/expanded-search/?q=orcid:" + term + '&start=0&rows=50';
+    return this.http.get(url, {headers: headers})
+      .pipe(map(res => res['expanded-result']))
+      .pipe(map(res => {
+        if(res) {
+          for (let auth_result of res) {
+            const author = {};
+            author['id'] = auth_result['orcid-id'];
+            author['authorGivenName'] = auth_result['given-names'];
+            author['authorFamilyName'] = auth_result['family-names'];
+            author['institutions'] = auth_result['institution-name'];
+            return author;
+          }
+        }
+        return null;
+
+      }));
+  }
   searchOrcidAuthors(term: string,
                      properties: EnvProperties): any {
 
@@ -45,17 +69,46 @@ export class SearchOrcidService {
 
   }
 
+  searchOrcidAuthorsNew(term: string,
+                        properties: EnvProperties, size = 10): any {
+    let headers = new HttpHeaders({'Accept': 'application/orcid+json'});
+    // let url = properties.searchOrcidURL+'search?defType=edismax&q='+term+'&qf=given-name^1.0+family-name^2.0+other-names^1.0+credit-name^1.0&start=0&rows=10';
+    let url = /*properties.searchOrcidURL +*/ 'https://pub.orcid.org/v3.0/expanded-search?q=' + StringUtils.URIEncode('{!edismax qf="given-and-family-names^50.0 family-name^10.0 given-names^10.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" bq="current-institution-affiliation-name:[* TO *]^100.0 past-institution-affiliation-name:[* TO *]^70" mm=1}') + term + '&start=0&rows=' + size;
+    // given-and-family-names^50.0 family-name^10.0 given-names^10.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" bq="current-institution-affiliation-name:[* TO *]^100.0 past-institution-affiliation-name:[* TO *]^70" mm=1}
+    // https://pub.orcid.org/v3.0/expanded-search/?q=%7B!edismax%20qf%3D%22given-and-family-names%5E50.0%20family-name%5E10.0%20given-names%5E10.0%20credit-name%5E10.0%20other-names%5E5.0%20text%5E1.0%22%20pf%3D%22given-and-family-names%5E50.0%22%20bq%3D%22current-institution-affiliation-name%3A%5B*%20TO%20*%5D%5E100.0%20past-institution-affiliation-name%3A%5B*%20TO%20*%5D%5E70%22%20mm%3D1%7Dpaolo%20manghi&start=0&rows=50
+
+    //q={!edismax qf="given-and-family-names^50.0 family-name^10.0 given-names^5.0 credit-name^10.0 other-names^5.0 text^1.0" pf="given-and-family-names^50.0" mm=1}alessia bardi&start=0&rows=10
+    let key = url;
+    return this.http.get(url, {headers: headers})
+      .pipe(map(res => res['expanded-result']))
+      .pipe(map(res => {
+        let authors = [];
+        if(res) {
+          for (let auth_result of res) {
+            const author = {};
+            author['id'] = auth_result['orcid-id'];
+            author['authorGivenName'] = auth_result['given-names'];
+            author['authorFamilyName'] = auth_result['family-names'];
+            author['institutions'] = auth_result['institution-name'];
+            authors.push(author);
+          }
+        }
+        return authors;
+
+      }));
+  }
 
   searchOrcidPublications(id: string, properties: EnvProperties, parse: boolean = false): any {
     let headers = new HttpHeaders({'Accept': 'application/orcid+json'});
     let url = properties.searchOrcidURL + id + '/works';
-      return this.http.get(url, { headers: headers })
+    return this.http.get(url, { headers: headers })
-        .pipe(map(res => res['group']))
+      .pipe(map(res => res['group']))
-        .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request)));
+      .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request)));
-      }
+  }
 
 
   static parseOrcidAuthor(data: any, authorIds: string[], authors, addId): any {
+    console.log(data)
     if (data[2] != null) {
       if (addId) {
         authorIds.push(data[2].path);
@@ -72,7 +125,12 @@ export class SearchOrcidService {
       } else {
         author['authorFamilyName'] = "";
       }
+      if (data[3] != null) {
+        author['institution'] = data[3];
+      }
+      console.log(author['institution'])
       authors.push(author);
+
       return true;
     }
     return false;

claims/claim-utils/service/searchOrcidService.module.ts

@@ -0,0 +1,19 @@
+import { NgModule}            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import {SearchOrcidService} from "./searchOrcid.service";
+
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule
+  ],
+  declarations: [
+  ],
+  providers:[
+    SearchOrcidService
+],
+  exports: [
+    ]
+})
+export class SearchOrcidServiceModule { }

claims/claimsAdmin/claimsAdmin.component.ts

@@ -37,7 +37,6 @@ export class ClaimsAdminComponent {
   @Input() isConnect: boolean = false;
   @Input() externalPortalUrl: string;
   @Input() claimsInfoURL: string;
-  @Input() userInfoURL: string;
   public user: User = null;
   sub;
   

claims/directLinking/directLinking.component.ts

@@ -29,7 +29,7 @@ export class DirectLinkingComponent {
   // linkTo: string = null; // entity type (project or context or entity)
   // linkToEntities: string[] = [];
   showOptions:ShowOptions = new ShowOptions();
-  validEntityTypes = ["dataset", "publication", "software", "orp", "project", "context"];
+  validEntityTypes = ["dataset", "publication", "software", "other", "project", "context"];
   sources: ClaimEntity[] = [];
   inlineEntity: ClaimEntity = null;
   validInput: boolean = null;//'true;
@@ -74,7 +74,7 @@ export class DirectLinkingComponent {
           this.getResearchResultById("dataset", this.id);
         } else if (this.type == "software") {
           this.getResearchResultById("software", this.id);
-        } else if (this.type == "orp") {
+        } else if (this.type == "other") {
           this.getResearchResultById("other", this.id);
         } else {
           this.validInput = this.isValidInput(null);
@@ -110,9 +110,9 @@ export class DirectLinkingComponent {
       return false;
     } else if (this.type == "project" && this.showOptions.linkTo != "result") {
       return false;
-    } else if (["dataset", "publication", "software", "orp"].indexOf(this.type) != -1 && (["project", "context", "result"].indexOf(this.showOptions.linkTo) == -1)) {
+    } else if (["dataset", "publication", "software", "other"].indexOf(this.type) != -1 && (["project", "context", "result"].indexOf(this.showOptions.linkTo) == -1)) {
       return false;
-    } else if (["project", "dataset", "publication", "software", "orp"].indexOf(this.type) == -1) {
+    } else if (["project", "dataset", "publication", "software", "other"].indexOf(this.type) == -1) {
       return false;
     } else {
       return true;

claims/linking/insertClaim/insertClaim.component.ts

@@ -16,6 +16,7 @@ import {
 import {UserManagementService} from "../../../services/user-management.service";
 import {Subscriber, timer} from "rxjs";
 import {map} from "rxjs/operators";
+import {LogService} from "../../../utils/log/log.service";
 
 @Component({
   selector: 'claim-insert',
@@ -59,7 +60,7 @@ import {map} from "rxjs/operators";
 })
 export class ClaimInsertComponent {
   constructor(private claimService: ClaimsService, private _router: Router, private route: ActivatedRoute,
-              private userManagementService: UserManagementService) {
+              private userManagementService: UserManagementService, private _logService: LogService) {
   }
   subscriptions = [];
   ngOnDestroy() {
@@ -127,6 +128,7 @@ export class ClaimInsertComponent {
   public feedRecordsJob;
   public claims2Insert;
   public records2Insert
+  infoToLog = [];
   public insert() {
       this.confirmOpen();
   }
@@ -145,6 +147,7 @@ export class ClaimInsertComponent {
     this.errorInClaims = [];
     this.insertedRecords = [];
     this.errorInRecords = [];
+    this.infoToLog = [];
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
       if (!user) {
        this.saveAndNavigate();
@@ -190,10 +193,11 @@ export class ClaimInsertComponent {
             } else if (entity.project) {
               claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email, dashboard));
             }
-
+            this.infoToLog.push([ result.title?result.title: result.id, entity.title?entity.title:entity.id]);
 
           }
           if (this.inlineEntity) {
+            this.infoToLog.push([ this.inlineEntity.title?this.inlineEntity.title: this.inlineEntity.id, entity.title?entity.title:entity.id]);
             if (this.inlineEntity.result) {
               if (entity.result) {
 
@@ -256,6 +260,12 @@ export class ClaimInsertComponent {
       data => {
         this.claims2Insert = claims.length;
         this.claimsJob = data.data;
+        if(this.properties.logServiceUrl) {
+          for(let info of this.infoToLog) {
+            this.subscriptions.push(this._logService.logLink(this.properties, info[0],info[1]).subscribe(res => {
+            }));
+          }
+        }
         this.saveLocalStorage();
         let  timerSubscription = timer(0, 10000).pipe(
           map(() => {
@@ -375,7 +385,7 @@ export class ClaimInsertComponent {
       localStorage.removeItem(this.localStoragePrefix + "claimsJob");
       localStorage.removeItem(this.localStoragePrefix + "feedRecordsJob");
 
-      this._router.navigate(['/myclaims'], {queryParams: this.params});
+      this._router.navigate([this.properties.myClaimsLink], {queryParams: this.params});
     }
   }
 

claims/linking/insertClaim/insertClaim.module.ts

@@ -6,10 +6,11 @@ import {LoadingModalModule} from '../../../utils/modal/loadingModal.module';
 import {ClaimInsertComponent} from './insertClaim.component';
 import {ClaimServiceModule} from '../../claim-utils/service/claimsService.module';
 import {IconsModule} from "../../../utils/icons/icons.module";
+import {LogServiceModule} from "../../../utils/log/LogService.module";
 
 @NgModule({
   imports: [
-    SharedModule, AlertModalModule, LoadingModalModule, ClaimServiceModule, IconsModule
+    SharedModule, AlertModalModule, LoadingModalModule, ClaimServiceModule, IconsModule, LogServiceModule
   ],
   declarations: [ClaimInsertComponent],
    exports:[ ClaimInsertComponent]

claims/myClaims/myClaims.component.ts

@@ -30,7 +30,6 @@ import {Subscriber} from "rxjs";
 export class MyClaimsComponent {
   @Input() claimsInfoURL: string;
   @Input() communityId:string;
-  @Input() userInfoURL: string;
   public user: User = null;
 
   constructor(private userManagementService: UserManagementService, private _router: Router) {}

connect/connectHelper.ts

@@ -6,6 +6,9 @@ import {CommunityInfo} from "./community/communityInfo";
 export class ConnectHelper {
 
   public static  getCommunityFromDomain(domain: string): string{
+    if(properties.dashboard === 'irish') {
+      return properties.adminToolsCommunity;
+    }
     if(properties.environment == "development" &&
       (properties.adminToolsPortalType == "connect" || properties.adminToolsPortalType == "community"
         || properties.adminToolsPortalType == "aggregator" || properties.adminToolsPortalType == "eosc")) {

dashboard/portal/portalHelper.ts

@@ -1,17 +1,18 @@
 import {Option} from "../../sharedComponents/input/input.component";
-import {StakeholderEntities} from "../../monitor/entities/stakeholder";
+import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils";
 
-export class PortalUtils{
+export class PortalUtils {
 
   portalTypes: Option[] = [
     {value: 'explore', label: 'Explore Portal'},
     {value: 'connect', label: 'Connect portal'},
     {value: 'monitor', label: 'Monitor portal'},
     {value: 'community', label: 'Community Gateway'},
-    {value: 'funder', label: StakeholderEntities.FUNDER + ' Dashboard'},
+    {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
-    {value: 'ri', label: StakeholderEntities.RI + ' Dashboard'},
+    {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
-    {value: 'organization', label: StakeholderEntities.ORGANIZATION + ' Dashboard'},
+    {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
-    {value: 'project', label: StakeholderEntities.PROJECT + ' Dashboard'}
+    {value: 'project', label: StakeholderConfiguration.ENTITIES.project + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'country', label: StakeholderConfiguration.ENTITIES.country + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
   ];
 
 }

dashboard/sharedComponents/sidebar/sideBar.component.html

@@ -28,6 +28,9 @@
               [class.hide-on-close]="backItem.icon">{{backItem.title}}</span>
     </a>
   </div>
+  <div *ngIf="logoURL" id="sidebar_logo" class="uk-margin-top">
+    <img [src]="logoURL">
+  </div>
   <div *ngIf="items.length > 0" class="menu_section uk-margin-large-top" [class.mobile]="mobile" style="min-height: 30vh">
     <ul #nav class="uk-list uk-nav" [class.uk-list-large]="mobile"
         [class.uk-nav-default]="!mobile" [class.uk-nav-primary]="mobile" uk-nav="duration: 400">

dashboard/sharedComponents/sidebar/sideBar.component.ts

@@ -28,6 +28,7 @@ export class SideBarComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
   @Input() activeSubItem: string = '';
   @Input() backItem: MenuItem = null;
   @Input() queryParamsHandling;
+  @Input() logoURL: string;
   @ViewChild("nav") nav: ElementRef;
   @ViewChild("sidebar_offcanvas") sidebar_offcanvas: ElementRef;
   public offset: number;

dashboard/sharedComponents/sidebar/sidebar-base.component.ts

@@ -0,0 +1,48 @@
+import {ChangeDetectorRef, Directive, OnInit} from "@angular/core";
+import {BaseComponent} from "../../../sharedComponents/base/base.component";
+import {MenuItem} from "../../../sharedComponents/menu";
+import {LayoutService} from "./layout.service";
+
+@Directive()
+export class SidebarBaseComponent extends BaseComponent implements OnInit {
+  hasSidebar: boolean = false;
+  hasInternalSidebar: boolean = false;
+  hasAdminMenu: boolean = false;
+  /**
+   * Menu Items
+   * */
+  sideBarItems: MenuItem[] = [];
+  adminMenuItems: MenuItem[] = [];
+  backItem: MenuItem = null;
+
+  protected layoutService: LayoutService;
+  protected cdr: ChangeDetectorRef;
+
+  constructor() {
+    super();
+  }
+
+  ngOnInit() {
+    this.subscriptions.push(this.layoutService.hasSidebar.subscribe(hasSidebar => {
+      this.hasSidebar = hasSidebar;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => {
+      this.hasInternalSidebar = hasInternalSidebar;
+      this.cdr.detectChanges();
+    }));
+    this.subscriptions.push(this.layoutService.hasAdminMenu.subscribe(hasAdminMenu => {
+      this.hasAdminMenu = hasAdminMenu;
+      this.cdr.detectChanges();
+    }));
+    this.layoutService.setOpen(true);
+  }
+
+  public get open() {
+    return this.layoutService.open;
+  }
+
+  public get hover() {
+    return this.layoutService.hover;
+  }
+}

dashboard/users/role-users/role-users.component.ts

@@ -140,9 +140,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   updateLists() {
     this.loadActive = true;
     this.loadPending = true;
-    this.subs.push(this.userRegistryService.getActive(this.type, this.id, this.role).subscribe(users => {
+    this.subs.push(this.userRegistryService.getActive(this.type, this.id, this.role, true).subscribe(users => {
       this.active = users;
-			// users.forEach(user => this.active.push(user));
       this.filterActiveBySearch(this.filterForm.value.active);
       this.loadActive = false;
       this.exists = true;
@@ -154,7 +153,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
       }
       this.loadActive = false;
     }));
-    this.subs.push(this.userRegistryService.getPending(this.type, this.id, this.role).subscribe(users => {
+    this.subs.push(this.userRegistryService.getPending(this.type, this.id, this.role, true).subscribe(users => {
       this.pending = users;
       this.filterPendingBySearch(this.filterForm.value.pending);
       this.loadPending = false;
@@ -206,8 +205,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
     this.createRoleModal.okButtonLeft = false;
     this.createRoleModal.okButtonText = 'Create';
     this.roleFb = this.fb.group({
-      name: this.fb.control(Role.mapType(this.type) + '.' + this.id, Validators.required),
+      name: this.fb.control(Role.roleName(this.type, this.id), Validators.required),
-      description: this.fb.control(Role.mapType(this.type) + ' ' + this.id, Validators.required)
+      description: this.fb.control(Role.roleName(this.type, this.id), Validators.required)
     });
     setTimeout(() => {
       this.roleFb.get('name').disable();
@@ -277,7 +276,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
           if (!this.pending.includes(response.email)) {
             this.pending.push(response.email);
           }
-          if(this.notificationFn) {
+          if(this.notificationFn && properties.notificationsAPIURL) {
             return this.notificationService.sendNotification(this.notificationFn(this.name, response.email, this.role, response.invitation)).pipe(map(notification => {
               return notification;
             }), tap(() => {

dashboard/users/subscribers/subscribers.component.ts

@@ -105,7 +105,7 @@ export class SubscribersComponent implements OnInit, OnDestroy, OnChanges {
   
   updateList() {
     this.loading = true;
-    this.subs.push( this.userRegistryService.getActive(this.type, this.id, 'member').subscribe(users => {
+    this.subs.push( this.userRegistryService.getActive(this.type, this.id, 'member', true).subscribe(users => {
       this.subscribers = users;
       this.filterBySearch(this.filterForm.value.keyword);
       this.loading = false;

error-interceptor.service.ts

@@ -11,7 +11,7 @@ import * as url from "url";
 @Injectable()
 export class ErrorInterceptorService implements HttpInterceptor {
   
-  private static UNAUTHORIZED_WHITELIST = [properties.userInfoUrl, properties.orcidAPIURL, properties.registryUrl? (properties.registryUrl + 'verification/'):null, properties.eoscDataTransferAPI].filter(value => !!value);
+  private static UNAUTHORIZED_WHITELIST = [properties.orcidAPIURL, properties.registryUrl? (properties.registryUrl + 'verification/'):null, properties.eoscDataTransferAPI].filter(value => !!value);
   private url: string = null;
 
   constructor(private router: Router) {

landingPages/feedback/feedback.component.html

@@ -9,7 +9,8 @@
       <landing-header *ngIf="resultLandingInfo" [properties]="properties" [title]="title"
                       [subTitle]="resultLandingInfo.subtitle" [underCuration]="resultLandingInfo.underCurationMessage"
                       [entityType]="entityType" [types]="resultLandingInfo.types"
-                      [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate">
+                      [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate"
+                      [publiclyFunded]="resultLandingInfo.publiclyFunded" [projects]="resultLandingInfo.fundedByProjects">
       </landing-header>
       <landing-header *ngIf="organizationInfo" [properties]="properties" [title]="title"
                       [subTitle]="(organizationInfo.name && organizationInfo.title.name !== organizationInfo.name)?organizationInfo.name:null"

landingPages/landing-utils/availableOn.component.ts

@@ -93,10 +93,12 @@ import {RouterHelper} from "../../utils/routerHelper.class";
               {{instance.downloadNames.join("; ")}}
             </a>
           </span>
-          <div *ngIf="instance.types?.length > 0 || instance.years?.length > 0" class="uk-text-meta">
+          <div *ngIf="instance.types?.length > 0 || instance.years?.length > 0 || instance.peerReviewed" class="uk-text-meta">
             <span *ngIf="instance.types?.length > 0" class="uk-text-capitalize">{{instance.types.join(" . ")}}</span>
             <span *ngIf="instance.types?.length > 0 && instance.years?.length > 0"> . </span>
             <span *ngIf="instance.years?.length > 0">{{instance.years.join(" . ")}}</span>
+            <span *ngIf="(instance.types?.length > 0 || instance.years?.length > 0) && instance.peerReviewed"> . </span>
+            <span *ngIf="instance.peerReviewed">Peer-reviewed</span>
           </div>
           <div *ngIf="instance.license" class="uk-text-meta uk-text-truncate" uk-tooltip [title]="instance.license">
             License:

landingPages/landing-utils/entity-metadata.component.ts

@@ -31,22 +31,20 @@ import {RouterHelper} from "../../utils/routerHelper.class";
       <!-- types -->
       <span *ngIf="entityType" class="uk-flex-inline uk-flex-middle uk-flex-wrap"
             [class.other-separator]="types && removeUnknown(types, true).length > 0">
-        <span class="uk-margin-xsmall-right">
+        <icon *ngIf="entityType.toLowerCase() == 'publication'" name="description" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'publication'" name="description" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'research data'" name="database" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'research data'" name="database" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'research software'" name="integration_instructions"
-          <icon *ngIf="entityType.toLowerCase() == 'research software'" name="integration_instructions"
+              type="outlined" [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                type="outlined" [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'other research product'" name="apps" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'other research product'" name="apps" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'project'" name="assignment_turned_in" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'project'" name="assignment_turned_in" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'data source'" name="note_add" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'data source'" name="note_add" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
+        <icon *ngIf="entityType.toLowerCase() == 'organization'" name="corporate_fare" type="outlined"
-          <icon *ngIf="entityType.toLowerCase() == 'organization'" name="corporate_fare" type="outlined"
+              [flex]="true" [ratio]="0.8" class="uk-margin-xsmall-right"></icon>
-                [flex]="true" [ratio]="0.8"></icon>
-        </span>
         <u class="uk-text-capitalize uk-text-bolder">{{entityType}}</u>
         <span *ngIf="types && removeUnknown(types, true).length > 0">
           <icon name="keyboard_double_arrow_right" [flex]="true" [ratio]="0.8"></icon>
@@ -150,6 +148,9 @@ import {RouterHelper} from "../../utils/routerHelper.class";
       <ng-container *ngIf="thematic">
         <span>Thematic</span>
       </ng-container>
+      <ng-container *ngIf="publiclyFunded">
+        <span>Publicly funded</span>
+      </ng-container>
       <!-- Projects -->
       <span *ngIf="projects && projects.length > 0"
         [attr.uk-tooltip]="projects.length > projectsLimit ? 'cls: uk-invisible' : 'pos: top; cls: uk-active'" title="Funded by">
@@ -246,6 +247,7 @@ export class EntityMetadataComponent {
   @Input() type; // data provider landing
   @Input() provenanceAction: string; // search result
   @Input() relationName: string; // search result
+  @Input() publiclyFunded: boolean; // search result
   @Input() projects: Project[];
   @Input() organizations: Organization[];
   @Input() subjects: string[];

landingPages/landing-utils/entity-metadata.module.ts

@@ -0,0 +1,16 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {EntityMetadataComponent} from './entity-metadata.component';
+import {IconsModule} from '../../utils/icons/icons.module';
+import {AlertModalModule} from '../../utils/modal/alertModal.module';
+import {ShowPublisherModule} from "./showPublisher.module";
+
+@NgModule({
+  imports: [
+    CommonModule, IconsModule, AlertModalModule, ShowPublisherModule
+  ],
+  declarations: [EntityMetadataComponent],
+  providers:[],
+  exports: [EntityMetadataComponent]
+})
+export class EntityMetadataModule { }

landingPages/landing-utils/landing-header/landing-header.component.ts

@@ -21,7 +21,7 @@ import {AlertModal} from "../../../utils/modal/alert";
 												 [languages]="languages" [programmingLanguages]="programmingLanguages"
 												 [compatibility]="compatibility" [aggregationStatus]="aggregationStatus"
 												 [thematic]="thematic" [type]="type" [prevPath]="prevPath"
-                         [countries]="countries" [projects]="projects"
+                         [countries]="countries" [publiclyFunded]="publiclyFunded" [projects]="projects"
 				></entity-metadata>
 			</div>
 			<div *ngIf="authors">
@@ -63,5 +63,6 @@ export class LandingHeaderComponent {
 	@Input() type; // data provider landing
   @Input() prevPath: string = "";
   @Input() countries;
+  @Input() publiclyFunded;
   @Input() projects;
 }

landingPages/landing-utils/landing-header/landing-header.module.ts

@@ -4,12 +4,12 @@ import {CommonModule} from "@angular/common";
 import {LandingModule} from "../landing.module";
 import {ShowAuthorsModule} from "../../../utils/authors/showAuthors.module";
 import {IconsModule} from "src/app/openaireLibrary/utils/icons/icons.module";
-import {ShowPublisherModule} from "../showPublisher.module";
 import {RouterModule} from "@angular/router";
 import {ResultLandingUtilsModule} from "../resultLandingUtils.module";
+import {EntityMetadataModule} from "../entity-metadata.module";
 
 @NgModule({
-  imports: [CommonModule, LandingModule, ShowAuthorsModule, IconsModule, ShowPublisherModule, RouterModule, ResultLandingUtilsModule],
+  imports: [CommonModule, LandingModule, ShowAuthorsModule, IconsModule, RouterModule, ResultLandingUtilsModule, EntityMetadataModule],
   declarations: [LandingHeaderComponent],
   exports: [LandingHeaderComponent]
 })

landingPages/landing-utils/parsingFunctions.class.ts

@@ -265,7 +265,8 @@ export class ParsingFunctions {
       "types": [],
       "years": [],
       "license": "",
-      "fulltext": ""
+      "fulltext": "",
+      "peerReviewed": null
     };
 
     if (instance.hasOwnProperty("hostedby")) {
@@ -358,6 +359,10 @@ export class ParsingFunctions {
     if(instance.hasOwnProperty("fulltext")) {
       available.fulltext = instance['fulltext'];
     }
+
+    if(instance.hasOwnProperty("refereed") && instance.refereed.classname == "peerReviewed") {
+      available.peerReviewed = true;
+    }
     
     hostedBy_collectedFrom.push(available);
   }

landingPages/landing-utils/resultLandingUtils.module.ts

@@ -9,7 +9,6 @@ import {ShowSubjectsComponent} from './showSubjects.component';
 import {FundedByComponent} from './fundedBy.component';
 import {AvailableOnComponent} from './availableOn.component';
 import {TabTableComponent} from './tabTable.component';
-import {ShowPublisherComponent} from "./showPublisher.component";
 import {ShowPublisherModule} from "./showPublisher.module";
 import {RelatedToComponent} from "./relatedTo.component";
 import {FosComponent} from "./fos.component";
@@ -17,13 +16,11 @@ import {SdgComponent} from "./sdg.component";
 import {IconsModule} from "../../utils/icons/icons.module";
 import {AlertModalModule} from "../../utils/modal/alertModal.module";
 import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module';
-import {EntityMetadataComponent} from "./entity-metadata.component";
 import {IconsService} from "../../utils/icons/icons.service";
 import {book, closed_access, cog, database, earth, open_access, unknown_access} from "../../utils/icons/icons";
 import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
 import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.module";
 
-
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule, PagingModule, ShowPublisherModule, IconsModule, AlertModalModule,
@@ -32,15 +29,14 @@ import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.
   declarations: [
     ShowIdentifiersComponent,ShowSubjectsComponent,
     FundedByComponent,AvailableOnComponent,TabTableComponent,
-    RelatedToComponent, FosComponent, SdgComponent,
+    RelatedToComponent, FosComponent, SdgComponent
-    EntityMetadataComponent
   ],
   providers:[
   ],
   exports: [
     ShowIdentifiersComponent, ShowSubjectsComponent,
-    FundedByComponent,AvailableOnComponent, TabTableComponent, ShowPublisherComponent,
+    FundedByComponent,AvailableOnComponent, TabTableComponent,
-    RelatedToComponent, FosComponent, SdgComponent, EntityMetadataComponent
+    RelatedToComponent, FosComponent, SdgComponent
   ]
 })
 export class ResultLandingUtilsModule {

landingPages/result/resultLanding.component.html

@@ -229,6 +229,7 @@
                                   [publisher]="resultLandingInfo.publisher" [journal]="resultLandingInfo.journal"
                                   [languages]="resultLandingInfo.languages" [programmingLanguages]="resultLandingInfo.programmingLanguages"
                                   [prevPath]="prevPath" [countries]="resultLandingInfo.countries"
+                                  [publiclyFunded]="resultLandingInfo.publiclyFunded"
                                   [projects]="resultLandingInfo.fundedByProjects">
                   </landing-header>
                   <!-- Labels -->
@@ -454,6 +455,29 @@
 <!--            </div>-->
           </div>
         </div>
+
+        <div *ngIf="resultLandingInfo && resultLandingInfo.oaRoutes && !viewAll"
+             class="uk-margin-medium-top uk-padding uk-padding-remove-vertical">
+          <div class="landing-oaroutes-card uk-text-small uk-flex uk-padding-small">
+            <div>
+              <div class="uk-flex uk-flex-top" uk-grid>
+                <div *ngIf="resultLandingInfo.oaRoutes.green" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-margin-remove-top">
+                  <div class="dot green"></div>
+                  <div class="uk-text-capitalize">Green</div>
+                </div>
+                <div *ngIf="resultLandingInfo.oaRoutes.oaColor" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-margin-remove-top">
+                  <div class="dot" [ngClass]="resultLandingInfo.oaRoutes.oaColor"></div>
+                  <div class="uk-text-capitalize">{{resultLandingInfo.oaRoutes.oaColor}}</div>
+                </div>
+              </div>
+              <div *ngIf="resultLandingInfo.oaRoutes.isInDiamondJournal" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-text-truncate">
+                <div class="dot diamond"></div>
+                <div>Published in a Diamond OA journal</div>
+              </div>
+            </div>
+          </div>
+        </div>
+
         <div class="uk-margin-medium-top uk-list uk-list-large uk-padding uk-padding-remove-vertical" [class.uk-list-divider]="!viewAll">
           <!-- EOSC Services-->
           <div *ngIf="resultLandingInfo.eoscSubjects?.length > 0 && properties.adminToolsPortalType == 'eosc'
@@ -523,6 +547,7 @@
                       [date]="resultLandingInfo.dateofacceptance" [embargoEndDate]="resultLandingInfo.embargoEndDate"
                       [publisher]="resultLandingInfo.publisher" [journal]="resultLandingInfo.journal"
                       [languages]="resultLandingInfo.languages" [programmingLanguages]="resultLandingInfo.programmingLanguages"
+                      [publiclyFunded]="resultLandingInfo.publiclyFunded" [projects]="resultLandingInfo.fundedByProjects"
                       [isMobile]="true" [prevPath]="prevPath">
       </landing-header>
       <div class="uk-text-small">
@@ -540,6 +565,31 @@
           <fos [subjects]="resultLandingInfo.fos" (suggestClicked)="suggestMobileClicked($event)"
                (viewAllClicked)="viewAllMobile=$event; openFsModal(fosFsModal, 'Fields of Science (FoS)')"></fos>
         </div>
+        <!-- OA Routes -->
+        <div *ngIf="resultLandingInfo.oaRoutes && !viewAllMobile" class="uk-margin-top uk-grid uk-grid-small uk-grid-divider" uk-grid>
+          <div class="uk-width-auto uk-text-meta">
+            Access Routes
+          </div>
+          <div class="uk-width-expand uk-flex">
+            <div>
+              <div class="uk-flex uk-flex-top" uk-grid>
+                <div *ngIf="resultLandingInfo.oaRoutes.green" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-margin-remove-top">
+                  <div class="dot green"></div>
+                  <div class="uk-text-capitalize">Green</div>
+                </div>
+                <div *ngIf="resultLandingInfo.oaRoutes.oaColor" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-margin-remove-top">
+                  <div class="dot" [ngClass]="resultLandingInfo.oaRoutes.oaColor"></div>
+                  <div class="uk-text-capitalize">{{resultLandingInfo.oaRoutes.oaColor}}</div>
+                </div>
+              </div>
+              <div *ngIf="resultLandingInfo.oaRoutes.isInDiamondJournal" class="uk-flex-nowrap uk-flex uk-flex-middle uk-margin-xsmall-bottom uk-text-truncate">
+                <div class="dot diamond"></div>
+                <div>Published in a Diamond OA journal</div>
+              </div>
+            </div>
+          </div>
+        </div>
+
       </div>
       <div class="uk-section uk-margin-top uk-text-large uk-text-empashis uk-text-bold">
         <hr>

landingPages/result/resultLanding.service.ts

@@ -142,6 +142,19 @@ export class ResultLandingService {
       this.resultLandingInfo.publisher = data[0].publisher;
       this.resultLandingInfo.description = this.parsingFunctions.parseDescription(data[0] && data[0].description ? data[0].description : []);
       this.resultLandingInfo.embargoEndDate = data[0].embargoenddate ? Dates.getDate(data[0].embargoenddate) : null;
+
+      if(data[0].hasOwnProperty("publiclyfunded") && data[0].publiclyfunded) {
+        this.resultLandingInfo.publiclyFunded = data[0].publiclyfunded;
+      }
+      if((data[0].hasOwnProperty("isgreen") && data[0].isgreen)
+        || (data[0].hasOwnProperty("openaccesscolor") && data[0].openaccesscolor)
+        || (data[0].hasOwnProperty("isindiamondjournal") && data[0].isindiamondjournal)) {
+        this.resultLandingInfo.oaRoutes = {
+          "green": data[0].isgreen,
+          "oaColor": data[0].openaccesscolor,
+          "isInDiamondJournal":data[0].isindiamondjournal
+        };
+      }
     }
 
     if (data[0]['bestaccessright'] && data[0]['bestaccessright'].hasOwnProperty("classname")) {
@@ -325,11 +338,13 @@ export class ResultLandingService {
       if (this.resultLandingInfo.fos) {
         this.resultLandingInfo.fos.sort((a, b) => a.id.localeCompare(b.id));
       }
-      this.resultLandingInfo.sdg = subjectResults[4];
+      if(properties.dashboard != "irish") {
-      if (this.resultLandingInfo.sdg) {
+        this.resultLandingInfo.sdg = subjectResults[4];
-        this.resultLandingInfo.sdg.sort((a, b) => {
+        if (this.resultLandingInfo.sdg) {
-          return HelperFunctions.sortSDGs(a, b);
+          this.resultLandingInfo.sdg.sort((a, b) => {
-        })
+            return HelperFunctions.sortSDGs(a, b);
+          })
+        }
       }
 
       // if(!this.resultLandingInfo.eoscSubjects) {

login/user.component.ts

@@ -27,7 +27,6 @@ export class UserComponent {
   public errorCode: string = "";
   public redirectUrl: string = "";
   public routerHelper: RouterHelper = new RouterHelper();
-  public loginUrl;
   public properties: EnvProperties = properties;
   @Input() mainComponent = true;
 
@@ -40,7 +39,6 @@ export class UserComponent {
   }
 
   ngOnInit() {
-    this.loginUrl = this.properties.loginUrl;
     if (typeof document !== 'undefined') {
       this.server = false;
       this.userManagementsService.updateUserInfo( () => {

login/userMini.component.ts

@@ -122,12 +122,8 @@ export class UserMiniComponent implements OnInit, OnChanges {
   public isAuthorized: boolean = false;
   @Input() public mobileView: boolean = false;
   public firstLetters: string = "";
-  public server: boolean = true;
   public routerHelper: RouterHelper = new RouterHelper();
   @Input() userMenuItems;
-  @Input() logInUrl;
-  @Input() logOutUrl;
-  @Input() cookieDomain;
   @Input() notificationConfiguration: NotificationConfiguration;
   @ViewChild('notificationsSidebar') notificationsSidebar: NotificationsSidebarComponent;
   public showNotifications = false;
@@ -137,9 +133,6 @@ export class UserMiniComponent implements OnInit, OnChanges {
   }
   
   ngOnInit() {
-    if (typeof document !== 'undefined') {
-      this.server = false;
-    }
     this.initUser();
   }
   

login/utils/helper.class.ts

@@ -1,4 +1,5 @@
-import {stakeholderTypes} from "../../monitor/entities/stakeholder";
+import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils";
+
 
 export class User {
   email: string;
@@ -9,6 +10,7 @@ export class User {
   expirationDate: number;
   role: string[];
   accessToken?: string;
+  orcid?: string;
   refreshToken?: string;
 
   constructor(info: any) {
@@ -22,6 +24,9 @@ export class User {
     if(info.refreshToken) {
       this.refreshToken = info.refreshToken;
     }
+    if(info.orcid) {
+      this.orcid = info.orcid;
+    }
     this.fullname = (info.name) ? info.name : "";
     if (this.fullname == "") {
       if (this.firstname != "") {
@@ -37,7 +42,7 @@ export class User {
     this.role = [];
     if (info.roles) {
       info.roles.forEach(role => {
-        this.role.push(role);
+        this.role.push(decodeURIComponent(role).replace('$$', '::'));
       });
     } else {
       if (info.edu_person_entitlements) {
@@ -63,21 +68,32 @@ export class Session {
     var cookie = COOKIE.getCookie(COOKIE.cookieName_id);
     return (cookie != null && cookie != "");
   }
-  
+  public static clearReloadUrl() {
+    COOKIE.setCookie("reloadURLs", JSON.stringify([]), -1);
+  }
   public static setReloadUrl(host: string, path: string, params: string, fragment: string) {
-    var URL = {};
+    let URLs:any[] = this.getReloadUrl();
+    let URL = {};
     URL["host"] = host;
     URL["path"] = path;
     URL["params"] = params;
     URL["fragment"] = fragment;
-    COOKIE.setCookie("reloadURL", JSON.stringify(URL), -1);
+    URLs.push(URL);
+    COOKIE.setCookie("reloadURLs", JSON.stringify(URLs), -1);
   }
   
   public static getReloadUrl() {
-    var URL = COOKIE.getCookie("reloadURL");
+    let URLs = COOKIE.getCookie("reloadURLs");
-    URL = JSON.parse(URL);
+    let array = JSON.parse(URLs);
-    return URL;
+    return array?array:[];
     
+  }
+  public static popReloadUrl() {
+    let array = this.getReloadUrl();
+    let Url = array.length>0?array[0]:null;
+    COOKIE.setCookie("reloadURLs", JSON.stringify(array.slice(1)), -1);
+    return Url;
+
   }
   
   public static getParamsObj(params: string) {
@@ -100,7 +116,7 @@ export class Session {
   }
   
   public static isMonitorCurator(user: User): boolean {
-    return stakeholderTypes.filter(stakeholderType => this.isTypeCurator(stakeholderType.value, user)).length > 0;
+    return StakeholderConfiguration.TYPES.filter(stakeholderType => this.isTypeCurator(stakeholderType.value, user)).length > 0;
   }
   
   public static isCommunityCurator(user: User): boolean {
@@ -112,7 +128,7 @@ export class Session {
   }
   
   public static isCurator(type: string, user: User): boolean {
-    return (type === 'community' || stakeholderTypes.find(stakeholderType => stakeholderType.value == type)) && this.isTypeCurator(type, user);
+    return (type === 'community' || StakeholderConfiguration.TYPES.find(stakeholderType => stakeholderType.value == type)) && this.isTypeCurator(type, user);
   }
   
   public static isPortalAdministrator(user: User): boolean {
@@ -212,8 +228,11 @@ export class Role {
   public static ANONYMOUS_USER = 'ROLE_ANONYMOUS';
   public static USER_MANAGER = 'USER_MANAGER';
   public static CURATOR_CLAIM = 'CURATOR_CLAIM';
-  
+
-  
+  public static roleName(type: string, id: string) {
+    return this.GROUP + this.mapType(type) + '.' + id;
+  }
+
   public static mapType(type: string, communityMap: boolean = true): string {
     if (type == "ri" && communityMap) {
       type = "community";

monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts

@@ -1,11 +1,8 @@
-import {Component, Input, OnDestroy, ViewChild} from "@angular/core";
+import {Component, Input, ViewChild} from "@angular/core";
 import {Stakeholder} from "../../../monitor/entities/stakeholder";
 import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
-import {StakeholderUtils} from "../../utils/indicator-utils";
 import {Option} from "../../../sharedComponents/input/input.component";
 import {Subscription} from "rxjs";
-import {EnvProperties} from "../../../utils/properties/env-properties";
-import {properties} from "src/environments/environment";
 import {StakeholderService} from "../../../monitor/services/stakeholder.service";
 import {UtilitiesService} from "../../../services/utilities.service";
 import {Role, Session, User} from "../../../login/utils/helper.class";
@@ -16,121 +13,132 @@ import {NotificationUtils} from "../../../notifications/notification-utils";
 import {Notification} from "../../../notifications/notifications";
 import {NotificationHandler} from "../../../utils/notification-handler";
 import {StatsProfilesService} from "../../utils/services/stats-profiles.service";
+import {StakeholderBaseComponent} from "../../utils/stakeholder-base.component";
 
 @Component({
   selector: 'edit-stakeholder',
   template: `
-      <form *ngIf="stakeholderFb" [formGroup]="stakeholderFb">
+      <div class="uk-margin-medium-bottom">
-          <div class="uk-grid uk-grid-large" uk-grid>
+          <form *ngIf="stakeholderFb" [formGroup]="stakeholderFb">
-              <div class="uk-width-1-2@m">
+              <div class="uk-grid uk-grid-large" uk-grid>
-                  <div input id="name" [formInput]="stakeholderFb.get('name')"
+                  <div class="uk-width-1-2@m">
-                       placeholder="Name"></div>
+                      <div input id="name" [formInput]="stakeholderFb.get('name')"
-              </div>
+                           placeholder="Name"></div>
-              <div class="uk-width-1-2@m">
+                  </div>
-                  <div input [formInput]="stakeholderFb.get('alias')"
+                  <div class="uk-width-1-2@m">
-                       placeholder="URL Alias"></div>
+                      <div input [formInput]="stakeholderFb.get('alias')"
-              </div>
+                           placeholder="URL Alias"></div>
-              <div class="uk-width-1-3@m">
-                  <div input [formInput]="stakeholderFb.get('index_id')"
-                       placeholder="Index ID"></div>
-              </div>
-              <div class="uk-width-1-3@m">
-                  <div input [formInput]="stakeholderFb.get('index_name')"
-                       placeholder="Index Name"></div>
-              </div>
-              <div class="uk-width-1-3@m">
-                  <div input [formInput]="stakeholderFb.get('index_shortName')"
-                       placeholder="Index Short Name"></div>
-              </div>
-              <ng-container *ngIf="isCurator">
-                  <div class="uk-width-1-3@m">
-                      <div *ngIf="statsProfiles" input [formInput]="stakeholderFb.get('statsProfile')" [type]="'select'"
-                           [options]="statsProfiles"
-                           placeholder="Stats Profile"></div>
                   </div>
                   <div class="uk-width-1-3@m">
-                      <div input [formInput]="stakeholderFb.get('projectUpdateDate')" [type]="'date'"
+                      <div input [formInput]="stakeholderFb.get('index_id')"
-                           placeholder="Last Project Update"></div>
+                           placeholder="Index ID"></div>
                   </div>
-              </ng-container>
+                  <div class="uk-width-1-3@m">
-              <div class="uk-width-1-3@m">
+                      <div input [formInput]="stakeholderFb.get('index_name')"
-                  <div input [formInput]="stakeholderFb.get('locale')" [type]="'select'"
+                           placeholder="Index Name"></div>
-                       [options]="stakeholderUtils.locales"
+                  </div>
-                       placeholder="Locale"></div>
+                  <div class="uk-width-1-3@m">
-              </div>
+                      <div input [formInput]="stakeholderFb.get('index_shortName')"
-              <div class="uk-width-1-1">
+                           placeholder="Index Short Name"></div>
-                  <div input [type]="'textarea'" placeholder="Description"
+                  </div>
-                       [rows]="4" [formInput]="stakeholderFb.get('description')"></div>
+                  <ng-container *ngIf="isCurator">
-              </div>
+                      <div class="uk-width-1-3@m">
-              <div class="uk-width-1-1">
+                          <div *ngIf="statsProfiles" input [formInput]="stakeholderFb.get('statsProfile')"
-                  <input #file id="photo" type="file" class="uk-hidden" (change)="fileChangeEvent($event)"/>
+                               [type]="'select'"
-                  <div *ngIf="!stakeholderFb.get('isUpload').value" class="uk-grid uk-grid-column-large" uk-grid>
+                               [options]="statsProfiles"
-                      <div class="uk-margin-top uk-width-auto@l uk-width-1-1">
+                               placeholder="Stats Profile"></div>
-                          <div class="uk-grid uk-grid-column-large uk-flex-middle" uk-grid>
+                      </div>
-                              <div class="uk-width-auto@l uk-width-1-1 uk-flex uk-flex-center">
+                      <div class="uk-width-1-3@m">
-                                  <button class="uk-button uk-button-primary uk-flex uk-flex-middle uk-flex-wrap"
+                          <div input [formInput]="stakeholderFb.get('projectUpdateDate')" [type]="'date'"
-                                          (click)="file.click()">
+                               placeholder="Last Project Update"></div>
-                                      <icon name="cloud_upload" [flex]="true"></icon>
+                      </div>
-                                      <span class="uk-margin-small-left">Upload a file</span>
+                  </ng-container>
-                                  </button>
+                  <div class="uk-width-1-3@m">
-                              </div>
+                      <div input [formInput]="stakeholderFb.get('locale')" [type]="'select'"
-                              <div class="uk-text-center uk-text-bold uk-width-expand">
+                           [options]="stakeholderUtils.locales"
-                                  OR
+                           placeholder="Locale"></div>
+                  </div>
+                  <div class="uk-width-1-1">
+                      <div input [type]="'textarea'" placeholder="Description"
+                           [rows]="4" [formInput]="stakeholderFb.get('description')"></div>
+                  </div>
+                  <div class="uk-width-1-1">
+                      <input #file id="photo" type="file" class="uk-hidden" (change)="fileChangeEvent($event)"/>
+                      <div *ngIf="!stakeholderFb.get('isUpload').value" class="uk-grid uk-grid-column-large" uk-grid>
+                          <div class="uk-margin-xsmall-top uk-width-auto@l uk-width-1-1">
+                              <div class="uk-grid uk-grid-column-large uk-flex-middle" uk-grid>
+                                  <div class="uk-width-auto@l uk-width-1-1 uk-flex uk-flex-center">
+                                      <button class="uk-button uk-button-primary uk-flex uk-flex-middle uk-flex-wrap"
+                                              (click)="file.click()">
+                                          <icon name="cloud_upload" [flex]="true"></icon>
+                                          <span class="uk-margin-small-left">Upload a file</span>
+                                      </button>
+                                  </div>
+                                  <div class="uk-text-center uk-text-bold uk-width-expand">
+                                      OR
+                                  </div>
                               </div>
                           </div>
+                          <div input class="uk-width-expand" type="logoURL" [placeholder]="'Link to the logo'"
+                               [formInput]="stakeholderFb.get('logoUrl')"></div>
                       </div>
-                      <div input class="uk-width-expand" type="logoURL" [placeholder]="'Link to the logo'"
+                      <div *ngIf="stakeholderFb.get('isUpload').value" class="uk-width-1-1 uk-flex uk-flex-middle">
-                           [formInput]="stakeholderFb.get('logoUrl')"></div>
+                          <div class="uk-card uk-card-default uk-text-center uk-border-circle">
+                              <img class="uk-position-center uk-blend-multiply" [src]="photo">
+                          </div>
+                          <div class="uk-margin-left">
+                              <button (click)="remove()" class="uk-button-danger uk-icon-button uk-icon-button-small">
+                                  <icon [flex]="true" ratio="0.8" name="delete"></icon>
+                              </button>
+                          </div>
+                          <div class="uk-margin-small-left">
+                              <button class="uk-button-secondary uk-icon-button uk-icon-button-small"
+                                      (click)="file.click()">
+                                  <icon [flex]="true" ratio="0.8" name="edit"></icon>
+                              </button>
+                          </div>
+                      </div>
+                      <!-- Full width error message -->
+                      <div *ngIf="uploadError"
+                           class="uk-text-danger uk-margin-small-top uk-width-1-1">{{uploadError}}</div>
                   </div>
-                  <div *ngIf="stakeholderFb.get('isUpload').value" class="uk-width-1-1 uk-flex uk-flex-middle">
+                  <div class="uk-width-1-1">
-                      <div class="uk-card uk-card-default uk-text-center uk-border-circle">
+                      <div class="uk-grid uk-child-width-expand@m uk-child-width-1-1" uk-grid>
-                          <img class="uk-position-center uk-blend-multiply" [src]="photo">
+                          <div *ngIf="showVisibility">
-                      </div>
+                              <div input [formInput]="stakeholderFb.get('visibility')"
-                      <div class="uk-margin-left">
+                                   [placeholder]="'Select a status'"
-                          <button (click)="remove()" class="uk-button-danger uk-icon-button uk-icon-button-small">
+                                   [options]="stakeholderUtils.visibilities" type="select"></div>
-                              <icon [flex]="true" ratio="0.8" name="delete"></icon>
+                          </div>
-                          </button>
+                          <div [class.uk-width-1-2@m]="!showVisibility && !showFunderType && !canChooseTemplate">
-                      </div>
+                              <div input [formInput]="stakeholderFb.get('type')"
-                      <div class="uk-margin-small-left">
+                                   [placeholder]="'Select a type of ' + entities.stakeholder"
-                          <button class="uk-button-secondary uk-icon-button uk-icon-button-small"
+                                   [options]="typesByRole" type="select"></div>
-                                  (click)="file.click()">
+                          </div>
-                              <icon [flex]="true" ratio="0.8" name="edit"></icon>
+                          <div *ngIf="showFunderType">
-                          </button>
+                              <div input [formInput]="stakeholderFb.get('funderType')"
+                                   [placeholder]="'Select a type of ' + entities.funder"
+                                   [options]="stakeholderUtils.funderTypes" type="select"></div>
+                          </div>
+                          <div *ngIf="canChooseTemplate">
+                              <div [placeholder]="'Select a template'"
+                                   input [formInput]="stakeholderFb.get('defaultId')"
+                                   [options]="defaultStakeholdersOptions" type="select"></div>
+                          </div>
                       </div>
                   </div>
-                  <!-- Full width error message -->
-                  <div *ngIf="uploadError" class="uk-text-danger uk-margin-small-top uk-width-1-1">{{uploadError}}</div>
               </div>
-              <div [class]="canChooseTemplate ? 'uk-width-1-3@m' : 'uk-width-1-2@m'">
+          </form>
-                  <div input [formInput]="stakeholderFb.get('visibility')"
+          <div #notify [class.uk-hidden]="!stakeholderFb" notify-form
-                       [placeholder]="'Select a status'"
+               class="uk-width-1-1 uk-margin-large-top"></div>
-                       [options]="stakeholderUtils.statuses" type="select"></div>
+      </div>
-              </div>
-              <div [class]="canChooseTemplate ? 'uk-width-1-3@m' : 'uk-width-1-2@m'">
-                  <div input [formInput]="stakeholderFb.get('type')"
-                       [placeholder]="'Select a type'"
-                       [options]="types" type="select"></div>
-              </div>
-              <ng-container *ngIf="canChooseTemplate">
-                  <div class="uk-width-1-3@m">
-                      <div [placeholder]="'Select a template'"
-                           input [formInput]="stakeholderFb.get('defaultId')"
-                           [options]="defaultStakeholdersOptions" type="select"></div>
-                  </div>
-              </ng-container>
-          </div>
-      </form>
-      <div #notify [class.uk-hidden]="!stakeholderFb" notify-form
-           class="uk-width-1-1 uk-margin-large-top uk-margin-medium-bottom"></div>
   `,
   styleUrls: ['edit-stakeholder.component.less']
 })
-export class EditStakeholderComponent implements OnDestroy {
+export class EditStakeholderComponent extends StakeholderBaseComponent {
   @Input()
   public disableAlias: boolean = false;
   public stakeholderFb: UntypedFormGroup;
   public secure: boolean = false;
-  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public defaultStakeholdersOptions: Option[];
   public defaultStakeholders: Stakeholder[];
   public alias: string[];
@@ -138,10 +146,8 @@ export class EditStakeholderComponent implements OnDestroy {
   public isDefault: boolean;
   public isNew: boolean;
   public loading: boolean = false;
-  public types: Option[];
+  public typesByRole: Option[];
   public statsProfiles: string[];
-  public properties: EnvProperties = properties;
-  private subscriptions: any[] = [];
   /**
    * Photo upload
    * */
@@ -153,21 +159,26 @@ export class EditStakeholderComponent implements OnDestroy {
   user: User;
   @ViewChild('notify', {static: true}) notify: NotifyFormComponent;
   private notification: Notification;
-  
+
   constructor(private fb: UntypedFormBuilder,
               private stakeholderService: StakeholderService,
               private statsProfileService: StatsProfilesService,
               private utilsService: UtilitiesService, private userManagementService: UserManagementService,) {
+    super();
   }
-  
+
   ngOnDestroy() {
     this.reset();
+    super.ngOnDestroy();
   }
-  
+
   public init(stakeholder: Stakeholder, alias: string[], defaultStakeholders: Stakeholder[], isDefault: boolean, isNew: boolean) {
     this.reset();
     this.deleteCurrentPhoto = false;
     this.stakeholder = stakeholder;
+    if (this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities)) {
+      this.stakeholder.visibility = this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities);
+    }
     this.alias = alias;
     this.defaultStakeholders = defaultStakeholders;
     this.isDefault = isDefault;
@@ -183,7 +194,7 @@ export class EditStakeholderComponent implements OnDestroy {
       } else {
         this.statsProfiles = [];
       }
-      this.types = this.stakeholderUtils.getTypesByUserRoles(this.user, this.stakeholder.alias);
+      this.typesByRole = this.stakeholderUtils.getTypesByUserRoles(this.user, this.stakeholder.alias);
       this.stakeholderFb = this.fb.group({
         _id: this.fb.control(this.stakeholder._id),
         defaultId: this.fb.control(this.stakeholder.defaultId),
@@ -191,21 +202,22 @@ export class EditStakeholderComponent implements OnDestroy {
         description: this.fb.control(this.stakeholder.description),
         index_name: this.fb.control(this.stakeholder.index_name, Validators.required),
         index_id: this.fb.control(this.stakeholder.index_id, Validators.required),
-        index_shortName: this.fb.control(this.stakeholder.index_shortName, Validators.required),
+        index_shortName: this.fb.control(this.stakeholder.index_shortName),
         statsProfile: this.fb.control(this.stakeholder.statsProfile, Validators.required),
         locale: this.fb.control(this.stakeholder.locale, Validators.required),
         projectUpdateDate: this.fb.control(this.stakeholder.projectUpdateDate),
         creationDate: this.fb.control(this.stakeholder.creationDate),
         alias: this.fb.control(this.stakeholder.alias,
-          [
+            [
-            Validators.required,
+              Validators.required,
-            this.stakeholderUtils.aliasValidatorString(
+              this.stakeholderUtils.aliasValidatorString(
-              this.alias.filter(alias => alias !== this.stakeholder.alias)
+                  this.alias.filter(alias => alias !== this.stakeholder.alias)
-            )]
+              )]
         ),
         isDefault: this.fb.control((this.isDefault)),
         visibility: this.fb.control(this.stakeholder.visibility, Validators.required),
         type: this.fb.control(this.stakeholder.type, Validators.required),
+        funderType: this.fb.control(this.stakeholder.funderType),
         topics: this.fb.control(this.stakeholder.topics),
         isUpload: this.fb.control(this.stakeholder.isUpload),
         logoUrl: this.fb.control(this.stakeholder.logoUrl),
@@ -234,7 +246,7 @@ export class EditStakeholderComponent implements OnDestroy {
       this.subscriptions.push(this.stakeholderFb.get('type').valueChanges.subscribe(value => {
         this.onTypeChange(value, defaultStakeholders);
       }));
-      this.stakeholderFb.setControl('defaultId', this.fb.control(stakeholder.defaultId, (this.isDefault && !this.isNew)?[]:Validators.required));
+      this.stakeholderFb.setControl('defaultId', this.fb.control(stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required));
       if (!this.isNew) {
         this.notification = NotificationUtils.editStakeholder(this.user.firstname + ' ' + this.user.lastname, this.stakeholder.name);
         this.notify.reset(this.notification.message);
@@ -269,29 +281,29 @@ export class EditStakeholderComponent implements OnDestroy {
       }
     }));
   }
-  
+
   public get isAdmin() {
     return Session.isPortalAdministrator(this.user);
   }
-  
+
   public get isCurator() {
     return this.stakeholder && (this.isAdmin || Session.isCurator(this.stakeholder.type, this.user));
   }
-  
+
   public get disabled(): boolean {
     return (this.stakeholderFb && this.stakeholderFb.invalid) ||
-      (this.stakeholderFb && this.stakeholderFb.pristine && !this.isNew && !this.file) ||
+        (this.stakeholderFb && this.stakeholderFb.pristine && !this.isNew && !this.file) ||
-      (this.uploadError && this.uploadError.length > 0);
+        (this.uploadError && this.uploadError.length > 0);
   }
-  
+
   public get dirty(): boolean {
     return this.stakeholderFb && this.stakeholderFb.dirty;
   }
-  
+
   public get canChooseTemplate(): boolean {
     return this.isNew && this.stakeholderFb.get('type').valid && !!this.defaultStakeholdersOptions;
   }
-  
+
   reset() {
     this.uploadError = null;
     this.stakeholderFb = null;
@@ -301,9 +313,9 @@ export class EditStakeholderComponent implements OnDestroy {
       }
     });
   }
-  
+
   onTypeChange(value, defaultStakeholders: Stakeholder[]) {
-    this.stakeholderFb.setControl('defaultId', this.fb.control(this.stakeholder.defaultId, (this.isDefault && !this.isNew)?[]:Validators.required));
+    this.stakeholderFb.setControl('defaultId', this.fb.control(this.stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required));
     this.defaultStakeholdersOptions = [{
       label: 'New blank profile',
       value: '-1'
@@ -315,7 +327,7 @@ export class EditStakeholderComponent implements OnDestroy {
       })
     });
   }
-  
+
   public save(callback: Function, errorCallback: Function = null) {
     this.loading = true;
     if (this.file) {
@@ -335,14 +347,14 @@ export class EditStakeholderComponent implements OnDestroy {
       this.saveStakeholder(callback, errorCallback);
     }
   }
-  
+
   public saveStakeholder(callback: Function, errorCallback: Function = null) {
     if (this.isNew) {
       let defaultStakeholder = this.defaultStakeholders.find(value => value._id === this.stakeholderFb.getRawValue().defaultId);
       this.stakeholderFb.setValue(this.stakeholderUtils.createFunderFromDefaultProfile(this.stakeholderFb.getRawValue(),
-        (defaultStakeholder ? defaultStakeholder.topics : []), this.stakeholderFb.getRawValue().isDefault));
+          (defaultStakeholder ? defaultStakeholder.topics : []), this.stakeholderFb.getRawValue().isDefault));
       this.removePhoto();
-      if(this.stakeholderFb.getRawValue().isDefault) {
+      if (this.stakeholderFb.getRawValue().isDefault) {
         this.stakeholderFb.get('defaultId').setValue(null);
       }
       this.subscriptions.push(this.stakeholderService.buildStakeholder(this.properties.monitorServiceAPIURL,
@@ -381,7 +393,7 @@ export class EditStakeholderComponent implements OnDestroy {
       }));
     }
   }
-  
+
   fileChangeEvent(event) {
     if (event.target.files && event.target.files[0]) {
       this.file = event.target.files[0];
@@ -407,13 +419,13 @@ export class EditStakeholderComponent implements OnDestroy {
       }
     }
   }
-  
+
   initPhoto() {
     if (this.stakeholderFb.getRawValue().isUpload) {
       this.photo = this.properties.utilsService + "/download/" + this.stakeholderFb.get('logoUrl').value;
     }
   }
-  
+
   removePhoto() {
     if (this.file) {
       if (typeof document != 'undefined') {
@@ -423,7 +435,7 @@ export class EditStakeholderComponent implements OnDestroy {
       this.file = null;
     }
   }
-  
+
   remove() {
     this.stakeholderFb.get('isUpload').setValue(false);
     this.stakeholderFb.get('isUpload').markAsDirty();
@@ -433,11 +445,15 @@ export class EditStakeholderComponent implements OnDestroy {
       this.deleteCurrentPhoto = true;
     }
   }
-  
+
   public deletePhoto() {
     if (this.stakeholder.logoUrl && this.stakeholder.isUpload) {
       this.subscriptions.push(this.utilsService.deletePhoto(this.properties.utilsService + '/delete/' +
-        encodeURIComponent(this.stakeholder.type) + "/" + encodeURIComponent(this.stakeholder.alias) + "/" + this.stakeholder.logoUrl).subscribe());
+          encodeURIComponent(this.stakeholder.type) + "/" + encodeURIComponent(this.stakeholder.alias) + "/" + this.stakeholder.logoUrl).subscribe());
     }
   }
+
+  get showFunderType() {
+    return super.showFunderType && this.stakeholderFb?.get('type').value === 'funder' && !this.isDefault;
+  }
 }

monitor-admin/general/general.component.ts

@@ -1,29 +1,28 @@
-import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
+import {ChangeDetectorRef, Component, OnInit, ViewChild} from "@angular/core";
 import {StakeholderService} from "../../monitor/services/stakeholder.service";
-import {EnvProperties} from "../../utils/properties/env-properties";
 import {Stakeholder} from "../../monitor/entities/stakeholder";
-import { Subscription, zip} from "rxjs";
+import {zip} from "rxjs";
 import {EditStakeholderComponent} from "./edit-stakeholder/edit-stakeholder.component";
-import {properties} from "src/environments/environment";
 import {Title} from "@angular/platform-browser";
+import {BaseComponent} from "../../sharedComponents/base/base.component";
+import {ActivatedRoute} from "@angular/router";
 
 @Component({
   selector: 'general',
   templateUrl: "./general.component.html"
 })
-export class GeneralComponent implements OnInit, OnDestroy {
+export class GeneralComponent extends BaseComponent implements OnInit {
-
   public stakeholder: Stakeholder;
   public alias: string[];
-  public properties: EnvProperties = properties;
   public defaultStakeholders: Stakeholder[];
   public loading: boolean = false;
-  private subscriptions: any[] = [];
   @ViewChild('editStakeholderComponent') editStakeholderComponent: EditStakeholderComponent;
 
   constructor(private stakeholderService: StakeholderService,
               private cdr: ChangeDetectorRef,
-              private title: Title) {
+              protected _route: ActivatedRoute,
+              protected _title: Title) {
+    super();
   }
 
   ngOnInit() {
@@ -32,7 +31,8 @@ export class GeneralComponent implements OnInit, OnDestroy {
       this.stakeholder = stakeholder;
       this.cdr.detectChanges();
       if(this.stakeholder) {
-        this.title.setTitle(this.stakeholder.name + " | General");
+        this.title = this.stakeholder.name + " | General";
+        this.setMetadata();
         let data = zip(
           this.stakeholderService.getDefaultStakeholders(this.properties.monitorServiceAPIURL),
           this.stakeholderService.getAlias(this.properties.monitorServiceAPIURL)
@@ -51,10 +51,9 @@ export class GeneralComponent implements OnInit, OnDestroy {
     this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, this.stakeholder.defaultId == null, false)
   }
 
-
   public save() {
     this.loading = true;
-    this.editStakeholderComponent.save((stakeholder) => {
+    this.editStakeholderComponent.save(stakeholder => {
       this.stakeholder = stakeholder;
       this.stakeholderService.setStakeholder(this.stakeholder);
       this.reset();
@@ -64,12 +63,4 @@ export class GeneralComponent implements OnInit, OnDestroy {
       this.loading = false;
     });
   }
-
-  ngOnDestroy() {
-    this.subscriptions.forEach(subscription => {
-      if(subscription instanceof Subscription) {
-        subscription.unsubscribe();
-      }
-    });
-  }
 }

monitor-admin/manageStakeholders/manageStakeholders.component.html

@@ -1,138 +1,173 @@
 <div page-content>
-  <div header>
+    <div header>
-    <sidebar-mobile-toggle class="uk-margin-top uk-hidden@m uk-display-block"></sidebar-mobile-toggle>
+        <sidebar-mobile-toggle class="uk-margin-top uk-hidden@m uk-display-block"></sidebar-mobile-toggle>
-    <div *ngIf="isCurator()" class="uk-margin-remove-bottom uk-margin-medium-top">
+        <div *ngIf="isCurator()" class="uk-margin-remove-bottom uk-margin-medium-top">
-      <slider-tabs [type]="'dynamic'" (activeEmitter)="tab = $event">
+            <slider-tabs [type]="'dynamic'" (activeEmitter)="tab = $event">
-        <slider-tab tabTitle="All" [tabId]="'all'" [active]="tab === 'all'"></slider-tab>
+                <slider-tab tabTitle="All" [tabId]="'all'" [active]="tab === 'all'"></slider-tab>
-        <slider-tab tabTitle="Profile templates" [tabId]="'templates'" [active]="tab === 'templates'"></slider-tab>
+                <slider-tab tabTitle="Profile templates" [tabId]="'templates'"
-        <slider-tab tabTitle="Profiles" [tabId]="'profiles'" [active]="tab === 'profiles'"></slider-tab>
+                            [active]="tab === 'templates'"></slider-tab>
-      </slider-tabs>
+                <slider-tab tabTitle="Profiles" [tabId]="'profiles'" [active]="tab === 'profiles'"></slider-tab>
+            </slider-tabs>
+        </div>
     </div>
-  </div>
+    <div actions>
-  <div actions>
+        <div class="uk-section-xsmall">
-    <div class="uk-section-xsmall">
+            <div class="uk-flex uk-flex-center uk-flex-wrap uk-flex-middle"
-      <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle">
+                 [ngClass]="properties.dashboard == 'irish' ? 'uk-flex-between@m' : 'uk-flex-right@m'">
-        <div search-input [searchControl]="filters.get('keyword')" [expandable]="true" placeholder="Search Profiles" searchInputClass="outer"
+                <div *ngIf="properties.dashboard == 'irish'" class="uk-width-medium uk-margin-small-bottom">
-             class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
+                    <div input type="select" placeholder="Type"
-      </div>
+                         [options]="typeOptions" [formInput]="filters.get('type')">
+                    </div>
+                </div>
+                <div search-input [searchControl]="filters.get('keyword')" [expandable]="true"
+                     placeholder="Search Profiles" searchInputClass="outer"
+                     class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-right"></div>
+            </div>
+        </div>
     </div>
-  </div>
+    <div inner>
-  <div inner>
+        <div *ngIf="loading" class="uk-margin-medium-top uk-padding-large">
-    <div *ngIf="loading" class="uk-margin-medium-top uk-padding-large">
+            <loading></loading>
-      <loading></loading>
+        </div>
-    </div>
+        <div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
-    <div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
+            <div uk-height-match="target: .logoContainer; row: false">
-			<div uk-height-match="target: .logoContainer; row: false">
+                <div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
-				<div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
-					<h4>Profile Templates</h4>
+                        <h4 class="uk-margin-remove">Profile Templates</h4>
-					<div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match" uk-grid>
+                        <paging-no-load *ngIf="displayDefaultStakeholders?.length > pageSize"
-						<ng-template ngFor [ngForOf]="displayDefaultStakeholders" let-stakeholder>
+                                        (pageChange)="updateCurrentTemplatesPage($event)"
-							<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
+                                        [currentPage]="currentTemplatesPage" [size]="pageSize"
-						</ng-template>
+                                        [totalResults]="displayDefaultStakeholders.length">
-						<div *ngIf="!loading && isCurator()">
+                        </paging-no-load>
-							<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new default profile.', isDefault:true}"></ng-container>
+                    </div>
-						</div>
+                    <div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match"
-					</div>
+                         uk-grid>
-				</div>
+                        <ng-template ngFor
-				<div *ngIf="!isManager()" class="message">
+                                     [ngForOf]="displayDefaultStakeholders.slice((currentTemplatesPage-1)*pageSize, currentTemplatesPage*pageSize)"
-					<h4 class="uk-text-center">
+                                     let-stakeholder>
-						No profiles to manage yet
+                            <ng-container
-					</h4>
+                                    *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
-				</div>
+                        </ng-template>
-				<div *ngIf="tab != 'templates' && isManager()" class="uk-section">
+                        <div *ngIf="!loading && isCurator()">
-					<h4>Profiles</h4>
+                            <ng-container
-					<div class="uk-grid uk-grid-match uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1" uk-grid>
+                                    *ngTemplateOutlet="newBox; context: {text:'Create a new default profile.', isDefault:true}"></ng-container>
-						<ng-template ngFor [ngForOf]="displayStakeholders" let-stakeholder>
+                        </div>
-							<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
+                    </div>
-						</ng-template>
+                </div>
-						<div *ngIf="!loading && isCurator()">
+                <div *ngIf="!isManager()" class="message">
-							<ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+typesAsString+') and ' +
+                    <h4 class="uk-text-center">
+                        No profiles to manage yet
+                    </h4>
+                </div>
+                <div *ngIf="tab != 'templates' && isManager()" class="uk-section">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
+                        <h4 class="uk-margin-remove">Profiles</h4>
+                        <paging-no-load *ngIf="displayStakeholders?.length > pageSize"
+                                        (pageChange)="updateCurrentPage($event)"
+                                        [currentPage]="currentPage" [size]="pageSize"
+                                        [totalResults]="displayStakeholders.length">
+                        </paging-no-load>
+                    </div>
+                    <div class="uk-grid uk-grid-match uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1"
+                         uk-grid>
+                        <ng-template ngFor
+                                     [ngForOf]="displayStakeholders.slice((currentPage-1)*pageSize, currentPage*pageSize)"
+                                     let-stakeholder>
+                            <ng-container
+                                    *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
+                        </ng-template>
+                        <div *ngIf="!loading && isCurator()">
+                            <ng-container *ngTemplateOutlet="newBox; context: {text:'Create a new profile by selecting the type ('+typesAsString+') and ' +
 							'select indicators based on a default or a blank profile.', isDefault:false}"></ng-container>
-						</div>
+                        </div>
-					</div>
+                    </div>
-				</div>
+                </div>
-			</div>
+            </div>
+        </div>
     </div>
-  </div>
 </div>
-
 <ng-template #stakeholderBox let-stakeholder="stakeholder">
-  <div *ngIf="stakeholder">
+    <div *ngIf="stakeholder">
-    <div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
+        <div class="uk-card uk-card-default uk-card-body uk-position-relative" [ngClass]="stakeholder.type">
-      <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
+            <div class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-        <a class="uk-link-reset uk-flex uk-flex-middle">
+                <a class="uk-link-reset uk-flex uk-flex-middle">
-          <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>
+                    <icon *ngIf="showVisibility" [flex]="true"
-          <icon [flex]="true" name="more_vert"></icon>
+                          [name]="stakeholderUtils.visibilityIcon.get(stakeholder.visibility)" ratio="0.6"></icon>
-        </a>
+                    <icon [flex]="true" name="more_vert"></icon>
-        <div #element class="uk-dropdown" uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
-          <ul class="uk-nav uk-dropdown-nav">
-            <li>
-              <a (click)="editStakeholder(stakeholder, !stakeholder.defaultId); hide(element)">Edit</a>
-            </li>
-            <li *ngIf="isCurator">
-              <a (click)="createReport(stakeholder);hide(element)">Cache Indicators</a>
-            </li>
-            <li class="uk-nav-divider"></li>
-            <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
-              <li [class.uk-active]="stakeholder.visibility === v.value">
-                <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
-                  <div class="uk-flex uk-flex-middle">
-                    <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
-                    <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
-                    <icon *ngIf="stakeholder.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
-                  </div>
                 </a>
-              </li>
+                <div #element class="uk-dropdown"
-            </ng-template>
+                     uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
-            <hr *ngIf="isProfileManager(stakeholder)" class="uk-nav-divider">
+                    <ul class="uk-nav uk-dropdown-nav">
-            <li *ngIf="isProfileManager(stakeholder)"><a
+                        <li>
-                (click)="deleteStakeholderOpen(stakeholder);hide(element)">Delete</a>
+                            <a (click)="editStakeholder(stakeholder, !stakeholder.defaultId); hide(element)">Edit</a>
-            </li>
+                        </li>
-          </ul>
+                        <li *ngIf="isCurator && stakeholderUtils.isCachingIndicators">
+                            <a (click)="createReport(stakeholder);hide(element)">Cache Indicators</a>
+                        </li>
+                        <li *ngIf="showVisibility" class="uk-nav-divider"></li>
+                        <ng-template *ngIf="showVisibility" ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
+                            <li [class.uk-active]="stakeholder.visibility === v.value">
+                                <a (click)="changeStakeholderStatus(stakeholder, v.value);hide(element)">
+                                    <div class="uk-flex uk-flex-middle">
+                                        <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
+                                        <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
+                                        <icon *ngIf="stakeholder.visibility === v.value" [flex]="true" name="done"
+                                              class="uk-text-secondary" ratio="0.8"></icon>
+                                    </div>
+                                </a>
+                            </li>
+                        </ng-template>
+                        <hr *ngIf="isProfileManager(stakeholder)" class="uk-nav-divider">
+                        <li *ngIf="isProfileManager(stakeholder)"><a
+                                (click)="deleteStakeholderOpen(stakeholder);hide(element)">Delete</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="'/admin/' + stakeholder.alias">
+                <div class="titleContainer uk-h6 uk-margin-remove-bottom uk-margin-top multi-line-ellipsis lines-2">
+                    <p *ngIf="stakeholder.name" class="uk-margin-remove">
+                        {{stakeholder.name}}
+                    </p>
+                </div>
+                <div class="logoContainer uk-margin-top uk-flex uk-flex-column uk-flex-center uk-flex-middle">
+                    <img [src]="stakeholder | logoUrl" class="uk-blend-multiply" style="max-height: 80px;">
+                </div>
+            </a>
         </div>
-      </div>
-      <a class="uk-display-block uk-text-center uk-link-reset" [routerLink]="'/admin/' + stakeholder.alias">
-        <div class="titleContainer uk-h6 uk-margin-remove-bottom uk-margin-top multi-line-ellipsis lines-2">
-					<p *ngIf="stakeholder.name" class="uk-margin-remove">
-						{{stakeholder.name}}
-					</p>
-				</div>
-        <div class="logoContainer uk-margin-top uk-flex uk-flex-column uk-flex-center uk-flex-middle">
-          <img [src]="stakeholder | logoUrl" class="uk-blend-multiply" style="max-height: 80px;">
-        </div>
-      </a>
     </div>
-  </div>
 </ng-template>
 <ng-template #newBox let-text="text" let-isDefault="isDefault">
-  <ng-container *ngIf="!loading">
+    <ng-container *ngIf="!loading">
-    <div class="uk-card uk-card-default uk-text-center uk-card-body clickable" (click)="editStakeholder(null, isDefault)">
+        <div class="uk-card uk-card-default uk-text-center uk-card-body clickable"
-      <div class="uk-text-small uk-text-muted">
+             (click)="editStakeholder(null, isDefault)">
-        {{text}}
+            <div class="uk-text-small uk-text-muted">
-      </div>
+                {{text}}
-      <div class="uk-margin-medium-top uk-margin-small-bottom">
+            </div>
+            <div class="uk-margin-medium-top uk-margin-small-bottom">
         <span class="uk-text-secondary">
           <icon name="add" [ratio]="3"></icon>
         </span>
-      </div>
+            </div>
-    </div>
+        </div>
-  </ng-container>
+    </ng-container>
 </ng-template>
 <modal-alert #editStakeholderModal [large]="true" classTitle="uk-background-primary uk-light"
-						(alertOutput)="editStakeholderComponent.save(callback)" (cancelOutput)="editStakeholderComponent.removePhoto()"
+             (alertOutput)="editStakeholderComponent.save(callback)"
-						[okDisabled]="editStakeholderComponent.disabled">
+             (cancelOutput)="editStakeholderComponent.removePhoto()"
-	<div class="uk-height-large uk-position-relative" *ngIf="editStakeholderComponent.loading">
+             [okDisabled]="editStakeholderComponent.disabled">
-		<loading class="uk-position-center"></loading>
+    <div class="uk-height-large uk-position-relative" *ngIf="editStakeholderComponent.loading">
-	</div>
+        <loading class="uk-position-center"></loading>
-	<div class="uk-padding" [class.uk-hidden]="editStakeholderComponent.loading">
+    </div>
-		<edit-stakeholder #editStakeholderComponent></edit-stakeholder>
+    <div class="uk-padding" [class.uk-hidden]="editStakeholderComponent.loading">
-	</div>
+        <edit-stakeholder #editStakeholderComponent></edit-stakeholder>
+    </div>
 </modal-alert>
 <modal-alert #deleteStakeholderModal [overflowBody]="false" (alertOutput)="deleteStakeholder()">
-	<div class="uk-height-medium uk-position-relative" *ngIf="deleteLoading">
+    <div class="uk-height-medium uk-position-relative" *ngIf="deleteLoading">
-		<loading class="uk-position-center"></loading>
+        <loading class="uk-position-center"></loading>
-	</div>
+    </div>
-	<div *ngIf="!deleteLoading">
+    <div *ngIf="!deleteLoading">
-		This stakeholder will permanently be deleted. Are you sure you want to proceed?
+        This stakeholder will permanently be deleted. Are you sure you want to proceed?
-	</div>
+    </div>
 </modal-alert>

monitor-admin/manageStakeholders/manageStakeholders.component.less

@@ -1,7 +1,8 @@
 @import (reference) "~src/assets/openaire-theme/less/color.less";
+@import (optional) "~src/assets/extend-theme/less/color.less";
 
 .setType(@color) {
-  border-bottom: 4px solid fade(@color, 30%);
+  border-bottom: 4px solid if(@color = none, none, fade(@color, 30%));
 
   & .type {
     color: @color;
@@ -20,4 +21,12 @@
   &.organization {
     .setType(@organization-color);
   }
+
+  &.country {
+    .setType(@country-color);
+  }
+
+  &.datasource {
+    .setType(@datasource-color);
+  }
 }

monitor-admin/manageStakeholders/manageStakeholders.component.ts

@@ -1,9 +1,7 @@
 import {Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
 import {StakeholderService} from "../../monitor/services/stakeholder.service";
-import {EnvProperties} from "../../utils/properties/env-properties";
+import {Stakeholder, Visibility} from "../../monitor/entities/stakeholder";
-import {Stakeholder, StakeholderEntities, Visibility} from "../../monitor/entities/stakeholder";
+import {zip} from "rxjs";
-import {Subscriber, zip} from "rxjs";
-import {StakeholderUtils} from "../utils/indicator-utils";
 import {UntypedFormBuilder, UntypedFormGroup} from "@angular/forms";
 import {AlertModal} from "../../utils/modal/alert";
 import {Option} from "../../sharedComponents/input/input.component";
@@ -11,10 +9,10 @@ import {Title} from "@angular/platform-browser";
 import {UserManagementService} from "../../services/user-management.service";
 import {Session} from "../../login/utils/helper.class";
 import {EditStakeholderComponent} from "../general/edit-stakeholder/edit-stakeholder.component";
-import {properties} from "src/environments/environment";
 import {ActivatedRoute} from "@angular/router";
 import {CacheIndicatorsService} from "../utils/cache-indicators/cache-indicators.service";
 import {NotificationHandler} from "../../utils/notification-handler";
+import {StakeholderBaseComponent} from "../utils/stakeholder-base.component";
 
 type Tab = 'all' | 'templates'| 'profiles';
 
@@ -25,12 +23,9 @@ declare var UIkit;
   templateUrl: "./manageStakeholders.component.html",
   styleUrls: ["./manageStakeholders.component.less"]
 })
-export class ManageStakeholdersComponent implements OnInit, OnDestroy {
+export class ManageStakeholdersComponent extends StakeholderBaseComponent implements OnInit, OnDestroy {
-  
-  public properties: EnvProperties;
   public loading: boolean = true;
 	public deleteLoading: boolean = false;
-  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public defaultStakeholders: Stakeholder[];
   public stakeholders: Stakeholder[];
   public alias: string[];
@@ -38,26 +33,24 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
   public index: number;
   public user = null;
   public tab: Tab = 'all';
+  public currentPage: number = 1;
+  public currentTemplatesPage: number = 1;
+  public pageSize: number = 15;
+  public typeOptions: Option[];
   /**
    *  Filtered Stakeholders
    */
-  public displayDefaultStakeholders: Stakeholder[];
+  public displayDefaultStakeholders: Stakeholder[] = [];
-  public displayStakeholders: Stakeholder[];
+  public displayStakeholders: Stakeholder[] = [];
   /**
    * Top filters
    */
   public filters: UntypedFormGroup;
-  public all: Option = {
-    value: 'all',
-    label: 'All'
-  };
-  
   public callback: Function;
   
   /**
    * Grid or List View
    */
-  private subscriptions: any[] = [];
   @ViewChild('editStakeholderModal', { static: true }) editStakeholderModal: AlertModal;
   @ViewChild('deleteStakeholderModal', { static: true }) deleteStakeholderModal: AlertModal;
   @ViewChild('editStakeholderComponent', { static: true }) editStakeholderComponent: EditStakeholderComponent;
@@ -65,15 +58,17 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
   constructor(private stakeholderService: StakeholderService,
               private cacheIndicatorsService: CacheIndicatorsService,
               private userManagementService: UserManagementService,
-              private route: ActivatedRoute,
+              protected _route: ActivatedRoute,
-              private title: Title,
+              protected _title: Title,
               private fb: UntypedFormBuilder) {
+    super();
   }
   
   ngOnInit(): void {
+    this.typeOptions = [{value: 'all', label: 'All'}].concat(this.stakeholderUtils.types);
     this.buildFilters();
-    this.properties = properties;
+    this.title = 'Manage Profiles';
-    this.title.setTitle('Manage profiles');
+    this.setMetadata();
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
       this.user = user;
     }));
@@ -94,51 +89,42 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
     }));
   }
   
-  ngOnDestroy(): void {
-    this.subscriptions.forEach(value => {
-      if (value instanceof Subscriber) {
-        value.unsubscribe();
-      } else if (value instanceof Function) {
-        value();
-      }
-    });
-  }
-  
   hide(element: any) {
     UIkit.dropdown(element).hide();
   }
   
-  
   private buildFilters() {
     this.filters = this.fb.group({
       status: this.fb.control('all'),
+      type: this.fb.control('all'),
       keyword: this.fb.control('')
     });
     this.subscriptions.push(this.filters.get('status').valueChanges.subscribe(value => {
-      this.onStatusChange(value);
+      this.filtering();
+    }));
+    this.subscriptions.push(this.filters.get('type').valueChanges.subscribe(value => {
+      this.filtering();
     }));
     this.subscriptions.push(this.filters.get('keyword').valueChanges.subscribe(value => {
-      this.onKeywordChange(value);
+      this.filtering();
     }));
   }
   
-  onStatusChange(value) {
+  private filterByStatus(stakeholders: Stakeholder[], value): Stakeholder[] {
-    this.displayDefaultStakeholders = this.filterStatus(this.defaultStakeholders, value);
-    this.displayStakeholders = this.filterStatus(this.stakeholders, value);
-  }
-  
-  onKeywordChange(value) {
-    this.displayDefaultStakeholders = this.filterByKeyword(this.defaultStakeholders, value);
-    this.displayStakeholders = this.filterByKeyword(this.stakeholders, value);
-  }
-  
-  private filterStatus(stakeholders: Stakeholder[], value): Stakeholder[] {
     if (value === 'all') {
       return stakeholders;
     } else {
       return stakeholders.filter(stakeholder => stakeholder.visibility == value);
     }
   }
+
+  private filterByType(stakeholders: Stakeholder[], value) {
+    if(value == 'all') {
+      return stakeholders;
+    } else {
+      return stakeholders.filter(item => item.type == value);
+    }
+  }
   
   private filterByKeyword(stakeholders: Stakeholder[], value): Stakeholder[] {
     if (!value) {
@@ -153,6 +139,26 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
       );
     }
   }
+
+  filtering() {
+    let keyword = this.filters.get('keyword').value;
+    let type = this.filters.get('type').value;
+    let status = this.filters.get('status').value;
+    let displayStakeholders = this.stakeholders;
+    let displayDefaultStakeholders = this.defaultStakeholders;
+
+    displayStakeholders = this.filterByKeyword(displayStakeholders, keyword);
+    displayStakeholders = this.filterByType(displayStakeholders, type);
+    displayStakeholders = this.filterByStatus(displayStakeholders, status);
+    displayDefaultStakeholders = this.filterByKeyword(displayDefaultStakeholders, keyword);
+    displayDefaultStakeholders = this.filterByType(displayDefaultStakeholders, type);
+    displayDefaultStakeholders = this.filterByStatus(displayDefaultStakeholders, status);
+
+    this.displayStakeholders = displayStakeholders;
+    this.displayDefaultStakeholders = displayDefaultStakeholders;
+    this.currentPage = 1;
+    this.currentTemplatesPage = 1;
+  }
   
   public editStakeholder(stakeholder: Stakeholder = null, isDefault: boolean = false) {
     if (isDefault) {
@@ -193,6 +199,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
         }
         this.alias.push(stakeholder.alias);
 				this.editStakeholderModal.cancel();
+        this.filtering();
       };
       this.editStakeholderModal.alertTitle = 'Create a new ' + (isDefault?'Default ':'') + 'Profile';
       this.editStakeholderModal.okButtonText = 'Create';
@@ -244,6 +251,7 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
       this.alias = this.alias.filter(item => item !== this.stakeholder.alias);
 			this.deleteLoading = false;
 			this.deleteStakeholderModal.cancel();
+      this.filtering();
     }, error => {
       UIkit.notification('An error has occurred. Please try again later', {
         status: 'danger',
@@ -296,16 +304,11 @@ export class ManageStakeholdersComponent implements OnInit, OnDestroy {
         ' or ' + this.stakeholderUtils.types[this.stakeholderUtils.types.length - 1].label
   }
 
-  private isTab(tab: Tab): boolean {
+  public updateCurrentPage($event) {
-    switch (tab) {
+    this.currentPage = $event.value;
-      case "all":
+  }
-        return true;
+
-      case "profiles":
+  public updateCurrentTemplatesPage($event) {
-        return true;
+    this.currentTemplatesPage = $event.value;
-      case "templates":
-        return true;
-      default:
-        return false;
-    }
   }
 }

monitor-admin/manageStakeholders/manageStakeholders.module.ts

@@ -19,6 +19,7 @@ import {
 } from "../../dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module";
 import {SliderTabsModule} from "../../sharedComponents/tabs/slider-tabs.module";
 import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholder.module";
+import {PagingModule} from "../../utils/paging.module";
 
 @NgModule({
   declarations: [ManageStakeholdersComponent],
@@ -36,7 +37,8 @@ import {EditStakeholderModule} from "../general/edit-stakeholder/edit-stakeholde
     LogoUrlPipeModule,
     SearchInputModule,
     SidebarMobileToggleModule,
-    SliderTabsModule
+    SliderTabsModule,
+    PagingModule
   ],
   providers: [
     PreviousRouteRecorder,

monitor-admin/topic/indicators.component.html

@@ -39,26 +39,28 @@
                   <div *ngIf="!dragging"
                       class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
                     <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                      <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
+                      <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
                     <div #element class="uk-dropdown" uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                       <ul class="uk-nav uk-dropdown-nav">
                         <ng-container *ngIf="isCurator">
                           <li><a (click)="editNumberIndicatorOpen(number, indicator._id); hide(element)">Edit</a></li>
-                          <li class="uk-nav-divider"></li>
                         </ng-container>
-                        <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                        <ng-container *ngIf="showVisibility">
-                          <li>
+                          <li *ngIf="isCurator" class="uk-nav-divider"></li>
-                            <a (click)="changeIndicatorStatus(number._id, indicator, v.value);hide(element)">
+                          <ng-template ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
-                              <div class="uk-flex uk-flex-middle">
+                            <li>
-                                <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
+                              <a (click)="changeIndicatorStatus(number._id, indicator, v.value);hide(element)">
-                                <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
+                                <div class="uk-flex uk-flex-middle">
-                                <icon *ngIf="indicator.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
+                                  <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
-                              </div>
+                                  <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
-                            </a>
+                                  <icon *ngIf="indicator.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
-                          </li>
+                                </div>
-                        </ng-template>
+                              </a>
+                            </li>
+                          </ng-template>
+                        </ng-container>
                         <ng-container *ngIf="!indicator.defaultId && !editing && isCurator">
                           <li class="uk-nav-divider">
                           <li><a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete</a></li>
@@ -136,26 +138,28 @@
                   <div *ngIf="!dragging"
                       class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
                     <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                      <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
+                      <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
                     <div #element class="uk-dropdown" uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                       <ul class="uk-nav uk-dropdown-nav">
                         <ng-container *ngIf="isCurator">
                           <li><a (click)="editChartIndicatorOpen(chart, indicator._id); hide(element)">Edit</a></li>
-                          <li class="uk-nav-divider"></li>
                         </ng-container>
-                        <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                        <ng-container *ngIf="showVisibility">
-                          <li>
+                          <li *ngIf="isCurator" class="uk-nav-divider"></li>
-                            <a (click)="changeIndicatorStatus(chart._id, indicator, v.value);">
+                          <ng-template ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
-                              <div class="uk-flex uk-flex-middle">
+                            <li>
-                                <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
+                              <a (click)="changeIndicatorStatus(chart._id, indicator, v.value);">
-                                <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
+                                <div class="uk-flex uk-flex-middle">
-                                <icon *ngIf="indicator.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
+                                  <icon [flex]="true" [name]="v.icon" ratio="0.6"></icon>
-                              </div>
+                                  <span class="uk-margin-small-left uk-width-expand">{{v.label}}</span>
-                            </a>
+                                  <icon *ngIf="indicator.visibility === v.value" [flex]="true" name="done" class="uk-text-secondary" ratio="0.8"></icon>
-                          </li>
+                                </div>
-                        </ng-template>
+                              </a>
+                            </li>
+                          </ng-template>
+                        </ng-container>
                         <ng-container *ngIf="!indicator.defaultId && !editing && isCurator">
                           <li class="uk-nav-divider">
                           <li><a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">Delete</a></li>
@@ -231,8 +235,8 @@
       <div input class="uk-width-1-1" *ngIf="stakeholder.defaultId" [formInput]="numberIndicatorFb.get('additionalDescription')"
            placeholder="Description" type="textarea">
       </div>
-      <div input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('visibility')"
+      <div *ngIf="showVisibility" input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('visibility')"
-           placeholder="Visibility" [options]="stakeholderUtils.visibility" type="select">
+           placeholder="Visibility" [options]="stakeholderUtils.visibilities" type="select">
       </div>
       <div input class="uk-width-1-2@m" [formInput]="numberIndicatorFb.get('width')"
            placeholder="Number Size" [options]="indicatorUtils.indicatorSizes" type="select">
@@ -346,8 +350,8 @@
       <div *ngIf="stakeholder.defaultId" input class="uk-width-1-1" [formInput]="chartIndicatorFb.get('additionalDescription')"
            placeholder="Description" type="textarea">
       </div>
-      <div input class="uk-width-1-2@m" [formInput]="chartIndicatorFb.get('visibility')"
+      <div *ngIf="showVisibility" input class="uk-width-1-2@m" [formInput]="chartIndicatorFb.get('visibility')"
-           placeholder="Status" [options]="stakeholderUtils.visibility" type="select">
+           placeholder="Status" [options]="stakeholderUtils.visibilities" type="select">
       </div>
       <div input class="uk-width-1-2@m" [formInput]="chartIndicatorFb.get('width')" placeholder="Chart width"
            [options]="indicatorUtils.indicatorSizes" type="select">

monitor-admin/topic/indicators.component.ts

@@ -5,7 +5,6 @@ import {
   HostListener,
   Input,
   OnChanges,
-  OnDestroy,
   OnInit,
   SimpleChanges,
   ViewChild
@@ -20,7 +19,6 @@ import {
   Stakeholder,
   Visibility
 } from "../../monitor/entities/stakeholder";
-import {IndicatorUtils, StakeholderUtils} from "../utils/indicator-utils";
 import {
   AbstractControl,
   UntypedFormArray,
@@ -34,7 +32,6 @@ import {StatisticsService} from "../utils/services/statistics.service";
 import {HelperFunctions} from "../../utils/HelperFunctions.class";
 import {DomSanitizer, SafeResourceUrl} from "@angular/platform-browser";
 import {Reorder, StakeholderService} from "../../monitor/services/stakeholder.service";
-import {EnvProperties} from "../../utils/properties/env-properties";
 import {Observable, Subscriber} from "rxjs";
 import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service";
 import {Router} from "@angular/router";
@@ -44,8 +41,9 @@ import {Notification} from "../../notifications/notifications";
 import {NotificationUtils} from "../../notifications/notification-utils";
 import {NotifyFormComponent} from "../../notifications/notify-form/notify-form.component";
 import {NotificationService} from "../../notifications/notification.service";
-import {properties} from "src/environments/environment";
 import {NotificationHandler} from "../../utils/notification-handler";
+import {IndicatorStakeholderBaseComponent} from "../utils/stakeholder-base.component";
+import {properties} from "../../../../environments/environment";
 
 declare var UIkit;
 declare var copy;
@@ -54,10 +52,9 @@ declare var copy;
   selector: 'indicators',
   templateUrl: './indicators.component.html'
 })
-export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterViewInit {
+export class IndicatorsComponent extends IndicatorStakeholderBaseComponent implements OnInit, OnChanges, AfterViewInit {
   filesToUpload: Array<File>;
   errorMessage = "";
-  public properties: EnvProperties = properties;
   @Input()
   public topicIndex: number = 0;
   @Input()
@@ -71,8 +68,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   @Input()
   public user: User = null;
   public preview: string;
-  public indicatorUtils: IndicatorUtils = new IndicatorUtils();
-  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public numberIndicatorFb: UntypedFormGroup;
   public chartIndicatorFb: UntypedFormGroup;
   public chartSections: UntypedFormArray;
@@ -118,7 +113,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   /**
    * Subscriptions
    **/
-  private subscriptions: any[] = [];
   private urlSubscriptions: any[] = [];
   private numberSubscription: any[] = [];
 
@@ -127,9 +121,10 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
               private statisticsService: StatisticsService,
               private notificationService: NotificationService,
               private fb: UntypedFormBuilder,
-              private router: Router,
+              protected _router: Router,
               private cdr: ChangeDetectorRef,
               private sanitizer: DomSanitizer) {
+    super()
     this.filesToUpload = [];
   }
 
@@ -146,13 +141,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   }
 
   ngOnDestroy(): void {
-    this.subscriptions.forEach(value => {
+    super.ngOnDestroy();
-      if (value instanceof Subscriber) {
-        value.unsubscribe();
-      } else if (value instanceof Function) {
-        value();
-      }
-    });
     this.urlSubscriptions.forEach(value => {
       if (value instanceof Subscriber) {
         value.unsubscribe();
@@ -857,39 +846,42 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
       this.setCharts();
       this.setNumbers();
       this.initReorder();
-      this.notification = NotificationUtils.importIndicators(this.user.fullname, this.stakeholder.alias);
+      if(properties.notificationsAPIURL) {
-      this.notification.entity = this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index]._id;
+        this.notification = NotificationUtils.importIndicators(this.user.fullname, this.stakeholder.alias);
-      this.notification.name = this.user.firstname;
+        this.notification.entity = this.stakeholder.topics[this.topicIndex].categories[this.categoryIndex].subCategories[this.index]._id;
-      this.notification.surname = this.user.lastname;
+        this.notification.name = this.user.firstname;
-      this.notification.stakeholder = this.stakeholder.alias;
+        this.notification.surname = this.user.lastname;
-      this.notification.stakeholderType = this.stakeholder.type;
+        this.notification.stakeholder = this.stakeholder.alias;
-      this.notification.groups = [Role.curator(this.stakeholder.type)];
+        this.notification.stakeholderType = this.stakeholder.type;
-      if (this.stakeholder.defaultId) {
+        this.notification.groups = [Role.curator(this.stakeholder.type)];
-        this.notification.groups.push(Role.manager(this.stakeholder.type, this.stakeholder.alias));
+        if (this.stakeholder.defaultId) {
-        this.notificationService.sendNotification(this.notification).subscribe(notification => {
+          this.notification.groups.push(Role.manager(this.stakeholder.type, this.stakeholder.alias));
-          UIkit.notification('A notification has been <b>sent</b> successfully', {
-            status: 'success',
-            timeout: 6000,
-            pos: 'bottom-right'
-          });
-        }, error => {
-          UIkit.notification('An error has occurred. Please try again later', {
-            status: 'danger',
-            timeout: 6000,
-            pos: 'bottom-right'
-          });
-        });
-      } else {
-        this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, null, this.stakeholder._id).subscribe(stakeholders => {
-          stakeholders.forEach(value => {
-            this.notification.groups.push(Role.manager(value.type, value.alias))
-          });
           this.notificationService.sendNotification(this.notification).subscribe(notification => {
-            NotificationHandler.rise('A notification has been <b>sent</b> successfully');
+            UIkit.notification('A notification has been <b>sent</b> successfully', {
+              status: 'success',
+              timeout: 6000,
+              pos: 'bottom-right'
+            });
           }, error => {
-            NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
+            UIkit.notification('An error has occurred. Please try again later', {
+              status: 'danger',
+              timeout: 6000,
+              pos: 'bottom-right'
+            });
           });
-        });
+        } else {
+          this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, null, this.stakeholder._id).subscribe(stakeholders => {
+            stakeholders.forEach(value => {
+              this.notification.groups.push(Role.manager(value.type, value.alias))
+            });
+
+            this.notificationService.sendNotification(this.notification).subscribe(notification => {
+              NotificationHandler.rise('A notification has been <b>sent</b> successfully');
+            }, error => {
+              NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
+            });
+          });
+        }
       }
       this.editing = false;
       this.importLoading = false;
@@ -1207,7 +1199,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
   }
 
   private checkForSchemaEnhancements(url: string) {
-    this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url);
+    this.showCheckForSchemaEnhancements = this.isAdministrator && url && !this.properties.useOldStatisticsSchema && this.indicatorUtils.checkForSchemaEnhancements(url) && this.properties.dashboard != 'irish';
   }
 
   migrateFromOldImportJsonFile(charts) {
@@ -1237,6 +1229,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
     let duplicates = 0;
     charts = this.migrateFromOldImportJsonFile(charts);
     for (let chart of charts) {
+      chart.visibility = this.showVisibility?chart.visibility:this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities);
       if (!sectionsToSave[chart['sectionIndex']]) {
         let sectionToSave = new Section(chart['sectionType'] ? chart['sectionType'] : chart['type'], chart['sectionTitle']);
         sectionToSave.indicators = [];
@@ -1295,7 +1288,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
         noValidParams++;
       }
       if (!exists) {
-        let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, "RESTRICTED", [indicatorPath]);
+        let i: Indicator = new Indicator(chart.name, chart.description, chart.additionalDescription, chart.type, chart.width, chart.height, this.showVisibility?"RESTRICTED":this.stakeholderUtils.defaultValue(this.stakeholderUtils.visibilities), [indicatorPath]);
         sectionsToSave[chart['sectionIndex']].indicators.push(i);
         countIndicators++;
       }
@@ -1309,7 +1302,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
         pos: 'bottom-right'
       });
     }
-    if (noValidParams > 0) {
+    if (noValidParams > 0 && !(this.stakeholder.type == 'country')) {
       let noValidMessage = "Some indicators couldn't be generated properly. Please make sure chart data is for the current stakeholder.";
       if (this.stakeholder.defaultId == null) {
         noValidMessage = "Some indicators couldn't be generated properly. Stakeholders based on this profile may not inherit the data correctly.";
@@ -1379,7 +1372,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV
 
     let topic = this.stakeholder ? this.stakeholder.topics[this.topicIndex] : null;
     let category = topic ? topic.categories[this.categoryIndex] : null;
-    let subCategory = category ? category.subCategories[this.subcategoryIndex] : null;
+    let subCategory = category ? category.subCategories[subcategoryIndex] : null;
 
     var jsonFileUrl = window.URL.createObjectURL(new Blob([JSON.stringify(indicators)], {type: 'application/json'}));
     var a = window.document.createElement('a');

monitor-admin/topic/topic.component.html

@@ -9,6 +9,9 @@
           <span class="uk-width-expand uk-text-truncate uk-margin-left hide-on-close">Indicators</span>
         </a>
       </div>
+      <div *ngIf="showLogo" id="sidebar_logo" class="uk-margin-top">
+        <img [src]="stakeholder | logoUrl">
+      </div>
       <div class="menu_section uk-margin-large-top">
         <ul class="uk-list uk-nav uk-nav-default" transition-group [id]="'topics'"
             uk-nav="duration: 400">
@@ -26,12 +29,11 @@
               <span class="uk-margin-xsmall-left hide-on-close" [class.uk-invisible-hover]="topicIndex !== i"
                     (click)="$event.stopPropagation();$event.preventDefault()">
                 <a class="uk-link-reset uk-flex uk-flex-middle">
-                  <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
+                  <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
                         ratio="0.6"></icon>
                   <icon [flex]="true" name="more_vert"></icon>
                 </a>
-                <div #element
+                <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
-                     uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
                   <ul class="uk-nav uk-dropdown-nav">
                     <ng-container *ngIf="isCurator">
                       <li>
@@ -59,9 +61,10 @@
                           </div>
                         </a>
                       </li>
-                      <li class="uk-nav-divider"></li>
                     </ng-container>
-                    <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                    <ng-container *ngIf="showVisibility">
+                      <li *ngIf="isCurator" class="uk-nav-divider"></li>
+                      <ng-template ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
                       <li [class.uk-active]="topic.visibility === v.value">
                         <a (click)="openVisibilityModal(i, v.value, 'topic'); hide(element)">
                           <div class="uk-flex uk-flex-middle">
@@ -73,6 +76,7 @@
                         </a>
                       </li>
                     </ng-template>
+                    </ng-container>
                     <ng-container *ngIf="!topic.defaultId && isCurator">
                       <li class="uk-nav-divider">
                       <li>
@@ -103,7 +107,7 @@
                     <span class="uk-margin-xsmall-left hide-on-close" [class.uk-invisible-hover]="categoryIndex !== j"
                           (click)="$event.stopPropagation();$event.preventDefault()">
                     <a class="uk-link-reset uk-flex uk-flex-middle">
-                      <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
+                      <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
                             ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
@@ -137,9 +141,11 @@
                               </div>
                             </a>
                           </li>
-                          <li class="uk-nav-divider"></li>
+
                         </ng-container>
-                        <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                        <ng-container *ngIf="showVisibility">
+                          <li *ngIf="isCurator" class="uk-nav-divider"></li>
+                          <ng-template ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
                           <li [class.uk-active]="category.visibility === v.value">
                             <a (click)="openVisibilityModal(j, v.value, 'category'); hide(element)">
                               <div class="uk-flex uk-flex-middle">
@@ -151,6 +157,7 @@
                             </a>
                           </li>
                         </ng-template>
+                        </ng-container>
                         <ng-container *ngIf="!category.defaultId && isCurator">
                           <li class="uk-nav-divider">
                           <li>
@@ -191,8 +198,8 @@
     </div>
   </aside>
   <div #pageContent *ngIf="stakeholder && filters" class="uk-width-1-1" page-content>
-    <div actions>
+    <div actions class="uk-margin-medium-top">
-      <div *ngIf="stakeholder.topics.length > 0" class="uk-flex uk-flex-center uk-margin-medium-top uk-flex-right@m uk-width-1-1">
+      <div *ngIf="stakeholder.topics.length > 0 && showVisibility" class="uk-flex uk-flex-center uk-flex-right@m uk-width-1-1">
         <button class="uk-button uk-button-primary uk-flex uk-flex-middle">
           <icon name="visibility" [flex]="true"></icon>
           <span class="uk-margin-small-left uk-margin-small-right">Preview</span>
@@ -229,7 +236,7 @@
                   [class.uk-invisible-hover]="subCategoryIndex !== i"
                   (click)="$event.stopPropagation();$event.preventDefault()">
             <a class="uk-link-reset uk-flex uk-flex-middle">
-              <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
+              <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
                     ratio="0.6"></icon>
               <icon [flex]="true" name="more_vert"></icon>
             </a>
@@ -279,9 +286,10 @@
                       </div>
                     </a>
                   </li>
-                  <li class="uk-nav-divider"></li>
                 </ng-container>
-                <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                <ng-container *ngIf="showVisibility">
+                  <li *ngIf="isCurator" class="uk-nav-divider"></li>
+                   <ng-template ngFor [ngForOf]="stakeholderUtils.visibilities" let-v>
                   <li [class.uk-active]="subCategory.visibility === v.value">
                     <a (click)="openVisibilityModal(i, v.value, 'subcategory'); hide(element)">
                       <div class="uk-flex uk-flex-middle">
@@ -293,6 +301,7 @@
                     </a>
                   </li>
                 </ng-template>
+                </ng-container>
                 <ng-container *ngIf="!subCategory.defaultId && isCurator">
                   <li class="uk-nav-divider">
                   <li>
@@ -348,8 +357,8 @@
   <div *ngIf="form" [class.uk-hidden]="loading"
        class="uk-grid uk-padding uk-padding-remove-horizontal uk-child-width-1-1" [formGroup]="form" uk-grid>
     <div input [formInput]="form.get('name')" class="uk-width-1-2@m" placeholder="Title"></div>
-    <div input [formInput]="form.get('visibility')" class="uk-width-1-2@m" placeholder="Status"
+    <div *ngIf="showVisibility" input [formInput]="form.get('visibility')" class="uk-width-1-2@m" placeholder="Status"
-         [options]="stakeholderUtils.visibility" type="select"></div>
+         [options]="stakeholderUtils.visibilities" type="select"></div>
     <div input [formInput]="form.get('description')" placeholder="Description" type="textarea" rows="4"></div>
     <div *ngIf="form.get('icon')" input [formInput]="form.get('icon')" placeholder="Icon(SVG)" type="textarea"></div>
   </div>

monitor-admin/topic/topic.component.ts

@@ -1,32 +1,32 @@
 import {
   AfterViewInit,
   ChangeDetectorRef,
-  Component, Inject,
+  Component,
+  Inject,
   OnDestroy,
-  OnInit, PLATFORM_ID,
+  OnInit,
+  PLATFORM_ID,
   QueryList,
   ViewChild,
   ViewChildren
 } from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {Title} from '@angular/platform-browser';
-import {EnvProperties} from '../../utils/properties/env-properties';
 import {Category, Stakeholder, SubCategory, Topic, Visibility} from "../../monitor/entities/stakeholder";
 import {StakeholderService} from "../../monitor/services/stakeholder.service";
 import {HelperFunctions} from "../../utils/HelperFunctions.class";
 import {AlertModal} from "../../utils/modal/alert";
 import {BehaviorSubject, Subject, Subscriber, Subscription} from "rxjs";
 import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
-import {StakeholderUtils} from "../utils/indicator-utils";
 import {StringUtils} from "../../utils/string-utils.class";
 import {IDeactivateComponent} from "../../utils/can-exit.guard";
-import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service";
 import {Option} from "../../sharedComponents/input/input.component";
 import {properties} from "src/environments/environment";
 import {Session, User} from "../../login/utils/helper.class";
 import {UserManagementService} from "../../services/user-management.service";
 import {TransitionGroupComponent} from "../../utils/transition-group/transition-group.component";
 import {NotificationHandler} from "../../utils/notification-handler";
+import {StakeholderBaseComponent} from "../utils/stakeholder-base.component";
 
 declare var UIkit;
 
@@ -34,14 +34,12 @@ declare var UIkit;
   selector: 'topic',
   templateUrl: './topic.component.html',
 })
-export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeactivateComponent {
+export class TopicComponent extends StakeholderBaseComponent implements OnInit, OnDestroy, AfterViewInit, IDeactivateComponent {
   private topicSubscriptions: any[] = [];
-  private subscriptions: any[] = [];
-  public properties: EnvProperties = properties;
   public offset: number;
-  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public loading: boolean = false;
   public stakeholder: Stakeholder;
+  public showLogo: boolean = false;
   public user: User;
   /**
    * Stakeholder change event
@@ -84,18 +82,21 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
   };
   
   constructor(
-    private route: ActivatedRoute,
+    protected _route: ActivatedRoute,
-    private router: Router,
+    protected _router: Router,
-    private title: Title,
+    protected _title: Title,
     private fb: UntypedFormBuilder,
     private stakeholderService: StakeholderService,
     private userManagementService: UserManagementService,
-    private layoutService: LayoutService,
+    protected cdr: ChangeDetectorRef,
-    private cdr: ChangeDetectorRef,
     @Inject(PLATFORM_ID) private platformId) {
+    super();
   }
   
   public ngOnInit() {
+    if(this._route.snapshot.data?.showLogo === true) {
+      this.showLogo = true;
+    }
     if (typeof document !== "undefined") {
       this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height'));
     }
@@ -115,7 +116,7 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
         this.subCategoryIndex = index;
       });
     }));
-    this.subscriptions.push(this.route.params.subscribe(params => {
+    this.subscriptions.push(this._route.params.subscribe(params => {
       if (subscription) {
         subscription.unsubscribe();
       }
@@ -136,7 +137,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
           if (this.topicIndex === -1) {
             this.navigateToError();
           } else {
-            this.title.setTitle(stakeholder.name + " | Indicators");
+            this.title = stakeholder.name + " | Indicators"
+            this.setMetadata();
           }
         }
       });
@@ -146,7 +148,7 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
       this.user = user;
     }))
   }
-  
+
   ngAfterViewInit() {
     if(this.topics) {
       let activeIndex = UIkit.nav(this.topics.element.nativeElement).items.findIndex(item => item.classList.contains('uk-open'));
@@ -163,16 +165,12 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
   }
   
   public ngOnDestroy() {
+    super.ngOnDestroy();
     this.topicSubscriptions.forEach(value => {
       if (value instanceof Subscriber) {
         value.unsubscribe();
       }
     });
-    this.subscriptions.forEach(value => {
-      if (value instanceof Subscriber) {
-        value.unsubscribe();
-      }
-    });
   }
   
   canExit(): boolean {
@@ -665,10 +663,6 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
     });
   }
   
-  private navigateToError() {
-    this.router.navigate([this.properties.errorLink], {queryParams: {'page': this.router.url}});
-  }
-  
   get isCurator(): boolean {
     return Session.isPortalAdministrator(this.user) || Session.isCurator(this.stakeholder.type, this.user);
   }
@@ -714,8 +708,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
 			this.editModal.cancel();
       NotificationHandler.rise(message);
       if (redirect) {
-        this.router.navigate(['../' + saveElement.alias], {
+        this._router.navigate(['../' + saveElement.alias], {
-          relativeTo: this.route
+          relativeTo: this._route
         });
       }
     }, error => {
@@ -758,8 +752,8 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
   }
   
   back() {
-    this.router.navigate(['../'], {
+    this._router.navigate(['../'], {
-      relativeTo: this.route
+      relativeTo: this._route
     });
   }
   
@@ -774,19 +768,6 @@ export class TopicComponent implements OnInit, OnDestroy, AfterViewInit, IDeacti
       return this.type;
     }
   }
-  
-  public get isSmallScreen() {
-    return this.layoutService.isSmallScreen;
-  }
-  
-  public get open() {
-    return this.layoutService.open;
-  }
-  
-  public toggleOpen(event: MouseEvent) {
-    event.preventDefault();
-    this.layoutService.setOpen(!this.open);
-  }
 
 	public openVisibilityModal(index: number, visibility: Visibility, type: any) {
 		this.index = index;

monitor-admin/utils/adminDashboard.guard.ts

@@ -8,12 +8,14 @@ import {StakeholderService} from "../../monitor/services/stakeholder.service";
 import {Observable, zip} from "rxjs";
 
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class AdminDashboardGuard  {
 
-  constructor(private router: Router,
+  constructor(protected router: Router,
-              private stakeholderService: StakeholderService,
+              protected stakeholderService: StakeholderService,
-              private userManagementService: UserManagementService) {
+              protected userManagementService: UserManagementService) {
   }
 
   check(path: string, alias: string): Observable<boolean> | boolean {
@@ -38,6 +40,6 @@ export class AdminDashboardGuard  {
   }
   
   canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    return this.check(state.url, childRoute.params.stakeholder);
+    return this.check(state.url, childRoute.data?.stakeholder?childRoute.data.stakeholder:childRoute.params.stakeholder);
   }
 }

monitor-admin/utils/indicator-utils.ts

@@ -7,11 +7,9 @@ import {
   IndicatorPathType,
   IndicatorType,
   SourceType,
-  Stakeholder,
+  Stakeholder, SubCategory,
-  StakeholderEntities,
+  Topic,
-  SubCategory,
+  Visibility,
-  Topic, stakeholderTypes,
-  Visibility
 } from "../../monitor/entities/stakeholder";
 import {AbstractControl, ValidatorFn, Validators} from "@angular/forms";
 import {Option} from "../../sharedComponents/input/input.component";
@@ -19,35 +17,86 @@ import {Session} from "../../login/utils/helper.class";
 import {HelperFunctions} from "../../utils/HelperFunctions.class";
 import {properties} from "src/environments/environment";
 
-export class StakeholderUtils {
+class Entities {
-  
+  stakeholder = 'Dashboard';
-  statuses: Option[] = [
+  funder = 'Funder';
-    {value: 'PUBLIC', label: 'Public'},
+  ri = 'Research Initiative';
-    {value: 'RESTRICTED', label: 'Restricted'},
+  organization = 'Research Institution';
-    {value: 'PRIVATE', label: 'Private'}
+  project = 'Project';
+  country = 'National';
+  datasource = 'Repository';
+  researcher = 'Researcher';
+
+  stakeholders = 'Dashboards';
+  funders = 'Funders';
+  ris = 'Research Initiatives';
+  organizations = 'Research Institutions';
+  projects = 'Projects';
+  datasources = 'Repositories';
+  researchers = 'Researchers';
+}
+
+export class StakeholderConfiguration {
+  public static ENTITIES: Entities = new Entities();
+  public static TYPES: Option[] = [
+    {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder},
+    {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri},
+    {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization},
+    {value: 'project', label: StakeholderConfiguration.ENTITIES.project}
   ];
-  
+  public static LOCALES: Option[] = [
-  types: Option[] = [
+    {value: "en", label: 'English'},
-      ...stakeholderTypes
+    {value: "eu", label: 'Europe'}
   ];
-  
+  public static FUNDER_TYPES: Option[] = [];
-  visibility: Option[] = [
+  public static VISIBILITIES: Option[] = [
     {icon: 'earth', value: "PUBLIC", label: 'Public'},
     {icon: 'restricted', value: "RESTRICTED", label: 'Restricted'},
     {icon: 'incognito', value: "PRIVATE", label: 'Private'},
   ];
-  
+  public static CACHE_INDICATORS: boolean = true;
-  locales: Option[] = [
+}
-    {value: "en", label: 'English'},
+
-    {value: "eu", label: 'Europe'}
+export class StakeholderUtils {
-  ];
+  get entities() {
-  
+    return StakeholderConfiguration.ENTITIES;
-  visibilityIcon: Map<Visibility, string> = new Map<Visibility, string>([
+  }
-    ["PUBLIC", 'earth'],
+
-    ["PRIVATE", 'incognito'],
+  get types() {
-    ["RESTRICTED", 'restricted']
+    return StakeholderConfiguration.TYPES
-  ]);
+  }
-  
+
+  get funderTypes() {
+    return StakeholderConfiguration.FUNDER_TYPES;
+  }
+
+  get locales() {
+    return StakeholderConfiguration.LOCALES;
+  }
+
+  get visibilities() {
+    return StakeholderConfiguration.VISIBILITIES;
+  }
+
+  get isCachingIndicators() {
+    return StakeholderConfiguration.CACHE_INDICATORS;
+  }
+
+  visibilityIcon: Map<Visibility, string> = new Map<Visibility, string>(this.visibilities.map(option => [option.value, option.icon]));
+
+  defaultValue(options: Option[]) {
+    return options.length === 1?options[0].value:null;
+  }
+
+  showField(options: Option[]) {
+    return options.length > 1;
+  }
+
+  getLabel(options: Option[], value) {
+    let option = options.find(option => option.value === value);
+    return option?option.label:null;
+  }
+
   getTypesByUserRoles(user, id: string = null): Option[] {
     let types = [];
     for (let type of this.types) {
@@ -57,7 +106,7 @@ export class StakeholderUtils {
     }
     return types;
   }
-  
+
   public createFunderFromDefaultProfile(funder: Stakeholder, defaultTopics: Topic[], isDefault: boolean = false): Stakeholder {
     funder.topics = HelperFunctions.copy(defaultTopics);
     for (let topic of funder.topics) {
@@ -105,36 +154,36 @@ export class StakeholderUtils {
               indicator._id = null;
             }
           }
-          
+
         }
         category.subCategories = subTokeep;
       }
     }
     return funder;
   }
-  
+
   aliasValidatorString(elements: string[]): ValidatorFn {
     return (control: AbstractControl): { [key: string]: string } | null => {
       if (control.value && elements.find(element =>
-        element === control.value
+          element === control.value
       )) {
         return {'error': 'Alias already in use'};
       }
       return null;
     }
   }
-  
+
   aliasValidator(elements: any[]): ValidatorFn {
     return (control: AbstractControl): { [key: string]: string } | null => {
       if (control.value && elements.find(element =>
-        element.alias === control.value
+          element.alias === control.value
       )) {
         return {'error': 'Alias already in use'};
       }
       return null;
     }
   }
-  
+
   generateAlias(name: string): string {
     let alias = name.toLowerCase();
     while (alias.includes('/') || alias.includes(' ')) {
@@ -147,7 +196,7 @@ export class StakeholderUtils {
 }
 
 export class IndicatorUtils {
-  
+
   allChartTypes: Option[] = [
     {value: 'pie', label: 'Pie'},
     {value: 'table', label: 'Table'},
@@ -163,64 +212,64 @@ export class IndicatorUtils {
     {value: 'medium', label: 'Medium'},
     {value: 'large', label: 'Large'}
   ];
-  
+
   allSourceTypes: Option[] = [
     {value: 'search', label: 'Search'},
     {value: 'statistics', label: 'Statistics'},
     {value: 'stats-tool', label: 'Statistics tool'}
   ];
-  
+
   formats: Option[] = [
     {value: "NUMBER", label: "Number"},
     {value: "PERCENTAGE", label: "Percentage"}
   ];
-  
+
   sourceTypes: Option[] = [
     {value: 'stats-tool', label: 'Statistics tool'}
   ];
-  
+
   isActive: Option[] = [
     {icon: 'brightness_1', iconClass: '', value: true, label: 'Active'},
     {icon: 'brightness_1', value: false, label: 'Inactive'},
   ];
-  
+
   parametersValidators: Map<string, any> = new Map<string, any>([
     ['start_year', [Validators.required, Validators.pattern('^\\d+$')]],
     ['end_year', [Validators.required, Validators.pattern('^\\d+$')]]
   ]);
   ignoredParameters = ['index_name', 'index_id', 'index_shortName'];
   statsProfileParameter = 'profile';
-  
+
   numberSources: Map<SourceType, string[]> = new Map<SourceType, string[]>();
   chartSources: Map<SourceType, string[]> = new Map<SourceType, string[]>();
-  
+
   constructor() {
     this.numberSources.set('statistics', [properties.statisticsAPIURL]);
     this.numberSources.set('search', [properties.searchAPIURLLAst]);
-    this.numberSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/","https://beta.services.openaire.eu/stats-tool/","https://services.openaire.eu/stats-tool/","https://services.openaire.eu/monitor-stats-tool/"]);
+    this.numberSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/", "https://beta.services.openaire.eu/stats-tool/", "https://services.openaire.eu/stats-tool/", "https://services.openaire.eu/monitor-stats-tool/"]);
-    this.chartSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/","https://beta.services.openaire.eu/stats-tool/","https://services.openaire.eu/stats-tool/","https://services.openaire.eu/monitor-stats-tool/"]);
+    this.chartSources.set('stats-tool', [properties.monitorStatsFrameUrl, "http://marilyn.athenarc.gr:8080/stats-api/", "http://88.197.53.71:8080/stats-api/", "https://stats.madgik.di.uoa.gr/stats-api/", "https://beta.services.openaire.eu/stats-tool/", "https://services.openaire.eu/stats-tool/", "https://services.openaire.eu/monitor-stats-tool/"]);
     this.chartSources.set('old', [properties.statisticsFrameAPIURL]);
     this.chartSources.set('image', [""]);
   }
-  
+
-  getSourceType(source:string): SourceType{
+  getSourceType(source: string): SourceType {
     let sourceType: SourceType = 'search';
     this.numberSources.forEach((values, key) => {
-      if(key == source) {
+      if (key == source) {
         sourceType = key;
       }
     });
     return sourceType;
   }
-  
+
   getChartUrl(source: SourceType, url: string): string {
     return this.chartSources.get(source)[0] + url;
   }
-  
+
   getNumberUrl(source: SourceType, url: string): string {
     return this.numberSources.get(this.getSourceType(source))[0] + url;
   }
-  
+
   getNumberSource(url: string): SourceType {
     let source: SourceType = 'search';
     this.numberSources.forEach((values, key) => {
@@ -232,7 +281,7 @@ export class IndicatorUtils {
     });
     return source;
   }
-  
+
   getChartSource(url: string): SourceType {
     let source: SourceType = 'image';
     this.chartSources.forEach((values, key) => {
@@ -244,7 +293,7 @@ export class IndicatorUtils {
     });
     return source;
   }
-  
+
   getChartTypes(initialType) {
     let types: Option[] = [];
     if (this.basicChartTypes.indexOf(initialType) != -1) {
@@ -265,7 +314,7 @@ export class IndicatorUtils {
       return this.allChartTypes;
     }
   }
-  
+
   public getFullUrl(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null): string {
     let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url;
     if (stakeholder.statsProfile) {
@@ -289,7 +338,7 @@ export class IndicatorUtils {
         if (key == "index_shortName") {
           replacedValue = stakeholder.index_shortName.toLowerCase();
         }
-        
+
         replacedUrl = replacedUrl.split(ChartHelper.prefix + key + ChartHelper.suffix).join(replacedValue)
       });
     }
@@ -307,7 +356,7 @@ export class IndicatorUtils {
       }
       if (startYear && indicatorPath.filters["start_year"]) {
         let newJsonObject = JSON.parse(replacedUrl);
-        
+
         for (let queries of this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)] : newJsonObject[this.getDescriptionObjectName(newJsonObject)]) {
           if (!queries["query"]["filters"] || queries["query"]["filters"].length == 0) {
             queries["query"]["filters"] = [];
@@ -328,7 +377,7 @@ export class IndicatorUtils {
         }
         replacedUrl = JSON.stringify(newJsonObject);
       }
-      
+
     }
     //For numbers (e.g. from stats-api , search service, etc)
     if (replacedUrl.indexOf(ChartHelper.prefix + 'index_id' + ChartHelper.suffix) != -1) {
@@ -342,13 +391,83 @@ export class IndicatorUtils {
     }
     return (indicatorPath.chartObject ? indicatorPath.url + encodeURIComponent(replacedUrl) : replacedUrl);
   }
-  
+
-  public getFullUrlWithFilters(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null, coFunded: boolean = false): string {
+  public getFullUrlWithFilters(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null, coFunded: boolean = false, foslvl1:string[]=[], foslvl2:string[]=[], publiclyFunded: "all"| "true"| "false"= "all" ): string {
+    let filterSubtitleText = [];
     indicatorPath.filtersApplied = 0;
     let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url;
     if (stakeholder.statsProfile) {
       replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(stakeholder.statsProfile);
     }
+    if (fundingL0) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+        let filterResults = this.addFilter(replacedUrl, 'fundingL0', fundingL0);
+        replacedUrl = filterResults.url;
+        indicatorPath.filtersApplied += filterResults.filtersApplied;
+        filterSubtitleText.push( "Funding level 0: " ) ;
+      }
+    }
+    if (startYear) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+        let filterResults = this.addFilter(replacedUrl, 'start_year', startYear);
+        replacedUrl = filterResults.url;
+        indicatorPath.filtersApplied += filterResults.filtersApplied;
+      }
+    }
+    if (endYear) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+        let filterResults = this.addFilter(replacedUrl, 'end_year', endYear);
+        replacedUrl = filterResults.url;
+        indicatorPath.filtersApplied += filterResults.filtersApplied;
+      }
+    }
+    if(startYear || endYear) {
+      filterSubtitleText.push(startYear && endYear ? (startYear + ' - ' + endYear) : (endYear ? ('until ' + endYear) : ''));
+    }
+    if (coFunded) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+        let filterResults = this.addFilter(replacedUrl, 'co-funded', coFunded);
+        replacedUrl = filterResults.url;
+        indicatorPath.filtersApplied += filterResults.filtersApplied;
+        filterSubtitleText.push( "Co-funded: " + (coFunded?'yes':'no') ) ;
+      }
+    }
+    if (publiclyFunded && publiclyFunded !="all") {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+        let filterResults = this.addFilter(replacedUrl, 'publicly-funded', publiclyFunded);
+        replacedUrl = filterResults.url;
+        indicatorPath.filtersApplied += filterResults.filtersApplied;
+        filterSubtitleText.push( "Publicly funded: " + (publiclyFunded?'yes':'no') ) ;
+      }
+    }
+    if (foslvl1) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+          let filterResults = this.addFilter(replacedUrl, 'foslvl1', foslvl1);
+          replacedUrl = filterResults.url;
+          indicatorPath.filtersApplied +=filterResults.filtersApplied?foslvl1.length:0;
+      }
+    }
+    if (foslvl2) {
+      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
+          let filterResults = this.addFilter(replacedUrl, 'foslvl2', foslvl2);
+          replacedUrl = filterResults.url;
+          indicatorPath.filtersApplied += filterResults.filtersApplied?foslvl2.length:0;
+      }
+    }
+    if((foslvl1 && foslvl1.length > 0) || (foslvl2 && foslvl2.length > 0)){
+      filterSubtitleText.push( "Field of Science: " + foslvl1.join(', ') + ( foslvl1.length > 0 && foslvl2.length > 0? ', ': '') + foslvl2.join(", ") ) ;
+    }
+
+    //For numbers
+    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_id' + ChartHelper.suffix) != -1) {
+      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_id' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_id));
+    }
+    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_name' + ChartHelper.suffix) != -1) {
+      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_name' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_name));
+    }
+    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) {
+      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName));
+    }
     if (indicatorPath.parameters) {
       Object.keys(indicatorPath.parameters).forEach(key => {
         let replacedValue = indicatorPath.parameters[key];
@@ -371,54 +490,16 @@ export class IndicatorUtils {
         if (key == "index_shortName") {
           replacedValue = stakeholder.index_shortName.toLowerCase();
         }
-        
+        if (key == "subtitle" && filterSubtitleText.length > 0) {
+          replacedValue = replacedValue + (replacedValue.length > 0 ? ' - ':'') + ' Active filters: ('+filterSubtitleText.join(", ") + ')';
+        }
         replacedUrl = replacedUrl.split(ChartHelper.prefix + key + ChartHelper.suffix).join(replacedValue)
       });
     }
-    if (fundingL0) {
-      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
-        let filterResults = this.addFilter(replacedUrl, 'fundingL0', fundingL0);
-        replacedUrl = filterResults.url;
-        indicatorPath.filtersApplied += filterResults.filtersApplied;
-      }
-    }
-    if (startYear) {
-      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
-        let filterResults = this.addFilter(replacedUrl, 'start_year', startYear);
-        replacedUrl = filterResults.url;
-        indicatorPath.filtersApplied += filterResults.filtersApplied;
-      }
-    }
-    if (endYear) {
-      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
-        let filterResults = this.addFilter(replacedUrl, 'end_year', endYear);
-        replacedUrl = filterResults.url;
-        indicatorPath.filtersApplied += filterResults.filtersApplied;
-      }
-    }
-    if (coFunded) {
-      if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) {
-        let filterResults = this.addFilter(replacedUrl, 'co-funded', endYear);
-        replacedUrl = filterResults.url;
-        indicatorPath.filtersApplied += filterResults.filtersApplied;
-      }
-    }
-    
-    //For numbers
-    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_id' + ChartHelper.suffix) != -1) {
-      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_id' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_id));
-    }
-    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_name' + ChartHelper.suffix) != -1) {
-      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_name' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_name));
-    }
-    if (replacedUrl.indexOf(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix) != -1) {
-      replacedUrl = replacedUrl.split(ChartHelper.prefix + 'index_shortName' + ChartHelper.suffix).join(encodeURIComponent(stakeholder.index_shortName));
-    }
-    //Check  apply enhancements return this.applySchemaEnhancements( ..);
     return (indicatorPath.chartObject ? indicatorPath.url + encodeURIComponent(replacedUrl) : replacedUrl);
-    
+
   }
-  
+
   private addFilter(replacedUrl, filterType: FilterType, filterValue) {
     let newJsonObject = JSON.parse(replacedUrl);
     let filterApplied: boolean = false;
@@ -426,7 +507,7 @@ export class IndicatorUtils {
     for (let queries of this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)] : newJsonObject[this.getDescriptionObjectName(newJsonObject)]) {
       /*Chart with  Named Queries*/
       if (queries["query"]["name"] && !queries["query"]["select"]) {
-        
+
         if (queries["query"]["name"].indexOf("monitor.") == -1 || !queries["query"]["parameters"]) {
           continue;
         }
@@ -493,7 +574,7 @@ export class IndicatorUtils {
       /*Chart with  proper json object*/
       //apply the filter in any select fields
       for (let select of queries["query"]["select"]) {
-        let filterString = IndicatorFilterUtils.getFilter(select["field"], filterType);
+        let filterString = IndicatorFilterUtils.getFilter(select["field"], filterType,filterValue);
         if (filterString) {
           let filter = JSON.parse(filterString);
           //check if filter already exists
@@ -537,7 +618,7 @@ export class IndicatorUtils {
     }
     return {"url": JSON.stringify(newJsonObject), "filtersApplied": (filterApplied) ? 1 : 0};
   }
-  
+
   isComparingChart(newJsonObject, filter,) {
     let queriesCount = this.getQueryObjectName(newJsonObject) ? newJsonObject[this.getDescriptionObjectName(newJsonObject)][this.getQueryObjectName(newJsonObject)].length : newJsonObject[this.getDescriptionObjectName(newJsonObject)].length;
     let values = [];
@@ -554,10 +635,10 @@ export class IndicatorUtils {
     }
     return values.length > 1;
   }
-  
+
   generateIndicatorByForm(form: any, indicatorPaths: IndicatorPath[], type: IndicatorType, addParameters: boolean = true): Indicator {
     let indicator: Indicator = new Indicator(form.name, form.description, form.additionalDescription, type,
-      form.width, form.height, form.visibility, indicatorPaths, form.defaultId);
+        form.width, form.height, form.visibility, indicatorPaths, form.defaultId);
     indicator._id = form._id;
     form.indicatorPaths.forEach((indicatorPath, index) => {
       indicator.indicatorPaths[index].type = indicatorPath.type;
@@ -573,7 +654,7 @@ export class IndicatorUtils {
     });
     return indicator;
   }
-  
+
   generateIndicatorByNumberUrl(source: SourceType, url: string, stakeholder: Stakeholder, jsonPath = [], sourceServices: string[] = []): IndicatorPath {
     let indicatorPath = new IndicatorPath(null, source, url, null, jsonPath);
     if (source === 'stats-tool') {
@@ -611,7 +692,7 @@ export class IndicatorUtils {
     }
     return indicatorPath;
   }
-  
+
   generateIndicatorByChartUrl(source: SourceType, url: string, type: IndicatorPathType = null, stakeholder: Stakeholder): IndicatorPath {
     let indicatorPath = new IndicatorPath(type, source, null, null, []);
     try {
@@ -621,13 +702,13 @@ export class IndicatorUtils {
         indicatorPath.chartObject = decodeURIComponent(url.split("json=")[1]);
         let chart = JSON.parse(indicatorPath.chartObject);
         if (indicatorPath.url == "chart?json=") {
-          
+
           if (chart["library"] && (chart["library"] == "HighCharts" || chart["library"] == "eCharts" || chart["library"] == "HighMaps")) {
             indicatorPath.type = this.extractType(chart, indicatorPath);
           } else {
             indicatorPath.type = this.defaultChartType;
           }
-          
+
           this.extractTitle(chart, indicatorPath);
           this.extractSubTitle(chart, indicatorPath);
           this.extractXTitle(chart, indicatorPath);
@@ -667,7 +748,7 @@ export class IndicatorUtils {
     }
     return indicatorPath;
   }
-  
+
   private getQueryObjectName(obj) {
     if ((obj[this.getDescriptionObjectName(obj)]).hasOwnProperty("queriesInfo")) {
       return "queriesInfo";
@@ -675,7 +756,7 @@ export class IndicatorUtils {
       return "queries";
     }
   }
-  
+
   private getDescriptionObjectName(obj) {
     if (obj.hasOwnProperty("mapDescription")) {
       return "mapDescription";
@@ -687,7 +768,7 @@ export class IndicatorUtils {
       return "series";
     }
   }
-  
+
   private extractType(obj, indicatorPath: IndicatorPath): IndicatorPathType {
     let type = (obj[this.getDescriptionObjectName(obj)] && obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)][0]["type"]) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)][0]["type"] : "";
     if (this.basicChartTypes.indexOf(type) == -1) {
@@ -698,13 +779,15 @@ export class IndicatorUtils {
     }
     return type;
   }
-  
+
   private extractStakeHolders(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
     this.extractFunder(obj, indicatorPath, stakeholder);
     this.extractRI(obj, indicatorPath, stakeholder);
     this.extractOrganization(obj, indicatorPath, stakeholder);
+    this.extractDatasource(obj, indicatorPath, stakeholder);
+    this.extractResearcher(obj, indicatorPath, stakeholder);
   }
-  
+
   private extractFunder(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
     if (stakeholder.type != "funder") {
       return;
@@ -719,21 +802,19 @@ export class IndicatorUtils {
       for (let filter of query["query"]["filters"]) {
         for (let gfilter of filter["groupFilters"]) {
           //ignore field No Of Funders
-          if (gfilter["field"].indexOf(" funder") != -1 && gfilter["field"].indexOf(" funders") == -1) {//new statistcs schema
+          let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
-            gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
+          if(replacedValue) { // don't proceed in replacement if no replaced value matches
-            indicatorPath.parameters["index_name"] = stakeholder.index_name;
+            if ((gfilter["field"].indexOf(" funder") != -1 && gfilter["field"].indexOf(" funders") == -1 ) ||
-          } else if (gfilter["field"].indexOf(".funder") != -1) {
+              (gfilter["field"].indexOf(".funder") != -1) ||
-            gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
+              (gfilter["field"].indexOf(".funder.id") != -1)) {
-            indicatorPath.parameters["index_name"] = stakeholder.index_name;
+              gfilter["values"][0] = replacedValue;
-          } else if (gfilter["field"].indexOf(".funder.id") != -1) {
+            }
-            gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
-            indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
           }
         }
       }
     }
   }
-  
+
   private extractRI(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
     if (stakeholder.type != "ri") {
       return;
@@ -747,18 +828,18 @@ export class IndicatorUtils {
       }
       for (let filter of query["query"]["filters"]) {
         for (let gfilter of filter["groupFilters"]) {
-          if (gfilter["field"].indexOf(".context.name") != -1) {
+          let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
-            gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
+          if(replacedValue) { // don't proceed in replacement if no replaced value matches
-            indicatorPath.parameters["index_name"] = stakeholder.index_name;
+            if ((gfilter["field"].indexOf(".context.name") != -1)
-          } else if (gfilter["field"].indexOf(".context.id") != -1) {
+              || (gfilter["field"].indexOf(".context.id") != -1)) {
-            gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
+              gfilter["values"][0] = replacedValue;
-            indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
+            }
           }
         }
       }
     }
   }
-  
+
   private extractOrganization(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
     // works for publication.project.organization.name
     // and publication.organization.name
@@ -774,18 +855,80 @@ export class IndicatorUtils {
       }
       for (let filter of query["query"]["filters"]) {
         for (let gfilter of filter["groupFilters"]) {
-          if (gfilter["field"].indexOf(".organization.name") != -1) {
+          let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
-            gfilter["values"][0] = ChartHelper.prefix + "index_name" + ChartHelper.suffix;
+          if(replacedValue) { // don't proceed in replacement if no replaced value matches
-            indicatorPath.parameters["index_name"] = stakeholder.index_name;
+            if ((gfilter["field"].indexOf(".organization.name") != -1)||
-          } else if (gfilter["field"].indexOf(".organization.id") != -1) {
+              (gfilter["field"].indexOf(".organization.id") != -1)) {
-            gfilter["values"][0] = ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
+              gfilter["values"][0] = replacedValue;
-            indicatorPath.parameters["index_shortName"] = stakeholder.index_shortName;
+            }
           }
         }
       }
     }
   }
-  
+  private extractDatasource(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
+    // works for .datasource.name and .HostedBy datasource
+    // and .datasource.id
+    if (stakeholder.type != "datasource") {
+      return;
+    }
+    for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) {
+      if (query["query"]["profile"]) {
+        query["query"]["profile"] = ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix;
+      }
+      if (!query["query"]["filters"]) {
+        return;
+      }
+      for (let filter of query["query"]["filters"]) {
+        for (let gfilter of filter["groupFilters"]) {
+          let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
+          if(replacedValue) { // don't proceed in replacement if no replaced value matches
+            if ((gfilter["field"].indexOf(".datasource.name") != -1 || gfilter["field"].indexOf(".HostedBy datasource") != -1)||
+              (gfilter["field"].indexOf(".datasource.id") != -1) || (gfilter["field"].indexOf(".hostedby") != -1)) {
+              gfilter["values"][0] = replacedValue;
+            }
+          }
+        }
+      }
+    }
+  }
+  private extractResearcher(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
+    // works for  .orcid
+    if (stakeholder.type != "researcher") {
+      return;
+    }
+    for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) {
+      if (query["query"]["profile"]) {
+        query["query"]["profile"] = ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix;
+      }
+      if (!query["query"]["filters"]) {
+        return;
+      }
+      for (let filter of query["query"]["filters"]) {
+        for (let gfilter of filter["groupFilters"]) {
+          let replacedValue = this.replaceIndexValues(gfilter["values"][0], stakeholder, indicatorPath.parameters);
+          if(replacedValue) { // don't proceed in replacement if no replaced value matches
+            if ((gfilter["field"].indexOf(".orcid") != -1 )) {
+              gfilter["values"][0] = replacedValue;
+            }
+          }
+        }
+      }
+    }
+  }
+  private replaceIndexValues(currentValue, stakeholder, parameters ){
+    if(currentValue == stakeholder.index_name){
+      parameters["index_name"] = stakeholder.index_name;
+      return ChartHelper.prefix + "index_name" + ChartHelper.suffix;
+    }else if(currentValue == stakeholder.index_id){
+      parameters["index_id"] = stakeholder.index_id;
+      return ChartHelper.prefix + "index_id" + ChartHelper.suffix;
+    }else if(currentValue == stakeholder.index_shortName) {
+      parameters["index_shortName"] = stakeholder.index_shortName;
+      return ChartHelper.prefix + "index_shortName" + ChartHelper.suffix;
+    }
+
+  }
   private extractStartYear(obj, indicatorPath: IndicatorPath) {
     let start_year;
     for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) {
@@ -803,7 +946,7 @@ export class IndicatorUtils {
       }
     }
   }
-  
+
   private extractEndYear(obj, indicatorPath: IndicatorPath) {
     let end_year;
     for (let query of obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) {
@@ -821,7 +964,7 @@ export class IndicatorUtils {
       }
     }
   }
-  
+
   private parameterizeDefaultQuery(obj, indicatorPath: IndicatorPath, stakeholder: Stakeholder) {
     let name = "";
     for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) {
@@ -843,7 +986,7 @@ export class IndicatorUtils {
         } else if (name.split('.')[0] == "monitor" && parameters.length > 0 && name.split('.')[1] == stakeholder.type) {
           // new parameterized queries
           //monitor.{{type}}.{{queryname}}.{{param1 - id }}.{{param2 result-type}}.{{fl0}} --> params [start year, end year, id, result type, fl0]
-          
+
           let index = (name.split('.').slice(3).length + 2 == parameters.length) ? [2] : ((name.split('.').slice(3).length * 2 + 4 == parameters.length) ? [2, name.split('.').slice(3).length + 4] : [0]);
           for (let i of index) {
             if (name.split('.').length > 3 && name.split('.')[3] == "id") {
@@ -861,7 +1004,7 @@ export class IndicatorUtils {
       }
     }
   }
-  
+
   private extractDataTitle(obj, indicatorPath: IndicatorPath) {
     let index = 0;
     if (!obj[this.getDescriptionObjectName(obj)] || !obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)]) {
@@ -876,7 +1019,7 @@ export class IndicatorUtils {
       index++;
     }
   }
-  
+
   private extractTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj[this.getDescriptionObjectName(obj)]["title"]) {
@@ -888,7 +1031,7 @@ export class IndicatorUtils {
     }
     indicatorPath.parameters["title"] = title ? title : "";
   }
-  
+
   private extractSubTitle(obj, indicatorPath: IndicatorPath) {
     let subtitle = "";
     if (obj[this.getDescriptionObjectName(obj)]["subtitle"]) {
@@ -901,7 +1044,7 @@ export class IndicatorUtils {
       indicatorPath.parameters["subtitle"] = subtitle ? subtitle : "";
     }
   }
-  
+
   private extractXTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj[this.getDescriptionObjectName(obj)]["xAxis"] && obj[this.getDescriptionObjectName(obj)]["xAxis"]["title"]) {
@@ -916,7 +1059,7 @@ export class IndicatorUtils {
     }
     indicatorPath.parameters["xAxisTitle"] = title ? title : "";
   }
-  
+
   private extractYTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj[this.getDescriptionObjectName(obj)]["yAxis"] && obj[this.getDescriptionObjectName(obj)]["yAxis"]["title"]) {
@@ -931,17 +1074,17 @@ export class IndicatorUtils {
     }
     indicatorPath.parameters["yAxisTitle"] = title ? title : "";
   }
-  
+
   private extractOldToolTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj["title"]) {
       title = obj["title"];
       obj["title"] = ChartHelper.prefix + "title" + ChartHelper.suffix;
       indicatorPath.parameters["title"] = title;
-      
+
     }
   }
-  
+
   private extractOldToolXTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj["xaxistitle"]) {
@@ -950,7 +1093,7 @@ export class IndicatorUtils {
       indicatorPath.parameters["xAxisTitle"] = title;
     }
   }
-  
+
   private extractOldToolYTitle(obj, indicatorPath: IndicatorPath) {
     let title = "";
     if (obj["fieldsheaders"]) {
@@ -963,11 +1106,11 @@ export class IndicatorUtils {
       indicatorPath.parameters["yAxisTitle"] = title;
     }
   }
-  
+
   public checkForSchemaEnhancements(url: string): boolean {
     return url != this.applySchemaEnhancements(url);
   }
-  
+
   public applySchemaEnhancements(url: string): string {
     let resultEnhancements = [
       [".project.acronym", ".project acronym"],
@@ -986,7 +1129,7 @@ export class IndicatorUtils {
         }
       }
     }
-    
+
     if (url.split('json=').length > 1) {
       let obj = JSON.parse(decodeURIComponent(url.split('json=')[1]));
       for (let query of this.getQueryObjectName(obj) ? obj[this.getDescriptionObjectName(obj)][this.getQueryObjectName(obj)] : obj[this.getDescriptionObjectName(obj)]) {

monitor-admin/utils/stakeholder-base.component.ts

@@ -0,0 +1,54 @@
+import {Directive} from "@angular/core";
+import {BaseComponent} from "../../sharedComponents/base/base.component";
+import {IndicatorUtils, StakeholderUtils} from "./indicator-utils";
+import {ConnectHelper} from "../../connect/connectHelper";
+
+@Directive()
+export abstract class StakeholderBaseComponent extends BaseComponent {
+
+  stakeholderUtils: StakeholderUtils = new StakeholderUtils();
+
+  get entities() {
+    return this.stakeholderUtils.entities;
+  }
+
+  get showVisibility() {
+    return this.stakeholderUtils.showField(this.stakeholderUtils.visibilities);
+  }
+
+  get showType() {
+    return this.stakeholderUtils.showField(this.stakeholderUtils.types);
+  }
+
+  get showFunderType() {
+    return this.stakeholderUtils.showField(this.stakeholderUtils.funderTypes);
+  }
+
+  getFunderTypeLabel(value: any) {
+    return this.stakeholderUtils.getLabel(this.stakeholderUtils.funderTypes, value);
+  }
+
+  get showLocale() {
+    return this.stakeholderUtils.showField(this.stakeholderUtils.locales);
+  }
+
+  protected navigateToError() {
+    this._router.navigate([this.properties.errorLink], {queryParams: {'page': this._router.url}});
+  }
+
+  setProperties(id, type = null, configurationService) {
+    this.properties.adminToolsCommunity = id;
+    if (type) {
+      this.properties.adminToolsPortalType = type;
+    } else {
+      ConnectHelper.setPortalTypeFromPid(id);
+    }
+    configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
+  }
+}
+
+@Directive()
+export abstract class IndicatorStakeholderBaseComponent extends StakeholderBaseComponent {
+
+  indicatorUtils: IndicatorUtils = new IndicatorUtils();
+}

monitor/entities/stakeholder.ts

@@ -1,24 +1,25 @@
 import {SafeResourceUrl} from "@angular/platform-browser";
 import {properties} from "../../../../environments/environment";
 import {Session, User} from "../../login/utils/helper.class";
-import {Option} from "../../sharedComponents/input/input.component";
 
 export const ChartHelper = {
   prefix: "((__",
   suffix: "__))"
 };
 
-export type StakeholderType = 'funder' | 'ri' | 'project' | 'organization';
+export type StakeholderType = 'funder' | 'ri' | 'project' | 'organization' | 'country' | 'researcher' | 'datasource';
 export type IndicatorType = 'number' | 'chart';
 export type IndicatorSize = 'small' | 'medium' | 'large';
 export type IndicatorPathType = 'table' | 'bar' | 'column' | 'pie' | 'line' | 'other';
 export type SourceType = 'statistics' | 'search' |'stats-tool' | 'old' | 'image';
 export type Format = 'NUMBER' | 'PERCENTAGE';
 export type Visibility = 'PUBLIC' | 'PRIVATE' | 'RESTRICTED';
+export type Overlay = 'embed' | 'description' | false;
 
 export class Stakeholder {
   _id: string;
   type: StakeholderType;
+  funderType: string;
   name: string;
   index_id;
   index_name: string;
@@ -36,8 +37,9 @@ export class Stakeholder {
   isUpload: boolean = false;
   description: string;
   topics: any[];
+  details?: any;
   
-  constructor(_id: string, type: StakeholderType, index_id, index_name: string, index_shortName: string, alias: string, visibility: Visibility, logoUrl: string, defaultId: string = null, description: string = null) {
+  constructor(_id: string, type: StakeholderType, index_id: string, index_name: string, index_shortName: string, alias: string, visibility: Visibility, logoUrl: string, defaultId: string = null, description: string = null) {
     this._id = _id;
     this.type = type;
     this.index_id = index_id;
@@ -170,7 +172,7 @@ export class Indicator {
   visibility: Visibility;
   defaultId: string;
   indicatorPaths: IndicatorPath[];
-  descriptionOverlay: boolean = false;
+  overlay: Overlay = false;
 
   constructor(name: string, description: string, additionalDescription:string, type: IndicatorType, width: IndicatorSize,height: IndicatorSize, visibility: Visibility, indicatorPaths: IndicatorPath[], defaultId: string = null) {
     this._id = null;
@@ -221,66 +223,104 @@ export class IndicatorPath {
 
 }
 
-export type FilterType = "fundingL0"|"start_year" | "end_year" | "co-funded";
+export type FilterType = "fundingL0"|"start_year" | "end_year" | "co-funded" | "foslvl1" | "foslvl2" | "publicly-funded";
 
 export class IndicatorFilterUtils {
- 
+  public static filteredFields = {
-  static getFilter(fieldPath: string, filterType:FilterType) {
+    "year":{
-    if((filterType == "start_year" || filterType == "end_year") && (fieldPath.indexOf(".year") != -1 || fieldPath.indexOf(".start year") != -1) 
+      "result": "result.year",
-      && fieldPath.indexOf("indi_pub_downloads_year.year") == -1){
+      "indi_pub_downloads_year": "indi_pub_downloads_year.year",   //exclude indi_pub_downloads_year.year because it throws errors. when there is a solution remove the exclusion
-      // make it work for any table with field year or start year no matter the type or the table name
+      "indi_pub_downloads":"indi_pub_downloads.result.year",
-      //exclude indi_pub_downloads_year.year because it throws errors. when there is a solution remove the exclusion
+      "result_apc":"result_apc.result.year",
-      if (filterType == "start_year") {
+      "result_apc_affiliations":"result_apc_affiliations.result.year",
-        return '{"groupFilters":[{"field":"' + fieldPath + '","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      "result_country":"result_country.result.year",
-      } else if (filterType == "end_year") {
+      "indi_impact_measures": "indi_impact_measures.result.year",
-        return '{"groupFilters":[{"field":"' + fieldPath + '","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      "project": "project.start year"
-      }
+    },
-    }
+    "fundingL0":{
-    let table = fieldPath&&fieldPath.length > 0? fieldPath.split(".")[0]:"";
+      "result": "result.project funding level 0",
-    if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1){
+      "project": "project.funding level 0",
-      return this.getResultFilter(table,filterType);
+      "country":"country.organization.project.funding level 0",
-    }else if (table == "project"){
+      "organization":"organization.project.funding level 0"
-      return this.getProjectFilter(filterType);
+    },
-    }
+    "co-funded":{
-    else if (table == "country"){
+      "result": "result.No of funders",
-      return this.getCountryFilter(filterType);
+    },
-    }else if (table == "organization"){
+    "foslvl1":
-      return this.getOrganizationFilter(filterType);
+      {
+      "publication":"publication.topics.result.result_fos.lvl1",
+      "result":"result.topics.result.result_fos.lvl1",
+      "indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl1",
+      "indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl1",
+       "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
+        "result_apc":"result_apc.result.result_fos.lvl1",
+        "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl1",
+        "result_country":"result_country.result.result_fos.lvl1",
+        "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl1"
+      },
+    "foslvl2":{
+      "publication":"publication.topics.result.result_fos.lvl2",
+      "result":"result.topics.result.result_fos.lvl2",
+      "indi_pub_downloads":"indi_pub_downloads.result.result_fos.lvl2",
+      "indi_pub_downloads_year":"indi_pub_downloads_year.result.result_fos.lvl2",
+      "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2",
+      "result_apc":"result_apc.result.result_fos.lvl2",
+      "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl2",
+      "result_country":"result_country.result.result_fos.lvl2",
+      "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl2"
+      },
+    "publicly-funded":{
+      "result":"result.indi_pub_publicly_funded.publicly_funded",
+      "indi_pub_downloads":"indi_pub_downloads.result.indi_pub_publicly_funded.publicly_funded",
+      "indi_pub_downloads_year":"indi_pub_downloads_year.result.indi_pub_publicly_funded.publicly_funded",
+      "indi_impact_measures":"indi_impact_measures.result.indi_pub_publicly_funded.publicly_funded",
+      "result_apc":"result_apc.result.indi_pub_publicly_funded.publicly_funded",
+      "result_apc_affiliations":"result_apc_affiliations.result.indi_pub_publicly_funded.publicly_funded",
+      "result_country":"result_country.result.indi_pub_publicly_funded.publicly_funded"
     }
 
-    return "";
   }
-  static getResultFilter(table: string = null, filterType:FilterType) {
+ static getFieldForTable(field, table){
-    //works for tables ["publication", "software", "dataset", "other", "result"]
+    if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1 && IndicatorFilterUtils.filteredFields[field]["result"]){
-    if (filterType == "fundingL0") {
+      return IndicatorFilterUtils.filteredFields[field]["result"];
-      if(properties.useOldStatisticsSchema) {
+    }else{
-        return '{"groupFilters":[{"field":"' + table + '.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      return IndicatorFilterUtils.filteredFields[field][table];
-      }else{//new statistcs schema
+    }
-        return '{"groupFilters":[{"field":"' + table + '.project funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
+ }
+  static getFilter(fieldPath: string, filterType:FilterType, value:string|string[] =null) {
+    let tablename = fieldPath.split(".")[0];
+    if ((filterType == "start_year" || filterType == "end_year") && (IndicatorFilterUtils.getFieldForTable("year",tablename))){
+      if (filterType == "start_year") {
+        return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("year",tablename) + '","type":">=","values":["' + ChartHelper.prefix + 'start_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      } else if (filterType == "end_year") {
+        return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("year",tablename) + '","type":"<=","values":["' + ChartHelper.prefix + 'end_year' + ChartHelper.suffix + '"]}],"op":"AND"}';
       }
-    }else if (filterType == "co-funded") {
-      return '{"groupFilters":[{"field":"' + table + '.No of funders","type":">","values":["1"]}],"op":"AND"}';
     }
-    return "";
+    if (filterType == "fundingL0" && IndicatorFilterUtils.getFieldForTable("fundingL0",tablename)) {
-  }
+      return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("fundingL0",tablename) + '","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
-  static getProjectFilter( filterType:FilterType) {
+
-    //works for table "project"
+    }else if (filterType == "co-funded" && IndicatorFilterUtils.getFieldForTable("co-funded",tablename)) {
-    if (filterType == "fundingL0") {
+      return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("co-funded",tablename) + '","type":">","values":["1"]}],"op":"AND"}';
-      return '{"groupFilters":[{"field":"project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
+    }else if (filterType == "publicly-funded" && IndicatorFilterUtils.getFieldForTable("publicly-funded",tablename)) {
-    }
+      return '{"groupFilters":[{"field":"' + IndicatorFilterUtils.getFieldForTable("publicly-funded",tablename) + '","type":"=","values":["' + (value=="true"?"1":"0") +'"]}],"op":"AND"}';
-    return "";
+    }else if (filterType == "foslvl1" && IndicatorFilterUtils.getFieldForTable("foslvl1",tablename) && value && value.length > 0) {
-  }
+      let filterString = '{"groupFilters":[' ;
-  static getOrganizationFilter( filterType:FilterType) {
+      let filters = [];
-    //works for table "organization"
+      for(let v of value) {
-    if (filterType == "fundingL0") {
+        filters.push('{"field":"' + IndicatorFilterUtils.getFieldForTable("foslvl1",tablename) + '","type":"=","values":["' + v + '"]}');
-      return '{"groupFilters":[{"field":"organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      }
-    }
+      filterString+=filters.join(", ")
-    return "";
+      filterString+='],"op":"OR"}'
-  }
+      return filterString;
-  static getCountryFilter( filterType:FilterType) {
+    }else if (filterType == "foslvl2" && IndicatorFilterUtils.getFieldForTable("foslvl2",tablename) && value && value.length > 0) {
-    //works for table "country"
+      let filterString = '{"groupFilters":[' ;
-    if (filterType == "fundingL0") {
+      let filters = [];
-      return '{"groupFilters":[{"field":"country.organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}';
+      for(let v of value) {
+        filters.push('{"field":"' + IndicatorFilterUtils.getFieldForTable("foslvl2",tablename) + '","type":"=","values":["' + v + '"]}');
+      }
+      filterString+=filters.join(", ")
+      filterString+='],"op":"OR"}'
+      return filterString;
     }
     return "";
   }
@@ -297,12 +337,18 @@ export class IndicatorFilterUtils {
   }
 }
 
+/**
+ * @deprecated
+ *
+ * TODO: Remove after merge with develop
+ * */
 export enum StakeholderEntities {
 	STAKEHOLDER = 'Dashboard',
 	FUNDER = 'Funder',
 	RI = 'Research Initiative',
 	ORGANIZATION = 'Research Institution',
 	PROJECT = 'Project',
+  COUNTRY = 'National',
 
 	STAKEHOLDERS = 'Dashboards',
 	FUNDERS = 'Funders',
@@ -310,10 +356,3 @@ export enum StakeholderEntities {
 	ORGANIZATIONS = 'Research Institutions',
 	PROJECTS = 'Projects'
 }
-
-export let stakeholderTypes: Option[] = [
-  {value: 'funder', label: StakeholderEntities.FUNDER},
-  {value: 'ri', label: StakeholderEntities.RI},
-  {value: 'organization', label: StakeholderEntities.ORGANIZATION},
-  {value: 'project', label: StakeholderEntities.PROJECT}
-];

monitor/indicators/indicator-themes.component.ts

@@ -5,7 +5,7 @@ import {Meta, Title} from "@angular/platform-browser";
 import {SEOService} from "../../sharedComponents/SEO/SEO.service";
 import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component";
 import {Subscriber} from "rxjs";
-import {StakeholderEntities} from "../entities/stakeholder";
+import {StakeholderBaseComponent} from "../../monitor-admin/utils/stakeholder-base.component";
 
 @Component({
   selector: 'indicator-themes-page',
@@ -30,10 +30,10 @@ import {StakeholderEntities} from "../entities/stakeholder";
 									This is the current set of indicator themes we cover. We’ll keep enriching it as new requests and data are coming into the <a href="https://graph.openaire.eu" class="text-graph" target="_blank">OpenAIRE Graph</a>. We are at your disposal, should you have any recommendations!
 								</p>
 								<p>
-									Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="route">funders</a>,
+									Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="_route">funders</a>,
-									<a [routerLink]="['../organization']" [relativeTo]="route">research institutions</a> and
+									<a [routerLink]="['../organization']" [relativeTo]="_route">research institutions</a> and
-									<a [routerLink]="['../ri']" [relativeTo]="route">research initiatives</a>)
+									<a [routerLink]="['../ri']" [relativeTo]="_route">research initiatives</a>)
-									for the specific indicators for each type of dashboard, and the  <a [routerLink]="['../../methodology']" [relativeTo]="route">methodology and terminology</a> page on how we produce the metrics.
+									for the specific indicators for each type of dashboard, and the  <a [routerLink]="['../../methodology']" [relativeTo]="_route">methodology and terminology</a> page on how we produce the metrics.
 								</p>
 							</div>
 						</div>
@@ -54,10 +54,10 @@ import {StakeholderEntities} from "../entities/stakeholder";
 							This is the current set of indicator themes we cover. We’ll keep enriching it as new requests and data are coming into the <a href="https://graph.openaire.eu" class="text-graph" target="_blank">OpenAIRE Graph</a>. We are at your disposal, should you have any recommendations!
 						</p>
 						<p>
-							Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="route" class="uk-text-lowercase">{{entities.FUNDERS}}</a>,
+							Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="_route" class="uk-text-lowercase">{{entities.funders}}</a>,
-							<a [routerLink]="['../organization']" [relativeTo]="route" class="uk-text-lowercase">{{entities.ORGANIZATIONS}}</a> and
+							<a [routerLink]="['../organization']" [relativeTo]="_route" class="uk-text-lowercase">{{entities.organizations}}</a> and
-							<a [routerLink]="['../ri']" [relativeTo]="route" class="uk-text-lowercase">{{entities.RIS}}</a>)
+							<a [routerLink]="['../ri']" [relativeTo]="_route" class="uk-text-lowercase">{{entities.ris}}</a>)
-							for the specific indicators for each type of dashboard, and the  <a [routerLink]="['../../methodology']" [relativeTo]="route">methodology and terminology</a> page on how we produce the metrics.
+							for the specific indicators for each type of dashboard, and the  <a [routerLink]="['../../methodology']" [relativeTo]="_route">methodology and terminology</a> page on how we produce the metrics.
 						</p>
 					</div>
 				</div>
@@ -65,44 +65,24 @@ import {StakeholderEntities} from "../entities/stakeholder";
 		</div>
   `
 })
-export class IndicatorThemesComponent implements OnInit, OnDestroy {
+export class IndicatorThemesComponent extends StakeholderBaseComponent implements OnInit {
-  private subscriptions: any[] = [];
-  public properties = properties;
-  public entities = StakeholderEntities;
   public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources - Themes'}];
   
-  constructor(private router: Router,
+  constructor(protected _router: Router,
-              private meta: Meta,
+              protected _meta: Meta,
-              private title: Title,
+              protected _title: Title,
-              private seoService: SEOService,
+              protected seoService: SEOService,
-              public route: ActivatedRoute) {
+              protected _route: ActivatedRoute) {
+    super();
   }
   
   ngOnInit() {
-    this.subscriptions.push(this.route.params.subscribe(params => {
+    this.subscriptions.push(this._route.params.subscribe(params => {
-      const description = "Monitor | Indicator Themes";
+      this.title = "Monitor | Indicator Themes";
-      const title = "Monitor | Indicator Themes";
+      this.description = "Monitor | Indicator Themes";
-      this.metaTags(title, description);
+      this.setMetadata();
       this.breadcrumbs[0].route = '/' + (params['stakeholder']?params['stakeholder']:'');
       this.breadcrumbs[0].name = (params['stakeholder']?'dashboard':'home');
     }));
   }
-  
-  ngOnDestroy() {
-    this.subscriptions.forEach(subscription => {
-      if (subscription instanceof Subscriber) {
-        subscription.unsubscribe();
-      }
-    });
-  }
-  
-  metaTags(title, description) {
-    const url = properties.domain + properties.baseLink + this.router.url;
-    this.seoService.createLinkForCanonicalURL(url, false);
-    this.meta.updateTag({content: url}, "property='og:url'");
-    this.meta.updateTag({content: description}, "name='description'");
-    this.meta.updateTag({content: description}, "property='og:description'");
-    this.meta.updateTag({content: title}, "property='og:title'");
-    this.title.setTitle(title);
-  }
 }

monitor/monitor-indicator-stakeholder-base.component.ts

@@ -0,0 +1,484 @@
+import {ChangeDetectorRef, Directive, HostListener, OnInit, ViewRef} from "@angular/core";
+import {IndicatorStakeholderBaseComponent} from "../monitor-admin/utils/stakeholder-base.component";
+import {DomSanitizer} from "@angular/platform-browser";
+import {
+  Category,
+  Indicator, IndicatorPath,
+  IndicatorSize, Overlay,
+  Section,
+  Stakeholder,
+  SubCategory,
+  Topic,
+  Visibility
+} from "./entities/stakeholder";
+import {LayoutService} from "../dashboard/sharedComponents/sidebar/layout.service";
+import {ClickEvent} from "../utils/click/click-outside-or-esc.directive";
+import {Session, User} from "../login/utils/helper.class";
+import {Filter, Value} from "../searchPages/searchUtils/searchHelperClasses.class";
+import {RangeFilter} from "../utils/rangeFilter/rangeFilterHelperClasses.class";
+import {RangeFilterComponent} from "../utils/rangeFilter/rangeFilter.component";
+import {Dates, StringUtils} from "../utils/string-utils.class";
+import {Params} from "@angular/router";
+import {StatisticsService} from "../monitor-admin/utils/services/statistics.service";
+import {SearchResearchResultsService} from "../services/searchResearchResults.service";
+import {CustomFilterService} from "../shared/customFilter.service";
+
+@Directive()
+export abstract class MonitorIndicatorStakeholderBaseComponent extends IndicatorStakeholderBaseComponent implements OnInit {
+  /** Status */
+  public loading: boolean = true;
+  public isMobile: boolean = false;
+  public isFullscreen: boolean = false;
+
+  /** Variables */
+  public user: User;
+  public requireLogin: boolean = true;
+  public view: Visibility;
+  public stakeholder: Stakeholder;
+  public activeTopic: Topic = null;
+  public activeCategory: Category = null;
+  public activeSubCategory: SubCategory = null;
+  public filters: Filter[] = [];
+  public queryParams: any = {};
+  public periodFilter: RangeFilter = {
+    title: "Time range",
+    filterId: "year",
+    originalFilterIdFrom: null,
+    originalFilterIdTo: null,
+    selectedFromValue: null,
+    selectedToValue: null,
+    selectedFromAndToValues: ""
+  };
+  rangeFilter: RangeFilterComponent;
+
+  public numberResults: Map<string, number> = new Map<string, number>();
+  public chartsActiveType: Map<string, IndicatorPath> = new Map<string, IndicatorPath>();
+  public currentYear = new Date().getFullYear();
+  public clipboard;
+
+  /** Services */
+  protected sanitizer: DomSanitizer;
+  protected cdr: ChangeDetectorRef;
+  protected layoutService: LayoutService;
+  protected statisticsService: StatisticsService;
+  protected searchResearchResultsService: SearchResearchResultsService;
+  protected customFilterService: CustomFilterService;
+
+  @HostListener('fullscreenchange', ['$event'])
+  @HostListener('webkitfullscreenchange', ['$event'])
+  @HostListener('mozfullscreenchange', ['$event'])
+  @HostListener('MSFullscreenChange', ['$event'])
+  screenChange() {
+    this.isFullscreen = !this.isFullscreen;
+  }
+
+  ngOnInit() {
+    this.layoutService.isMobile.subscribe(isMobile => {
+      this.isMobile = isMobile;
+      this.cdr.detectChanges();
+    });
+    this.createClipboard();
+  }
+
+  protected setView(params: Params) {
+    this.setSelectedFilters();
+    this.loading = false;
+    if (params['topic']) {
+      this.activeTopic = this.stakeholder.topics.find(topic => topic.alias === decodeURIComponent(params['topic']) && this.hasPermission(topic.visibility));
+      if (this.activeTopic) {
+        if (params['category']) {
+          this.activeCategory = this.activeTopic.categories.find(category =>
+              (category.alias === params['category']) && this.hasPermission(category.visibility));
+          if (!this.activeCategory) {
+            this.navigateToError();
+            return;
+          }
+        } else {
+          this.activeCategory = this.activeTopic.categories.find(category => this.hasPermission(category.visibility));
+          if (this.activeCategory) {
+            this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
+                this.hasPermission(subCategory.visibility));
+            if (this.activeSubCategory) {
+              this.setIndicators();
+            }
+          }
+          return;
+        }
+        if (this.activeCategory) {
+          if (params['subCategory']) {
+            this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
+                (subCategory.alias === params['subCategory'] && this.hasPermission(subCategory.visibility)));
+            if (!this.activeSubCategory) {
+              this.navigateToError();
+              return;
+            }
+          } else {
+            this.activeSubCategory = this.activeCategory.subCategories.find(subCategory =>
+                this.hasPermission(subCategory.visibility));
+          }
+          if (this.activeSubCategory) {
+            this.setIndicators();
+          } else {
+            this.navigateToError();
+          }
+          return;
+        } else {
+          this.activeSubCategory = null;
+        }
+      } else {
+        this.navigateToError();
+        return;
+      }
+    } else {
+      this.activeTopic = this.stakeholder.topics.find(topic => this.hasPermission(topic.visibility));
+      if (this.activeTopic) {
+        this.activeCategory = this.activeTopic.categories.find(category => this.hasPermission(category.visibility));
+        if (this.activeCategory) {
+          this.activeSubCategory = this.activeCategory.subCategories.find(subCategory => this.hasPermission(subCategory.visibility));
+          if (this.activeSubCategory) {
+            this.setIndicators();
+          }
+        }
+      }
+    }
+  }
+
+  protected handleQueryParams(queryParams, params) {
+    this.queryParams = Object.assign({}, queryParams);
+    this.initializeFilters();
+    this.setView(params);
+    if(this.requireLogin && !this.user && (this.filters.filter(filter => this.queryParams[filter.filterId]).length > 0 || this.queryParams['year'])) {
+      if(queryParams['view']) {
+        this._router.navigate([], {queryParams: {view: queryParams['view']}});
+      } else {
+        this._router.navigate([], {queryParams: {}});
+      }
+    }
+    this.view = queryParams['view'];
+  }
+
+  protected initializeFilters() {
+    this.periodFilter.selectedFromValue = (this.queryParams['year'] && this.queryParams['year'].indexOf("range") == 0) ? this.queryParams['year'].split("range")[1].split(":")[0] : "";
+    this.periodFilter.selectedToValue = (this.queryParams['year'] && this.queryParams['year'].indexOf("range") == 0) ? this.queryParams['year'].split("range")[1].split(":")[1] : "";
+    this.validateYearRange(false);
+
+    for (let filter of this.filters) {
+      if (this.queryParams[filter.filterId]) {
+        for (let value of filter.values) {
+          if (value.id == StringUtils.URIDecode(StringUtils.unquote(this.queryParams[filter.filterId]))) {
+            value.selected = true;
+            filter.countSelectedValues = 1;
+            break;
+          }
+        }
+      } else {
+        this.clearFilter(filter);
+      }
+    }
+  }
+
+  protected validateYearRange(navigateTo: boolean = false) {
+    let validYears = true;
+    if (this.periodFilter.selectedToValue && (this.periodFilter.selectedToValue.length == 0 || !Dates.isValidYear(this.periodFilter.selectedToValue, Dates.currentYear - 20, Dates.currentYear))) {
+      this.periodFilter.selectedToValue = Dates.currentYear + "";
+      validYears = false;
+    }
+    if (this.periodFilter.selectedFromValue && (this.periodFilter.selectedFromValue.length == 0 || !Dates.isValidYear(this.periodFilter.selectedFromValue, Dates.currentYear - 20, Dates.currentYear))) {
+      this.periodFilter.selectedFromValue = Dates.currentYear - 20 + "";
+      validYears = false;
+    }
+    if (this.periodFilter.selectedFromValue && this.periodFilter.selectedFromValue.length && this.periodFilter.selectedToValue && this.periodFilter.selectedToValue.length > 0 && parseInt(this.periodFilter.selectedFromValue, 10) > parseInt(this.periodFilter.selectedToValue, 10)) {
+      this.periodFilter.selectedFromValue = this.periodFilter.selectedToValue;
+      validYears = false;
+    }
+    if (!validYears || navigateTo) {
+      if (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue) {
+        this.queryParams["year"] = 'range' + (this.periodFilter.selectedFromValue ? this.periodFilter.selectedFromValue : '') + ":" + (this.periodFilter.selectedToValue ? this.periodFilter.selectedToValue : "");
+      } else {
+        delete this.queryParams["year"];
+      }
+      this._router.navigate([], {queryParams: this.queryParams});
+      this.setIndicators();
+    }
+  }
+
+  protected getFullUrl(indicatorPath: IndicatorPath) {
+    let fosValues = this.getSelectedFilterValues("fos");
+    return this.indicatorUtils.getFullUrlWithFilters(this.stakeholder, indicatorPath,null, this.periodFilter.selectedFromValue, this.periodFilter.selectedToValue, false, fosValues?fosValues.lvl1:[],fosValues?fosValues.lvl2:[], this.getSelectedFilterValues("publiclyfunded"));
+  }
+
+  protected setIndicators() {
+    this.periodFilter.selectedFromAndToValues = (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue ? ((this.periodFilter.selectedFromValue && !this.periodFilter.selectedToValue ? "From " : "") + (!this.periodFilter.selectedFromValue && this.periodFilter.selectedToValue ? "Until " : "") + (this.periodFilter.selectedFromValue ? this.periodFilter.selectedFromValue : "") +
+        (this.periodFilter.selectedFromValue && this.periodFilter.selectedToValue ? " - " : "") + (this.periodFilter.selectedToValue ? this.periodFilter.selectedToValue : "")) : "");
+    //clear numbers when filters change
+    this.numberResults.clear();
+    let urls: Map<string, [number, number][]> = new Map<string, [number, number][]>();
+    this.activeSubCategory.numbers.forEach((section, i) => {
+      section.indicators.forEach((number, j) => {
+        if (this.hasPermission(number.visibility)) {
+          let url = this.getFullUrl(number.indicatorPaths[0]);
+          const pair = JSON.stringify([number.indicatorPaths[0].source, url]);
+          const indexes = urls.get(pair) ? urls.get(pair) : [];
+          indexes.push([i, j]);
+          urls.set(pair, indexes);
+        }
+      });
+    });
+    urls.forEach((indexes, pair) => {
+      pair = JSON.parse(pair);
+      let activeSubcategory = this.activeSubCategory._id;
+      this.subscriptions.push(this.statisticsService.getNumbers(this.indicatorUtils.getSourceType(pair[0]), pair[1]).subscribe(response => {
+        if(activeSubcategory === this.activeSubCategory._id) {
+          indexes.forEach(([i, j]) => {
+            if( this.activeSubCategory?.numbers[i]?.indicators[j]) {
+              let result = JSON.parse(JSON.stringify(response));
+              this.activeSubCategory.numbers[i].indicators[j].indicatorPaths[0].jsonPath.forEach(jsonPath => {
+                if (result) {
+                  result = result[jsonPath];
+                }
+              });
+              if (typeof result === 'string' || typeof result === 'number') {
+                result = Number(result);
+                if (result === Number.NaN) {
+                  result = 0;
+                }
+              } else {
+                result = 0;
+              }
+              this.numberResults.set(i + '-' + j, result);
+            }
+          });
+        }
+      }));
+    });
+    this.activeSubCategory.charts.forEach((section, i) => {
+      section.indicators.forEach((indicator, j) => {
+        if (indicator.indicatorPaths.length > 0) {
+          indicator.indicatorPaths[0].safeResourceUrl = this.getUrlByStakeHolder(indicator.indicatorPaths[0]);
+          this.chartsActiveType.set(i + '-' + j, indicator.indicatorPaths[0]);
+        }
+      });
+    });
+    if (this.cdr && !(this.cdr as ViewRef).destroyed) {
+      this.cdr.detectChanges();
+    }
+  }
+
+  public getUrlByStakeHolder(indicatorPath: IndicatorPath) {
+    return this.sanitizer.bypassSecurityTrustResourceUrl(
+        this.indicatorUtils.getChartUrl(indicatorPath.source, this.getFullUrl(indicatorPath)));
+  }
+
+  public setActiveChart(i: number, j: number, type: string) {
+    let activeChart = this.activeSubCategory.charts[i].indicators[j].indicatorPaths.filter(indicatorPath => indicatorPath.type === type)[0];
+    activeChart.safeResourceUrl = this.getUrlByStakeHolder(activeChart);
+    this.chartsActiveType.set(i + '-' + j, activeChart);
+  }
+
+  public filter() {
+    this.validateYearRange(true);
+  }
+
+  public filterChanged($event, navigate: boolean = true) {
+    let selected = [];
+    for (let value of $event.value.values) {
+      if (value.selected) {
+        selected.push( StringUtils.quote(StringUtils.URIEncode(value.id)));
+      }
+    }
+    if (selected.length > 0) {
+      this.queryParams[$event.value.filterId] = selected.join(",");
+    } else {
+      delete this.queryParams[$event.value.filterId];
+    }
+    if (navigate) {
+      this._router.navigate([], {queryParams: this.queryParams});
+      this.setIndicators();
+    }
+
+  }
+
+  public countSelectedFilters(): number {
+    let count = 0;
+    if (this.periodFilter.selectedFromAndToValues.length > 0) {
+      count += 1;
+    }
+    for (let filter of this.filters) {
+      count += filter.countSelectedValues;
+    }
+    return count;
+  }
+
+  public clearAll() {
+    for (let filter of this.filters) {
+      this.clearFilter(filter);
+    }
+    this.periodFilter.selectedFromValue = "";
+    this.periodFilter.selectedToValue = "";
+    this.validateYearRange(true)
+  }
+
+  public clearFilter(filter: Filter) {
+    filter.countSelectedValues = 0;
+    filter.radioValue = "";
+    for (let value of filter.values) {
+      if (value.selected) {
+        value.selected = false;
+      }
+    }
+    if (this.queryParams[filter.filterId]) {
+      delete this.queryParams[filter.filterId];
+    }
+  }
+
+  clearPeriodFilter() {
+    if (this.periodFilter.selectedFromValue || this.periodFilter.selectedToValue) {
+      this.periodFilter.selectedFromValue = "";
+      this.periodFilter.selectedToValue = "";
+      if(this.rangeFilter) {
+        this.rangeFilter.clearFilter();
+      }
+      this.filter();
+    }
+  }
+
+  clearFilterValue(filter: Filter, value: Value) {
+    value.selected = false;
+    filter.radioValue = '';
+    filter.countSelectedValues = filter.countSelectedValues - 1;
+    this.filterChanged({
+      value:filter
+    });
+  }
+
+  public hasPermission(visibility: Visibility): boolean {
+    if(visibility === 'PUBLIC') {
+      return true;
+    } else if(visibility === 'RESTRICTED') {
+      return (!this.view || this.view === 'RESTRICTED') && this.isMember(this.stakeholder);
+    } else {
+      return !this.view && this.isManager(this.stakeholder);
+    }
+  }
+
+  public isMember(stakeholder: Stakeholder) {
+    return this.user && (Session.isPortalAdministrator(this.user) || Session.isCurator(stakeholder.type, this.user)
+        || Session.isManager(stakeholder.type, stakeholder.alias, this.user) || Session.isMember(stakeholder.type, stakeholder.alias, this.user));
+  }
+
+  public isManager(stakeholder: Stakeholder) {
+    return this.user && (Session.isPortalAdministrator(this.user) || Session.isCurator(stakeholder.type, this.user) || Session.isManager(stakeholder.type, stakeholder.alias, this.user));
+  }
+
+  public countSubCategoriesToShow(category: Category): number {
+    return category.subCategories.filter(subCategory => this.hasPermission(subCategory.visibility)).length;
+  }
+
+  public countSectionsWithIndicatorsToShow(sections: Section[]):number {
+    return sections.map(section => this.countIndicatorsToShow(section.indicators)).reduce((sum, current) => sum + current, 0);
+  }
+
+  public countIndicatorsToShow(indicators: Indicator[]): number {
+    return indicators.filter(indicator => this.hasPermission(indicator.visibility)).length;
+  }
+
+  public getNumberClassBySize(size: IndicatorSize) {
+    if (size === 'small') {
+      return 'uk-width-medium@m uk-width-1-1';
+    } else if (size === 'medium') {
+      return 'uk-width-1-4@l uk-width-1-2@m uk-width-1-1';
+    } else {
+      return 'uk-width-1-2@l uk-width-1-1@m uk-width-1-1';
+    }
+  }
+
+  public getChartClassBySize(size: IndicatorSize): string {
+    if (size === 'small') {
+      return 'uk-width-1-3@xl uk-width-1-2@m uk-width-1-1';
+    } else if (size === 'medium') {
+      return 'uk-width-1-2@l uk-width-1-1';
+    } else {
+      return 'uk-width-1-1';
+    }
+  }
+
+  public printReport() {
+    window.print();
+  }
+
+  changeOverlay(event, indicator: Indicator, overlay: Overlay) {
+    event.stopPropagation();
+    indicator.overlay = overlay;
+  }
+
+  closeOverlay(event: ClickEvent, indicator: Indicator) {
+    if(event.clicked && indicator.overlay) {
+      indicator.overlay = false;
+    }
+  }
+
+  private createClipboard() {
+    if (typeof window !== 'undefined') {
+      delete this.clipboard;
+      let Clipboard;
+      Clipboard = require('clipboard');
+      this.clipboard = new Clipboard('.clipboard_btn');
+    }
+  }
+
+  //Refine Type Filters
+
+  setSelectedFilters(){
+    for (var i = 0; i < this.filters.length; i++) {
+      var filter: Filter = this.filters[i];
+      filter.countSelectedValues = 0;
+      let parameterNames = Object.keys(this.queryParams);
+      if (parameterNames.indexOf(filter.filterId) != -1) {
+        let values = (decodeURIComponent(this.queryParams[filter.filterId])).split(/,(?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)/, -1);
+        for (let filterValue of filter.values) {
+          if (values.indexOf(StringUtils.quote(filterValue.id)) > -1) {
+            filterValue.selected = true;
+            filter.countSelectedValues++;
+          } else {
+            filterValue.selected = false;
+
+          }
+        }
+
+      } else {
+        for (let filterValue of filter.values) {
+          filterValue.selected = false;
+        }
+      }
+
+    }
+  }
+  getSelectedFilterValues(filterId){
+    let values = null;
+    for (let filter of this.filters) {
+      if(filterId == filter.filterId && filter.countSelectedValues > 0) {
+        values =filterId == "fos"?{lvl1:[],lvl2:[]}:[];
+          for (let filterValue of filter.values) {
+            if (filterValue.selected) {
+              if(filterId == "fos"){
+                let code = filterValue.id.split(" ")[0];
+                if(code.length == 2){
+                  values.lvl1.push(filterValue.id)
+                }else{
+                  values.lvl2.push(filterValue.id)
+                }
+              }else if(filterId == "publiclyfunded"){
+                // console.log("publiclyFunded", filterValue)
+                return filterValue.id;
+              }else{
+                values.push(filterValue.id);
+              }
+            }
+          }
+      }
+
+    }
+    return values;
+  }
+
+}

monitor/services/resources.service.ts

@@ -1,12 +1,12 @@
 import {Injectable} from "@angular/core";
 import {MenuItem} from "../../sharedComponents/menu";
 import {Option} from "../../sharedComponents/input/input.component";
-import {StakeholderEntities} from "../entities/stakeholder";
 import {from, Subscription} from "rxjs";
 import {HttpClient} from "@angular/common/http";
 import {properties} from "../../../../environments/environment";
 import {Page} from "../../utils/entities/adminTool/page";
 import {map} from "rxjs/operators";
+import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils";
 
 @Injectable({
   providedIn: 'root'
@@ -16,12 +16,7 @@ export class ResourcesService {
   private subscription: Subscription;
   private routes = ResourcesService.types.map(type => '/indicators/' + type.value);
   
-  public static readonly types: Option[] = [
+  public static readonly types: Option[] = StakeholderConfiguration.TYPES;
-    {value: 'funder', label: StakeholderEntities.FUNDERS},
-    {value: 'ri', label: StakeholderEntities.RIS},
-    {value: 'project', label: StakeholderEntities.PROJECTS},
-    {value: 'organization', label: StakeholderEntities.ORGANIZATIONS}
-  ];
   
   constructor(private http: HttpClient) {
   }

monitor/services/stakeholder.service.ts

@@ -53,6 +53,30 @@ export class StakeholderService {
     }
     return from(this.getStakeholderAsync());
   }
+  getResearcherStakeholder( orcid, name, results, shouldUpdate: boolean = false): Observable<Stakeholder> {
+    if (!this.stakeholderSubject.value || this.stakeholderSubject.value.alias !== orcid || shouldUpdate) {
+      this.promise = new Promise<void>((resolve, reject) => {
+        this.sub = this.http.get<Stakeholder>(properties.monitorServiceAPIURL + '/stakeholder/' + encodeURIComponent("researcher"), CustomOptions.registryOptions()).pipe(map(stakeholder => {
+          return this.formalize(this.checkIsUpload(stakeholder));
+        })).subscribe(stakeholder => {
+          stakeholder.index_id = orcid;
+          stakeholder.index_name = name;
+          stakeholder.name = name;
+          stakeholder.alias = orcid;
+          if(results <7 && stakeholder.topics[0]?.categories[0]?.subCategories[0]){
+            stakeholder.topics[0].categories[0].subCategories[0].charts=[]; // keep only numbers - charts wont show much anyway
+          }
+          this.stakeholderSubject.next(stakeholder);
+          resolve();
+        }, error => {
+          let stakeholder = new Stakeholder(null,"researcher", orcid,name,name,orcid,"PUBLIC", null, null,"");
+          this.stakeholderSubject.next(stakeholder);
+          resolve();
+        });
+      });
+    }
+    return from(this.getStakeholderAsync());
+  }
 
   async getStakeholderAsync() {
     if (this.promise) {

notifications/notifications-sidebar/notification-sidebar.component.less

@@ -1,4 +1,5 @@
-@import "~src/assets/openaire-theme/less/_import-variables";
+@import (reference) "~src/assets/openaire-theme/less/_import-variables";
+@import (optional) "~src/assets/extend-theme/less/_import-variables";
 
 #notifications-switcher {
   top: 480px !important;

notifications/notifications-sidebar/notifications-sidebar.component.ts

@@ -40,7 +40,7 @@ export class NotificationConfiguration {
             <span *ngIf="mobile" class="uk-margin-right">
               <icon ratio="1.5" name="west" visuallyHidden="back" [flex]="true"></icon>
             </span>
-            <div class="uk-text-bold">Notifications</div>
+            <span class="uk-text-bold">Notifications</span>
           </h4>
           <div class="uk-flex uk-flex-right@m uk-flex-center uk-padding uk-padding-remove-vertical">
             <button [disabled]="unreadCount === 0" (click)="readAll()" class="uk-button uk-button-link">Mark As Read ({{unreadCount}})</button>
@@ -75,7 +75,7 @@ export class NotificationConfiguration {
           <span class="uk-margin-right">
             <icon ratio="1.5" name="west" visuallyHidden="back" [flex]="true"></icon>
           </span>
-          <div *ngIf="notification.title" class="uk-text-bold">{{notification.title}}</div>
+          <span *ngIf="notification.title" class="uk-text-bold">{{notification.title}}</span>
         </h4>
         <div class="uk-flex uk-flex-middle uk-margin-medium-bottom">
           <notification-user [name]="notification.name" [surname]="notification.surname" colorClass="uk-text-secondary" [outline]="true"></notification-user>

notifications/notify-form/notify-form.component.ts

@@ -7,11 +7,12 @@ import {NotificationService} from "../notification.service";
 import {Notification} from "../notifications";
 import {InputComponent, Option} from "../../sharedComponents/input/input.component";
 import {NotificationHandler} from "../../utils/notification-handler";
+import {BaseComponent} from "../../sharedComponents/base/base.component";
 
 @Component({
   selector: '[notify-form]',
   template: `
-    <form *ngIf="user && form" [formGroup]="form">
+    <form *ngIf="user && form && properties.notificationsAPIURL" [formGroup]="form">
       <ng-template [ngIf]="form.get('notify')">
         <label><input name="notify" type="checkbox" class="uk-checkbox" formControlName="notify"><span class="uk-margin-small-left">{{label}}</span></label>
         <div [class.uk-hidden]="!form.get('notify').value" class="uk-position-relative uk-margin-medium-top">
@@ -44,7 +45,7 @@ import {NotificationHandler} from "../../utils/notification-handler";
   styleUrls: ['notify-form.component.less'],
   encapsulation: ViewEncapsulation.None
 })
-export class NotifyFormComponent implements OnInit, OnDestroy {
+export class NotifyFormComponent extends BaseComponent implements OnInit {
   @Input()
   public label: string = 'Notify Managers';
   public form: UntypedFormGroup;
@@ -57,13 +58,13 @@ export class NotifyFormComponent implements OnInit, OnDestroy {
   public focused: boolean = false;
   @ViewChild('recipients', { static: false }) recipients: InputComponent;
   private notification: Notification;
-  private subscriptions: any[] = [];
   public sending: boolean = false;
   
   constructor(private fb: UntypedFormBuilder,
               private cdr: ChangeDetectorRef,
               private userManagementService: UserManagementService,
               private notificationService: NotificationService) {
+    super();
   }
   
   @Input()
@@ -79,14 +80,6 @@ export class NotifyFormComponent implements OnInit, OnDestroy {
     }));
   }
   
-  ngOnDestroy() {
-    this.subscriptions.forEach(subscription => {
-      if (subscription instanceof Subscription) {
-        subscription.unsubscribe();
-      }
-    })
-  }
-  
   reset(message: string = null) {
     if (!this.availableGroups) {
       this.form = this.fb.group({
@@ -116,7 +109,7 @@ export class NotifyFormComponent implements OnInit, OnDestroy {
   }
   
   sendNotification(notification: Notification = null) {
-    if (this.message) {
+    if (this.message && this.properties.notificationsAPIURL) {
       if(notification === null) {
         notification = new Notification('CUSTOM', [this.service], null, null);
         notification.groups = this.parseGroups();
@@ -162,16 +155,12 @@ export class NotifyFormComponent implements OnInit, OnDestroy {
   }
   
   get message(): string {
-    if ((this.form.get('notify') && !this.form.get('notify').value) || (this.groupsAsFromArray && this.groupsAsFromArray.length === 0)) {
+    if (!this.properties.notificationsAPIURL || (this.form.get('notify') && !this.form.get('notify').value) || (this.groupsAsFromArray && this.groupsAsFromArray.length === 0)) {
       return null;
     }
     return this.form.get('message').value;
   }
   
-  onFocus(event: boolean) {
-    this.focused = event;
-  }
-  
   focus(event) {
     this.focused = true;
     event.stopPropagation();

orcid/my-orcid-links/myOrcidLinks.component.ts

@@ -32,10 +32,14 @@ declare var UIkit: any;
               My ORCID links
             </div>
             <span *ngIf="authorNameParam" class="uk-width-1-1 uk-width-expand@m">
-              <a class="uk-button-text uk-align-left uk-align-right@m" [queryParams]="authorNameParam" 
+              <a *ngIf="!properties.orcidDiscoverLinksPage" class="uk-button uk-button-text uk-align-left uk-align-right@m" [queryParams]="authorNameParam" 
                   [routerLink]="properties.searchLinkToAdvancedResults" routerLinkActive="router-link-active">
                 Discover {{openaireEntities.RESULTS | lowercase}} related to you
               </a>
+              <a *ngIf="properties.orcidDiscoverLinksPage" class="uk-button uk-button-text uk-align-left uk-align-right@m" 
+                 [routerLink]="properties.orcidDiscoverLinksPage" routerLinkActive="router-link-active">
+                Discover {{openaireEntities.RESULTS | lowercase}} related to you
+              </a>
             </span>
           </div>
           
@@ -203,7 +207,7 @@ export class MyOrcidLinksComponent {
     this.subscriptions.push(this._orcidService.getPersonalDetails().subscribe(
       details => {
         let author: string = "";
-
+console.log(details)
         if(details && details['name']) {
           let name: string = details['name'];
           if(name['given-names'] && name['given-names']['value']) {

orcid/orcid-work.component.ts

@@ -12,6 +12,8 @@ import {EnvProperties} from "../utils/properties/env-properties";
 import {UserManagementService} from "../services/user-management.service";
 import {OpenaireEntities} from "../utils/properties/searchFields";
 import {FullScreenModalComponent} from "../utils/modal/full-screen-modal/full-screen-modal.component";
+import {LogService} from "../utils/log/log.service";
+import {UserProfileService} from "../services/userProfile.service";
 
 declare var UIkit: any;
 
@@ -364,7 +366,7 @@ export class OrcidWorkComponent {
   public window: any;
   
   public isLoggedIn: boolean = false;
-  
+  public hasConsent: boolean = false;
   public currentAction: string = "";
   
   public hoverAdd: boolean = false;
@@ -377,7 +379,7 @@ export class OrcidWorkComponent {
               private _router: Router,
               private orcidService: OrcidService,
               private resultLandingService: ResultLandingService,
-              private userManagementService: UserManagementService) {
+              private userManagementService: UserManagementService, private _logService: LogService, private _userProfileService: UserProfileService) {
     if (typeof document !== 'undefined') {
       this.tokenUrl = properties.orcidTokenURL
         + "client_id=" + properties.orcidClientId
@@ -401,6 +403,13 @@ export class OrcidWorkComponent {
     }, error => {
       this.isLoggedIn = false;
     }));
+    if(properties.dashboard == 'irish'){
+      this.subscriptions.push(this._userProfileService.getUserProfile().subscribe(userProfile => {
+        this.hasConsent = userProfile.consent;
+      }, error =>{
+        this.hasConsent = false;
+     }));
+    }
   }
   
   ngOnDestroy() {
@@ -441,7 +450,7 @@ export class OrcidWorkComponent {
   }
   
   openGrantWindow() {
-    if (!Session.isLoggedIn()) {
+    if (!this.isLoggedIn) {
       //this.userValidMessage = "User session has expired. Please login again.";
       this._router.navigate(['/user-info'], {
         queryParams: {
@@ -513,7 +522,7 @@ export class OrcidWorkComponent {
   }
   
   public saveWorkPreparation() {
-    if (!Session.isLoggedIn()) {
+    if (!this.isLoggedIn) {
       //this.userValidMessage = "User session has expired. Please login again.";
       this._router.navigate(['/user-info'], {
         queryParams: {
@@ -522,7 +531,15 @@ export class OrcidWorkComponent {
         }
       });
     } else {
-      
+      if(properties.dashboard == 'irish' && !this.hasConsent){
+        this._router.navigate(['/consent'], {
+          queryParams: {
+            "errorCode": LoginErrorCodes.NOT_VALID,
+            "redirectUrl": this._router.url
+          }
+        });
+        return;
+      }
       if (this.requestGrant) {
         this.openGrantModal("Add, delete or edit work in your ORCID record");
       } else {
@@ -540,7 +557,9 @@ export class OrcidWorkComponent {
   private saveWork() {
     this.subscriptions.push(this.orcidService.saveWork(this.resultLandingInfo, this.pids).subscribe(
       response => {
-        
+        if(this.properties.logServiceUrl) {
+          this.subscriptions.push(this._logService.logOrcidLink(this.properties, "added", this.resultLandingInfo.title, this.resultLandingInfo.identifiers.get('doi')[0]).subscribe(res => { }));
+        }
         // for testing only
         // this.openGrantModal("Add work in your ORCID record");
         // this.requestGrant = true;
@@ -722,6 +741,9 @@ export class OrcidWorkComponent {
             if (deletedPutCodes) {
               for (let i = 0; i < deletedPutCodes.length; i++) {
                 let deletedPutCode = deletedPutCodes[i];
+                if(this.properties.logServiceUrl) {
+                  this.subscriptions.push(this._logService.logRemoveOrcidLink(this.properties, deletedPutCode).subscribe(res => { }));
+                }
                 if (deletedPutCode == null) {
                   deletedAll = false;
                 } else {

orcid/orcid.module.ts

@@ -16,11 +16,12 @@ import {IconsModule} from '../utils/icons/icons.module';
 import {IconsService} from "../utils/icons/icons.service";
 import {orcid_add, orcid_bin} from "../utils/icons/icons";
 import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
+import {LogServiceModule} from "../utils/log/LogService.module";
 
 @NgModule({
   imports: [
     CommonModule, RouterModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
-    IconsModule, FullScreenModalModule
+    IconsModule, FullScreenModalModule, LogServiceModule
   ],
   declarations: [
     OrcidComponent,

reload/reload.component.ts

@@ -15,7 +15,7 @@ export class ReloadComponent {
   }
   
   public ngOnInit() {
-    let URL = Session.getReloadUrl();
+    let URL = Session.popReloadUrl();
     if (URL && URL["path"] && URL["path"] != "") {
       let url: string = URL["path"];
       let host = URL["host"];
@@ -24,14 +24,12 @@ export class ReloadComponent {
         let baseUrl = (document && document.getElementsByTagName('base')) ? document.getElementsByTagName('base')[0].href.split(document.location.host)[1] : "/";
         url = (baseUrl.length > 1 && url.indexOf(baseUrl) != -1) ? ("/" + url.split(baseUrl)[1]) : url;
         if (paramsObject) {
-          Session.setReloadUrl("", "", "", "");
           if(URL['fragment'] && URL['fragment'] !== '') {
             this._router.navigate([url], {queryParams: paramsObject, fragment: URL['fragment']});
           } else {
             this._router.navigate([url], {queryParams: paramsObject});
           }
         } else {
-          Session.setReloadUrl("", "", "", "");
           if(URL['fragment'] && URL['fragment'] !== '') {
             this._router.navigate([url], {fragment: URL['fragment']});
           } else {
@@ -39,12 +37,10 @@ export class ReloadComponent {
           }
         }
       } else {
-        Session.setReloadUrl("", "", "", "");
         window.location.href = host + url + ((URL["params"] && URL["params"] != null) ? ((URL["params"].indexOf("?") == -1 ? "?" : "") + URL["params"]) : "");
       }
       
     } else {
-      Session.setReloadUrl("", "", "", "");
       this._router.navigate(['/']);
     }
   }

role-verification/role-verification.component.ts

@@ -1,10 +1,10 @@
-import {AfterViewInit, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild} from "@angular/core";
+import {AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, ViewChild} from "@angular/core";
 import {Role, User} from "../login/utils/helper.class";
 import {ActivatedRoute, Router} from "@angular/router";
 import {UserManagementService} from "../services/user-management.service";
 import {UserRegistryService} from "../services/user-registry.service";
 import {LoginErrorCodes} from "../login/utils/guardHelper.class";
-import {Subscriber, Subscription} from "rxjs";
+import {Subscription} from "rxjs";
 import {UntypedFormBuilder, UntypedFormControl, Validators} from "@angular/forms";
 import {AlertModal} from "../utils/modal/alert";
 import {properties} from "../../../environments/environment";
@@ -88,7 +88,7 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
   @Input()
   public name: string;
   @Input()
-  public service: "connect" | "monitor" = "monitor";
+  public service: "connect" | "monitor" | "irish" = "monitor";
   @Input()
   public userInfoLinkPrefix = '';
   @Input()
@@ -216,7 +216,10 @@ export class RoleVerificationComponent extends BaseComponent implements OnInit,
         if (this.paramsSubscription instanceof Subscription) {
           this.paramsSubscription.unsubscribe();
         }
-        if (this.service === "monitor" ) {
+        if(this.service === "irish") {
+          this.loading = false;
+          this.userManagementService.login(properties.domain + '/admin/' + this.verification.entity);
+        } else if (this.service === "monitor" ) {
           this.loading = false;
           this._router.navigate(['/admin/' + this.verification.entity]);
         } else {

sdg/sdg.component.less

@@ -1,4 +1,5 @@
 @import (reference) "~src/assets/openaire-theme/less/_import-variables";
+@import (optional) "~src/assets/extend-theme/less/_import-variables";
 
 @sdgs: #E6233D, #DF9F00, #19A220, #D70023, #FF0B00, #00BFE8, #FFC300, #B10240, #FF5D00,
 #F50D86, #FF8A00, #CA8A03, #2B772B, #0098DF, #00B91C, #0069A2, #1C336A;

searchPages/searchDataProviders.component.ts

@@ -53,8 +53,15 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service"
 export class SearchDataProvidersComponent {
   private errorCodes: ErrorCodes;
   private errorMessages: ErrorMessagesComponent;
-  @Input() customFilter:SearchCustomFilter= null;
+  @Input() customFilters: SearchCustomFilter[] = null;
-  @Input() tableViewLink;
+  @Input()
+  set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
+    if(!Array.isArray(customFilter)) {
+      this.customFilters = [customFilter];
+    }else{
+      this.customFilters = customFilter;
+    }
+  }  @Input() tableViewLink;
   @Input() searchForm: SearchForm = {class: 'search-form', dark: true};
   public results =[];
   public filters =[];
@@ -159,7 +166,7 @@ export class SearchDataProvidersComponent {
         this.searchPage.keywordFields = this.searchFields.DEPOSIT_DATASOURCE_KEYWORD_FIELDS;
         this.searchPage.usedBy = "deposit";
       }
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.staticFields, this.fieldIdsMap,this.customFilter,params, this.entityType);
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [],this.staticFields, this.fieldIdsMap,this.customFilters,params, this.entityType);
       if(refine) {
         this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(params), this.searchUtils.page, 0, true, this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad));
       } else {
@@ -381,7 +388,7 @@ export class SearchDataProvidersComponent {
         }
 
         let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId);
-        filter.isOpen = true;
+        filter.isViewAllOpen = true;
         this.filters[index] = filter;
         this.cdr.detectChanges();
       },

searchPages/searchOrganizations.component.ts

@@ -62,8 +62,15 @@ export class SearchOrganizationsComponent {
   public loadPaging: boolean = true;
   public oldTotalResults: number = 0;
   public pagingLimit: number = 0;
-  @Input() customFilter:SearchCustomFilter= null;
+  @Input() customFilters: SearchCustomFilter[] = null;
-  public refineFields: string[] = this.searchFields.ORGANIZATION_REFINE_FIELDS;
+  @Input()
+  set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
+    if(!Array.isArray(customFilter)) {
+      this.customFilters = [customFilter];
+    }else{
+      this.customFilters = customFilter;
+    }
+  }  public refineFields: string[] = this.searchFields.ORGANIZATION_REFINE_FIELDS;
   @ViewChild(NewSearchPageComponent, { static: true }) searchPage: NewSearchPageComponent;
   @Input() simpleView: boolean = true;
   @Input() simpleSearchLink: string = "";
@@ -132,7 +139,7 @@ export class SearchOrganizationsComponent {
       // this.searchPage.fieldIdsMap = this.fieldIdsMap;
       // this.searchPage.customFilter = this.customFilter;
       // this.searchPage.getSelectedFiltersFromUrl(params);
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap,this.customFilter,params, "organization");
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap,this.customFilters,params, "organization");
       if(refine) {
         this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(),  this.searchUtils.page, 0, true, this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad));
       } else {
@@ -340,7 +347,7 @@ export class SearchOrganizationsComponent {
         }
 
         let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId);
-        filter.isOpen = true;
+        filter.isViewAllOpen = true;
         this.filters[index] = filter;
         this.cdr.detectChanges();
       },

searchPages/searchProjects.component.ts

@@ -46,8 +46,15 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service"
 export class SearchProjectsComponent {
   private errorCodes: ErrorCodes;
   private errorMessages: ErrorMessagesComponent;
-  @Input() customFilter: SearchCustomFilter = null;
+  @Input() customFilters: SearchCustomFilter[] = null;
-  @Input() searchForm: SearchForm = {class: 'search-form', dark: true};
+  @Input()
+  set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
+    if(!Array.isArray(customFilter)) {
+      this.customFilters = [customFilter];
+    }else{
+      this.customFilters = customFilter;
+    }
+  }  @Input() searchForm: SearchForm = {class: 'search-form', dark: true};
   public results = [];
   public filters = [];
   public rangeFilters: RangeFilter[] = [];
@@ -133,7 +140,7 @@ export class SearchProjectsComponent {
       
       this.searchPage.fieldIds = this.fieldIds;
       this.selectedFields = [];
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields, [], this.fieldIdsMap, this.customFilter, params, "project");
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields,[], this.fieldIdsMap, this.customFilters, params, "project");
       if (refine) {
         this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(), this.searchUtils.page, 0, "", true, this.searchPage.getSearchAPIQueryForRangeFields(params) + this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad));
       } else {
@@ -369,7 +376,7 @@ export class SearchProjectsComponent {
         }
 
         let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId);
-        filter.isOpen = true;
+        filter.isViewAllOpen = true;
         this.filters[index] = filter;
         this.cdr.detectChanges();
       },
@@ -381,4 +388,4 @@ export class SearchProjectsComponent {
       }
     )
   }
-}
+}

searchPages/searchResearchResults.component.ts

@@ -19,7 +19,7 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service"
   selector: 'search-research-results',
   template: `
     <new-search-page
-        pageTitle="{{(simpleView?'':'Advanced ')}} Search for {{ getEntityName(resultType, true, true) | titlecase }}"
+        pageTitle="{{pageTitlePrefix}}{{(simpleView?'':'Advanced ')}} Search for {{ getEntityName(resultType, true, true) | titlecase }}"
         [entityType]="resultType"
         [type]="getEntityName(resultType, true, true)"
         [results]="results"
@@ -83,7 +83,15 @@ export class SearchResearchResultsComponent {
   public loadPaging: boolean = true;
   public oldTotalResults: number = 0;
   @Input() openaireLink: string = null;
-  @Input() customFilter: SearchCustomFilter = null;
+  @Input() customFilters: SearchCustomFilter[] = null;
+  @Input()
+  set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
+    if(!Array.isArray(customFilter)) {
+      this.customFilters = [customFilter];
+    }else{
+      this.customFilters = customFilter;
+    }
+  }
   public pagingLimit: number = 0;
   properties: EnvProperties = properties;
   public openaireEntities = OpenaireEntities;
@@ -113,7 +121,7 @@ export class SearchResearchResultsComponent {
   @Input() usedBy: string = "search";
   @Input() orcidQuery: string = "";
   @Input() identifiers: string[] = [];
-
+  @Input() pageTitlePrefix: string = "";
   private refineQuery: string = "";
 
   constructor(private route: ActivatedRoute, private _router: Router,
@@ -183,7 +191,8 @@ export class SearchResearchResultsComponent {
         this.searchUtils.sortBy = "";
       }
       this.selectedFields = [];
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields, this.staticFields, this.fieldIdsMap,this.customFilter,params, this.resultType, this.quickFilter);
+
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, this.rangeFields, this.staticFields, this.fieldIdsMap,this.customFilters,params, this.resultType, this.quickFilter);
       if(refine) {
         this._getFilters(this.searchPage.getSearchAPIQueryForAdvancedSearhFields(), this.searchUtils.page, 0, "", true, this.searchPage.getSearchAPIQueryForRangeFields(params)+this.searchPage.getSearchAPIQueryForRefineFields(params, firstLoad));
       } else {
@@ -309,7 +318,14 @@ export class SearchResearchResultsComponent {
       }
 
       if (refine) {
-        this.filters = this.searchPage.prepareFiltersToShow(filters, totalResults);
+        let refineFilters = this.searchPage.prepareFiltersToShow(filters, totalResults);
+        // for(let filter of refineFilters) {
+        //   let index = this.filters.findIndex(oldFilter => oldFilter.filterId == filter.filterId);
+          // if(index != -1 && this.filters[index].isOpen) {
+            // filter.isOpen = true;
+          // }
+        // }
+        this.filters = refineFilters;
         this.rangeFilters = this.searchPage.prepareRangeFiltersToShow();
         this.staticFilters = this.searchPage.prepareStaticFiltersToShow();
 
@@ -319,9 +335,14 @@ export class SearchResearchResultsComponent {
             if (group.type == "refine") {
               let groupedFilters = {title: group.title, values: []};
               for (let field of group.values) {
-                let index = this.filters.findIndex(filter => filter.filterId == field);
+                let index = this.staticFilters.findIndex(filter => filter.filterId == field);
                 if (index > -1) {
-                  groupedFilters.values.push(this.filters[index]);
+                  groupedFilters.values.push(this.staticFilters[index]);
+                } else {
+                  index = this.filters.findIndex(filter => filter.filterId == field);
+                  if (index > -1) {
+                    groupedFilters.values.push(this.filters[index]);
+                  }
                 }
               }
               if (groupedFilters.values.length > 0) {
@@ -526,7 +547,7 @@ export class SearchResearchResultsComponent {
         }
 
         let index: number = this.filters.findIndex((fltr: Filter) => fltr.filterId == filter.filterId);
-        filter.isOpen = true;
+        filter.isViewAllOpen = true;
         filter.countSelectedValues = oldFilter.countSelectedValues;
         filter.radioValue = oldFilter.radioValue;
         this.filters[index] = filter;

searchPages/searchUtils/entitiesSelection.component.ts

@@ -106,7 +106,8 @@ export class EntitiesSelectionComponent {
       }));
     } else if ((this.customFilter && this.customFilter.queryFieldName == "community") ||
       (this.customFilter && (this.customFilter.queryFieldName == "relfunder" || this.customFilter.queryFieldName == "funder")) ||
-      (this.customFilter && this.customFilter.queryFieldName == "relorganizationid")) {
+      (this.customFilter && this.customFilter.queryFieldName == "relorganizationid")
+    || this.properties.dashboard == "irish") {
       this.entities.push({label: OpenaireEntities.RESULTS, value: 'result'});
       this.entities.push({label: OpenaireEntities.PROJECTS, value: 'project'});
       this.entities.push({label: OpenaireEntities.ORGANIZATIONS, value: 'organization'});

searchPages/searchUtils/newSearchPage.component.html

@@ -4,15 +4,15 @@
       <div [class.uk-invisible]="list.children.length === 0" class="uk-position-relative">
         <div class="uk-slider-container">
           <ul #list class="uk-slider-items uk-grid uk-grid-small uk-margin-small-right uk-flex-nowrap" style="padding-bottom: 1px">
-            <ng-container *ngIf="customFilter && ((customFilterEnabled &&
+            <ng-container  *ngFor="let customFilter of customFilters">
-            refineFields.indexOf(customFilter.queryFieldName) ==
+              <ng-container *ngIf="customFilter.isHiddenFilter">
-            -1) ||customFilter.isHiddenFilter)">
                 <li class="uk-flex uk-flex-middle">
                   <span class="uk-label uk-label-secondary uk-text-truncate">
                     {{customFilter.valueName}}
                   </span>
                 </li>
             </ng-container>
+            </ng-container>
             <ng-container *ngIf="resultTypes && resultTypes.countSelectedValues > 0">
               <ng-container *ngFor="let type of resultTypes.values; let i = index;">
                 <ng-container *ngIf="type.selected">
@@ -49,9 +49,13 @@
                     <span class="uk-label uk-label-primary uk-flex uk-flex-middle">
                       <span
                         class="uk-margin-small-right uk-width-expand uk-text-truncate">
-                        <span *ngIf="filter.type && filter.type == 'boolean' else noboolean">{{filter.title}}:
+                        <ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
-                          {{value.name=='true'?'Yes':'No'}}
+<!--                          *ngIf="filter.type == 'boolean'"-->
-                      </span>
+                          <span>{{filter.title}}:
+                            {{(value.name=='true'||value.name=='Yes')?'Yes':'No'}}
+                          </span>
+<!--                          <span *ngIf="filter.type == 'triplet'">{{value.name=='true'?'':'Not '}}{{filter.title}}</span>-->
+                        </ng-container>
                         <ng-template  #noboolean>
                         {{value.name}}
                         </ng-template></span>
@@ -66,14 +70,16 @@
             <ng-container *ngFor="let filter of filters ">
               <ng-container *ngIf="filter.countSelectedValues > 0">
                 <ng-container *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; ">
-                  <li *ngIf="!customFilter || (customFilter.isHiddenFilter && customFilter.valueId != value.id)"
+                  <li *ngIf="!customFilters || (customFilters[0].isHiddenFilter && customFilters[0].valueId != value.id)"
                         class="">
                     <span class="uk-label uk-label-primary uk-flex uk-flex-middle">
                       <span 
-                        class="uk-margin-small-right uk-width-expand uk-text-truncate"> 
+                        class="uk-margin-small-right uk-width-expand uk-text-truncate">
-                        <span *ngIf="filter.type && filter.type == 'boolean' else noboolean">{{filter.title}}:
+                        <ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
-                          {{value.name=='true'?'Yes':'No'}}
+                          <span>{{filter.title}}:
-                      </span>
+                            {{(value.name=='true'||value.name=='Yes')?'Yes':'No'}}
+                          </span>
+                        </ng-container>
                         <ng-template  #noboolean>
                         {{value.name}}
                         </ng-template></span>
@@ -94,13 +100,13 @@
   </h1>
 </ng-template>
 
-<ng-template #search_filter let-filter="filter" let-showResultCount="showResultCount">
+<ng-template #search_filter let-filter="filter" let-showResultCount="showResultCount" let-grouped="grouped">
   <search-filter [filterValuesNum]="filterValuesNum" [showMoreInline]="showMoreFilterValuesInline"
                  [isDisabled]="disabled"
                  [filter]="filter" [showResultCount]=showResultCount
                  (onFilterChange)="filterChanged($event)"
                  (onFilterToggle)="filterToggled($event)"
-                 [actionRoute]="true"></search-filter>
+                 [actionRoute]="true" [grouped]="grouped"></search-filter>
 </ng-template>
 
 <ng-template #filters_column>
@@ -125,15 +131,15 @@
     <ul *ngIf="!showUnknownFilters" class="uk-list uk-list-xlarge">
       <ng-container *ngIf="orderedFilters && orderedFilters.length > 0">
         <ng-container *ngFor="let group of orderedFilters">
-          <h5 *ngIf="group.title" class="uk-h5">{{group.title}}</h5>
+          <h6 *ngIf="group.title" class="uk-h6">{{group.title}}</h6>
-          <ng-container *ngFor="let filter of group.values">
+          <ng-container *ngFor="let filter of group.values; let i=index">
             <li *ngIf="filter.originalFilterIdFrom && filter.originalFilterIdTo; else refineBlock">
               <range-filter [isDisabled]="disabled" [filter]="filter"
                             (onFilterChange)="filterChanged($event)" [actionRoute]="true"></range-filter>
             </li>
             <ng-template #refineBlock>
-              <li *ngIf="filter.values && filter.values.length > 0">
+              <li *ngIf="filter.values && filter.values.length > 0" [ngClass]="group.title && i==0 ? 'uk-margin-small-top' : ''">
-                <ng-container *ngTemplateOutlet="search_filter; context: {filter: filter, showResultCount: filter.type!='static'}"></ng-container>
+                <ng-container *ngTemplateOutlet="search_filter; context: {filter: filter, showResultCount: filter.type!='static', grouped: !!group.title}"></ng-container>
               </li>
             </ng-template>
           </ng-container>
@@ -222,12 +228,12 @@
   </div>
 
   <!-- TODO - Clean up -->
-  <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
+  <div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilters || customFilters[0].queryFieldName != 'communityId') ?
 		(stickyForm?'':'  ') :
     (+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom  uk-padding-remove-top ' +
     ((usedBy == 'deposit' || usedBy == 'orcid') ? ' uk-padding-remove-top ' : ' '))"
        [attr.uk-sticky]="((stickyForm || (simpleView && mobile))?'{offset:100;start:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+
-		(usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
+		(usedBy != 'deposit' && usedBy != 'orcid' && (!customFilters || customFilters[0].queryFieldName != 'communityId') ?
     '  uk-position-relative ' :(' uk-section '  ))+'}':null)">
     <div class="uk-background-norepeat uk-background-bottom-center" [ngClass]="searchForm.class">
       <div class="uk-width-1-1">
@@ -254,7 +260,7 @@
                                     [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)"
                                     [simpleView]="simpleView" [formPlaceholderText]="formPlaceholderText" [isMobile]="mobile"
                                     [resultTypes]="resultTypes" [quickFilter]="quickFilter" [entitiesSelection]="entitiesSelection"
-                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilter"
+                                    [showSwitchSearchLink]="showSwitchSearchLink" [customFilter]="customFilters[0]"
               >
               </advanced-search-form>
             </div>
@@ -317,18 +323,13 @@
           </div>
           <div class="uk-width-expand@m uk-with-1-1@s">
             <div [class.uk-padding-small]="mobile" class="uk-padding-remove-vertical">
-              <!-- Results only for Custom Filter? -->
-              <div *ngIf="customFilter && !customFilter.isHiddenFilter &&
-              customFilter.selected == false && customFilter.promptToAddFilter"
-                   class="uk-alert uk-animation-slide-top-small">
-                Do you want to see results only for {{customFilter.valueName}}? <a
-                  (click)="addCustomFilter();">Click here</a>.
-              </div>
               <!-- Related results for Custom Filter Alert -->
               <div *ngIf="openaireLink && (searchUtils.totalResults > 0 || !loadPaging )"
                    class="uk-alert uk-margin-small-top ">
-                <span *ngIf="customFilter">The following results are related to <span class="uk-text-primary uk-text-bold"
+                <ng-container *ngFor="let customFilter of customFilters">
+                <span *ngIf="customFilter.showFilterMessage">The following results are related to <span class="uk-text-primary uk-text-bold"
                 >{{customFilter.valueName}}</span>.</span>
+                </ng-container>
                 Are you interested to view more results? Visit
                 <a
                     class="uk-margin-top   uk-link"
@@ -338,7 +339,7 @@
               <div class="uk-flex uk-flex-middle uk-flex-wrap uk-child-width-1-1 uk-child-width-auto@m" [class.uk-flex-between]="!mobile"
                    [class.uk-margin-top]="mobile">
                 <!-- Total results, number of pages -->
-                <div class="uk-width-xlarge@m uk-margin-remove-bottom uk-text-truncate uk-margin-medium-right" [class.uk-h6]="!mobile" [class.uk-text-center]="mobile">
+                <div class="uk-width-expand@m uk-margin-remove-bottom uk-text-truncate" [class.uk-margin-medium-right]="!mobile" [class.uk-h6]="!mobile" [class.uk-text-center]="mobile">
                   <ng-container *ngIf="results && searchUtils.totalResults > 0">
                     <span>{{searchUtils.totalResults|number}}</span>
                     <span class="uk-text-meta uk-text-capitalize"> {{type}}</span>
@@ -365,6 +366,11 @@
                       [isDisabled]="disabled"
                       [type]="csvPath" [csvParams]="csvParams" [totalResults]="searchUtils.totalResults">
                   </search-download>
+                  <ng-container *ngIf="properties.zenodoDumpUrl && entityType == 'result'">
+                    <a [href]="properties.zenodoDumpUrl" target="_blank" class=" uk-margin-left uk-button uk-button-link uk-flex uk-flex-middle">
+                      <img src="assets/common-assets/common/zenodoDump.png" width="20"><span class="uk-margin-xsmall-left">Data dump</span>
+                    </a>
+                  </ng-container>
                 </div>
               </div>
               <div *ngIf="(searchUtils.status !== errorCodes.LOADING || !loadPaging) && !mobile" class="uk-margin-top">
@@ -444,4 +450,3 @@
 <div *ngIf="isMobile || isServer" class="uk-hidden@m">
   <ng-container *ngTemplateOutlet="main; context: {mobile: true}"></ng-container>
 </div>
-<modal-alert #removeCustomFilter (alertOutput)="closeCustomFilterModal()"></modal-alert>

searchPages/searchUtils/newSearchPage.component.ts

@@ -69,7 +69,15 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   @Input() loadPaging: boolean = true;
   @Input() oldTotalResults: number = 0;
   @Input() openaireLink: string;
-  @Input() customFilter: SearchCustomFilter;
+  @Input() customFilters: SearchCustomFilter[] = null;
+  @Input()
+  set customFilter(customFilter: SearchCustomFilter | SearchCustomFilter[]) {
+    if(!Array.isArray(customFilter)) {
+      this.customFilters = [customFilter];
+    }else{
+      this.customFilters = customFilter;
+    }
+  }
   @Input() sort: boolean = true;
   @Input() sortedByChanged: string = "";
   @Input() searchForm: SearchForm = {class: 'search-form', dark: true};
@@ -144,11 +152,9 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   
   //Dashboard
   filterToggle = false;
-  customFilterEnabled: boolean = false;
   //stickyform
   @Input() stickyForm: boolean = false;
-  
+
-  @ViewChild('removeCustomFilter') removeCustomFilter: AlertModal;
   currentValueToRemove;
   currentFilterToRemove;
   public indexUpdateDate: Date;
@@ -159,7 +165,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   advancedSearchTerms: number = 0;
 
   @Output() filterRequestAll = new EventEmitter();
-  
+
   constructor(private route: ActivatedRoute,
               private location: Location,
               private _meta: Meta,
@@ -195,7 +201,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
       if (params['page'] && params['page'] != 1) {
         HelperFunctions.scrollToId("searchForm");
       }
-      this.customFilterEnabled = params['cf'] && params['cf'] == "true";
       if (this.basicMetaDescription.length == 0) {
         if (this.entityType == "result") {
           this.basicMetaDescription = [OpenaireEntities.RESULTS, "Discover" + (this.properties.adminToolsCommunity == 'openaire' ? " over 100 million of" : "") + " "+OpenaireEntities.RESULTS+" ", "categorized by research type, year range, funder, languages, "+OpenaireEntities.COMMUNITY+" and "+OpenaireEntities.DATASOURCES+"."];
@@ -229,14 +234,14 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   }
   
   private getPageContents() {
-    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilter && this.customFilter.queryFieldName == "communityId") ? this.customFilter.valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
+    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, (this.customFilters[0] && this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
       this.pageContents = contents;
     }));
     
   }
   
   private getDivContents() {
-    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilter && this.customFilter.queryFieldName == "communityId") ? this.customFilter.valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
+    this.subscriptions.push(this.helper.getDivHelpContents(this.properties, (this.customFilters[0] &&  this.customFilters[0].queryFieldName == "communityId") ? this.customFilters[0].valueId : this.properties.adminToolsCommunity, this.router.url).subscribe(contents => {
       this.divContents = contents;
     }));
   }
@@ -422,13 +427,19 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   /*
 * Get A sub-array of this.refineFields array, which contains the ids of the selected filters
 */
-  public getSelectedFilters(): string[] {
+  public getSelectedFilters(): Map<string, string[]> {
-    var selected: string[] = [];
+    var selected: Map<string, string[]> = new Map<string, string[]>();
     var filters = this.URLCreatedFilters;
     for (var i = 0; i < filters.length; i++) {
       var filter: Filter = filters[i];
       if (filter.countSelectedValues > 0) {
-        selected.push(filter.filterId);
+        let selectedValues: string[] = [];
+        for(let value of filter.values) {
+          if(value.selected) {
+            selectedValues.push(value.id);
+          }
+        }
+        selected.set(filter.filterId, selectedValues);
       }
     }
     return selected;
@@ -437,31 +448,96 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   /*
     * Get A sub-array of this.refineFields array, which contains the ids of the selected parameters
     */
-  private getSelectedParameters(): string[] {
+  private getSelectedParameters(): Map<string, string[]> {
-    var selected: string[] = [];
+    var selected: Map<string, string[]> = new Map<string, string[]>();
     for (var i = 0; i < this.refineFields.length; i++) {
-      if (this.parameterNames.indexOf(this.refineFields[i]) != -1) {
+      let selectedValues: string[] = [];
-        selected.push(this.refineFields[i]);
+      let index = this.parameterNames.indexOf(this.refineFields[i]);
+      if (index != -1) {
+        for(let values of this.parameterValues[index]) {
+          let split = values.split('"');
+          for(let value of split) {
+            if(value != "" && value != ",") {
+              selectedValues.push(value);
+            }
+          }
+        }
+        selected.set(this.refineFields[i], selectedValues);
       }
     }
     return selected;
   }
-  
+
+  /*
+* Get A sub-array of this.staticFields array, which contains the ids of the selected filters
+*/
+  public getSelectedStaticFilters(): Map<string, string[]> {
+    var selected: Map<string, string[]> = new Map<string, string[]>();
+    var filters = this.URLCreatedStaticFilters;
+    for (var i = 0; i < filters.length; i++) {
+      var filter: Filter = filters[i];
+      if (filter.countSelectedValues > 0) {
+        let selectedValues: string[] = [];
+        for(let value of filter.values) {
+          if(value.selected) {
+            selectedValues.push(value.id);
+          }
+        }
+        selected.set(filter.filterId, selectedValues);
+      }
+    }
+    return selected;
+  }
+
+  /*
+    * Get A sub-array of this.staticFields array, which contains the ids of the selected parameters
+    */
+  private getSelectedStaticParameters(): Map<string, string[]> {
+    var selected: Map<string, string[]> = new Map<string, string[]>();
+    for (var i = 0; i < this.staticFields.length; i++) {
+      let selectedValues: string[] = [];
+      let index = this.parameterNames.indexOf(this.staticFields[i]);
+      if (index != -1) {
+        let split = this.parameterValues[index].split('"');
+        for(let value of split) {
+          if(value != "" && value != ",") {
+            selectedValues.push(value);
+          }
+        }
+        selected.set(this.staticFields[i], selectedValues);
+      }
+    }
+    return selected;
+  }
+
   /*
   * Get A sub-array of this.refineFields array, which hides hidden fields (e.g Funding level 0,1,2,..), and contains those that depend on another fields (e.g  Funding level 0 if Funder is selected )
   */
   public getFields(): string[] {
-    var selected_filters: string[] = this.getSelectedFilters();
+    var selected_filters: Map<string, string[]> = this.getSelectedFilters();
-    if (selected_filters.length == 0) {
+    if (selected_filters.size == 0) {
       selected_filters = this.getSelectedParameters();
     }
+
+    var selected_static_filters: Map<string, string[]> = this.getSelectedStaticFilters();
+    if (selected_static_filters.size == 0) {
+      selected_static_filters = this.getSelectedStaticParameters();
+    }
+
+    let all_selected_filters = new Map([...selected_filters, ...selected_static_filters]);
+    // let all_selected_filters = selected_filters.concat(selected_static_filters);
+
     var fields: string[] = [];
     for (var i = 0; i < this.refineFields.length; i++) {
       var dependentTo = this.searchFieldsHelper.DEPENDENT_FIELDS[this.refineFields[i]];
+      var dependentToValues = this.searchFieldsHelper.DEPENDENT_FIELDS_AND_VALUES[this.refineFields[i]];
       // TODO check again the checks
       //if filter is not marked as hidden OR it is hidden but it is dependent to a field that it IS selected
       if (this.searchFieldsHelper.HIDDEN_FIELDS.indexOf(this.refineFields[i]) == -1
-        || (selected_filters.indexOf(dependentTo) != -1) || (selected_filters.indexOf(this.refineFields[i]) != -1)
+        || (all_selected_filters.has(this.refineFields[i]))
+        || (!dependentTo && !dependentToValues)
+        || (all_selected_filters.has(dependentTo))
+        || (dependentToValues && (all_selected_filters.has(dependentToValues.field) && dependentToValues.values.some(dependentValue=> all_selected_filters.get(dependentToValues.field).includes(dependentValue))))
         || (this.resultTypes && this.resultTypes.filterId == dependentTo && this.resultTypes.countSelectedValues > 0)
         // || (this.resultAccesses && this.resultAccesses.filterId == dependentTo && this.resultAccesses.countSelectedValues > 0)
       ) {
@@ -490,8 +566,12 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   */
   public checkSelectedFilters(filters: Filter[]) {
     this.filters = filters;
-    if (this.customFilter && !this.customFilter.isHiddenFilter) {
+    if (this.customFilters) {
-      this.customFilter.selected = null;
+      for (let customFilter of this.customFilters) {
+        if (!customFilter.isHiddenFilter) {
+          customFilter.selected = null;
+        }
+      }
     }
     for (var i = 0; i < filters.length; i++) {
       var filter: Filter = filters[i];
@@ -507,8 +587,10 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
             
           }
         }
-        if (this.customFilter) {
+        if (this.customFilters) {
-          this.customFilter.selected = this.customFilter.queryFieldName == filter.filterId && values.indexOf(StringUtils.quote(this.customFilter.valueId)) != -1;
+          for (let customFilter of this.customFilters) {
+            customFilter.selected = customFilter.queryFieldName == filter.filterId && values.indexOf(StringUtils.quote(customFilter.valueId)) != -1;
+          }
         }
         // } else if (this.quickFilter && this.quickFilter.filterId == filter.filterId && this.quickFilter.selected) {
         //   for (let filterValue of filter.values) {
@@ -528,11 +610,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
       //   this.quickFilter.filter = filter;
       // }
     }
-    if (this.parameterNames.indexOf("cf") != -1 && this.parameterValues[this.parameterNames.indexOf("cf")] == "true") {
-      this.customFilter.selected = true;
-    } else if (this.customFilter && this.customFilter.selected == null) {
-      this.customFilter.selected = false;
-    }
     this.filterFilterValues(this.filters);
     if (!this.includeOnlyResultsAndFilter) {
       this.updateMeta(this.pageTitle);
@@ -634,7 +711,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
     this.staticFilters = filters;
     return filters;
   }
-  
+
   get existingFiltersWithValues() {
     if (this.filters.length == 0) {
       return 0;
@@ -709,7 +786,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
     }
     return this.selectedStaticFilters;
   }
-  
+
   private clearKeywords() {
     if (this.searchUtils.keyword.length > 0) {
       this.searchUtils.keyword = '';
@@ -720,10 +797,6 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   public removeFilter(value: Value, filter: Filter, forceRemove: boolean = false) {
     this.currentValueToRemove = value;
     this.currentFilterToRemove = filter;
-    if (!forceRemove && this.customFilter && this.customFilter.queryFieldName == filter.filterId && this.customFilter.valueId == value.id && this.customFilter.promptToAddFilter) {
-      this.openRemoveCustomFilterModal();
-      return;
-    }
     filter.countSelectedValues--;
     this.selectedFilters--;
     if (value.selected == true) {
@@ -737,20 +810,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
     // }
     this.goTo(1);
   }
-  
+
-  public openRemoveCustomFilterModal() {
-    this.removeCustomFilter.alertTitle = 'Remove filter';
-    this.removeCustomFilter.message = 'You are about to see results that are not related to ' + this.customFilter.valueName + '. Do you want to proceed?';
-    this.removeCustomFilter.okButtonText = 'Yes';
-    this.removeCustomFilter.cancelButtonText = 'No';
-    this.removeCustomFilter.open();
-  }
-  
-  closeCustomFilterModal() {
-    this.customFilterEnabled = false;
-    this.removeFilter(this.currentValueToRemove, this.currentFilterToRemove, true);
-  }
-  
   public removeRangeFilter(filter: RangeFilter) {
     filter.selectedFromValue = null;
     filter.selectedToValue = null;
@@ -781,7 +841,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   filterToggled($event) {
     this.filterRequestAll.emit($event)
   }
-  
+
   /**
    * if there is a change in the values of the quick filter, this function has to be run, to also update the quickFilter
    */
@@ -798,42 +858,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
       }
     }*/
   
-  /**
+
-   * Set selected the value of the custom filter.
-   */
-  addCustomFilter() {
-    this.customFilter.selected = true;
-    this.customFilterEnabled = true;
-    if (this.refineFields.indexOf(this.customFilter.queryFieldName) != -1) {
-      let found = false;
-      for (let filter of this.filters) {
-        if (this.customFilter.queryFieldName == filter.filterId) {
-          for (let value of filter.values) {
-            if (value.id == this.customFilter.valueId) {
-              value.selected = true;
-              filter.countSelectedValues++;
-              found = true;
-              break;
-            }
-          }
-          //add filter when field exist in refine but not in the refine values
-          if (!found) {
-            filter.countSelectedValues++;
-            filter.values.push({
-              selected: true,
-              name: this.customFilter.valueName,
-              id: this.customFilter.valueId,
-              number: 0
-            });
-          }
-          break;
-        }
-      }
-    }
-    this.filterChanged(null);
-    
-  }
-  
   // for loading
   public openLoading() {
     this.loading.open();
@@ -1219,9 +1244,16 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
       }
     }
 
-    this.customFilterEnabled = URLparams["cf"] == "true";
+    if (this.customFilters) {
-    if (this.customFilter && (this.customFilter.isHiddenFilter || this.customFilterEnabled)) {
+      for (let customFilter of this.customFilters) {
-      allFqs += "&fq=" + StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId)));
+        if (customFilter.isHiddenFilter) {
+          if(customFilter.customQuery){
+            allFqs += "&fq=" + StringUtils.URIEncode(customFilter.customQuery);
+          }else {
+            allFqs += "&fq=" + StringUtils.URIEncode(customFilter.queryFieldName + " exact " + StringUtils.quote((customFilter.valueId)));
+          }
+        }
+      }
     }
     
     /*    if (this.quickFilter && this.entityType == "result") {
@@ -1579,12 +1611,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
       this.parameterNames.push("keyword");
       this.parameterValues.push(this.searchUtils.keyword);
     }
-    
+
-    
-    if (this.customFilterEnabled) {
-      this.parameterNames.push("cf");
-      this.parameterValues.push("true");
-    }
     // if (this.searchUtils.size != this.resultsPerPage) {
     //   // allLimits += ((allLimits.length == 0) ? '?' : '&') + 'size=' + this.searchUtils.size;
     //   this.parameterNames.push("size");
@@ -1698,7 +1725,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
     //     }
     //   }
     // }
-    
+
     this.URLCreatedFilters = filters;
     this.URLCreatedStaticFilters = staticFilters;
   }
@@ -1812,14 +1839,45 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   }
 
   public prepareStaticFiltersToShow() {
-    this.staticFilters = RefineResultsUtils.parse(this.staticFieldValues, this.staticFields, this.entityType, "search", true);
+    var selected_filters: Map<string, string[]> = this.getSelectedFilters();
+    if (selected_filters.size == 0) {
+      selected_filters = this.getSelectedParameters();
+    }
+
+    var selected_static_filters: Map<string, string[]> = this.getSelectedStaticFilters();
+    if (selected_static_filters.size == 0) {
+      selected_static_filters = this.getSelectedStaticParameters();
+    }
+
+    let all_selected_filters = new Map([...selected_filters, ...selected_static_filters]);
+    // let all_selected_filters = selected_filters.concat(selected_static_filters);
+
+    let staticFields: string[] = [];
+
+    for (var i = 0; i < this.staticFields.length; i++) {
+      var dependentTo = this.searchFieldsHelper.DEPENDENT_FIELDS[this.staticFields[i]];
+      var dependentToValues = this.searchFieldsHelper.DEPENDENT_FIELDS_AND_VALUES[this.staticFields[i]];
+
+      // TODO check again the checks
+      //if filter is not marked as hidden OR it is hidden but it is dependent to a field that it IS selected
+      if (this.searchFieldsHelper.HIDDEN_FIELDS.indexOf(this.staticFields[i]) == -1
+        || (all_selected_filters.has(this.staticFields[i]))
+        || (!dependentTo && !dependentToValues)
+        || (all_selected_filters.has(dependentTo))
+        || (dependentToValues && (all_selected_filters.has(dependentToValues.field) && dependentToValues.values.some(dependentValue=> all_selected_filters.get(dependentToValues.field).includes(dependentValue))))
+      ) {
+        staticFields.push(this.staticFields[i]);
+      }
+    }
+
+    this.staticFilters = RefineResultsUtils.parse(this.staticFieldValues, staticFields, this.entityType, "search", true);
     this.checkSelectedStaticFilters(this.staticFilters);
     this.countSelectedStaticFilters(this.staticFilters);
     this.cdr.detectChanges();
 
     return this.staticFilters;
   }
-  
+
   /**
    * Used to set the variables and search page, and prepare it before the getResults query
    * @param fieldIds

searchPages/searchUtils/portal-search-result.component.less

@@ -1,5 +1,6 @@
-@import (reference) "~src/assets/openaire-theme/less/color.less";
 @import (reference) "~src/assets/openaire-theme/less/_import-variables.less";
+@import (optional) "~src/assets/extend-theme/less/_import-variables.less";
+
 
 .setType(@color, @position: left) {
   border-@{position}: 4px solid fade(@color, 30%);

searchPages/searchUtils/searchDownload.component.ts

@@ -14,12 +14,13 @@ import {properties} from "../../../../environments/environment";
 @Component({
   selector: 'search-download',
   template: `
-      <button [attr.uk-tooltip]="'title: Download' + ((totalResults > csvLimit)?' the first 2000 ':' ') + 'results;'"
+      <button [attr.uk-tooltip]="'title: Download' + ((totalResults > csvLimit)?' the first 2000 ':' ') + 'results.' + 
+      ((totalResults > csvLimit && properties.zenodoDumpUrl)?' To get all results download the data dump. ':' ') "
               class="uk-button uk-button-link uk-flex uk-flex-middle" [class.uk-disabled]="isDisabled"
               [disabled]="isDisabled"
               (click)="downloadfile(downloadURLAPI+'?format=csv'+csvParams,type+'-report-'+((totalResults > csvLimit)?'2000 ':totalResults))">
           <icon name="download" [flex]="true"></icon>
-          <span class="uk-margin-small-left">Download Results</span>
+          <span class="uk-margin-xsmall-left">Download Results</span>
       </button>
       <modal-loading></modal-loading>
       <modal-alert #AlertModalCsvError></modal-alert>

searchPages/searchUtils/searchFilter.component.html

@@ -1,9 +1,35 @@
 <div *ngIf="filter.values.length >0">
-  <div class="uk-flex uk-flex-middle uk-margin-bottom">
+  <div *ngIf="!grouped else groupedTitle" class="uk-flex uk-flex-middle uk-margin-bottom">
     <h6 [title]="filter.title" class="uk-margin-remove-bottom">{{_formatTitle(filter.title, filter.values.length)}}</h6>
     <a *ngIf="filter.countSelectedValues>0" class="uk-text-small uk-margin-left" (click)="clearFilter()" [class.uk-disabled]="isDisabled">Clear</a>
   </div>
-  <div>
+  <ng-template #groupedTitle>
+    <div class="uk-flex uk-flex-middle uk-margin-small-bottom">
+      <div [title]="filter.title" class="uk-margin-remove-bottom uk-text-meta">{{_formatTitle(filter.title, filter.values.length)}}</div>
+      <a *ngIf="filter.countSelectedValues>0" class="uk-text-small uk-margin-left" (click)="clearFilter()" [class.uk-disabled]="isDisabled">Clear</a>
+    </div>
+  </ng-template>
+
+  <div *ngIf="filter.type && filter.type == 'triplet'">
+    <span>
+      <mat-button-toggle-group [name]="filter.title" [aria-label]="filter.title" class="uk-text-xsmall"
+                               [(ngModel)]="filter.radioValue" (ngModelChange)="tripletFilterChange()" [disabled]="isDisabled">
+        <mat-button-toggle *ngFor="let value of filter.values" [value]="value.id" class="filter-button-toggle">
+          <div style="width: 50px">{{value.name}}</div>
+        </mat-button-toggle>
+<!--        <ng-container *ngFor="let value of filter.values">-->
+<!--          <mat-button-toggle value="true">-->
+<!--            {{filter.title}}-->
+<!--          </mat-button-toggle>-->
+<!--          <mat-button-toggle value="false">-->
+<!--            Not {{filter.title}}-->
+<!--          </mat-button-toggle>-->
+<!--        </ng-container>-->
+      </mat-button-toggle-group>
+    </span>
+  </div>
+
+  <div *ngIf="!filter.type || filter.type != 'triplet'">
     <div *ngFor="let value of getSelectedAndTopValues(filter, filterValuesNum)"
          class="uk-animation-fade uk-text-small uk-margin-small-bottom">
       <div [title]="value.name">
@@ -12,10 +38,10 @@
     </div>
     <div *ngIf="addShowMore && hasMoreValues">
       <a  *ngIf="filterValuesNum > 0 " class="uk-text-small view-more-less-link uk-margin-small-top" [ngClass]="((isDisabled)?'uk-disabled uk-link-muted ':'')" (click)="toggle($event)">
-        <span *ngIf="!filter.isOpen">View all</span>
+        <span *ngIf="!filter.isViewAllOpen">View all</span>
-        <span *ngIf="filter.isOpen">View less </span>
+        <span *ngIf="filter.isViewAllOpen">View less </span>
       </a>
-      <div *ngIf="filter.isOpen" class="uk-text-small uk-margin-small-top uk-margin-small-bottom">
+      <div *ngIf="filter.isViewAllOpen" class="uk-text-small uk-margin-small-top uk-margin-small-bottom">
         <div *ngIf="filter.countAllValues == -1">
           <loading class="uk-height-small uk-display-block" size="medium"></loading>
         </div>
@@ -49,6 +75,67 @@
     </div>
   </div>
 </div>
+
+
+
+
+<!--<ul *ngIf="filter.values.length >0" class="uk-accordion">-->
+<!--  <li (click)="filter.isOpen = !filter.isOpen" [class]="filter.isOpen ? 'uk-open' : ''">-->
+<!--    <a class="uk-accordion-title">-->
+<!--      {{filter.isOpen}}-->
+<!--      <span>{{_formatTitle(filter.title, filter.values.length)}}</span>-->
+<!--      <span *ngIf="filter.countSelectedValues>0" class="uk-margin-left">{{filter.countSelectedValues}}</span>-->
+<!--    </a>-->
+<!--    <div *ngIf="filter.isOpen" class="uk-accordion-content">-->
+<!--      <div *ngFor="let value of getSelectedAndTopValues(filter, filterValuesNum)"-->
+<!--           class="uk-animation-fade uk-text-small uk-margin-small-bottom">-->
+<!--        <div [title]="value.name">-->
+<!--          <ng-container *ngTemplateOutlet="input_label_wrapper; context: {filter: filter, value: value}"></ng-container>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div *ngIf="addShowMore && hasMoreValues">-->
+<!--        <a  *ngIf="filterValuesNum > 0 " class="uk-text-small view-more-less-link uk-margin-small-top" [ngClass]="((isDisabled)?'uk-disabled uk-link-muted ':'')" (click)="toggle($event)">-->
+<!--          <span *ngIf="!filter.isViewAllOpen">View all</span>-->
+<!--          <span *ngIf="filter.isViewAllOpen">View less </span>-->
+<!--        </a>-->
+<!--        <div *ngIf="filter.isViewAllOpen" class="uk-text-small uk-margin-small-top uk-margin-small-bottom">-->
+<!--          <div *ngIf="filter.countAllValues == -1">-->
+<!--            <loading class="uk-height-small uk-display-block" size="medium"></loading>-->
+<!--          </div>-->
+<!--          <div *ngIf="filter.countAllValues == 0">-->
+<!--            <span class="uk-text-warning">An error occured. </span><span><a class="uk-button-link" (click)="toggleWithoutUpdate()">Please try again</a>.</span>-->
+<!--          </div>-->
+<!--          <ng-container *ngIf="(!filter.countAllValues && filter.countAllValues != 0) || filter.countAllValues > 0">-->
+<!--            <div class="uk-margin-small-left">-->
+<!--              <div class="uk-text-meta">Top 100 values are shown in the filters</div>-->
+<!--              <div class="uk-flex uk-flex-bottom uk-margin-top">-->
+<!--                <div input class="uk-width-1-2@m uk-margin-right" [placeholder]="{label: 'Search', static: true}" inputClass="inner small" [(value)]="keyword" (valueChange)="initMatching()"></div>-->
+<!--                <div *ngIf="showResultCount === true" input type="select" class="uk-width-expand" placeholder="Sort by"-->
+<!--                     inputClass="border-bottom" [(value)]="sortBy" [options]="sortByOptions" (valueChange)="sort()"></div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="uk-overflow-auto uk-height-max-small uk-margin-small-left uk-margin-small-right uk-margin-top">-->
+<!--              <ng-container *ngFor="let value of this.sortedValues">-->
+<!--                <div *ngIf="filterKeywords(value.name)" title="{{value.name}}"-->
+<!--                     class="uk-animation-fade uk-text-small">-->
+<!--                  <ng-container *ngTemplateOutlet="input_label_wrapper; context: {filter: filter, value: value}"></ng-container>-->
+<!--                </div>-->
+<!--              </ng-container>-->
+<!--              <ng-container *ngIf="!hasMatch">-->
+<!--                <div class="uk-padding-small uk-text-meta">-->
+<!--                  No filters available with that term-->
+<!--                </div>-->
+<!--              </ng-container>-->
+<!--            </div>-->
+<!--          </ng-container>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--  </li>-->
+<!--</ul>-->
+
+
+
 <ng-template #input_label let-filter="filter" let-value="value">
   <span *ngIf="filter.filterType == 'checkbox' || filter.filterType == 'radio'" class="uk-flex uk-flex-middle"
         [class.uk-disabled]="isDisabled || (showResultCount && value.number === 0)">
@@ -65,7 +152,7 @@
          {{value.name=='true'?'Yes':'No'}}
         </span>
           <ng-template  #noboolean>
-          {{_formatName(value)}}
+            <span class="uk-text-capitalize">{{_formatName(value)}} </span>
           </ng-template>
 
       <span *ngIf="showResultCount">({{value.number|number}})</span>

searchPages/searchUtils/searchFilter.component.ts

@@ -43,9 +43,10 @@ export class SearchFilterComponent implements OnInit, OnChanges {
   @Input() actionRoute: boolean = false;
   @Input() quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string };
   sub;
-  @Input() isOpen: boolean = false;
+  // @Input() isViewAllOpen: boolean = false;
   sortedValues;
   hasMatch: boolean = false;
+  @Input() grouped: boolean = false;
 
   constructor(private _router: Router,
               private route: ActivatedRoute,
@@ -60,11 +61,11 @@ export class SearchFilterComponent implements OnInit, OnChanges {
   
   ngOnInit() {
     if(this.filterValuesNum == 0){
-      this.filter.isOpen = true;
+      this.filter.isViewAllOpen = true;
       this.sortBy = "num";
     }
     // else{
-    //   this.filter.isOpen = false;
+    //   this.filter.isViewAllOpen = false;
     // }
     this.sub = this.route.queryParams.subscribe(params => {
       this.queryParams = Object.assign({}, params);
@@ -90,7 +91,7 @@ export class SearchFilterComponent implements OnInit, OnChanges {
       //   && value.name.toLowerCase() != "null"
       // );
 
-      if (this.filter.filterType == "radio") {
+      if (this.filter.filterType == "radio" || this.filter.filterType == "triplet") {
         this.filter.radioValue = "";
         this.filter.values.forEach(value => {
           if (value.selected) {
@@ -164,6 +165,20 @@ export class SearchFilterComponent implements OnInit, OnChanges {
       value: this.filter
     });
   }
+
+  tripletFilterChange() {
+    if(this.filter.radioValue == "") {
+      this.clearFilter();
+    } else {
+      this.filter.countSelectedValues = 1;
+      this.filter.values.forEach(value => {
+        value.selected = (value.id == this.filter.radioValue);
+      });
+      this.onFilterChange.emit({
+        value: this.filter
+      });
+    }
+  }
   
   clearFilter() {
     for (var i = 0; i < this.filter.values.length; i++) {
@@ -274,7 +289,7 @@ export class SearchFilterComponent implements OnInit, OnChanges {
   }
   
   toggle(event) {
-    this.filter.isOpen = !this.filter.isOpen;
+    this.filter.isViewAllOpen = !this.filter.isViewAllOpen;
     event.stopPropagation();
     this.toggleWithoutUpdate();
   }
@@ -283,7 +298,7 @@ export class SearchFilterComponent implements OnInit, OnChanges {
     if(this.filter.countAllValues == 0) {
       this.filter.countAllValues = -1;  // if request failed, try again automatically if toggled again
     }
-    if(this.filter.isOpen && this.filter.countAllValues < 0) {
+    if(this.filter.isViewAllOpen && this.filter.countAllValues < 0) {
       this.onFilterToggle.emit(this.filter);
     }
   }

searchPages/searchUtils/searchFilter.module.ts

@@ -9,11 +9,12 @@ import {RouterModule} from "@angular/router";
 import {InputModule} from '../../sharedComponents/input/input.module';
 import {IconsModule} from "../../utils/icons/icons.module";
 import {LoadingModule} from "../../utils/loading/loading.module";
+import {MatButtonToggleModule} from "@angular/material/button-toggle";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, ModalModule, RouterModule,
-    InputModule, IconsModule, LoadingModule
+    InputModule, IconsModule, LoadingModule, MatButtonToggleModule
   ],
   declarations: [
     SearchFilterComponent, SearchFilterModalComponent

searchPages/searchUtils/searchHelperClasses.class.ts

@@ -12,7 +12,8 @@ export class Filter{
     public radioValue?: string = "";
 //    public uniqueValueIdSelected: string;
     public countAllValues?: number = -1; // -1: not yet requested, 0: request failed, >0 OK
-    public isOpen?: boolean = false;
+    // public isOpen?: boolean = false;
+    public isViewAllOpen?: boolean = false;
     public countUnfilteredValues?: number = 0;
 }
 

searchPages/searchUtils/searchUtils.class.ts

@@ -27,18 +27,20 @@ export class SearchCustomFilter{
  valueName:string; // Greece
  isHiddenFilter:boolean;
  selected:boolean;
- promptToAddFilter:boolean;
+ showFilterMessage:boolean;
- constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string ){
+ customQuery:string;
+ constructor( fieldName:string, queryFieldName:string, valueId:string, valueName:string, showFilterMessage:boolean = true, customQuery =  null ){
    if(valueId == "test" && properties.environment == "development"){
      valueId = "covid-19";
    }
+   this.showFilterMessage = showFilterMessage;
    this.isHiddenFilter = true;
    this.fieldName = fieldName;
    this.queryFieldName = queryFieldName;
    this.valueId = valueId;
    this.valueName = valueName;
    this.selected = null;
-   this.promptToAddFilter = false;
+   this.customQuery = customQuery;
  }
 
  public getParameters(params={}){

services/searchDataproviders.service.ts

@@ -6,6 +6,7 @@ import {StringUtils} from '../utils/string-utils.class';
 import{EnvProperties} from '../utils/properties/env-properties';
 import {map} from "rxjs/operators";
 import {ParsingFunctions} from "../landingPages/landing-utils/parsingFunctions.class";
+import {properties} from '../../../environments/environment';
 
 @Injectable()
 export class SearchDataprovidersService {
@@ -116,7 +117,7 @@ export class SearchDataprovidersService {
             } else {
               result['englishname'] = "";
             }
-
+            result['originalId'] = resData.originalId;
             //result['title'].url = OpenaireProperties.getsearchLinkToDataProvider();
             //result['title'].url += Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
             result['id'] = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
@@ -289,4 +290,11 @@ export class SearchDataprovidersService {
     return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
       .pipe(map(res => res['meta']['total']));
   }
+
+  searchDataproviderById(id: string):any {
+    let url = properties.searchAPIURLLAst + "datasources/" + id + '?format=json';
+
+    return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+    .pipe(map(res => this.parseResults(res)));
+  }
 }

services/searchResearchResults.service.ts

@@ -426,7 +426,21 @@ export class SearchResearchResultsService {
       result.hostedBy_collectedFrom = this.parsingFunctions.addPublisherToHostedBy_collectedFrom(
         result.hostedBy_collectedFrom, result.publisher,
         result['journal']?result['journal'].journal:null, result.identifiers);
-      
+
+
+      if(resData.hasOwnProperty("publiclyfunded") && resData.publiclyfunded) {
+        result.publiclyFunded = resData.publiclyfunded;
+      }
+      if((resData.hasOwnProperty("isgreen") && resData.isgreen)
+        || (resData.hasOwnProperty("openaccesscolor") && resData.openaccesscolor)
+        || (resData.hasOwnProperty("isindiamondjournal") && resData.isindiamondjournal)) {
+        result.oaRoutes = {
+          "green": resData.isgreen,
+          "oaColor": resData.openaccesscolor,
+          "isInDiamondJournal":resData.isindiamondjournal
+        };
+      }
+
       results.push(result);
     }
     return results;
@@ -598,4 +612,9 @@ export class SearchResearchResultsService {
     return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
         .pipe(map(res => res['meta']['total']));
   }
+  fetchByDOIs(DOIs:string[],query:string): any {
+    let url = properties.searchAPIURLLAst + "/researchProducts/byDoi?type=publications" + (query?query:"");
+    return this.http.post(url, {doiArray: DOIs})
+      .pipe(map(res => [res['meta'].total, this.parseResults("result", res['results'], properties), RefineResultsUtils.parse(res['refineResults'], null, "publication")]));
+  }
 }

services/user-management.service.ts

@@ -7,13 +7,18 @@ import {properties} from "../../../environments/environment";
 import {StringUtils} from "../utils/string-utils.class";
 import {CustomOptions} from "./servicesUtils/customOptions.class";
 import {AdvancedAsyncSubject} from "../utils/AdvancedAsyncSubject";
+import {isArray} from "rxjs/internal-compatibility";
 
 @Injectable({
   providedIn: 'root'
 })
 export class UserManagementService {
   private readonly getUserInfoSubject: AdvancedAsyncSubject<User> = new AdvancedAsyncSubject<User>();
+  private static LOGIN = 'openid_connect_login';
+  private static LOGOUT: string = 'openid_logout';
+  private static USERINFO: string = 'userInfo';
   public fixRedirectURL: string = null;
+  public allowDoubleRedirectToFixAndCurrentPage: boolean = false;
   private redirectUrl: string = null;
   private subscription;
   private readonly routerSubscription;
@@ -38,11 +43,17 @@ export class UserManagementService {
   public getUserInfo(): Observable<User> {
     return this.getUserInfoSubject.asObservable();
   }
-  
+
-  public updateUserInfo(resolve: Function = null) {
+  public getUserInfoAt(index = 0): Observable<User> {
-    this.subscription = this.http.get<User>(properties.userInfoUrl, CustomOptions.registryOptions()).pipe(map(userInfo => {
+    return this.http.get<User>((isArray(properties.loginServiceURL)?properties.loginServiceURL[index]:properties.loginServiceURL) +
+        UserManagementService.USERINFO, CustomOptions.registryOptions()).pipe(map(userInfo => {
       return new User(userInfo);
-    })).subscribe(user => {
+    }))
+  }
+
+
+  public updateUserInfo(resolve: Function = null) {
+    this.subscription = this.getUserInfoAt().subscribe(user => {
       this.getUserInfoSubject.next(user);
       if (resolve) {
         resolve();
@@ -55,8 +66,9 @@ export class UserManagementService {
     });
   }
 
-  public setRedirectUrl(url: string = null) {
+  public setRedirectUrl(redirectTo: string | string [] = null) {
-    if (url) {
+    let urls = Array.isArray(redirectTo)?redirectTo:(redirectTo?[redirectTo]:[])
+    for(let url of urls) {
       let parts = url.split('?');
       let path = properties.baseLink + parts[0];
       let params = null;
@@ -74,24 +86,47 @@ export class UserManagementService {
         Session.setReloadUrl(location.protocol + "//" + location.host, path, params, fragment);
       }
       this.redirectUrl = StringUtils.URIEncode(location.protocol + "//" + location.host + this.fixRedirectURL);
-    } else {
+    }
+      if(urls.length == 0){
       this.redirectUrl = StringUtils.URIEncode(location.href);
       Session.setReloadUrl(location.protocol + "//" + location.host, location.pathname, location.search, location.hash);
     }
   }
   
-  public login() {
+  public login(redirect: string = null) {
-    if (this.fixRedirectURL) {
+    Session.clearReloadUrl();
-      this.setRedirectUrl(this.fixRedirectURL);
+    if(redirect) {
+      this.redirectUrl = redirect;
+    } else if (this.fixRedirectURL) {
+      this.setRedirectUrl(this.allowDoubleRedirectToFixAndCurrentPage?[this.fixRedirectURL,location.href.split(location.host)[1]]:this.fixRedirectURL);
     } else {
       this.setRedirectUrl();
     }
-    window.location.href = properties.loginUrl + "?redirect=" + this.redirectUrl;
+    let loginURL: string | string[] = isArray(properties.loginServiceURL)?properties.loginServiceURL.map(url => url + UserManagementService.LOGIN):(properties.loginServiceURL + UserManagementService.LOGIN);
+    window.location.href = this.setURL(loginURL) + this.redirectUrl;
   }
-  
+
   public logout() {
+    Session.clearReloadUrl();
     this.setRedirectUrl();
     Session.removeUser();
-    window.location.href = properties.logoutUrl + "?redirect=" + this.redirectUrl;
+    let logoutURL: string | string[] = isArray(properties.loginServiceURL)?properties.loginServiceURL.map(url => url + UserManagementService.LOGOUT):(properties.loginServiceURL + UserManagementService.LOGOUT);
+    window.location.href = this.setURL(logoutURL) + this.redirectUrl;
+  }
+
+  setURL(url: string | string[]) {
+    if(isArray(url)) {
+      let redirectURL = '';
+      url.forEach((url, index) => {
+        if(index === 0) {
+          redirectURL = url + "?redirect=";
+        } else {
+          redirectURL += encodeURIComponent(url + "?redirect=");
+        }
+      });
+      return redirectURL;
+    } else {
+      return url + "?redirect=";
+    }
   }
 }

services/user-registry.service.ts

@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {HttpClient, HttpErrorResponse} from '@angular/common/http';
+import {HttpClient} from '@angular/common/http';
 import {Observable} from 'rxjs';
 import {properties} from '../../../environments/environment';
 import {CustomOptions} from './servicesUtils/customOptions.class';
@@ -58,9 +58,9 @@ export class UserRegistryService {
     return this.http.delete<any>(properties.registryUrl + 'verification/' + id, CustomOptions.registryOptions());
   }
 
-  public getActive(type: string, id: string, role: "member" | "manager" = "manager"): Observable<any[]> {
+  public getActive(type: string, id: string, role: "member" | "manager" = "manager", admin = false): Observable<any[]> {
     let url = properties.registryUrl + Role.GROUP + type + '/' + id + "/" + role + 's';
-    return this.http.get<any>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url,
+    return this.http.get<any>((properties.useCache && !admin) ? (properties.cacheUrl + encodeURIComponent(url)) : url,
       CustomOptions.registryOptions()).pipe(map((response:any) => response.response), map(users => {
         if(users.length > 0 && !users[0].email) {
           return [];
@@ -69,10 +69,10 @@ export class UserRegistryService {
         }
     }));
   }
-  
+
-  public getPending(type: string, id: string, role: "member" | "manager" = "manager"): Observable<any[]> {
+  public getPending(type: string, id: string, role: "member" | "manager" = "manager", admin = false): Observable<any[]> {
     let url = properties.registryUrl + 'invite/' + Role.GROUP + type + '/' +id + "/" + role + 's/';
-    return this.http.get<any>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url,
+    return this.http.get<any>((properties.useCache && !admin) ? (properties.cacheUrl + encodeURIComponent(url)) : url,
       CustomOptions.registryOptions()).pipe(map((response: any) => response.response));
   }
   

services/userProfile.service.ts

@@ -0,0 +1,70 @@
+import {Injectable} from "@angular/core";
+import {HttpClient} from "@angular/common/http";
+import {Observable} from "rxjs";
+import {EnvProperties} from "../utils/properties/env-properties";
+import {CustomOptions} from "./servicesUtils/customOptions.class";
+import {AdvancedAsyncSubject} from "../utils/AdvancedAsyncSubject";
+import {properties} from "../../../environments/environment";
+import {map} from "rxjs/operators";
+
+export class UserProfile{
+  id:string;
+  aaiId:string;
+  consent:boolean = false;
+  constructor(consent:boolean) {
+    this.consent = consent;
+  }
+}
+
+@Injectable({
+  providedIn: "root"
+})
+export class UserProfileService {
+  private subscription;
+  private readonly userProfileSubject: AdvancedAsyncSubject<UserProfile> = new AdvancedAsyncSubject<UserProfile>();
+  constructor(private http: HttpClient) {
+  }
+
+  clearSubscriptions() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
+
+  }
+
+  public get user(): UserProfile {
+    return this.userProfileSubject.getValue();
+  }
+
+  public getUserProfile(): Observable<UserProfile> {
+    return this.userProfileSubject.asObservable();
+  }
+
+  public setUserProfile(userProfile:UserProfile) {
+    this.userProfileSubject.next(userProfile?userProfile:new UserProfile(false));
+  }
+  public initUserProfile(resolve: Function = null) {
+
+    this.subscription = this.http.get<UserProfile>(properties.monitorServiceAPIURL + 'user', CustomOptions.registryOptions()).pipe(map(userProfile => {
+      return userProfile;
+    })).subscribe(user => {
+      this.userProfileSubject.next(user);
+      if (resolve) {
+        resolve();
+      }
+    }, error => {
+      this.userProfileSubject.next(new UserProfile(false));
+      if (resolve) {
+        resolve();
+      }
+    });
+  }
+
+  saveConsentInUserProfile(properties:EnvProperties): Observable<UserProfile> {
+    return this.http.post<UserProfile>(properties.monitorServiceAPIURL + 'user/save', new UserProfile(true), CustomOptions.registryOptions(),);
+  }
+  undoConsentInUserProfile(properties:EnvProperties): Observable<UserProfile> {
+    return this.http.post<UserProfile>(properties.monitorServiceAPIURL + 'user/save', new UserProfile(false), CustomOptions.registryOptions(),);
+  }
+
+}

shared/customFilter.service.ts

@@ -0,0 +1,56 @@
+import {Injectable} from "@angular/core";
+import {HttpClient} from "@angular/common/http";
+import {BehaviorSubject, from, Observable, Subscriber} from "rxjs";
+import {SearchCustomFilter} from "../searchPages/searchUtils/searchUtils.class";
+
+
+@Injectable({
+  providedIn: "root"
+})
+export class CustomFilterService {
+
+  private customFilterSubject: BehaviorSubject<SearchCustomFilter[]> = null;
+  private promise: Promise<void>;
+  private sub;
+
+  constructor(private http: HttpClient) {
+    this.customFilterSubject = new BehaviorSubject<SearchCustomFilter[]>(null);
+  }
+
+  ngOnDestroy() {
+    this.clearSubscriptions();
+  }
+
+  clearSubscriptions() {
+    if (this.sub instanceof Subscriber) {
+      this.sub.unsubscribe();
+    }
+  }
+
+  async getCustomFilterAsync() {
+    if (this.promise) {
+      await this.promise;
+      this.promise = null;
+    }
+    this.clearSubscriptions();
+    return this.customFilterSubject.getValue();
+  }
+
+ 
+  getCustomFilterAsObservable(): Observable<SearchCustomFilter[]> {
+    return this.customFilterSubject.asObservable();
+  }
+
+  setCustomFilter(customFilters: SearchCustomFilter[]) {
+    this.customFilterSubject.next(customFilters);
+  }
+/*
+  static getDefaultFilters(){
+    let defaultFilters = new Map<string, SearchCustomFilter[]>();
+    defaultFilters.set("result",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]);
+    defaultFilters.set("project",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]);
+    defaultFilters.set("organization",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]);
+    defaultFilters.set("datasource",[new SearchCustomFilter("National", "country", "IE", "Irish National Monitor")]);
+    return defaultFilters;
+  }*/
+}

sharedComponents/SEO/SEO.service.ts

@@ -2,7 +2,9 @@ import { Injectable, Inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import {  Optional, RendererFactory2, ViewEncapsulation } from '@angular/core';
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class SEOService {
    constructor( @Inject(DOCUMENT) private doc,
    private rendererFactory: RendererFactory2,

sharedComponents/base/base.component.ts

@@ -0,0 +1,112 @@
+import {Directive, OnDestroy} from "@angular/core";
+import {BehaviorSubject, Subscriber} from "rxjs";
+import {EnvProperties} from "../../utils/properties/env-properties";
+import {properties} from "src/environments/environment";
+import {PiwikService} from "../../utils/piwik/piwik.service";
+import {Meta, Title} from "@angular/platform-browser";
+import {SEOService} from "../SEO/SEO.service";
+import {ActivatedRoute, Data, NavigationEnd, Params, Router} from "@angular/router";
+import {StringUtils} from "../../utils/string-utils.class";
+import {RouterHelper} from "../../utils/routerHelper.class";
+
+@Directive()
+export abstract class BaseComponent implements OnDestroy {
+  public properties: EnvProperties = properties;
+  /** Router params */
+  protected paramsResolved: boolean = false;
+  protected params: BehaviorSubject<Params>;
+  protected data: BehaviorSubject<Data>;
+  protected subscriptions: any[] = [];
+  /** Metadata */
+  public title: string;
+  public description: string;
+  public url: string;
+  protected _route: ActivatedRoute;
+  protected _piwikService: PiwikService;
+  protected _meta: Meta;
+  protected seoService: SEOService;
+  protected _title: Title;
+  protected _router: Router;
+  public routerHelper: RouterHelper = new RouterHelper();
+
+  protected constructor() {
+  }
+
+  ngOnDestroy() {
+    this.subscriptions.forEach(subscription => {
+      if (subscription instanceof Subscriber) {
+        subscription.unsubscribe()
+      } else if (subscription instanceof Function) {
+        subscription();
+      } else if (typeof IntersectionObserver !== 'undefined' && subscription instanceof IntersectionObserver) {
+        subscription.disconnect();
+      } else if (typeof ResizeObserver !== 'undefined' && subscription instanceof ResizeObserver) {
+        subscription.disconnect();
+      }
+    });
+  }
+
+  /**
+   * Initialize router params and data (should be called in the constructor of a component with router-outlet)
+   * */
+  initRouterParams(route: ActivatedRoute = null, navigationChange: ((event: NavigationEnd) => void) = null) {
+    if (route) {
+      this.params = new BehaviorSubject<Params>(null);
+      this.data = new BehaviorSubject<Data>(null);
+      this.subscriptions.push(this._router.events.subscribe(event => {
+        if (event instanceof NavigationEnd) {
+          if(navigationChange) {
+            navigationChange(event);
+          }
+          let r = route;
+          while (r.firstChild) {
+            r = r.firstChild;
+          }
+          let data = r.snapshot.data;
+          let params = r.snapshot.params;
+          let current = r.snapshot;
+          while (current.parent) {
+            data = {...current.parent.data, ...data};
+            params = {...current.parent.params, ...params};
+            current = current.parent;
+          }
+          r.snapshot.data = data;
+          r.snapshot.params = params;
+          this.paramsResolved = true;
+          this.params.next(r.snapshot.params);
+          this.data.next(r.snapshot.data);
+        }
+      }));
+    }
+  }
+
+  public setMetadata() {
+    if (this._title && this.title) {
+      this.title = (this._route?.snapshot.data?.title ? this._route.snapshot.data?.title : '') + this.title;
+      this._title.setTitle(this.title);
+    }
+    if (this._router) {
+      this.url = properties.domain + properties.baseLink + this._router.url;
+      if (this.seoService) {
+        this.seoService.createLinkForCanonicalURL(this.url, false);
+      }
+      if (this._meta) {
+        this._meta.updateTag({content: this.url}, "property='og:url'");
+        this._meta.updateTag({content: this.description}, "name='description'");
+        this._meta.updateTag({content: this.description}, "property='og:description'");
+        this._meta.updateTag({content: this.title}, "property='og:title'");
+      }
+    }
+    this.trackView();
+  }
+
+  public trackView() {
+    if (this._piwikService) {
+      this.subscriptions.push(this._piwikService.trackView(properties, this.title).subscribe());
+    }
+  }
+
+  public quote(str: string) {
+    return StringUtils.quote(str);
+  }
+}

sharedComponents/cookie-law/cookie-law.component.ts

@@ -66,7 +66,7 @@ export type CookieLawTarget = '_blank' | '_self';
 })
 export class CookieLawComponent implements OnInit {
   public cookieLawSeen: boolean;
-
+  @Input() cookieName = "cookieLawSeen";
   @Input('learnMore')
   get learnMore() { return this._learnMore; }
   set learnMore(value: string) {
@@ -109,10 +109,11 @@ export class CookieLawComponent implements OnInit {
     this.isSeenEvt = new EventEmitter<boolean>();
     this.animation = 'topIn';
     this._position = 'bottom';
-    this.cookieLawSeen = this._service.seen();
+
   }
 
   ngOnInit(): void {
+    this.cookieLawSeen = this._service.seen(this.cookieName);
     if (typeof document !== 'undefined') {
       this.animation = this.position === 'bottom' ? 'bottomIn' : 'topIn';
 
@@ -142,7 +143,7 @@ export class CookieLawComponent implements OnInit {
       evt.preventDefault();
     }
 
-    this._service.storeCookie();
+    this._service.storeCookie(this.cookieName);
     this.animation = this.position === 'top' ? 'topOut' : 'bottomOut';
   }
 }

sharedComponents/cookie-law/cookie-law.service.ts

@@ -12,12 +12,12 @@ import { Injectable } from '@angular/core';
 export class CookieLawService {
 
 
-  seen(): boolean {
+  seen(cookieName): boolean {
-    return this.cookieExists('cookieLawSeen');
+    return this.cookieExists(cookieName);
   }
 
-  storeCookie(): void {
+  storeCookie(cookieName): void {
-    return this.setCookie('cookieLawSeen');
+    return this.setCookie(cookieName);
   }
 
   /**

sharedComponents/input/input.component.ts

@@ -65,8 +65,6 @@ export interface ControlConfiguration {
 declare var UIkit;
 
 /**
- * WARNING! dashboard-input selector is @deprecated, use input instead
- *
  * Autocomplete soft allows values that are not listed in options list. In order to work as expected
  * avoid providing options with different label and value.
  *
@@ -478,7 +476,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang
 
   ngOnChanges(changes: SimpleChanges) {
     if (this.formControl) {
-      if (changes.value) {
+      if (changes.value && changes.value.currentValue !== changes.value.previousValue) {
         this.formControl.setValue(this.value);
       }
       if (changes.validators) {
@@ -826,6 +824,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang
 
   resetValue(event: any) {
     event.stopPropagation();
+    console.log(1)
     this.formControl.setValue('');
     this.focus(true, event);
   }

sharedComponents/navigationBar.component.html

@@ -12,9 +12,7 @@
         </div>
         <div *ngIf="!onlyTop || userMenu" class="uk-navbar-right" [class.uk-light]='activeHeader.darkBg'>
           <ng-container *ngIf="userMenu">
-            <user-mini [user]="user" mobileView=true
+            <user-mini [user]="user" mobileView=true [userMenuItems]=userMenuItems [notificationConfiguration]="notificationConfiguration"></user-mini>
-                       [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [notificationConfiguration]="notificationConfiguration"
-                       [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
           </ng-container>
         </div>
       </nav>
@@ -151,11 +149,15 @@
   <div id="main-menu" class="uk-visible@m">
     <div *ngIf="activeHeader" [class.uk-light]='activeHeader.darkBg'>
       <div class="uk-navbar-container" uk-sticky>
-        <div *ngIf="(properties.environment =='beta' || properties.environment =='development') && showLogo  && activeHeader.badge">
+        <a *ngIf="(properties.environment =='beta' || properties.environment =='development' || activeHeader.environmentBadge) && showLogo  && activeHeader.badge"
-          <img class="uk-position-top-left"
+           [routerLink]="activeHeader.environmentBadge?.routerLink?activeHeader.environmentBadge.routerLink:null" target="_blank">
+          <img *ngIf="!activeHeader.environmentBadge" class="uk-position-top-left"
                [src]="'assets/common-assets/'+(properties.environment =='beta'?'beta_flag.svg':'prototype_flag.svg')"
                alt="BETA" style="height: 65px; width: 65px; z-index: 1000">
-        </div>
+          <img *ngIf="activeHeader.environmentBadge" class="uk-position-top-left"
+               [src]="activeHeader.environmentBadge.asset" [alt]="properties.environment"
+               style="height: 75px; width: 75px; z-index: 1000">
+        </a>
         <div class="uk-container uk-container-expand">
           <nav class="uk-navbar" uk-navbar="delay-hide: 400">
             <ng-container *ngIf="!onlyTop">
@@ -192,9 +194,7 @@
                   </div>
                 </div>
 
-                <user-mini *ngIf="!searchMode && userMenu" [user]="user"
+                <user-mini *ngIf="!searchMode && userMenu" [user]="user" [userMenuItems]=userMenuItems></user-mini>
-                           [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl
-                           [cookieDomain]=properties.cookieDomain></user-mini>
                 <div class="uk-visible@m">
                   <ng-content select="[extra-m]"></ng-content>
                 </div>

sharedComponents/navigationBar.component.ts

@@ -24,6 +24,12 @@ import {RouterHelper} from "../utils/routerHelper.class";
 
 declare var UIkit;
 
+export interface Badge {
+  asset: string,
+  routerLink?: string,
+  external?: boolean
+}
+
 export interface Header {
   route?: string,
   url?: string,
@@ -33,6 +39,7 @@ export interface Header {
   logoInfo?: string,
   position: 'left' | 'center' | 'right',
   badge: boolean,
+  environmentBadge?: Badge,
   darkBg?: boolean,
   menuPosition?:  'center' | 'right',
   replaceHeader?: Header;

sharedComponents/tabs/slider-tab.component.ts

@@ -1,4 +1,5 @@
 import {Component, Input} from "@angular/core";
+import {ActivatedRoute} from "@angular/router";
 
 @Component({
   selector: 'slider-tab',
@@ -22,4 +23,6 @@ export class SliderTabComponent {
   @Input()
   public customClass: string = '';
   @Input() tabTemplate: any;
+  @Input()
+  public relativeTo: ActivatedRoute = null;
 }

sharedComponents/tabs/slider-tabs.component.ts

@@ -43,7 +43,7 @@ declare var UIkit;
           </ng-container>
           <ng-container *ngIf="type === 'dynamic'">
             <li *ngFor="let tab of leftTabs; let i=index;" [class.uk-active]="tab.active" [style.max-width]="(position === 'horizontal')?'50%':null">
-              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass"
+              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass" [relativeTo]="tab.relativeTo"
                  (click)="showActive(i)"
                  class="uk-text-capitalize uk-text-truncate uk-display-block">
                   <span *ngIf="tab.title">{{tab.title}}</span>
@@ -52,7 +52,7 @@ declare var UIkit;
             </li>
             <li *ngFor="let tab of rightTabs; let i=index;" [style.max-width]="(position === 'horizontal')?'50%':null" [class.uk-active]="tab.active"
                 [ngClass]="i === 0?'uk-flex-1 uk-flex uk-flex-right':''">
-              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass"
+              <a [routerLink]="tab.routerLink" [queryParams]="tab.queryParams" [ngClass]="tab.customClass" [relativeTo]="tab.relativeTo"
                  (click)="showActive(i)"
                  class="uk-text-capitalize uk-text-truncate uk-display-block">
                   <span *ngIf="tab.title">{{tab.title}}</span>

utils/email/composer.ts

@@ -94,6 +94,19 @@ export class Composer {
 		return email;
 	}
 
+  public static composeEmailforIrishMonitor(contactForm: any, admins: any): Email {
+    let email: Email = new Email();
+
+    email.subject = "National OA Monitor Ireland | " + contactForm.subject;
+    email.body = "<div style='font-size:" + this.noteBodySize + "'>"
+      + "<span><b>Name</b>: " + contactForm.name + "</span><br>"
+      + "<span><b>Email</b>: " + contactForm.email + "</span><br>"
+      + "<p>" + contactForm.message + "</p>"
+      + "</div>";
+    email.recipients = admins;
+    return email;
+  }
+
   public static composeEmailForDevelop(contactForm: any, admins: any, user: User): Email {
 		let email: Email = new Email();
 		email.subject = "OpenAIRE - Develop [" + properties.environment.toUpperCase() + "]";
@@ -317,6 +330,26 @@ export class Composer {
     return message;
   }
 
+  public static composeMessageForIrishDashboard(name: string, recipient: string, role: "manager" | "member") {
+    let email: Email = new Email();
+    email.subject = 'National Open Access Monitor Ireland | ' + name;
+    email.recipient = recipient;
+    email.body = '<p>Dear user,</p>' +
+        '<p>You have been invited to be a ' + role +' of the for the National Open Access Monitor, Ireland dashboard for the ' + name + '.</p>' +
+        '<p>Click <a href="((__link__))" target="_blank">this URL</a> and use the verification code below to accept the invitation.</p>' +
+        '<p>The verification code is <b>((__code__))</b>.</p>' +
+        '<p>At your first sign in you will be asked to accept and consent to the "OpenAIRE Personal Data Protection Policy and Consent Form" to be able to use the service.</p>' +
+        (role === "manager"?
+            '<p>As a manager of the National Open Access Monitor, Ireland, you will have access to the administration part of the dashboard, where you will be able to also invite other users to become managers.</p>':
+            '<p>As a member of the OpenAIRE Monitor Dashboard, you will have access to the restricted access areas of the profile for the ' + name + '.') +
+        '<p>Please contact us at <a href="mailto:' + properties.helpdeskEmail+'">' +  properties.helpdeskEmail +
+        '</a> if you have any questions or concerns.</p>' +
+        '<p>Kind Regards<br>The OpenAIRE Team</p>' +
+        '<p><a href="' + properties.domain + '" target="_blank">National Open Access Monitor, Ireland</a></p>';
+    return email;
+  }
+
+
   public static composeEmailForCommunityDashboard(name: string, role: "manager" | "member", recipient: string) {
     let email: Email = new Email();
     email.subject = 'OpenAIRE Connect | ' + name;

utils/entities/resultLandingInfo.ts

@@ -1,7 +1,7 @@
 import {
   Author,
   HostedByCollectedFrom,
-  Journal,
+  Journal, OARoutes,
   Organization,
   Project,
   RelationResult
@@ -95,6 +95,9 @@ export class ResultLandingInfo {
   fos: {"id": string, "label": string}[] = [];
   sdg: string[];
   eoscSubjects: any[];
+
+  oaRoutes: OARoutes;
+  publiclyFunded: boolean;
   
   // // percentage is for trust
   // relatedResearchResults: RelationResult[];

utils/entities/searchResult.ts

@@ -1,4 +1,12 @@
-import {Author, HostedByCollectedFrom, Journal, Organization, Project, ResultTitle} from "../result-preview/result-preview";
+import {
+  Author,
+  HostedByCollectedFrom,
+  Journal,
+  OARoutes,
+  Organization,
+  Project,
+  ResultTitle
+} from "../result-preview/result-preview";
 import {Measure, Metric} from "./resultLandingInfo";
 
 export class SearchResult {
@@ -61,11 +69,15 @@ export class SearchResult {
   compatibilityUNKNOWN: boolean;
   countries: string[];
   subjects: string[];
+  originalId: string;
 
   entityType: string;
   types: string[];
   enermapsId: string;
 
+  oaRoutes: OARoutes;
+  publiclyFunded: boolean;
+
   constructor() {
   }
 

utils/entity-actions/entity-actions.component.ts

@@ -180,7 +180,7 @@ export class EntityActionsComponent implements OnInit {
   isRouteAvailable(routeToCheck: string) {
     for (let i = 0; i < this.router.config.length; i++) {
       let routePath: string = this.router.config[i].path;
-      if (routePath == routeToCheck) {
+      if (routePath == routeToCheck || routeToCheck.split('/')[0] == routePath) {
         return true;
       }
     }

utils/icons/icons.component.ts

@@ -47,11 +47,13 @@ export interface StopRule {
 @Component({
   selector: 'icon',
   template: `
-    <span #svgIcon *ngIf="icon.data" class="uk-icon" [class.uk-preserve]="gradient || icon.preserveColor" [class.uk-flex]="flex" [ngClass]="customClass" [ngStyle]="style" [innerHTML]="icon.data | safeHtml"></span>
+    <ng-container *ngIf="icon">
-    <span *ngIf="!icon.data && icon.name" [class.uk-flex]="flex" [ngClass]="customClass" [class.uk-display-inline-block]="!flex">
+        <span #svgIcon *ngIf="icon.data" class="uk-icon" [class.uk-preserve]="gradient || icon.preserveColor" [class.uk-flex]="flex" [ngClass]="customClass" [ngStyle]="style" [innerHTML]="icon.data | safeHtml"></span>
-      <span class="material-icons" [ngClass]="type?type:icon.type" [ngStyle]="style">{{icon.name}}</span>
+        <span *ngIf="!icon.data && icon.name" [class.uk-flex]="flex" [ngClass]="customClass" [class.uk-display-inline-block]="!flex">
-    </span>
+          <span class="material-icons" [ngClass]="type?type:icon.type" [ngStyle]="style">{{icon.name}}</span>
-    <span *ngIf="visuallyHidden" class="visually-hidden">{{visuallyHidden}}</span>
+        </span>
+        <span *ngIf="visuallyHidden" class="visually-hidden">{{visuallyHidden}}</span>
+    </ng-container>
   `
 })
 export class IconsComponent implements AfterViewInit, OnChanges {
@@ -149,7 +151,7 @@ export class IconsComponent implements AfterViewInit, OnChanges {
   }
   
   initIcon() {
-    if(this.icon.data && this.svgIcon) {
+    if(this.icon?.data && this.svgIcon) {
       this.cdr.detectChanges();
       let svg: Element = this.svgIcon.nativeElement.getElementsByTagName('svg').item(0);
       if(!this.defaultSize && svg) {

utils/log/LogService.module.ts

@@ -0,0 +1,21 @@
+import { NgModule }            from '@angular/core';
+import { CommonModule }        from '@angular/common';
+import { FormsModule }         from '@angular/forms';
+import {LogService} from "./log.service";
+
+
+
+@NgModule({
+  imports: [
+    CommonModule, FormsModule,
+
+  ],
+  declarations: [
+
+  ],
+  providers: [ LogService ],
+  exports: [
+
+    ]
+})
+export class LogServiceModule { }

utils/log/log.service.ts

@@ -0,0 +1,56 @@
+import {HttpClient} from "@angular/common/http";
+import {EnvProperties} from '../properties/env-properties';
+import {Injectable} from "@angular/core";
+import {Observable} from "rxjs";
+
+export abstract class Log{
+  action: "link" | "orcid-link" | "upload-dois";
+  message:string;
+  protected constructor(action, message){
+    this.action =action;
+    this.message = message;
+  }
+}
+
+export class LinkLog extends Log{
+  constructor(sourceTitle,targetTitle) {
+    super("link","a user linked the \"" +sourceTitle+"\" " +   " to the \"" +targetTitle+"\" " );
+
+  }
+}
+
+export class OrcidLinkLog extends Log{
+  constructor( action:'added'|'removed', title: string, id: string) {
+    super("orcid-link","user with ORCID ID " + action + " research product "+ (title?"\"" + title+ "\"":"") + " (" + id + ") " + (action == 'added'?'to':'from')
+      + " their ORCID record.");
+  }
+
+}
+
+export class UploadLog extends Log{
+  constructor(dois:number) {
+    super("upload-dois","a user uploaded a list of " + dois +" DOIs to the Irish Monitor to check their presence and retrieve the Open Access types and additional key metadata");
+  }
+}
+
+@Injectable()
+export class LogService {
+  constructor(private http: HttpClient) {
+  }
+
+   logUploadDOIs(properties: EnvProperties, dois:number){
+     return this.http.post(properties.logServiceUrl+"logAction", new UploadLog(dois) );
+   }
+  logLink(properties: EnvProperties, sourceTitle,targetTitle){
+    return this.http.post(properties.logServiceUrl+"logAction", new LinkLog(sourceTitle, targetTitle) );
+  }
+  logOrcidLink(properties: EnvProperties,  action:'added'|'removed', title: string, doi: string){
+    return this.http.post(properties.logServiceUrl+"logAction", new OrcidLinkLog(action, title, doi) );
+  }
+  logRemoveOrcidLink(properties: EnvProperties,  code: string){
+    return this.http.post(properties.logServiceUrl+"logAction", new OrcidLinkLog('removed',null, code) );
+  }
+  getLogs(properties: EnvProperties):Observable<any>{
+    return this.http.get(properties.logServiceUrl+"log");
+  }
+}

utils/piwik/piwik.service.ts

@@ -8,7 +8,9 @@ import {ConfigurationService} from "../configuration/configuration.service";
 import {switchMap, take} from "rxjs/operators";
 
 
-@Injectable()
+@Injectable({
+  providedIn: 'root'
+})
 export class PiwikService {
   constructor(private http: HttpClient, private configurationService: ConfigurationService) {
   }
@@ -69,6 +71,22 @@ export class PiwikService {
 
   }
 
+  public doTrackEvent(properties: EnvProperties, title, siteId, pageURL, eventCategory, eventAction, eventName, eventValue = 0): Observable<any> {
+    let ua = this.getUserAgent();
+    let referrer = this.getReferrer();
+    let piwikId = ((siteId != null) ? siteId : properties.piwikSiteId);
+    if (typeof location !== 'undefined' && piwikId) {
+      var url =`${properties.piwikBaseUrl}${piwikId}&rec=1&url=${encodeURIComponent(pageURL)}&action_name=${encodeURIComponent(title)}&e_c=${encodeURIComponent(eventCategory)}&e_a=${encodeURIComponent(eventAction)}&e_n=${encodeURIComponent(eventName)}&e_v=${encodeURIComponent(eventValue)}`
+        +((ua != null && ua.length > 0) ? ('&ua=' + StringUtils.URIEncode(ua)) : '') +
+        ((referrer != null && referrer.length > 0) ? ('&urlref=' + StringUtils.URIEncode(referrer)) : '');
+      // console.log(trackingApiUrl)
+      console.log(url)
+      // return of(new Object()); // for testing
+
+      return this.http.get(url, {responseType: 'blob'});
+    }
+  }
+
   private getUserAgent() {
     if (typeof navigator !== 'undefined') {
       return navigator.userAgent;

utils/properties/env-properties.ts

@@ -1,6 +1,6 @@
 export type Environment = "development" | "test" | "beta" | "production";
-export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
+export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc" | "irish";
-export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc";
+export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "country";
 
 export interface EnvProperties {
   environment?: Environment;
@@ -57,10 +57,8 @@ export interface EnvProperties {
   vocabulariesAPI?: string;
   piwikBaseUrl?: string;
   piwikSiteId?: string;
-  loginUrl?: string;
+  loginServiceURL?: string | string[];
   registryUrl?: string;
-  logoutUrl?: string;
-  userInfoUrl?: string;
   developersApiUrl?: string,
   cookieDomain?: string;
   feedbackmail?: string;
@@ -83,6 +81,7 @@ export interface EnvProperties {
   baseLink?: string;
   baseOpenaireLink?: string;
   afterLoginRedirectLink?: string;
+  myClaimsLink?: string;
   searchLinkToResult?: string;
   searchLinkToPublication?: string;
   searchLinkToProject?: string;
@@ -145,6 +144,14 @@ export interface EnvProperties {
   eoscDataTransferLoginUrl?;
   eoscDataTransferDestinations?;
   hasMachineCache?: boolean;
+
+//  irish
+  logFilesPath?:string;
+  matomoLogFilesPath?:string;
+  logServiceUrl?:string;
+  zenodoDumpUrl?:string;
+  openOrgsUrl?:string;
+  orcidDiscoverLinksPage?:string;
 }
 
 export function checkPropertyValues(properties:EnvProperties){

utils/properties/environments/environment.ts

@@ -33,7 +33,8 @@ export let common: EnvProperties = {
   csvLimit: 2000,
   pagingLimit: 20,
   resultsPerPage: 10,
-  baseLink: "",
+  baseLink : "",
+  myClaimsLink: '/myclaims',
   searchLinkToResult: "/search/result?id=",
   searchLinkToPublication: "/search/publication?articleId=",
   searchLinkToProject: "/search/project?projectId=",
@@ -84,6 +85,7 @@ export let common: EnvProperties = {
   shareInZenodoPage: '/participate/deposit/zenodo',
   afterLoginRedirectLink: '/myCommunities',
   searchLinkToCommunities: '/search/find/communities',
+  openOrgsUrl:"https://beta.orgs.openaire.eu",
 }
 
 export let commonDev: EnvProperties = {
@@ -101,11 +103,9 @@ export let commonDev: EnvProperties = {
   orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/",
   orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?",
   orcidClientId: "APP-A5M3KTX6NCN67L91",
-  utilsService: "http://dl170.madgik.di.uoa.gr:8000",
+  utilsService: "http://mpagasas.di.uoa.gr:8000",
   vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
-  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
+  loginServiceURL: "http://mpagasas.di.uoa.gr:19080/login-service/",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
   cookieDomain: ".di.uoa.gr",
   feedbackmail: "kostis30fylloy@gmail.com",
   cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
@@ -123,7 +123,7 @@ export let commonDev: EnvProperties = {
   //connect
   communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities',
   registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-
+  reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
   //admin
   miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining',
   feedbackmailForMissingEntities: 'feedback@openaire.eu',
@@ -142,9 +142,7 @@ export let commonTest: EnvProperties = {
   csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
   utilsService: "https://explore.openaire.eu/utils-service",
   vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  loginUrl: " https://services.openaire.eu/login-service/openid_connect_login",
+  loginServiceURL: " https://services.openaire.eu/login-service/",
-  userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
   cacheUrl: "https://explore.openaire.eu/cache/get?url=",
   datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/",
   monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
@@ -173,9 +171,7 @@ export let commonBeta: EnvProperties = {
   csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
   utilsService: "https://demo.openaire.eu/utils-service",
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-  loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
+  loginServiceURL: "https://beta.services.openaire.eu/login-service/",
-  userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
   cacheUrl: "https://demo.openaire.eu/cache/get?url=",
   datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/",
   monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service",
@@ -214,9 +210,7 @@ export let commonProd: EnvProperties = {
   csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
   utilsService: "https://explore.openaire.eu/utils-service",
   vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  loginUrl: " https://services.openaire.eu/login-service/openid_connect_login",
+  loginServiceURL: "https://services.openaire.eu/login-service/",
-  userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
   cacheUrl: "https://explore.openaire.eu/cache/get?url=",
   datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/",
   monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
@@ -240,6 +234,9 @@ export let commonProd: EnvProperties = {
   deleteCacheUrl: 'https://explore.openaire.eu/cache/clear',
   deleteBrowserCacheUrl: 'https://services.openaire.eu/uoa-admin-tools/cache',
   connectPortalUrl: 'https://connect.openaire.eu',
+
+  //irish
+  openOrgsUrl:"https://orgs.openaire.eu"
 }
 
 

utils/properties/searchFields.base.ts

@@ -293,6 +293,46 @@ export class SearchFieldsBase {
       operator: "tp",
       equalityOperator: " = ",
       filterType: "checkbox"
+    },
+    ["peerreviewed"]: {
+      name: "Peer reviewed",
+      type: "triplet",
+      param: "peerreviewed",
+      operator: "pv",
+      equalityOperator: " = ",
+      filterType: "triplet"
+    },
+    ["isgreen"]: {
+      name: "Green",
+      type: "triplet",
+      param: "isgreen",
+      operator: "ig",
+      equalityOperator: " = ",
+      filterType: "triplet"
+    },
+    ["openaccesscolor"]: {
+      name: "Publisher Access",
+      type: "refine",
+      param: "openaccesscolor",
+      operator: "oc",
+      equalityOperator: " exact ",
+      filterType: "radio"
+    },
+    ["isindiamondjournal"]: {
+      name: "In a Diamond OA journal",
+      type: "triplet",
+      param: "isindiamondjournal",
+      operator: "dj",
+      equalityOperator: " = ",
+      filterType: "triplet"
+    },
+    ["publiclyfunded"]: {
+      name: "Publicly funded",
+      type: "triplet",
+      param: "publiclyfunded",
+      operator: "pf",
+      equalityOperator: " = ",
+      filterType: "triplet"
     }
   };
 
@@ -309,6 +349,26 @@ export class SearchFieldsBase {
       { name: OpenaireEntities.DATASETS, id: "datasets", count: "0" },
       { name: OpenaireEntities.SOFTWARE, id: "software", count: "0" },
       { name: OpenaireEntities.OTHER, id: "other", count: "0" }
+    ],
+    ["isgreen"]: [
+      { name: "All", id: "", count: "0" },
+      { name: "Yes", id: "true", count: "0" },
+      { name: "No", id: "false", count: "0" }
+    ],
+    ["isindiamondjournal"]: [
+      { name: "All", id: "", count: "0" },
+      { name: "Yes", id: "true", count: "0" },
+      { name: "No", id: "false", count: "0" }
+    ],
+    ["peerreviewed"]: [
+      { name: "All", id: "", count: "0" },
+      { name: "Yes", id: "true", count: "0" },
+      { name: "No", id: "false", count: "0" }
+    ],
+    ["publiclyfunded"]: [
+      { name: "All", id: "", count: "0" },
+      { name: "Yes", id: "true", count: "0" },
+      { name: "No", id: "false", count: "0" }
     ]
   };
 
@@ -770,8 +830,8 @@ export class SearchFieldsBase {
 
 //add project field  depending on funder
   public HIDDEN_FIELDS: string[] = ["fundinglevel0_id", "fundinglevel1_id", "fundinglevel2_id",
-    "relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id", "relproject",
+    "relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id", "relproject", "instancetypename",
-    // "instancetypename"
+    "isgreen", "openaccesscolor", "isindiamondjournal", "peerreviewed"
   ];
 
   public DEPENDENT_FIELDS: { [key: string]: string } = {
@@ -782,9 +842,16 @@ export class SearchFieldsBase {
     ["relfundinglevel0_id"]: "relfunder",
     ["relfundinglevel1_id"]: "relfundinglevel0_id",
     ["relfundinglevel2_id"]: "relfundinglevel1_id",
-    // ["instancetypename"]: "type"
+    ["instancetypename"]: "type",
+    // ["isgreen"]: "type"
   };
 
+  public DEPENDENT_FIELDS_AND_VALUES: { [key: string]: { field: string, values: string[] } } = {
+    ["isgreen"]: { field: "type", values: ["publications"] },
+    ["openaccesscolor"]: { field: "type", values: ["publications"] },
+    ["isindiamondjournal"]: { field: "type", values: ["publications"] },
+    ["peerreviewed"]: { field: "type", values: ["publications"] },
+  };
 
   public ADVANCED_SEARCH_OPERATORS: string[] = ["and", "or"];
 

utils/result-preview/result-preview.component.html

@@ -1,3 +1,16 @@
+<ng-template #resultTitle>
+  <div *ngIf="(result.title) || result.acronym">
+    <span *ngIf="result.acronym">
+      {{result.acronym}}
+    </span>
+    <span *ngIf="result.acronym && (result.title)"> (</span>
+    <span *ngIf="result.title" [innerHTML]="result.title"></span>
+    <span *ngIf="result.acronym && result.title">)</span>
+  </div>
+  <div *ngIf="!result.title && !result.acronym">
+    [no title available]
+  </div>
+</ng-template>
 <div *ngIf="result" class="uk-card uk-card-hover" [ngClass]="modifier">
   <div class="uk-padding-small">
     <div>
@@ -35,47 +48,21 @@
                 </div>
                 <div class="multi-line-ellipsis lines-3 uk-width-expand">
                   <h2 class="uk-margin-remove uk-text-break uk-inline-block uk-h6">
-                    <a *ngIf="!externalUrl && result.id" (click)="onClick()" [queryParams]="addEoscPrevInParams(createParam())"
+                    <a *ngIf="!externalUrl && result.id && !customUrl" (click)="onClick()" [queryParams]="addEoscPrevInParams(createParam())"
-                       [routerLink]="url" class="uk-link uk-text-decoration-none uk-width-expand" [class.uk-disabled]="result.id == '-1'">
+                      [routerLink]="url" class="uk-link uk-text-decoration-none uk-width-expand" [class.uk-disabled]="result.id == '-1'">
-                      <div *ngIf="(result.title) || result.acronym">
+                      <ng-container *ngTemplateOutlet="resultTitle"></ng-container>
-                        <span *ngIf="result.acronym">
-                          {{result.acronym}}
-                        </span>
-                        <span *ngIf="result.acronym && (result.title)"> (</span>
-                        <span *ngIf="result.title" [innerHTML]="result.title"></span>
-                        <span *ngIf="result.acronym && result.title">)</span>
-                      </div>
-                      <div *ngIf="!result.title && !result.acronym">
-                        [no title available]
-                      </div>
                     </a>
-                    <a *ngIf="externalUrl && result.id" (click)="onClick()"
+                    <a *ngIf="externalUrl && result.id && !customUrl" (click)="onClick()"
-                       target="_blank" [href]="externalUrl+result.id"
+                      target="_blank" [href]="externalUrl+result.id"
-                       class="custom-external uk-link uk-text-decoration-none uk-width-expand">
+                      class="custom-external uk-link uk-text-decoration-none uk-width-expand">
-                      <span *ngIf="(result.title) || result.acronym">
+                      <ng-container *ngTemplateOutlet="resultTitle"></ng-container>
-                        <span *ngIf="result.acronym">
-                          {{result.acronym}}
-                        </span>
-                        <span *ngIf="result.acronym && (result.title)"> (</span>
-                        <span *ngIf="result.title" [innerHTML]="result.title"></span>
-                        <span *ngIf="result.acronym && result.title">)</span>
-                      </span>
-                      <span *ngIf="!result.title && !result.acronym">
-                        [no title available]
-                      </span>
                     </a>
-                    <div *ngIf="!result.id" class="uk-width-expand">
+                    <a *ngIf="customUrl" routerLink="./{{customUrl}}"
-                      <div *ngIf="(result.title) || result.acronym">
+                      class="uk-link uk-text-decoration-none uk-width-expand">
-                        <span *ngIf="result.acronym">
+                      <ng-container *ngTemplateOutlet="resultTitle"></ng-container>
-                          {{result.acronym}}
+                    </a>
-                        </span>
+                    <div *ngIf="!result.id && !customUrl" class="uk-width-expand">
-                        <span *ngIf="result.acronym && (result.title)"> (</span>
+                      <ng-container *ngTemplateOutlet="resultTitle"></ng-container>
-                        <span *ngIf="result.title" [innerHTML]="result.title"></span>
-                        <span *ngIf="result.acronym && result.title">)</span>
-                      </div>
-                      <div *ngIf="!result.title && !result.acronym">
-                        [no title available]
-                      </div>
                     </div>
                   </h2>
                 </div>
@@ -98,7 +85,8 @@
                                [embargoEndDate]="result.embargoEndDate"
                                [publisher]="result.publisher" [countries]="result.countries"
                                [languages]="result.languages" [programmingLanguages]="result.programmingLanguages"
-                               [compatibilityString]="result.compatibility" [type]="type" [projects]="result.projects"
+                               [compatibilityString]="result.compatibility" [type]="type"
+                               [publiclyFunded]="result.publiclyFunded" [projects]="result.projects"
                                [subjects]="showSubjects?result.subjects:null" [organizations]="showOrganizations?result.organizations:null"
                                [relationName]="relationName" [provenanceAction]="provenanceAction" [prevPath]="prevPath"
               ></entity-metadata>
@@ -185,7 +173,7 @@
 <!--          </div>-->
         </div>
       </div>
-      <div *ngIf="(result.hostedBy_collectedFrom || ((hasActions || result.measure?.bip.length || result.measure?.counts.length) && !isDeletedByInferenceModal))"
+      <div *ngIf="(result.hostedBy_collectedFrom || ((hasActions || result.measure?.bip.length || result.measure?.counts.length) && (!isDeletedByInferenceModal && showEntityActions)))"
            class="uk-text-small uk-margin-top" [class.uk-border-bottom]="!isMobile">
         <div uk-grid class="uk-grid uk-grid-small uk-text-xsmall uk-flex-middle uk-margin-xsmall-bottom"
              [class.uk-flex-between]="!isDeletedByInferenceModal && (result.measure?.bip.length || result.measure?.counts.length) && (result.hostedBy_collectedFrom?.length || hasActions)"
@@ -222,8 +210,52 @@
               </span>
             </entity-actions>
           </div>
-          <div *ngIf="!isDeletedByInferenceModal && (result.measure?.bip.length || result.measure?.counts.length)"
+
-               class="uk-text-xsmall uk-width-auto metrics uk-flex uk-flex-middle uk-flex-right uk-text-meta">
+          <div *ngIf="!isDeletedByInferenceModal && (result.oaRoutes || result.measure?.bip.length || result.measure?.counts.length)"
+            class="metrics uk-text-xsmall uk-width-auto uk-flex uk-flex-middle uk-flex-right uk-text-meta uk-grid uk-grid-small uk-grid-divider"
+               [ngClass]="isMobile ? '' : 'uk-padding-remove-horizontal'">
+          <div *ngIf="result.oaRoutes" class="uk-first-column">
+<!--               class="metrics uk-text-xsmall uk-width-auto uk-flex uk-flex-middle uk-flex-right uk-text-meta">-->
+            <a class="uk-flex uk-flex-middle uk-link-reset">
+              <span #badge class="access-route-badge" [ngClass]="'dots-' + badge.children.length.toString()">
+                <span *ngIf="result.oaRoutes.green" class="dot green"></span>
+                <span *ngIf="result.oaRoutes.oaColor" class="dot" [ngClass]="result.oaRoutes.oaColor"></span>
+                <span *ngIf="result.oaRoutes.isInDiamondJournal" class="dot diamond"></span>
+              </span>
+              <span class="uk-margin-xsmall-left">Access Routes</span>
+            </a>
+            <div uk-drop="pos: top-right" class="uk-drop">
+              <div class="uk-card uk-card-default uk-border uk-box-no-shadow uk-padding-small">
+                <table>
+                  <tr *ngIf="result.oaRoutes.green">
+                    <td>
+                      <span class="dot green"></span>
+                    </td>
+                    <td class="uk-text-capitalize">Green</td>
+                  </tr>
+                  <tr *ngIf="result.oaRoutes.oaColor">
+                    <td>
+                      <span class="dot" [ngClass]="result.oaRoutes.oaColor"></span>
+                    </td>
+                    <td class="uk-text-capitalize">{{result.oaRoutes.oaColor}}</td>
+                  </tr>
+                  <tr *ngIf="result.oaRoutes.isInDiamondJournal">
+                    <td>
+                      <span class="dot diamond"></span>
+                    </td>
+                    <td class="uk-text-capitalize">Published in a Diamond OA journal</td>
+                  </tr>
+                </table>
+<!--                <div class="uk-margin-top uk-flex uk-flex-middle uk-flex-center">-->
+<!--                  <a class="uk-button uk-button-text" target="_blank" href="">Learn more</a>-->
+<!--                </div>-->
+              </div>
+            </div>
+          </div>
+
+          <div *ngIf="result.measure?.bip.length || result.measure?.counts.length"
+               [ngClass]="result.oaRoutes ? '' : 'uk-first-column'" class="uk-flex uk-flex-middle">
+<!--               class="metrics uk-text-xsmall uk-width-auto uk-flex uk-flex-middle uk-flex-right  uk-text-meta">-->
             <ng-container *ngIf="result.measure?.bip.length">
               <a class="uk-flex uk-flex-middle uk-link-reset">
                 <icon customClass="bip-icon-hover" [flex]="true" [ratio]="0.7"
@@ -275,6 +307,8 @@
               </div>
             </ng-container>
           </div>
+          </div>
+
           <div *ngIf="result.hostedBy_collectedFrom?.length || (hasActions && !isDeletedByInferenceModal)" class="uk-hidden@m">
             <ng-container *ngIf="isDeletedByInferenceModal && result.hostedBy_collectedFrom?.length">
               <availableOn [availableOn]="result.hostedBy_collectedFrom" [inModal]="isDeletedByInferenceModal"></availableOn>

utils/result-preview/result-preview.component.ts

@@ -33,6 +33,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
   public routerHelper: RouterHelper = new RouterHelper();
   public urlParam: string;
   public url: string;
+  @Input() customUrl: string;
   @Input() externalUrl: string;
   @Input() showOrcid: boolean = true;
   @Input() showEnermaps: boolean = false;
@@ -40,6 +41,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
   @Input() relationsVocabulary = null;
   @Input() showInline: boolean = false; // do not open modal for "view more" when this is true
   @Input() isDeletedByInferenceModal: boolean = false; // do not show action bar in results when in "Other versions" modal section
+  @Input() showEntityActions: boolean = true; // we can use this instead of the above as it is more generic
 
   /* Metadata */
   public type: string;
@@ -124,7 +126,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     this.linking = true;
     this.share = true;
     this.cite = true;
-    this.orcid = (this.properties.adminToolsPortalType == 'explore' || this.properties.adminToolsPortalType == 'community' || this.properties.adminToolsPortalType == 'aggregator') &&
+    this.orcid = (this.properties.adminToolsPortalType == 'explore' || this.properties.adminToolsPortalType == 'community' || this.properties.adminToolsPortalType == 'aggregator' || this.properties.dashboard == 'irish') &&
       this.showOrcid && this.result.identifiers && this.result.identifiers.size > 0;
   }
   

utils/result-preview/result-preview.module.ts

@@ -7,11 +7,12 @@ import {ResultLandingUtilsModule} from "../../landingPages/landing-utils/resultL
 import {OrcidModule} from "../../orcid/orcid.module";
 import {IconsModule} from "../icons/icons.module";
 import {IconsService} from "../icons/icons.service";
-import {cite, fire, graph, landmark, link, link_to, quotes, rocket, versions} from "../icons/icons";
+import {cite, fire, landmark, link, link_to, quotes, rocket} from "../icons/icons";
 import {EntityActionsModule} from "../entity-actions/entity-actions.module";
+import {EntityMetadataModule} from "../../landingPages/landing-utils/entity-metadata.module";
 
 @NgModule({
-  imports: [CommonModule, RouterModule, ShowAuthorsModule, ResultLandingUtilsModule, OrcidModule, IconsModule, EntityActionsModule],
+  imports: [CommonModule, RouterModule, ShowAuthorsModule, ResultLandingUtilsModule, OrcidModule, IconsModule, EntityActionsModule, EntityMetadataModule],
   declarations: [ResultPreviewComponent],
   exports: [ResultPreviewComponent]
 })

utils/result-preview/result-preview.ts

@@ -12,6 +12,7 @@ export interface HostedByCollectedFrom {
   accessRightIcon: string;
   license?: string;
   fulltext?: string;
+  peerReviewed?: boolean;
 }
 
 export interface Journal {
@@ -72,6 +73,12 @@ export interface Organization {
   trust?: number;
 }
 
+export interface OARoutes {
+  green: boolean;
+  oaColor: "gold" | "hybrid" | "bronze";
+  isInDiamondJournal: boolean;
+}
+
 export class ResultPreview {
   objId: string;
   relcanId: string;
@@ -148,6 +155,9 @@ export class ResultPreview {
   //enermaps id - image
   enermapsId: string;
 
+  oaRoutes: OARoutes;
+  publiclyFunded: boolean;
+
   public static searchResultConvert(result: SearchResult, type: string): ResultPreview {
     let resultPreview: ResultPreview = new ResultPreview();
     resultPreview.id = result.id;
@@ -207,6 +217,9 @@ export class ResultPreview {
     resultPreview.enermapsId = result.enermapsId;
     resultPreview.measure = result.measure;
     resultPreview.hostedBy_collectedFrom = result.hostedBy_collectedFrom;
+
+    resultPreview.oaRoutes = result.oaRoutes;
+    resultPreview.publiclyFunded = result.publiclyFunded;
     return resultPreview;
   }
 
@@ -234,6 +247,9 @@ export class ResultPreview {
     resultPreview.resultType = type;
     resultPreview.identifiers = result.identifiers;
     resultPreview.hostedBy_collectedFrom = result.hostedBy_collectedFrom;
+
+    resultPreview.oaRoutes = result.oaRoutes;
+    resultPreview.publiclyFunded = result.publiclyFunded;
     return resultPreview;
   }
 

utils/string-utils.class.ts

@@ -1,9 +1,10 @@
 import {UrlSegment} from '@angular/router';
 import {AbstractControl, UntypedFormGroup, ValidationErrors, ValidatorFn, Validators} from "@angular/forms";
-import {Stakeholder, StakeholderEntities} from "../monitor/entities/stakeholder";
+import {Stakeholder} from "../monitor/entities/stakeholder";
 import {CommunityInfo} from "../connect/community/communityInfo";
 import {properties} from "../../../environments/environment";
 import {OpenaireEntities} from "./properties/searchFields";
+import {StakeholderConfiguration} from "../monitor-admin/utils/indicator-utils";
 
 export class Dates {
   public static yearMin = 1800;
@@ -530,13 +531,13 @@ export class StringUtils {
 
 	public static getStakeholderType(stakeholderType: string, plural: boolean = false): string {
 		if(stakeholderType == "funder") {
-			return plural ? StakeholderEntities.FUNDERS : StakeholderEntities.FUNDER;
+			return plural ? StakeholderConfiguration.ENTITIES.funders : StakeholderConfiguration.ENTITIES.funders;
 		} else if(stakeholderType == "ri") {
-			return plural ? StakeholderEntities.RIS : StakeholderEntities.RI;
+			return plural ?StakeholderConfiguration.ENTITIES.ris : StakeholderConfiguration.ENTITIES.ri;
 		} else if(stakeholderType == "organization") {
-			return plural ? StakeholderEntities.ORGANIZATIONS : StakeholderEntities.ORGANIZATION;
+			return plural ? StakeholderConfiguration.ENTITIES.organizations : StakeholderConfiguration.ENTITIES.organization;
 		} else if(stakeholderType == "project") {
-			return plural ? StakeholderEntities.PROJECTS : StakeholderEntities.PROJECT;
+			return plural ? StakeholderConfiguration.ENTITIES.projects: StakeholderConfiguration.ENTITIES.project;
 		}
 		return stakeholderType;
 	}