[develop]: Fix search stakeholders role fitler

src/app/about/about.component.ts

@@ -9,6 +9,7 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo
 import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
 import {properties} from "../../environments/environment";
 import {StakeholderEntities} from "../openaireLibrary/monitor/entities/stakeholder";
+import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
 
 @Component({
   selector: 'about',
@@ -583,11 +584,7 @@ import {StakeholderEntities} from "../openaireLibrary/monitor/entities/stakehold
 			</div>
 		</div>
   `,
-  styles: [`
+  styleUrls: ['about.component.less']
-    .custom-translate-bottom-left {
-      transform: translate(-20%, 20%);
-    }
-  `]
 })
 export class AboutComponent {
   public url: string = null;
@@ -607,6 +604,7 @@ export class AboutComponent {
     private _title: Title,
     private seoService: SEOService,
     private _piwikService: PiwikService,
+    private layoutService: LayoutService,
     private helper: HelperService,
     private cdr: ChangeDetectorRef) {
   }
@@ -621,10 +619,14 @@ export class AboutComponent {
   }
   
   ngAfterViewInit() {
+    this.subscriptions.push(this.layoutService.isBottomIntersecting.subscribe(isBottomIntersecting => {
+      this.shouldSticky = !isBottomIntersecting;
+      this.cdr.detectChanges();
+    }));
     if (typeof document !== 'undefined') {
       this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height'));
       this.cdr.detectChanges();
-      this.observeBottom();
+
     }
   }
   
@@ -636,20 +638,6 @@ export class AboutComponent {
     });
   }
   
-  private observeBottom() {
-    let bottom = document.getElementById('bottom');
-    if (bottom) {
-      let bottomObs = new IntersectionObserver(entries => {
-        entries.forEach(entry => {
-          this.shouldSticky = !entry.isIntersecting;
-          this.cdr.detectChanges();
-        })
-      });
-      this.subscriptions.push(bottomObs);
-      bottomObs.observe(bottom);
-    }
-  }
-  
   private updateDescription(description: string) {
     this._meta.updateTag({content: description}, "name='description'");
     this._meta.updateTag({content: description}, "property='og:description'");

src/app/about/you-we.component.ts

@@ -17,9 +17,9 @@ declare var UIkit;
     <div>
       <div class="uk-container">
         <h2 class="uk-text-center uk-margin-large-top uk-margin-large-bottom">Are you a <span
-            class="uk-text-primary">{{type}}?</span></h2>
+          [ngClass]="titleClass">{{type}}?</span></h2>
       </div>
-      <div [id]="'sticky-' + id" #sticky class="uk-background-default uk-blur-background uk-sticky uk-visible@l"
+      <div [id]="'sticky-' + id" #sticky class="uk-sticky uk-visible@l" [ngClass]="isSticky?backgroundClass:null"
            uk-sticky="animation: uk-animation-slide-bottom" [attr.end]="'#' + id"
            [attr.start]="'100vh -' + height + 'px'" [attr.offset]="offset">
         <div class="uk-container">
@@ -60,6 +60,10 @@ export class YouWeComponent implements AfterViewInit, AfterContentChecked, OnDes
   public type: StakeholderEntities.FUNDER | StakeholderEntities.RI | StakeholderEntities.ORGANIZATION = StakeholderEntities.FUNDER;
   @Input()
   public id;
+  @Input()
+  titleClass: string = "uk-text-primary";
+  @Input()
+  backgroundClass: string = "uk-background-default uk-blur-background";
   @ViewChild('sticky') sticky: ElementRef;
   public isSticky: boolean = false;
   public offset: number

src/app/home/home.component.html

@@ -43,7 +43,7 @@
                 </div>
                 <div class="uk-width-expand" uk-scrollspy-class>
                     <div class="uk-position-relative">
-                        <img style="padding: 1px" src="assets/monitor-assets/home/monitor.jpg">
+                        <img style="padding: 1px" src="assets/monitor-assets/home/monitor.jpg" uk-parallax="y: 300">
                         <img class="uk-position-top-left" src="assets/monitor-assets/home/mask.svg">
                     </div>
                 </div>
@@ -118,7 +118,7 @@
                         </ng-container>
                     </div>
                     <div *ngIf="fundersSize">
-                        <ng-container *ngTemplateOutlet="numberCard; context: {numberSize: fundersSize, name: stakeholderEntities.FUNDERS,
+                        <ng-container *ngTemplateOutlet="numberCard; context: {numberSize: fundersSize, name: stakeholderUtils.entities.funders,
 							url: 'https://explore.openaire.eu/search/find/projects'}">
                         </ng-container>
                     </div>
@@ -206,10 +206,9 @@
     </div>
     <div class="uk-section uk-container uk-container-large uk-margin-large-bottom">
         <div class="uk-width-1-2@m uk-margin-bottom">
-            <h2 class="uk-heading-xlarge">{{stakeholderEntities.STAKEHOLDERS}}  in action<span
+            <h2 class="uk-heading-xlarge">{{stakeholderUtils.entities.stakeholders}}  in action<span class="uk-text-primary">.</span></h2>
-                    class="uk-text-primary">.</span></h2>
             <div class="uk-text-large">
-                View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a
+                View existing {{stakeholderUtils.entities.stakeholders | lowercase}} from collaborating organizations. Get a
                 preview on how they work and how our service can be customized to serve you.
             </div>
         </div>
@@ -227,30 +226,17 @@
                 <div>
                     <slider-tabs position="horizontal">
                         <slider-tab [tabId]="'all'" tabTitle="All"></slider-tab>
-                        <slider-tab [tabId]="stakeholderEntities.FUNDERS"
+                        <slider-tab *ngFor="let type of types" [tabId]="type" tabTitle="{{getTitle(type) | titlecase}}"></slider-tab>
-                                    tabTitle="{{stakeholderEntities.FUNDERS | titlecase}}"></slider-tab>
-                        <slider-tab [tabId]="stakeholderEntities.RIS"
-                                    tabTitle="{{stakeholderEntities.RIS | titlecase}}"></slider-tab>
-                        <slider-tab [tabId]="stakeholderEntities.ORGANIZATIONS"
-                                    tabTitle="{{stakeholderEntities.ORGANIZATIONS | titlecase}}"></slider-tab>
                     </slider-tabs>
                 </div>
-                <ul class="uk-switcher">
+                <ul *ngIf="stakeholdersSlider" class="uk-switcher">
                     <li>
                         <ng-container
-                                *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.stakeholders}"></ng-container>
+                                *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider['all']}"></ng-container>
                     </li>
-                    <li>
+                    <li *ngFor="let type of types">
                         <ng-container
-                                *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.funders}"></ng-container>
+                                *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider[type]}"></ng-container>
-                    </li>
-                    <li>
-                        <ng-container
-                                *ngTemplateOutlet="sliderTemplate; context: {slides:stakeholdersSlider.ris}"></ng-container>
-                    </li>
-                    <li>
-                        <ng-container
-                                *ngTemplateOutlet="sliderTemplate; context: {slides: stakeholdersSlider.organizations}"></ng-container>
                     </li>
                 </ul>
             </ng-container>
@@ -405,7 +391,7 @@
                         </ng-container>
                     </div>
                     <div *ngIf="fundersSize">
-                        <ng-container *ngTemplateOutlet="numberCardMobile; context: {numberSize: fundersSize, name: stakeholderEntities.FUNDERS,
+                        <ng-container *ngTemplateOutlet="numberCardMobile; context: {numberSize: fundersSize, name: stakeholderUtils.entities.funders,
 							url: 'https://explore.openaire.eu/search/find/projects'}">
                         </ng-container>
                     </div>
@@ -497,10 +483,10 @@
     </div>
     <div class="uk-section uk-section-large uk-padding-remove-bottom uk-container uk-container-large">
         <div class="uk-margin-bottom">
-            <h2 class="uk-heading-xlarge">{{stakeholderEntities.STAKEHOLDERS}}  in action<span
+            <h2 class="uk-heading-xlarge">{{stakeholderUtils.entities.stakeholders}}  in action<span
                     class="uk-text-primary">.</span></h2>
             <div class="uk-text-large">
-                View existing {{stakeholderEntities.STAKEHOLDERS | lowercase}} from collaborating organizations. Get a
+                View existing {{stakeholderUtils.entities.stakeholders | lowercase}} from collaborating organizations. Get a
                 preview on how they work and how our service can be customized to serve you.
             </div>
         </div>
@@ -519,12 +505,8 @@
             <div class="uk-padding-small uk-padding-remove-right">
                 <slider-tabs position="horizontal">
                     <slider-tab [tabId]="'all'" tabTitle="All"></slider-tab>
-                    <slider-tab [tabId]="stakeholderEntities.FUNDERS"
+                    <slider-tab *ngFor="let type of types" [tabId]="type"
-                                tabTitle="{{stakeholderEntities.FUNDERS | titlecase}}"></slider-tab>
+                                tabTitle="{{getTitle(type) | titlecase}}"></slider-tab>
-                    <slider-tab [tabId]="stakeholderEntities.RIS"
-                                tabTitle="{{stakeholderEntities.RIS | titlecase}}"></slider-tab>
-                    <slider-tab [tabId]="stakeholderEntities.ORGANIZATIONS"
-                                tabTitle="{{stakeholderEntities.ORGANIZATIONS | titlecase}}"></slider-tab>
                 </slider-tabs>
             </div>
             <ul class="uk-switcher uk-margin-top uk-overflow-hidden">
@@ -540,38 +522,14 @@
                         </div>
                     </div>
                 </li>
-                <li [id]="stakeholderEntities.FUNDERS" class="uk-overflow-auto">
+                <li *ngFor="let type of types" [id]="type" class="uk-overflow-auto">
                     <div class="uk-padding-small uk-padding-remove-right"
                          uk-height-match="target: .uk-card; row: false">
-                        <div class="uk-flex uk-grid uk-grid-small uk-flex-nowrap"
+                        <div class="uk-grid uk-grid-small uk-flex-nowrap"
                              uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-fade; repeat: true">
-                            <div *ngFor="let funder of funders" class="uk-width-4-5 uk-width-2-5@s uk-flex-none"
+                            <div *ngFor="let stakeholder of getStakeholdersByType(type)"
-                                 uk-scrollspy-class>
-                                <browse-stakeholder [stakeholder]="funder"></browse-stakeholder>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-                <li [id]="stakeholderEntities.RIS" class="uk-overflow-auto">
-                    <div class="uk-padding-small uk-padding-remove-right"
-                         uk-height-match="target: .uk-card; row: false">
-                        <div class="uk-flex uk-grid uk-grid-small uk-flex-nowrap"
-                             uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-fade; repeat: true">
-                            <div *ngFor="let ri of ris" class="uk-width-4-5 uk-width-2-5@s uk-flex-none"
-                                 uk-scrollspy-class>
-                                <browse-stakeholder [stakeholder]="ri"></browse-stakeholder>
-                            </div>
-                        </div>
-                    </div>
-                </li>
-                <li [id]="stakeholderEntities.ORGANIZATIONS" class="uk-overflow-auto">
-                    <div class="uk-padding-small uk-padding-remove-right"
-                         uk-height-match="target: .uk-card; row: false">
-                        <div class="uk-flex uk-grid uk-grid-small uk-flex-nowrap"
-                             uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-fade; repeat: true">
-                            <div *ngFor="let organization of organizations"
                                  class="uk-width-4-5 uk-width-2-5@s uk-flex-none" uk-scrollspy-class>
-                                <browse-stakeholder [stakeholder]="organization"></browse-stakeholder>
+                                <browse-stakeholder [stakeholder]="stakeholder"></browse-stakeholder>
                             </div>
                         </div>
                     </div>

src/app/home/home.component.ts

@@ -24,7 +24,12 @@ import {NumberUtils} from "../openaireLibrary/utils/number-utils.class";
 import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
 import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
 import {LocalStorageService} from "../openaireLibrary/services/localStorage.service";
-import {Stakeholder, StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
+import {
+  Stakeholder,
+  StakeholderEntities,
+  StakeholderInfo,
+  StakeholderType
+} from "../openaireLibrary/monitor/entities/stakeholder";
 import {User} from "../openaireLibrary/login/utils/helper.class";
 import {UserManagementService} from "../openaireLibrary/services/user-management.service";
 import {properties} from "../../environments/environment";
@@ -34,6 +39,7 @@ import {IDeactivateComponent} from "../openaireLibrary/utils/can-exit.guard";
 import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
 import {isPlatformServer} from '@angular/common';
 import {LayoutService} from '../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service';
+import {StakeholderUtils} from "../openaireLibrary/monitor-admin/utils/indicator-utils";
 
 @Component({
   selector: 'home',
@@ -44,12 +50,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
   public pageTitle = "OpenAIRE | Monitor";
   public description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies. Work together with us to view, understand and visualize research statistics and indicators.";
   public stakeholders: StakeholderInfo[] = [];
-  public stakeholdersSlider: {
+  public stakeholdersSlider: any;
-    stakeholders: StakeholderInfo[][];
-    funders: StakeholderInfo[][];
-    ris: StakeholderInfo[][];
-    organizations: StakeholderInfo[][];
-  };
   public selected: Stakeholder = null;
   public pageContents = null;
   public divContents = null;
@@ -59,7 +60,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
   public errorCodes: ErrorCodes;
   public properties: EnvProperties = properties;
   public openaireEntities = OpenaireEntities;
-	public stakeholderEntities = StakeholderEntities;
+  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public directLink: boolean = true;
   public publicationsSize: any = null;
   public datasetsSize: any = null;
@@ -235,8 +236,14 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
         this.handleError("Error getting number of software data", err);
       }
     ));
+  }
 
+  get types(): StakeholderType[] {
+    return this.stakeholderUtils.types.map(option => option.value).filter(type => this.stakeholders.findIndex(stakeholder => stakeholder.type === type) > -1);
+  }
 
+  getTitle(type: string) {
+    return this.stakeholderUtils.entities[type + 's'] ? this.stakeholderUtils.entities[type + 's'] : type;
   }
 
   public getStakeholders() {
@@ -251,11 +258,11 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
           this.sort(this.stakeholders);
           this.stakeholders = this.publicStakeholders.concat(this.privateStakeholders);
           this.stakeholdersSlider = {
-            stakeholders: this.stakeholderSlider(this.stakeholders),
+            all: this.stakeholderSlider(this.stakeholders)
-            funders: this.stakeholderSlider(this.funders),
+          }
-            ris: this.stakeholderSlider(this.ris),
+          this.types.forEach(type => {
-            organizations: this.stakeholderSlider(this.organizations)
+            this.stakeholdersSlider[type] = this.stakeholderSlider(this.getStakeholdersByType(type));
-          };
+          });
         }
         this.loading = false;
       },
@@ -294,28 +301,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
     return this.stakeholders.filter(stakeholder => stakeholder.visibility !== "PUBLIC");
   }
 
-  get funders(): StakeholderInfo[] {
+  getStakeholdersByType(type: StakeholderType = null) {
-    if (this.stakeholders) {
+    return this.stakeholders.filter(stakeholder => !type || stakeholder.type === type)
-      return this.stakeholders.filter(stakeholder => stakeholder.type === "funder");
-    } else {
-      return [];
-    }
-  }
-  
-  get ris(): StakeholderInfo[] {
-    if (this.stakeholders) {
-      return this.stakeholders.filter(stakeholder => stakeholder.type === "ri");
-    } else {
-      return [];
-    }
-  }
-  
-  get organizations(): StakeholderInfo[] {
-    if (this.stakeholders) {
-      return this.stakeholders.filter(stakeholder => stakeholder.type === "organization");
-    } else {
-      return [];
-    }
   }
 
   private handleError(message: string, error): number {

src/app/my-stakeholders/my-stakeholders.component.ts

@@ -103,7 +103,7 @@ export class MyStakeholdersComponent {
     this.stakeholders = [];
     this.subscriptions.push(this.stakeholderService.getMyStakeholders(properties.monitorServiceAPIURL).subscribe(
       stakeholders => {
-          this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders, this.user);
+          this.stakeholders = StakeholderInfo.toStakeholderInfo(stakeholders.standalone.concat(stakeholders.umbrella), this.user);
           this.sort(this.stakeholders);
           this.loading = false;
       },

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae
+Subproject commit e51144a68de676221403ec2fed3614740d01c3c1

src/app/search-stakeholders/search-stakeholders.component.ts

@@ -11,20 +11,21 @@ import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
 import {UserManagementService} from "../openaireLibrary/services/user-management.service";
 import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
 import {NewSearchPageComponent, SearchForm} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
-import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
+import {StakeholderInfo, StakeholderType} from "../openaireLibrary/monitor/entities/stakeholder";
 import {properties} from "../../environments/environment";
 import {Subscriber} from "rxjs";
 import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 import {TitleCasePipe} from "@angular/common";
 import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
+import {StakeholderUtils} from "../openaireLibrary/monitor-admin/utils/indicator-utils";
 
 @Component({
   selector: 'search-stakeholders',
   template: `
-    <new-search-page pageTitle="OpenAIRE-Monitor | Browse {{this.stakeholderEntities.STAKEHOLDERS}}"
+    <new-search-page pageTitle="OpenAIRE-Monitor | Browse {{stakeholderUtils.entities.stakeholders}}"
                      [hasPrefix]=false
-                     [formPlaceholderText]="'Search ' + (!isMobile?'OpenAIRE Monitor ':'') + this.stakeholderEntities.STAKEHOLDERS"
+                     [formPlaceholderText]="'Search ' + (!isMobile?'OpenAIRE Monitor ':'') +stakeholderUtils.entities.stakeholders"
-                     [type]="(results.length > 1) ? this.stakeholderEntities.STAKEHOLDERS:this.stakeholderEntities.STAKEHOLDER"
+                     [type]="(results.length > 1) ? stakeholderUtils.entities.stakeholders:stakeholderUtils.entities.stakeholders"
                      entityType="stakeholder"
                      [results]="results" [searchUtils]="searchUtils"
                      [showResultCount]=true
@@ -43,6 +44,7 @@ export class SearchStakeholdersComponent {
   private errorMessages: ErrorMessagesComponent;
   public results: StakeholderInfo[] = [];
   public totalResults: StakeholderInfo[];
+  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
   public subscriptions = [];
   public filters = [];
   public searchFields: SearchFields = new SearchFields();
@@ -64,8 +66,7 @@ export class SearchStakeholdersComponent {
   };
   public keyword = "";
   public searchLink;
-  public stakeholderEntities = StakeholderEntities;
+  public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse ' + this.stakeholderUtils.entities.stakeholders}];
-  public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse ' + this.stakeholderEntities.STAKEHOLDERS}];
   public searchForm: SearchForm = {class: 'uk-background-muted', dark: false};
   public isMobile: boolean = false;
   properties: EnvProperties = properties;
@@ -100,15 +101,15 @@ export class SearchStakeholdersComponent {
       this.searchPage.refineFields = this.refineFields;
       this.searchLink = this.properties.searchLinkToStakeholders;
       this.selectedFields = [];
-      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], this.fieldIdsMap, null, params, "stakeholder", null);
+      this.searchPage.prepareSearchPage(this.fieldIds, this.selectedFields, this.refineFields, [], [], this.fieldIdsMap, null, params, "stakeholder", null);
       let queryParams = params;
       if (typeof document !== 'undefined') {
         this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
           this.user = user;
-          this.initFunders(queryParams);
+          this.initResults(queryParams);
         }));
       } else {
-        this.initFunders(queryParams);
+        this.initResults(queryParams);
       }
     }));
     this.layoutService.isMobile.subscribe(isMobile => {
@@ -125,28 +126,19 @@ export class SearchStakeholdersComponent {
     });
   }
   
-  private parseResults(data: any) {
-    for (let i = 0; i < data.length; i++) {
-      this.totalResults[i] = data[i];
-      this.totalResults[i].isManager = this.isManager(data[i]);
-      this.totalResults[i].isMember = this.isMember(data[i]);
-    }
-  }
-  
   /**
    * Initialize stakeholders from Communities APIs
    *
    * @param params
    */
-  private initFunders(params) {
+  private initResults(params) {
     if (this.totalResults) {
-      this.parseResults(this.totalResults);
+      this.totalResults = StakeholderInfo.toStakeholderInfo(this.totalResults, this.user);
       this._getResults(params);
     } else {
       this.subscriptions.push(this._stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL).subscribe(
         data => {
-          this.totalResults = [];
+          this.totalResults = StakeholderInfo.toStakeholderInfo(data, this.user);
-          this.parseResults(data);
           this._getResults(params);
         },
         err => {
@@ -430,13 +422,8 @@ export class SearchStakeholdersComponent {
     }
   }
 
-  private isManager(stakeholder) {
+  get types(): StakeholderType[] {
-    return Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user)
+    return this.stakeholderUtils.types.map(option => option.value).filter(type => this.totalResults.findIndex(stakeholder => stakeholder.type === type) > -1);
-      || Session.isCommunityCurator(this.user) || Session.isManager(stakeholder.type, stakeholder.alias, this.user);
-  }
-  
-  private isMember(stakeholder) {
-    return this.isManager(stakeholder) || Session.isSubscribedTo(stakeholder.type, stakeholder.alias, this.user);
   }
   
   /**
@@ -450,8 +437,8 @@ export class SearchStakeholdersComponent {
     let value_original_ids = [];
     filter_names.push("Type");
     filter_ids.push("type");
-    value_names.push([this.stakeholderEntities.FUNDERS, this.titleCasePipe.transform(this.stakeholderEntities.RIS), this.titleCasePipe.transform(this.stakeholderEntities.ORGANIZATIONS)]);
+    value_names.push(this.types.map(type => this.stakeholderUtils.entities[type + 's']));
-    value_original_ids.push(["funder", "ri", "organization"]);
+    value_original_ids.push(this.types);
     filter_names.push("Accessibility");
     filter_ids.push("access");
     if (!this.user) {

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit b68f375714b679743e586bb2fb4721e633e43fc1
+Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 7aa9e577193e3a77415434fd5e6e856a21d5efeb
+Subproject commit 99e7fe14bc804271116cc8ee54f2547e4f04034f

src/environments/environment.beta.ts

@@ -1,91 +1,17 @@
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
   environment: "beta",
   enablePiwikTrack: true,
-  useCache: true,
-  showContent: true,
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
-  useNewStatistisTool: true,
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
-  searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  utilsService: "https://demo.openaire.eu/utils-service",
-  vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
-  piwikSiteId: "298",
-  registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/',
-  loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
-  feedbackmail: "feedback@openaire.eu",
-  cacheUrl: "https://demo.openaire.eu/cache/get?url=",
-  monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
   adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
-  adminToolsCommunity: "monitor",
   adminToolsPortalType: "monitor",
-  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
+  adminToolsCommunity: "monitor",
-  contextsAPI: "https://beta.services.openaire.eu/openaire/context",
-  communityAPI: "https://beta.services.openaire.eu/openaire/community/",
-  communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  baseLink : "",
   domain : "https://beta.monitor.openaire.eu",
   afterLoginRedirectLink: '/my-dashboards',
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToStakeholders: "/browse",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-	errorLink: '/error',
-  lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
-  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://beta.openaire.eu/linking",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  shareInZenodoPage: "/participate/deposit/zenodo",
-  reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  admins: ["feedback@openaire.eu"],
-  lastIndexUpdate: "2019-08-07",
-  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
-  b2noteAPIURL: "http://b2note-dev.bsc.es/",
   footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonBeta, ...props
+}

src/environments/environment.prod.ts

@@ -1,91 +1,17 @@
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
   environment: "production",
   enablePiwikTrack: true,
-  useCache: true,
-  showContent: true,
-  statisticsAPIURL: "https://services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "",
-  useNewStatistisTool: false,
-  claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
-  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  utilsService: "https://explore.openaire.eu/utils-service",
-  vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
-  piwikSiteId: "104",
-  registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/',
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
-  feedbackmail: "feedback@openaire.eu",
-  cacheUrl: "https://explore.openaire.eu/cache/get?url=",
-  datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
-  monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
   adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/",
   adminToolsPortalType: "monitor",
   adminToolsCommunity: "monitor",
-  contextsAPI: "https://services.openaire.eu/openaire/context",
-  communityAPI: "https://services.openaire.eu/openaire/community/",
-  communitiesAPI: "https://services.openaire.eu/openaire/community/communities",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  baseLink : "",
   domain : "https://monitor.openaire.eu",
   afterLoginRedirectLink: '/my-dashboards',
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToStakeholders: "/browse",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-	errorLink: '/error',
-  lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
-  widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://www.openaire.eu/linking",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  shareInZenodoPage: "/participate/deposit/zenodo",
-  reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
-  admins: ["feedback@openaire.eu"],
-  lastIndexUpdate: "2019-07-24",
-  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
-  b2noteAPIURL: "http://b2note-dev.bsc.es/",
   footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonProd, ...props
+}

src/environments/environment.ts

@@ -1,91 +1,19 @@
 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
 
-export let properties: EnvProperties = {
+let props: EnvProperties = {
   environment: "development",
   enablePiwikTrack: false,
   useCache: false,
   showContent: true,
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "http://88.197.53.71:8080/stats-api/",
-  useNewStatistisTool: false,
-  claimsAPIURL: "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
-  searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  zenodo: "https://zenodo.org/",
-  zenodoCommunities: "https://zenodo.org/api/communities/",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  utilsService: "http://mpagasas.di.uoa.gr:8000",
-  vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
-  piwikSiteId: "298",
-  registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
-  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
-  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: "openaire.test@gmail.com",
-  cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
-  monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
   adminToolsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/",
   adminToolsPortalType: "monitor",
   adminToolsCommunity: "monitor",
-  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
+  domain : "http://mpagasas.di.uoa.gr:4000",
-  contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
-  communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
-  communitiesAPI: "https://dev-openaire.d4science.org/openaire/community/communities",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  baseLink : "",
-  domain : "http://dl170.madgik.di.uoa.gr/monitor",
   afterLoginRedirectLink: '/my-dashboards',
-  searchLinkToResult: "/search/result?id=",
-  searchLinkToPublication: "/search/publication?articleId=",
-  searchLinkToProject: "/search/project?projectId=",
-  searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToDataset: "/search/dataset?datasetId=",
-  searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToOrp: "/search/other?orpId=",
-  searchLinkToStakeholders: "/browse",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
-	errorLink: '/error',
-  lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
-  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://beta.openaire.eu/linking",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  shareInZenodoPage: "/participate/deposit/zenodo",
-  reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
-  admins: ["kostis30fylloy@gmail.com"],
-  lastIndexUpdate: "2019-05-16",
-  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
-  b2noteAPIURL: "http://b2note-dev.bsc.es/",
   footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonDev, ...props
+}