Merge pull request 'Production release June 2024 [EXPLORE]' (#41) from develop into master

Reviewed-on: #41

cache-interceptor.service.ts

@@ -1,6 +1,5 @@
-import { Injectable, Inject, PLATFORM_ID } from '@angular/core';
+import {Injectable, Inject, PLATFORM_ID, TransferState} from '@angular/core';
 import { HttpInterceptor, HttpRequest, HttpHandler } from '@angular/common/http';
-import { TransferState } from '@angular/platform-browser';
 import { properties } from "../../environments/environment";
 
 @Injectable({
@@ -9,29 +8,39 @@ import { properties } from "../../environments/environment";
 export class CacheInterceptorService implements HttpInterceptor {
   cachingRequests = [
     // Remove 2 following lines when bug with hidden refine filters is solved.
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=relfundinglevel0_id&fields=relproject&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&fields=country&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=relfundinglevel0_id&fields=relproject&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0",
     "/resources2/?format=json&refine=true&fields=funder&fields=fundinglevel0_id&fields=projectstartyear&fields=projectendyear&fields=projectoamandatepublications&&type=projects&page=0&size=0",
 
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=results&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=relfundinglevel0_id&fields=relproject&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&fields=country&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=relfunder%20exact%20%22ec__________%3A%3AEC%7C%7CEuropean%20Commission%7C%7CEC%22&type=results&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=results&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=relfundinglevel0_id&fields=relproject&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=relfunder%20exact%20%22ec__________%3A%3AEC%7C%7CEuropean%20Commission%7C%7CEC%22&type=results&page=0&size=0",
 
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=publications&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=datasets&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=software&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=other&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=publications&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=datasets&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=software&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&type=other&page=0&size=0",
 
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&type=results&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=resultbestaccessright&fields=instancetypename&fields=fos&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0",
-    "/resources2/?format=json&refine=true&fields=funder&fields=projectstartyear&fields=projectendyear&fields=projectoamandatepublications&&type=projects&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright%20exact%20%22Open%20Access%22&type=results&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=instancetypename&fields=foslabel&fields=relfunder&fields=sdg&fields=country&fields=resultlanguagename&fields=resulthostingdatasource&fields=community&&fq=resultbestaccessright exact \"Open Access\"&type=results&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=funder&fields=projectoamandatepublications&fields=projectstartyear&fields=projectendyear&&type=projects&page=0&size=0",
     "/resources2/?format=json&refine=true&fields=eoscdatasourcetype&fields=datasourceodlanguages&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=country&fields=collectedfromname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0",
-    "/resources2/?format=json&query= ( (reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*) ) &refine=true&fields=country&&type=organizations&page=0&size=0",
+    // "/resources2/?format=json&query= ( (reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*) ) &refine=true&fields=country&&type=organizations&page=0&size=0",
+    "/resources2/?format=json&refine=true&fields=country&&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)&page=0&size=0&minRef=true",
 
-    "/projects/?format=json&refine=true&page=1&size=0&fields=funder",
+    "/resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)",
+
+    // "/projects/?format=json&refine=true&page=1&size=0&fields=funder",
+    "/projects/?fields=funder&sf=funder&format=json&size=0",
+    "/results/?fields=relfunder&sf=relfunder&format=json&size=0",
 
     "/resources/?format=json&query=( oaftype exact datasource  and  (eoscdatasourcetype exact \"Journal Archive\"  or eoscdatasourcetype exact \"Repository\"))&refine=true&fields=datasourcetypename&fields=country&fields=datasourceodsubjects&fields=datasourceodcontenttypes&fields=datasourcecompatibilityname&fields=datasourcethematic&fields=datasourcejurisdiction&&type=datasources&page=0&size=0",
 
     "/search/v2/api/datasources/count?format=json", "/search/v2/api/publications/count?format=json", "/search/v2/api/datasets/count?format=json", "/search/v2/api/software/count?format=json", "/search/v2/api/other/count?format=json",
-    "relresulttype%3Dpublication"
+    "relresulttype%3Dpublication",
+
+    "/resources2/?format=json&size=0&type=projects",
+    "/resources2/?format=json&size=0&type=datasources",
+    "/resources2/?format=json&size=0&type=results",
+    "/resources2/?format=json&size=0&type=results&fq=resultbestaccessright%20exact%20%22Open%20Access%22"
   ];
 
 
@@ -49,7 +58,13 @@ export class CacheInterceptorService implements HttpInterceptor {
   }
 
   public checkForCachedRequests(url){
-    if(url.indexOf("refine=true") !== -1 || url.indexOf("/count?format=json") !== -1 || url.indexOf("relresulttype%3Dpublication") !== -1) {
+    // Do not call cache when it is not enabled at all.
+    // This property is not correctly used here. A new property should be introduced. For now it is ok.
+    if (!properties.useLongCache) {
+      return false;
+    }
+    if(url.indexOf("sf=") !== -1 || url.indexOf("refine=true") !== -1 || url.indexOf("/count?format=json") !== -1 || url.indexOf("relresulttype%3Dpublication") !== -1 ||
+      (url.indexOf("?format=json&size=0&type=") !== -1 && url.indexOf("query=") == -1)) {
       return this.cachingRequests.some(partUrl => (url.indexOf(partUrl) !== -1));
     }
     return false;

claims/claim-utils/claimContextSearchForm.component.html

@@ -1,5 +1,5 @@
 <div>
-  <div class="uk-width-xlarge@l uk-width-large">
+  <div class="uk-width-xlarge@l uk-width-large" [ngClass]="centerAlign ? 'uk-align-center':''">
     <advanced-search-input>
         <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
              [options]="showOptions.selectOptions" class="uk-width-2-5"></div>

claims/claim-utils/claimContextSearchForm.component.ts

@@ -2,13 +2,12 @@ import {Component, Input, ViewChild} from '@angular/core';
 import {Router} from '@angular/router';
 import {ContextsService} from './service/contexts.service';
 import {ClaimEntity, ShowOptions} from './claimHelper.class';
-import {Session} from '../../login/utils/helper.class';
-import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
 import {EnvProperties} from '../../utils/properties/env-properties';
 import {Subscriber} from "rxjs";
 import {OpenaireEntities} from "../../utils/properties/searchFields";
-import {CommunityService} from "../../connect/community/community.service";
 import {CommunitiesService} from "../../connect/communities/communities.service";
+import {UserManagementService} from "../../services/user-management.service";
+import {Session} from "../../login/utils/helper.class";
 
 declare var UIkit: any;
 
@@ -18,6 +17,7 @@ declare var UIkit: any;
 
 })
 export class ClaimContextSearchFormComponent {
+  @Input() public centerAlign: boolean = false;
   @Input() public results:ClaimEntity[];
   @Input() public sources;
   @Input() public properties: EnvProperties;
@@ -48,9 +48,14 @@ export class ClaimContextSearchFormComponent {
   keyword = "";
   subscriptions = [];
   communityLogos = {};
+  communityIds = [];
+  user = null;
   ngOnInit() {
     this.entitiesSelectOptions = this.showOptions.selectOptions;
     //get community logos
+    this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
+      this.user = user;
+
     this.subscriptions.push(this._communitiesService.getCommunities(this.properties, this.properties.communityAPI+"/communities/").subscribe(
       communitiesResults => {
         if(communitiesResults!=null) {
@@ -60,6 +65,13 @@ export class ClaimContextSearchFormComponent {
               this.communityLogos[community.communityId] = community;
             }
           }
+          this.communityIds = communitiesResults.filter(community => {
+            return community.claim == "all" ||
+              Session.isCommunityCurator(this.user) ||
+              Session.isClaimsCurator(this.user) ||
+              (community.claim == "membersOnly"  && Session.isSubscribedTo("community", community.communityId,this.user)) ||
+              (community.claim == "managersOnly"  && Session.isManager("community", community.communityId,this.user))
+          }).map(community => community.communityId);
           this.getCommunities();
         }
       },
@@ -67,6 +79,10 @@ export class ClaimContextSearchFormComponent {
         this.getCommunities();
       }
     ));
+
+    }, error => {
+
+    }));
   
   }
   ngOnDestroy() {
@@ -76,7 +92,7 @@ export class ClaimContextSearchFormComponent {
       }
     });
   }
-  constructor(private _contextService: ContextsService, private router: Router, private _communitiesService: CommunitiesService) {
+  constructor(private _contextService: ContextsService, private router: Router, private _communitiesService: CommunitiesService,  private userManagementService: UserManagementService,) {
 
   }
 
@@ -113,7 +129,7 @@ export class ClaimContextSearchFormComponent {
 
   }
   select(communityId, communityLabel) {
-    console.log("SELECT", communityId)
+    // console.log("SELECT", communityId)
     this.selectedCommunityId = communityId;
     this.selectedCommunityLabel = communityLabel;
     this.getCategories();
@@ -166,20 +182,17 @@ export class ClaimContextSearchFormComponent {
   }
 
   getCommunities() {
-    if (!Session.isLoggedIn()) {
-      this.saveStateAndRedirectLogin();
-
-    } else {
       this.loading = true;
-      this.subscriptions.push(this._contextService.getPublicCommunitiesByState().subscribe(
+      this.subscriptions.push(this._contextService.getCommunitiesByState().subscribe(
         data => {
-          this.communities = data;
-          console.log(this.communities)
+          this.communities = data.filter(community => {
+            return this.communityIds.indexOf(community.id) != -1
+          });
           if (this.communities.length > 0) {
-            this.communities.sort((n1, n2) => n1.label > n2.label);
+            this.communities.sort((n1, n2) => n1.title > n2.title);
           }
           this.loading = false;
-          if (this.communityId != null) {
+          if (this.communityId != null && this.communityIds.indexOf(this.communityId) != -1) {
             //preselect community
             this.selectedCommunityId = this.communityId;
             for (let i = 0; i < this.communities.length; i++) {
@@ -202,18 +215,14 @@ export class ClaimContextSearchFormComponent {
           this.error = true;
         }
       ));
-    }
+
   }
 
   getCategories() {
     this.loading = true;
     // this.categories=[];
     if (this.selectedCommunityId != '0') {
-      if (!Session.isLoggedIn()) {
-        this.saveStateAndRedirectLogin();
 
-
-      } else {
         if (this.categories[this.selectedCommunityId]) {
           this.loading = false;
           if(this.categories[this.selectedCommunityId].length > 0){
@@ -241,7 +250,7 @@ export class ClaimContextSearchFormComponent {
           }
         ));
       }
-    }
+
   }
   
   displaySubcategory(id) {
@@ -254,9 +263,6 @@ export class ClaimContextSearchFormComponent {
   }
 
   browseConcepts(categoryId) {
-    if (!Session.isLoggedIn()) {
-      this.saveStateAndRedirectLogin();
-    } else {
       if (this.conceptsClass[categoryId] != null) {
         this.conceptsClassDisplay[categoryId] = !this.conceptsClassDisplay[categoryId];
         return;
@@ -284,8 +290,6 @@ export class ClaimContextSearchFormComponent {
           this.conceptsCategoryLoading[categoryId] = false;
         }
       ));
-    }
-
   }
 
   browseSubConcepts(categoryId, conceptId) {
@@ -307,24 +311,6 @@ export class ClaimContextSearchFormComponent {
 
   }
 
-
-  saveStateAndRedirectLogin() {
-  
-    if (this.results != null) {
-      localStorage.setItem(this.localStoragePrefix + "results", JSON.stringify(this.results));
-    }
-    if (this.sources != null) {
-      localStorage.setItem(this.localStoragePrefix + "sources", JSON.stringify(this.sources));
-    }
-
-    this.router.navigate(['/user-info'], {
-      queryParams: {
-        "errorCode": LoginErrorCodes.NOT_VALID,
-        "redirectUrl": this.router.url
-      }
-    });
-  }
-
   private static handleError(message: string, error) {
     console.error("Claim context search form (component): " + message, error);
   }

claims/claim-utils/claimEntitiesSelection.component.ts

@@ -1,39 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import {ShowOptions} from './claimHelper.class';
-import {MatSelect} from "@angular/material/select";
-import {OpenaireEntities} from "../../utils/properties/searchFields";
-
- 
-@Component({
-    selector: 'claim-enities-selection',
-
-    template:`
-       <span *ngIf="showOptions && showOptions.linkToEntities && showOptions.linkToEntities.length > 0"
-            class=" entitiesSelection portal-box uk-text-small clickable" style=""
-            (click)="open()">
-      <mat-select  [(value)]="showOptions.show"
-                   [disableOptionCentering]="true" >
-  
-        <mat-option *ngIf="showOptions.linkToEntities.indexOf('result')!=-1" value="result">{{openaireEntities.RESULTS}}</mat-option>
-        <mat-option  *ngIf="showOptions.linkToEntities.indexOf('project')!=-1" value="project">{{openaireEntities.PROJECTS}}</mat-option>
-        <mat-option  *ngIf="showOptions.linkToEntities.indexOf('context')!=-1" value="context">{{openaireEntities.COMMUNITIES}}</mat-option>
-        
-      </mat-select>
-  
-      
-     </span>
-    `,
-
-})
-export class ClaimEntitiesSelectionComponent{
-  @ViewChild(MatSelect) matSelect: MatSelect;
-  @Input() showOptions:ShowOptions = new ShowOptions();
-  public openaireEntities = OpenaireEntities;
-   
-  open() {
-    if (this.matSelect && !this.matSelect.focused) {
-      this.matSelect.open();
-    }
-  }
- 
-}

claims/claim-utils/claimHelper.class.ts

@@ -1,6 +1,7 @@
 //Classes used in linking / inlinelinking when selecting an entity
 import {HelperFunctions} from "../../utils/HelperFunctions.class";
 import {OpenaireEntities} from "../../utils/properties/searchFields";
+import {ClaimsProperties} from "./claims.properties";
 
 export class ClaimResult {
   public source: string;
@@ -28,6 +29,7 @@ export class ClaimResult {
 
 export class ClaimProject {
   public funderId: string;
+  public funderShortname: string;
   public funderName: string;
   public acronym: string;
   public startDate: string;
@@ -37,6 +39,12 @@ export class ClaimProject {
   public fundingLevel0: string;
   public url: string;
 }
+export class ClaimOrganization {
+  public name: string;
+  // public shortName: string;
+  public url: string;
+  // public country: string;
+}
 
 export class ClaimContext {
   public community: string;
@@ -71,6 +79,7 @@ export class ClaimEntity {
   result: ClaimResult;
   project: ClaimProject;
   context: ClaimContext;
+  organization: ClaimOrganization;
 
   constructor() {
     this.warningMessages = [];
@@ -92,6 +101,7 @@ export class ClaimRecord2Insert {
   targetAccessRights: string;
   targetEmbargoEndDate: string;
   claimedInDashboard: string;
+  idSuffix:string;
 
   constructor() {
 
@@ -115,7 +125,12 @@ export class ClaimDBContext {
   title: string;
   openaireId: string;
 }
-
+export class ClaimDBOrganization {
+  openaireId: string;
+  name: string;
+  shortName: string;
+  country: string;
+}
 export class ClaimDBProject {
   openaireId: string;
   name: string;
@@ -168,24 +183,25 @@ export class ShowOptions {
     this.basketShowSources = false;  
   }
   showLinkTo() {
-    console.log(this.linkTo, "showLinkTo")
+    // console.log(this.linkTo, "showLinkTo")
     this.show = this.linkTo;
     this.basketswitchToLinkTo();
     HelperFunctions.scroll();
 
   }
 
-  initSelectOptions(){
+  initSelectOptions(claimProperties:ClaimsProperties){
     let options =[];
     if(this.linkToEntities.indexOf('result')!=-1){
       options.push({value: 'result',label: OpenaireEntities.RESULTS})
     }
     if(this.linkToEntities.indexOf('project')!=-1){
-      options.push({value: 'project',label: OpenaireEntities.PROJECTS})
+      options.push({value: 'project',label: claimProperties.SELECT_ENTITIES.projects})
     }
     if(this.linkToEntities.indexOf('context')!=-1){
       options.push({value: 'context',label: OpenaireEntities.COMMUNITIES})
     }
     this.selectOptions = options;
+    // console.log(options, claimProperties.SELECT_ENTITIES.projects)
   }
 }

claims/claim-utils/claimProjectSearchForm.component.html

@@ -1,69 +1,25 @@
-<div class="uk-width-xlarge@l uk-width-large">
+<div class="uk-width-expand" [ngClass]="centerAlign ? 'uk-align-center':''">
   <advanced-search-input (searchEmitter)="search(page,size)">
     <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
-         [options]="showOptions.selectOptions" class="uk-width-2-5"></div>
-    <div class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Entities to link"
-         [hint]="'Search for ' + openaireEntities.PROJECTS + '...'" tooltip="true"></div>
+         [options]="showOptions.selectOptions" class="uk-width-medium@xl uk-width-auto"></div>
+    <div *ngIf="funderOptions && funderOptions.length > 0" input type="select" [(value)]="selectedFunder" placeholder="Funder" hint="Select Funder..."
+         [options]="funderOptions" class="uk-width-expand" (valueChange)="funderChanged($event)"></div>
+    <div   class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Projects to link"
+         [hint]="'Search for ' + openaireEntities.PROJECTS + '...'" tooltip="true" [disabled]="isNoProjectFunder"></div>
   </advanced-search-input>
 </div>
-<div *ngIf="!showResults">
+<div *ngIf="  openaireResultsStatus != errorCodes.LOADING && !isNoProjectFunder && this.selectedFunder && openaireResults.length == 0">
   <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">No {{openaireEntities.PROJECT.toLowerCase()}} results yet... <br>Start
     searching for {{openaireEntities.PROJECTS.toLowerCase()}} to add them in the Basket
   </div>
 </div>
-<div *ngIf="showResults" class="uk-margin-top">
+<div *ngIf="  openaireResultsStatus != errorCodes.LOADING && this.funderOptions.length > 1 && !this.selectedFunder">
+  <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">Select funder or search for projects to proceed
+  </div>
+</div>
+<div class="uk-margin-top">
   <div class="uk-grid" uk-grid>
-    <div class="search-filters uk-width-1-1">
-      <!--<div *ngIf="countFilters()>0 && openaireResultsNum > 0"  class="uk-grid uk-flex uk-flex-bottom">
-        <div class="uk-grid">
-          <h6 class="uk-text-bold">Filters</h6>
-          <a *ngIf="countFilters()>1"  (click)="clearFilters()"
-             [class]="((openaireResultsStatus ==
-                              errorCodes.LOADING)?'uk-disabled uk-link-muted':'')+'  portal-link '">
-            Clear All
-          </a>
-        </div>
-        <div  *ngIf="countFilters()>0" class="uk-grid uk-grid-small uk-text-small  uk-margin-small-top " uk-grid>
-          <ng-container *ngFor="let filter of rangeFilters " >
-            <ng-container *ngIf = "filter.selectedFromAndToValues">
-                      <span [title]="'Remove '+ filter.selectedFromAndToValues" (click) = "removeRangeFilter(filter) " >
-                        <span class="selectedFilterLabel ">
-                          <a [class]="((openaireResultsStatus ==
-                          errorCodes.LOADING)?'  uk-disabled':'  ')+' uk-link-text '">
-                            <span class=" clickable" aria-hidden="true">
-                              <span class="uk-icon">
-                                <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
-                              </span>
-                            </span>
-                            <span class="uk-margin-small-left">{{filter.selectedFromAndToValues}}</span>
-                          </a>
-                        </span>
-                      </span>
-            </ng-container>
-          </ng-container>
-
-          <ng-container *ngFor="let filter of filters " >
-            <ng-container *ngIf = "filter.countSelectedValues > 0">
-               <span *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; "
-                     [title]="'Remove '+value.name" (click) = "removeFilter(value, filter) " >
-                        &lt;!&ndash; if no grid on the div above, remove it and move class 'selectedFilterLabel' on top span &ndash;&gt;
-                        <span class="selectedFilterLabel ">
-                          <a [class]="((openaireResultsStatus ==
-                            errorCodes.LOADING)?'  uk-disabled':'  ')+' uk-link-text '">
-                            <span class=" clickable" aria-hidden="true">
-                              <span class="uk-icon">
-                                <svg width="16" height="16" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="close" ratio="0.8"><path fill="none" stroke="#000" stroke-width="1.6" d="M16,16 L4,4"></path><path fill="none" stroke="#000" stroke-width="1.6" d="M16,4 L4,16"></path></svg>
-                              </span>
-                            </span>
-                            <span class="uk-margin-small-left" [innerHtml]="(value.name.length > 34)?value.name.substring(0,34)+'...':value.name"></span>
-                          </a>
-                        </span>
-                      </span>
-            </ng-container>
-          </ng-container>
-        </div>
-      </div>-->
-<!--      <ng-container *ngIf="openaireResultsNum > 0">-->
+    <div *ngIf="!isNoProjectFunder && openaireResultsStatus != errorCodes.LOADING && openaireResultsNum > 1 " class="search-filters uk-width-1-1">
       <div class="uk-grid uk-grid-small" uk-grid>
         <ng-container *ngFor="let filter of rangeFilters">
           <div>
@@ -104,9 +60,12 @@
            role="alert">Service not available
       </div>
       <div *ngIf="openaireResultsStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1"
-           role="alert"><span class="loading-gif  uk-align-center"></span></div>
+           role="alert">
+        <loading></loading>
+      </div>
       <claim-results [localStoragePrefix]="localStoragePrefix" [results]=openaireResults
                      [selectedResults]=selectedProjects [basketLimit]="basketLimit"></claim-results>
+      <div *ngIf="isNoProjectFunder && openaireResultsStatus != errorCodes.LOADING " class="uk-alert uk-alert-default">No projects for funder <span class=" uk-text-bold">{{selectedFunder.name}}</span>. </div>
       <div *ngIf="openaireResultsNum != null && openaireResultsNum > 0 && openaireResultsStatus != errorCodes.LOADING " class="uk-flex uk-flex-center  ">
               <paging-no-load [currentPage]="openaireResultsPage"
                               [totalResults]="openaireResultsNum" [term]="keyword"

claims/claim-utils/claimProjectSearchForm.component.ts

@@ -1,4 +1,4 @@
-import {Component, ElementRef, EventEmitter, Input, Output} from '@angular/core';
+import {Component, ElementRef, EventEmitter, Input, Output, ViewChild} from '@angular/core';
 import {SearchProjectsService} from '../../services/searchProjects.service';
 import {ProjectService} from '../../landingPages/project/project.service';
 import {ClaimEntity, ClaimProject} from './claimHelper.class';
@@ -10,6 +10,7 @@ import {RangeFilter} from "../../utils/rangeFilter/rangeFilterHelperClasses.clas
 import {OpenaireEntities, SearchFields} from "../../utils/properties/searchFields";
 import {NewSearchPageComponent} from "../../searchPages/searchUtils/newSearchPage.component";
 import {Subscriber} from "rxjs";
+import { properties } from 'src/environments/environment';
 
 declare var UIkit:any;
 
@@ -21,16 +22,16 @@ declare var UIkit:any;
 })
 export class ClaimProjectsSearchFormComponent {
   public query = '';
+  @Input() public centerAlign: boolean = false;
   @Input() public selectedProjects:ClaimEntity[]=[] ;
   public elementRef;
 
   @Output() projectSelected = new EventEmitter();
-  @Input() public properties:EnvProperties;
+  public properties:EnvProperties = properties;
   @Input() public inlineClaim:boolean=false;
   @Input()  localStoragePrefix:string = "";
   @Input() basketLimit;
   @Input() showOptions;
-
   public errorCodes:ErrorCodes = new ErrorCodes();
   public projects:string[];
   public warningMessage = "";
@@ -52,47 +53,85 @@ export class ClaimProjectsSearchFormComponent {
   public rangeFields:string[][] = this.searchFields.PROJECT_RANGE_FIELDS;
   openaireEntities = OpenaireEntities;
   sub;
+
+  selectedFunder = null;
+  funderOptions = [];
+  isNoProjectFunder = false;
+
   constructor(private _service: ProjectService, private _projectService: SearchProjectsService, myElement: ElementRef) {
       this.elementRef = myElement;
-    this.rangeFilters = RangeFilter.parse(this.rangeFields,"project");
-
+      this.rangeFilters = RangeFilter.parse(this.rangeFields,"project");
+      this.getFunders();
   }
   ngOnDestroy() {
     if (this.sub  instanceof Subscriber) {
       this.sub.unsubscribe();
     }
   }
+  getFunders(){
+    this.openaireResultsStatus = this.errorCodes.LOADING;
+    this.showResults = true;
+    this.sub = this._projectService.advancedSearchProjects("", 1, 0, this.properties,
+        this.refineFieldsQuery, this.refineFields, "&type=projects&sf=funder").subscribe(
+      data => {
+        let option = {value : null, label: "No funder selected"};
+        this.funderOptions.push(option);
+        for(let v of data[2][0].values){
+          let option = {value : v, label: v.name};
+          this.funderOptions.push(option);
+        }
+        this.openaireResultsStatus = this.errorCodes.DONE;
+      }, error =>{
+        this.openaireResultsStatus = this.errorCodes.ERROR;
+      })
+  }
 
-  search(page,size) {
-    if(this.keyword.length == 0){
-      this.showResults =false;
-      return;
+  funderChanged(value){
+    this.keyword = ""
+    this.selectedFunder = value;
+    this.isNoProjectFunder = this.selectedFunder && this.selectedFunder.number == 1;
+    this.openaireResults = [];
+    if(this.isNoProjectFunder){
+      this.showResults = true;
+      this.search(1,1);
+    }else{
+      this.openaireResults = [];
     }
-    this.showResults =true;
+  }
+  search(page,size) {
+   /* if (this.keyword.length == 0) {
+      this.showResults = false;
+      return;
+    }*/
+    this.showResults = true;
     this.openaireResults = [];
     this.openaireResultsStatus = this.errorCodes.LOADING;
     this.prevFilters = this.filters;
 
     //searchProjects (params: string, refineParams:string, page: number, size: number, refineFields:string[] , properties:EnvProperties ):any {
-    this.sub = this._projectService.searchProjects(this.createOpenaireQueryParams(),(page==1)? this.refineFieldsQuery:null, page, size, (page==1)?this.refineFields:[], this.properties).subscribe(
+    this.sub = this._projectService.advancedSearchProjects(this.createOpenaireQueryParams(), page, size, this.properties,   this.createOpenaireRefineQuery(), [], null).subscribe(
+      // this.sub = this._projectService.searchProjects(this.createOpenaireQueryParams(),(page==1)? this.refineFieldsQuery:null, page, size, (page==1)?this.refineFields:[], this.properties).subscribe(
       data => {
-          if(data != null) {
-              this.openaireResultsPage=page;
-              this.openaireResultsNum = data[0];
-              this.openaireResults =ClaimProjectsSearchFormComponent.openaire2ClaimEntity(data[1], this.properties);
-              if(data[2] && data[2].length > 0){
-                this.filters =  this.checkSelectedFilters( data[2], this.prevFilters);
-              }
-
-              this.openaireResultsStatus = this.errorCodes.DONE;
-              if(this.openaireResultsNum == 0){
-                this.openaireResultsStatus = this.errorCodes.NONE;
-                this.filters =  this.checkSelectedFilters( [], this.prevFilters);
-              }
-          }else {
-            this.openaireResultsStatus = this.errorCodes.ERROR;
+        if (data != null) {
+          this.openaireResultsPage = page;
+          this.openaireResultsNum = data[0];
+          this.openaireResults = ClaimProjectsSearchFormComponent.openaire2ClaimEntity(data[1], this.properties);
+          if (data[2] && data[2].length > 0) {
+            this.filters = this.checkSelectedFilters(data[2], this.prevFilters);
           }
-       },
+
+          this.openaireResultsStatus = this.errorCodes.DONE;
+          if (this.openaireResultsNum == 0) {
+            this.openaireResultsStatus = this.errorCodes.NONE;
+            this.filters = this.checkSelectedFilters([], this.prevFilters);
+          }
+         /* if(this.isNoProjectFunder && this.claimResultsComponent){
+            this.claimResultsComponent.add(this.openaireResults[0])
+          }*/
+        } else {
+          this.openaireResultsStatus = this.errorCodes.ERROR;
+        }
+      },
       err => {
         this.openaireResultsStatus = this.errorCodes.ERROR;
         //console.log(err.status);
@@ -100,85 +139,23 @@ export class ClaimProjectsSearchFormComponent {
       }
     );
   }
-// select(entity){
-//   if(this.selectedProjects.length > 50){
-//     UIkit.notification({
-//         message : 'Your basket exceeds the number of allowed projects (50)',
-//         status  : 'warning',
-//         timeout : 1500,
-//         pos     : 'top-center'
-//     });
-//     return;
-//   }
-//     this.query = "";
-//     // this.searchTermStream.next(this.query); //clear
-//     entity = entity.value;
-//     // var project: ClaimProject = new ClaimProject();
-//     // project.funderId = entity.funderId;
-//     // project.funderName = entity.funderName;
-//     // project.id = entity.id;
-//     // project.projectName = entity.projectName;
-//     // project.projectAcronym = entity.projectAcronym;
-//     // project.startDate = entity.startDate;
-//     // project.endDate = entity.endDate;
-//     // project.code = entity.code;
-//     // project.jurisdiction = entity.jurisdiction;
-//     // project.fundingLevel0 = entity.fundingLevel0;
-//
-//
-//     var index:number =this.selectedProjects.indexOf(entity);
-//     var found:boolean = false;
-//     this.warningMessage = "";
-//
-//     for (var _i = 0; _i < this.selectedProjects.length; _i++) {
-//         let project = this.selectedProjects[_i];
-//         if(entity.id == project.id){
-//               found=true;
-//               this.warningMessage = "Project already in your basket";
-//         }
-//      }
-//
-//     if (!found) {
-//       this.selectedProjects.push(entity);
-//       if(this.selectedProjects != null){
-//         localStorage.setItem(this.localStoragePrefix + "projects", JSON.stringify(this.selectedProjects));
-//       }
-//       this.projectSelected.emit({
-//         value: true
-//       });
-//
-//     }
-// }
-/*  static showItem(item):string{
-    return ((item.field[1]['@value'])?item.field[1]['@value']+" - ":"" ) + item.field[3]['@value'];
-  }*/
-  remove(item){
+   remove(item){
     let index:number =this.selectedProjects.indexOf(item);
      if (index > -1) {
         this.selectedProjects.splice(index, 1);
     }
 
   }
-/*  handleClick(event){
-   var clickedComponent = event.target;
-   var inside = false;
-   do {
-       if (clickedComponent === this.elementRef.nativeElement) {
-           inside = true;
-       }
-      clickedComponent = clickedComponent.parentNode;
-   } while (clickedComponent);
-
-  }*/
-  static openaire2ClaimEntity(items, properties:EnvProperties){
+   static openaire2ClaimEntity(items, properties:EnvProperties){
     const projects: ClaimEntity[] = [];
     for(const item of items){
       const entity: ClaimEntity = new ClaimEntity();
       entity.project = new ClaimProject();
       entity.project.funderId = item.funderId;
-      entity.project.funderName = item.funderShortname;
+      entity.project.funderShortname = item.funderShortname?item.funderShortname:(entity.project.funderId?entity.project.funderId.split("::")[1]:"");
+      entity.project.funderName = item.funderName;
       entity.id = item.id;
-      entity.project.url = properties.searchLinkToProject + entity.id;
+      entity.project.url = (item.code !="unidentified") ? properties.searchLinkToProject + entity.id : null;
       entity.title = item.title.name;
       entity.project.acronym = item.acronym;
       entity.project.startDate = item.startYear;
@@ -201,43 +178,47 @@ export class ClaimProjectsSearchFormComponent {
   }
 
 
-  createOpenaireQueryParams():string {
+  createOpenaireQueryParams(): string {
     let query = "";
-    if(this.keyword.length > 0){
-      query += "q=" + StringUtils.quote(StringUtils.URIEncode(this.keyword));
+    if (this.keyword.length > 0) {
+      // query += "q=" + StringUtils.quote(StringUtils.URIEncode(this.keyword));
+      query += StringUtils.quote(StringUtils.URIEncode(this.keyword));
     }
+    return query;
+  }
 
-    /*if(this.startYear.length > 0 ){
-      query+='&fq=projectstartyear exact \"'+this.startYear+'\"'
-    }
-    if(this.endYear.length > 0 ){
-      query+='&fq=projectendyear exact \"'+this.endYear+'\"'
-    }*/
+  createOpenaireRefineQuery(): string {
     let allFqs = "";
-    for (let filter of this.filters){
-      if(filter.countSelectedValues > 0){
-        let count_selected=0;
+    for (let filter of this.filters) {
+      if (filter.countSelectedValues > 0) {
+        let count_selected = 0;
         let fq = "";
-        for (let value of filter.values){
-          if(value.selected == true){
+        for (let value of filter.values) {
+          if (value.selected == true) {
             count_selected++;
-            fq+=(fq.length > 0 ? " " + filter.filterOperator + " ":"" ) + filter.filterId + " exact " + (StringUtils.quote(value.id));
+            fq += (fq.length > 0 ? " " + filter.filterOperator + " " : "") + filter.filterId + " exact " + (StringUtils.quote(value.id));
           }
         }
-        if(count_selected > 0){
-          fq="&fq="+StringUtils.URIEncode(fq);
+        if (count_selected > 0) {
+          fq = "&fq=" + StringUtils.URIEncode(fq);
           allFqs += fq;
         }
       }
     }
-    for (let i=0; i<this.rangeFilters.length; i++){
+    if(this.selectedFunder){
+      allFqs += "&fq=" + StringUtils.URIEncode( "funder exact " + (StringUtils.quote(this.selectedFunder.id)));
+    }
+    if(!this.isNoProjectFunder || !this.selectedFunder){
+      allFqs += '&fq=(projectcode<>"unidentified")'
+    }
+    for (let i = 0; i < this.rangeFilters.length; i++) {
       let filter = this.rangeFilters[i];
       //selectedFromValue, selectedToValue, equalityOp, equalityOpFrom, equalityOpTo, filterOp ){
-      allFqs+= NewSearchPageComponent.createRangeFilterQuery(this.rangeFields[i],filter.selectedFromValue, filter.selectedToValue, " within ", ">=" ,"<=", "and" )
+      allFqs += NewSearchPageComponent.createRangeFilterQuery(this.rangeFields[i], filter.selectedFromValue, filter.selectedToValue, " within ", ">=", "<=", "and")
     }
-    return query+allFqs;
-
+    return allFqs + "&type=projects";
   }
+
   public yearChanged() {
     this.search(this.page, this.size);
 
@@ -272,20 +253,21 @@ export class ClaimProjectsSearchFormComponent {
         }
 
       }
-
+      filter.countAllValues = filter.values.length;
     }
     if(filters.length == 0 ){
-      for(let j=0; j< prevFilters.length ; j++){
-            let filter  = Object.assign({}, prevFilters[j]);
-            filter.values = [];
-            for(let filterValue of prevFilters[j].values) {
-              if(filterValue.selected){
-                filterValue.number  = 0;
-                filter.values.push(filterValue);
-              }
-            }
-            filters.push(filter)
+      for(let j=0; j< prevFilters.length ; j++) {
+        let filter = Object.assign({}, prevFilters[j]);
+        filter.values = [];
+        for (let filterValue of prevFilters[j].values) {
+          if (filterValue.selected) {
+            filterValue.number = 0;
+            filter.values.push(filterValue);
           }
+        }
+        filter.countAllValues = filter.values.length;
+        filters.push(filter)
+      }
     }
     return filters;
   }

claims/claim-utils/claimProjectSearchForm.module.ts

@@ -1,11 +1,9 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
 
-import { SharedModule } from '../../../openaireLibrary/shared/shared.module';
-import { CommonModule }        from '@angular/common';
+import {SharedModule} from '../../shared/shared.module';
+import {CommonModule} from '@angular/common';
 
 import {ClaimProjectsSearchFormComponent} from './claimProjectSearchForm.component';
-// import {LoadingModalModule} from '../../utils/modal/loadingModal.module';
-
 import {ProjectServiceModule} from '../../landingPages/project/projectService.module';
 import {ProjectsServiceModule} from '../../services/projectsService.module';
 import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module';
@@ -13,29 +11,26 @@ import {HelperModule} from '../../utils/helper/helper.module';
 
 import {ClaimResultsModule} from './claimResults.module';
 
-import {PagingModule } from '../../utils/paging.module';
+import {PagingModule} from '../../utils/paging.module';
 import {SearchFilterModule} from '../../searchPages/searchUtils/searchFilter.module';
 import {RangeFilterModule} from "../../utils/rangeFilter/rangeFilter.module";
-import {ClaimEntitiesSelectionComponent} from "./claimEntitiesSelection.component";
-import {MatSelectModule} from "@angular/material/select";
 import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-input/advanced-search-input.module";
 import {InputModule} from "../../sharedComponents/input/input.module";
 import {DropdownFilterModule} from "../../utils/dropdown-filter/dropdown-filter.module";
+import {LoadingModule} from "../../utils/loading/loading.module";
 
- @NgModule({
-   imports: [
-     SharedModule, CommonModule,
-     // LoadingModalModule,
-     ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule, HelperModule,
-     PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, MatSelectModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule
-   ],
+@NgModule({
+  imports: [
+    SharedModule, CommonModule,
+    // LoadingModalModule,
+    ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule, HelperModule,
+    PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule, LoadingModule
+  ],
   providers:[
   ],
    declarations: [
      ClaimProjectsSearchFormComponent,
-     ClaimEntitiesSelectionComponent
-
    ],
-   exports: [ClaimProjectsSearchFormComponent, ClaimEntitiesSelectionComponent]
+   exports: [ClaimProjectsSearchFormComponent]
  })
 export class ClaimProjectsSearchFormModule { }

claims/claim-utils/claimResultSearchForm.component.html

@@ -1,14 +1,16 @@
-<div *ngIf="showOptions && showOptions.linkToEntities.length > 0" class="uk-width-xlarge@l uk-width-large">
-  <advanced-search-input (searchEmitter)="search(true)">
-    <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
-         [options]="showOptions.selectOptions" class="uk-width-2-5"></div>
-    <div class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Entities to link"
-         [hint]="'Search for ' + openaireEntities.RESULTS.toLowerCase()  + '...'" tooltip="true"></div>
-  </advanced-search-input>
-</div>
-<div *ngIf="!showOptions"  class="uk-width-xlarge@l uk-width-large">
-  <div search-input [(value)]="keyword" [placeholder]="'Search for ' + openaireEntities.RESULTS.toLowerCase() + '...'"
-         (searchEmitter)="search(true)"></div>
+<div class="uk-flex uk-flex-center uk-flex-left@m">
+  <div *ngIf="showOptions && showOptions.linkToEntities.length > 0" class="uk-width-xlarge@l uk-width-large" [ngClass]="centerAlign ? 'uk-align-center':''">
+    <advanced-search-input (searchEmitter)="search(true)">
+      <div input type="select" [(value)]="showOptions.show" placeholder="Type" hint="Select..."
+           [options]="showOptions.selectOptions" class="uk-width-2-5"></div>
+      <div class="uk-width-expand" input type="text" [(value)]="keyword" [searchable]="true" placeholder="Entities to link"
+           [hint]="'Search for ' + openaireEntities.RESULTS.toLowerCase()  + '...'" tooltip="true"></div>
+    </advanced-search-input>
+  </div>
+  <div *ngIf="!showOptions"  class="uk-width-xlarge@l uk-width-large">
+    <div search-input [(value)]="keyword" [placeholder]="'Search for ' + openaireEntities.RESULTS.toLowerCase() + '...'"
+         [searchInputClass]="'inner background'" (searchEmitter)="search(true)"></div>
+  </div>
 </div>
 <div *ngIf="!showSearchResults">
   <div class="uk-text-center uk-text-large uk-text-meta uk-margin-large-top">
@@ -49,7 +51,9 @@
         </div>
       </div>
       <div *ngIf="crossrefStatus === errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1"
-           role="alert"><span class="loading-gif  uk-align-center"></span></div>
+           role="alert">
+        <loading></loading>
+      </div>
       <div>
 
         <claim-results [localStoragePrefix]=localStoragePrefix [results]=crossrefResults
@@ -112,7 +116,7 @@
 
           <div *ngIf="openaireResultsStatus === errorCodes.LOADING"
                class="uk-animation-fade uk-margin-top  uk-width-1-1"
-               role="alert"><span class="loading-gif  uk-align-center">Loading...</span></div>
+               role="alert"><loading></loading></div>
           <claim-results [localStoragePrefix]=localStoragePrefix
                          [results]=openaireResults [selectedResults]=selectedResults [basketLimit]="basketLimit"></claim-results>
           <div  class="uk-flex uk-flex-center" *ngIf=" openaireResultsStatus != errorCodes.LOADING  && openaireResultsNum != null && openaireResultsNum > 0" >
@@ -175,7 +179,7 @@
         </div>
       </div>
       <div *ngIf="orcidStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1" role="alert">
-        <span class="loading-gif  uk-align-center"></span></div>
+        <loading></loading></div>
     </div>
   </div>
   <div *ngIf="activeTab == 'datacite'" id="datacite" class="uk-animation-fade">
@@ -188,7 +192,7 @@
     <div class="uk-margin-top">
       
       <div *ngIf="dataciteStatus == errorCodes.LOADING" class="uk-animation-fade uk-margin-top  uk-width-1-1"
-           role="alert"><span class="loading-gif  uk-align-center"></span></div>
+           role="alert"><loading></loading></div>
       <div>
         <claim-results [localStoragePrefix]=localStoragePrefix *ngIf="dataciteResults.length > 0 "
                        [results]=dataciteResults [selectedResults]=selectedResults [basketLimit]="basketLimit"></claim-results>

claims/claim-utils/claimResultSearchForm.component.ts

@@ -23,6 +23,7 @@ export class ClaimResultSearchFormComponent {
   source: string = "datacite";
   type: string = "dataset";
   showSearchResults: boolean = false;
+  @Input() public centerAlign: boolean = false;
   @Input() public select: boolean = true;
   @Input() public keyword: string = '';
   @Input() public selectedResults: ClaimEntity[];
@@ -864,7 +865,7 @@ export class ClaimResultSearchFormComponent {
         }
 
       }
-
+      filter.countAllValues = filter.values.length;
     }
     return filters;
   }

claims/claim-utils/claimResultSearchForm.module.ts

@@ -22,10 +22,11 @@ import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-
 import {InputModule} from "../../sharedComponents/input/input.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {DropdownFilterModule} from "../../utils/dropdown-filter/dropdown-filter.module";
+import {LoadingModule} from "../../utils/loading/loading.module";
 
  @NgModule({
    imports: [SharedModule, CommonModule, SearchResearchResultsServiceModule, PagingModule, SearchCrossrefServiceModule,
-     SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule, MatSelectModule, QuickSelectionsModule, RangeFilterModule, ClaimProjectsSearchFormModule, AdvancedSearchInputModule, InputModule, SearchInputModule, DropdownFilterModule],
+     SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule, MatSelectModule, QuickSelectionsModule, RangeFilterModule, ClaimProjectsSearchFormModule, AdvancedSearchInputModule, InputModule, SearchInputModule, DropdownFilterModule, LoadingModule],
   providers:[
      SearchOrcidService
   ],

claims/claim-utils/claimResults.component.ts

@@ -6,13 +6,9 @@ declare var UIkit: any;
 @Component({
   selector: 'claim-results',
   template: `
-
     <div *ngIf="results.length > 0 " class="uk-margin-top">
-      <div *ngFor=" let entity of results " [class]="(isSelected(entity))?'uk-block-muted':''" class=" uk-card uk-card-default uk-card-body uk-margin-bottom">
-        <div>
-          <div class="uk-text-small ">
-            {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
-          </div>
+      <div *ngFor="let entity of results" class="uk-card">
+        <div class="uk-padding-small">
           <div class="uk-grid">
             <div class="uk-width-expand uk-margin-right">
               <claim-title [entity]="entity" [showIcon]="false"></claim-title>
@@ -20,27 +16,29 @@ declare var UIkit: any;
               <claim-project-metadata [entity]="entity"></claim-project-metadata>
             </div>
             <div class="uk-margin-auto-vertical uk-padding-remove-left uk-margin-small-left  uk-margin-small-right" [title]="(this.selectedResults.length>=basketLimit)?'Basket reached the size limit':''">
-              <button class="linking-add-button" [class.uk-disabled]="(this.selectedResults.length>=basketLimit)" *ngIf="!isSelected(entity)"
+              <button class="linking-add-button uk-icon-button-small" [class.uk-disabled]="(this.selectedResults.length>=basketLimit)" *ngIf="!isSelected(entity)"
                  (click)="add(entity)">
                 <icon name="add" [flex]="true"></icon>
               </button>
-              <button *ngIf="isSelected(entity)" class="linking-selected-button" (click)="remove(entity)">
+              <button *ngIf="isSelected(entity)" class="linking-selected-button uk-icon-button-small" (click)="remove(entity)">
                 <icon name="check" [flex]="true"></icon>
               </button>
             </div>
           </div>
-
         </div>
       </div>
-    </div>`,
-
+    </div>
+  `
 })
 export class ClaimResultsComponent {
   @Input() results: ClaimEntity[];
   @Input() selectedResults: ClaimEntity[];
   @Input() localStoragePrefix: string = "";
   @Input() basketLimit;
-  
+
+  ngOnInit() {
+  }
+
   public isSelected(item: ClaimEntity) {
     return !!this.selectedResults.find(result => item.id === result.id);
   }

claims/claim-utils/claims.properties.ts

@@ -0,0 +1,23 @@
+export class ClaimsProperties{
+  ALLOW_ORGANIZATION_LINKING:boolean = false;
+  SELECT_ENTITIES = {
+    projects:"Funding"
+  }
+  INLINE_ENTITY = {
+    show: true,
+    guideText : null
+  }
+  BASKET ={
+    source_title: "Source",
+    target_title: "Link source to"
+  }
+  METADATA_PREVIEW ={
+    source_title: "Source",
+    target_title: "Link to",
+    edit_source_title: "Edit",
+    edit_target_title: "Edit",
+    edit_target_icon: "edit"
+  }
+
+
+}

claims/claim-utils/displayClaims/displayClaims.component.html

@@ -1,25 +1,27 @@
 <schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
 <div class="uk-grid">
-  <div class="uk-width-expand uk-position-relative">
+  <div class="uk-width-expand uk-position-relative uk-margin-small-top">
     <helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
             [texts]="pageContents['top']"></helper>
     <div *ngIf="filterForm" [id]="actions?'page_content_actions':null" [class.uk-blur-background]="actions" [attr.uk-sticky]="(actions)?'media: @m':null" [attr.offset]="offset">
       <div [class.uk-padding-small]="actions" class="uk-padding-remove-vertical">
-        <div class="uk-section-xsmall">
+
           <div class="uk-flex uk-flex-right@m uk-flex-center uk-flex-wrap uk-flex-middle">
           <div search-input [disabled]="loading" [searchControl]="filterForm.controls.keyword" searchInputClass="outer"
                placeholder="Search links" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1"
                (searchEmitter)="changeKeyword()" [expandable]="true"></div>
         </div>
-        </div>
       </div>
     </div>
     <div [class.uk-padding]="actions" class="uk-padding-remove-vertical">
-      <div class="uk-margin-medium-top">
-        <results-and-pages [type]="resultsNum !== 1?'Links':'Link'" [page]="page" [pageSize]="size"
+      <div class="uk-margin-small-top">
+        <results-and-pages [type]="resultsNum !== 1?'Links':'Link'" [page]="page" [pageSize]="size" [hasSearch]="true" [searchTerm]="keyword"
                            [totalResults]="resultsNum" customClasses="uk-margin-remove"></results-and-pages>
       </div>
-      <div class="uk-grid uk-flex-middle uk-margin-medium-top" uk-grid>
+      <div class="uk-grid uk-flex-middle uk-margin-small-top" uk-grid>
+        <div *ngIf="fetchBy != 'User' && properties.environment == 'development'" >
+          <input  [(ngModel)]="mine" [checked]="mine" (ngModelChange)="goTo(1)"   type="checkbox"   class="uk-checkbox"> Mine
+        </div>
         <div>
           <dropdown-filter #dropdownFilter dropdownClass="uk-width-medium uk-padding-small"
                            name="Type of Entity" [disabled]="loading" [count]="entities.length">
@@ -43,6 +45,7 @@
                type="select" [options]="sortOptions">
           </div>
         </div>
+
         <div class="uk-width-expand@l uk-width-1-1 uk-flex uk-flex-right@m uk-flex-center">
           <paging-no-load [currentPage]="page" [totalResults]="resultsNum" [size]="size"
                           [loading]="false" (pageChange)="pageChange($event)"></paging-no-load>
@@ -56,57 +59,76 @@
           <div *ngIf="claims && claims.length == 0"  class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
             <div>No links found</div>
           </div>
-          <ul class="uk-margin-small-top uk-list uk-list-xlarge">
-            <li *ngFor="let claim of claims;  let i=index" class="uk-card uk-card-default">
-              <div class="uk-card-body">
-                <div class="uk-grid uk-grid-small" uk-grid>
-                  <div class="uk-width-expand">
-                    <div class="uk-margin-bottom">
-                      <claim-entity [entity]="claim.target" [type]="claim.targetType" [properties]=properties
-                                    [externalPortalUrl]=externalPortalUrl [source]="true"></claim-entity>
-                    </div>
-                    <div class="uk-margin-bottom">
-                      <span *ngIf="isClaimAvailable(claim) else notAvailable" class="uk-label uk-label-success"
-                            [attr.uk-tooltip]="'title: The link information is available in the portal and the APIs.'">available</span>
-                      <ng-template #notAvailable>
-                        <span class="uk-label uk-label-danger"
-                            [attr.uk-tooltip]="'title:The link information  will be added in the portal and the APIs in the next content provision workflow.'">pending</span>
-                      </ng-template>
-                    </div>
-                    <div class="uk-text-small">
-                      <div *ngIf="showUserEmail" class="uk-margin-small-bottom">
-                        <span class="uk-text-meta">Claimed by:</span>
-                        <span class="uk-margin-xsmall-left">{{claim.userMail}}</span>
+          <ng-container *ngIf="claims && claims.length > 0">
+
+            <div class="uk-flex uk-flex-middle uk-margin-top uk-margin-small-bottom uk-padding-small uk-padding-remove-horizontal">
+              <div class="uk-width-xsmall uk-flex uk-flex-center uk-flex-middle">
+                <label>
+                  <input id="checkAll" type="checkbox" (click)="selectAll($event)" class="uk-checkbox" title="Select All"
+                    [ngModel]="selected.length == claims.length"/>
+                </label>
+              </div>
+              <button class="uk-button uk-button-link" [class.uk-disabled]="selected.length == 0" [disabled]="selected.length == 0"
+                (click)="deleteOpen()">
+                <span>Delete ({{selected.length}})</span>
+              </button>
+            </div>
+
+            <ul class="uk-margin-small-top uk-list uk-list-striped">
+              <li *ngFor="let claim of claims;  let i=index" class="uk-flex uk-flex-middle uk-padding-small uk-padding-remove-horizontal">
+                <div class="uk-width-xsmall uk-flex uk-flex-center uk-flex-middle">
+                  <input type="checkbox" class="uk-checkbox"
+                    [id]="claim.id" (click)="selectClaim(claim, $event)" [ngModel]="isSelectedClaim(claim.id)">
+                </div>
+                <div class="uk-width-expand">
+                  <div class="uk-grid uk-grid-small uk-flex-middle" uk-grid>
+                    <div class="uk-width-expand">
+                      <div class="uk-margin-small-bottom">
+                        <claim-entity [entity]="claim.target" [type]="claim.targetType" [properties]=properties
+                                      [externalPortalUrl]=externalPortalUrl [source]="true" [linkAvailable]="isClaimAvailable(claim)"></claim-entity>
                       </div>
-                      <div>
-                        <span class="uk-text-meta">Claimed date:</span>
-                        <span class="uk-margin-xsmall-left">{{claim.date}}</span>
+                      <div class="uk-margin-small-bottom">
+                        <span *ngIf="isClaimAvailable(claim) else notAvailable" class="uk-label uk-label-small uk-label-success"
+                              [attr.uk-tooltip]="'title: The link information is available in the portal and the APIs.'">available</span>
+                        <ng-template #notAvailable>
+                          <span class="uk-label uk-label-small uk-label-danger"
+                              [attr.uk-tooltip]="'title:The link information  will be added in the portal and the APIs in the next content provision workflow.'">pending</span>
+                        </ng-template>
+                      </div>
+                      <div class="uk-text-small">
+                        <div *ngIf="showUserEmail" class="uk-margin-xsmall-bottom">
+                          <span class="uk-text-meta">Claimed by:</span>
+                          <span class="uk-margin-xsmall-left">{{claim.userMail}}</span>
+                        </div>
+                        <div>
+                          <span class="uk-text-meta">Claimed date:</span>
+                          <span class="uk-margin-xsmall-left">{{claim.date}}</span>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <div class="uk-visible@m">
-                    <div class="claim-divider">
-                      <icon class="uk-position-center" name="link" customClass="uk-text-primary" ratio="2" [flex]="true"></icon>
+                    <div class="uk-visible@m">
+                      <div class="claim-divider">
+                        <icon class="uk-position-center" name="link" customClass="uk-text-primary" ratio="2" [flex]="true"></icon>
+                      </div>
+                    </div>
+                    <div class="uk-width-1-2@m uk-width-1-1">
+                      <claim-entity [entity]="claim.source" [type]="claim.sourceType" [source]="false" [properties]=properties
+                                    [externalPortalUrl]=externalPortalUrl></claim-entity>
                     </div>
-                  </div>
-                  <div class="uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-column uk-flex-center">
-                    <claim-entity [entity]="claim.source" [type]="claim.sourceType" [source]="false" [properties]=properties
-                                  [externalPortalUrl]=externalPortalUrl></claim-entity>
                   </div>
                 </div>
-              </div>
-              <div class="uk-card-footer uk-flex uk-flex-right">
-                <button class="uk-button uk-button-link uk-flex uk-flex-middle" (click)="deleteOpen(i)">
-                  <icon name="delete" [flex]="true"></icon>
-                  <span class="uk-margin-xsmall-left">Delete</span>
-                </button>
-              </div>
-            </li>
-          </ul>
-          <div class="uk-margin-medium-top uk-flex uk-flex-center uk-flex-right@m">
-            <paging-no-load *ngIf="resultsNum" [currentPage]="page" [totalResults]="resultsNum" [size]="size"
-                            (pageChange)="pageChange($event)"></paging-no-load>
-          </div>
+                <div class="uk-width-xsmall uk-flex uk-flex-center uk-flex-middle">
+                  <button class="uk-button uk-button-link uk-flex uk-flex-middle" (click)="deleteOpen(i)">
+                    <icon name="delete" [flex]="true"></icon>
+                  </button>
+                </div>
+              </li>
+            </ul>
+            <div class="uk-margin-medium-top uk-flex uk-flex-center uk-flex-right@m">
+              <paging-no-load *ngIf="resultsNum" [currentPage]="page" [totalResults]="resultsNum" [size]="size"
+                              (pageChange)="pageChange($event)"></paging-no-load>
+            </div>
+          </ng-container>
         </div>
       </div>
     </div>

claims/claim-utils/displayClaims/displayClaims.component.less

@@ -4,14 +4,4 @@
   position: relative;
   padding: 0 20px;
   height: 100%;
-
-  &::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 50%;
-    right: 0;
-    bottom: 0;
-    border-left: @global-border-width solid @global-border;
-  }
 }

claims/claim-utils/displayClaims/displayClaims.component.ts

@@ -27,7 +27,6 @@ import {DropdownFilterComponent} from "../../../utils/dropdown-filter/dropdown-f
   styleUrls: ['displayClaims.component.less']
 })
 export class DisplayClaimsComponent implements OnInit, OnDestroy {
-  @Input() piwikSiteId = null;
   @Input() pageTitle: string = "";
   properties: EnvProperties;
   public searchTermStream = new Subject<string>();
@@ -41,7 +40,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
   page: number = 1;
   size: number = 50;
   keyword: string; // the keyword string to give to the request as parameter
-  types = ["All", "Project", "Context", "Result", "User"];
+  types = ["All", "Project", "Context", "Result", "User", "Organization"];
   loading: boolean = false;
   @Input() fetchBy: string;
   @Input() fetchId: string;
@@ -53,6 +52,8 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
   lastIndexDate = null;
   public filterForm: FormGroup;
   public entities: string[] = [];
+  selected = [];
+  mine = false;
   
   allOptions: Option[] = [
     {label: OpenaireEntities.PUBLICATIONS, value: "publication"},
@@ -110,13 +111,13 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
     this.updateTitle(this.pageTitle);
     this.updateDescription(description);
     this.updateUrl(this.url);
-    if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
-      this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe());
+    this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
+
+    if(properties.adminToolsPortalType !== "explore") {
+      this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
+        this.pageContents = contents;
+      }));
     }
-    
-    this.subscriptions.push(this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
-      this.pageContents = contents;
-    }));
     this.subscriptions.push(this.indexInfoService.getLastIndexDate(this.properties).subscribe(res => {
       this.lastIndexDate = res;
     }));
@@ -133,6 +134,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
         this.fetchId = this.fetchId ? this.fetchId : '';
       }
       let page = (params['page'] === undefined) ? 1 : +params['page'];
+      this.mine = (params['mine'] == 'true' ? true:false);
       this.keyword = (params['keyword'] ? params['keyword'] : "");
       this.filterForm.get('keyword').setValue(this.keyword);
       this.page = (page <= 0) ? 1 : page;
@@ -186,6 +188,16 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
           this.handleErrors(err, "Error getting claims for project with id: " + this.fetchId);
         }
       );
+    } else if (this.fetchBy == "Organization") {
+      this.subResults = this._claimService.getClaimsByOrganization(this.size, this.page, this.fetchId, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL, this.mine).subscribe(
+        data => {
+          this.manageAPIData(data);
+          this.loading = false;
+        },
+        err => {
+          this.handleErrors(err, "Error getting claims for project with id: " + this.fetchId);
+        }
+      );
     } else if (this.fetchBy == "User") {
       this.subResults = this._claimService.getClaimsByUser(this.size, this.page, this.fetchId, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL).subscribe(
         data => {
@@ -209,7 +221,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
         }
       );
     } else if (this.fetchBy == "Context") {
-      this.subResults = this._claimService.getClaimsBycontext(this.size, this.page, this.fetchId, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL).subscribe(
+      this.subResults = this._claimService.getClaimsBycontext(this.size, this.page, this.fetchId, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL, this.mine).subscribe(
         data => {
           this.manageAPIData(data);
           this.loading = false;
@@ -220,7 +232,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
         }
       );
     } else {
-      this.subResults = this._claimService.getClaims(this.size, this.page, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL).subscribe(
+      this.subResults = this._claimService.getClaims(this.size, this.page, this.keyword, this.filterForm.get("sort").value.sort, this.filterForm.get("sort").value.descending, types, this.properties.claimsAPIURL, this.mine).subscribe(
         data => {
           this.manageAPIData(data);
           this.loading = false;
@@ -240,7 +252,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
   
   handleErrors(err, message) {
     NotificationHandler.rise(message, "danger");
-    console.error("Dispaly Claims (component): " + message + " " + (err && err.error ? err.error : ''));
+    console.error("Display Claims (component): " + message + " " + (err && err.error ? err.error : ''));
   }
   
   goTo(page: number = 1) {
@@ -259,15 +271,8 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
       types += (types.length > 0 ? ',' : '') + type;
     }
     params += (this.entities.length > 0) ? (params.length > 0 ? '&' : '') + "types=" + types : "";
-    if (this.isAdmin) {
-      params += (this.fetchBy == 'All' ? "" : (params.length > 0 ? '&' : '') + "fetchBy=" + this.fetchBy);
-      params += (this.fetchId == '' ? "" : (params.length > 0 ? '&' : '') + "fetchId=" + this.fetchId);
-    }
     params += (this.filterForm.get("sort").value.sort == 'date' && this.filterForm.get("sort").value.descending ? "" : (params.length > 0 ? '&' : '') + "sort=" + this.filterForm.get("sort").value.sort + "-" + this.filterForm.get("sort").value.descending);
     params += (this.keyword == '' ? "" : (params.length > 0 ? '&' : '') + "keyword=" + this.keyword);
-    if (this.communityId != null) {
-      params += "&communityId=" + this.communityId;
-    }
     return params;
   }
   
@@ -290,7 +295,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
   }
   
   changeKeyword() {
-    if (this.filterForm.get("keyword") && (this.filterForm.get("keyword").value.length >= 3 || this.filterForm.get("keyword").value.length == 0)) {
+    if (this.filterForm.get("keyword") && (this.filterForm.get("keyword").value?.length >= 3 || this.filterForm.get("keyword").value?.length == 0)) {
       this.searchTermStream.next(this.filterForm.get("keyword").value);
     }
   }
@@ -311,23 +316,34 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
   }
   
   isSelected(value: string) {
-    return this.filterForm && this.filterForm.get('entities').value.find(entity => entity === value)
+    return this.filterForm && this.filterForm.get('entities').value.find(entity => entity === value);
   }
   
-  deleteOpen(index: number) {
+  deleteOpen(index: number = null) {
     this.index = index;
     this.deleteModal.alertTitle = 'Delete Confirmation';
-    this.deleteModal.message = 'Are you sure you want to delete this link?';
+    this.deleteModal.message = 'Are you sure you want to delete ' + (this.index != null ? '1' : this.selected.length) + ' link(s)?';
     this.deleteModal.okButtonText = 'Yes';
     this.deleteModal.open();
   }
   
   delete() {
-    this.subscriptions.push(this._claimService.deleteBulk([this.claims[this.index].id], this.properties.claimsAPIURL).subscribe(
+    let claimsToBeDeleted = ((this.index != null) ? [this.claims[this.index].id] : this.selected.map(claim => claim.id));
+    // console.log(claimsToBeDeleted);
+    this.subscriptions.push(this._claimService.deleteBulk(claimsToBeDeleted, this.properties.claimsAPIURL).subscribe(
       res => {
-        this.claims.splice(this.index, 1);
-        this.resultsNum = this.resultsNum - 1;
-        NotificationHandler.rise('Link has been deleted successfully');
+        if (this.index != null) {
+          this.claims.splice(this.index, 1);
+          this.resultsNum = this.resultsNum - 1;
+          NotificationHandler.rise('Link has been deleted successfully');
+        } else {
+          claimsToBeDeleted.forEach(claimId => {
+            this.claims.splice(this.claims.findIndex((id) => id == claimId), 1);
+          });
+          this.resultsNum = this.resultsNum - claimsToBeDeleted.length;
+          NotificationHandler.rise(claimsToBeDeleted.length + ' links have been deleted successfully');
+        }
+        this.selected = [];
         let goToPage = this.page;
         if (this.totalPages(this.resultsNum) < this.page && this.page > 0) {
           goToPage = this.page - 1;
@@ -335,7 +351,8 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
         this.goTo(goToPage);
       }, err => {
         this.handleErrors(err, "Error deleting claim with id: " + this.claims[this.index].id);
-      }));
+      }
+    ));
   }
   
   pageChange($event) {
@@ -352,7 +369,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
     if (claimDateStr < lastUpdateDateStr) {
       return true;
     } else {
-      return claim.target.collectedFrom != "infrastruct_::openaire" && claim.indexed;
+      return claim.target.collectedFrom != "infrastruct_::openaire";
     }
   }
   
@@ -363,7 +380,44 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy {
     }
     return totalPages;
   }
-  
+
+  selectClaim(item: any, event) {
+    let value = event.currentTarget.checked;
+    if (value) {
+      this.selected.push(item);
+    } else {
+      for (var _i = 0; _i < this.selected.length; _i++) {
+        let claim = this.selected[_i];
+        if (claim['id'] == item.id) {
+          this.selected.splice(_i, 1);
+        }
+      }
+    }
+  }
+
+  selectAll(event) {
+    let value = event.currentTarget.checked;
+    if (value) {
+      this.selected = [];
+      for (let _i = 0; _i < this.claims.length; _i++) {
+        let claim = this.claims[_i];
+        this.selected.push(claim);
+      }
+    } else {
+      this.selected = [];
+    }
+  }
+
+  isSelectedClaim(id: string) {
+    for (let _i = 0; _i < this.selected.length; _i++) {
+      let claim = this.selected[_i];
+      if (claim['id'] == id) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private updateDescription(description: string) {
     this._meta.updateTag({content: description}, "name='description'");
     this._meta.updateTag({content: description}, "property='og:description'");

claims/claim-utils/displayClaims/displayClaims.module.ts

@@ -17,7 +17,6 @@ import {HelperModule} from '../../../utils/helper/helper.module';
 import {Schema2jsonldModule} from '../../../sharedComponents/schema2jsonld/schema2jsonld.module';
 import { SEOServiceModule } from '../../../sharedComponents/SEO/SEOService.module';
 import {IndexInfoServiceModule}  from "../../../utils/indexInfoService.module";
-import {PiwikServiceModule} from "../../../utils/piwik/piwikService.module";
 import {SearchInputModule} from '../../../sharedComponents/search-input/search-input.module';
 import {InputModule} from '../../../sharedComponents/input/input.module';
 import {LoadingModule} from '../../../utils/loading/loading.module';
@@ -30,7 +29,7 @@ import {link} from "../../../utils/icons/icons";
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule, ClaimServiceModule, LoadingModalModule, AlertModalModule,
-    ClaimEntityFormatterModule, PagingModule, HelperModule, Schema2jsonldModule, SEOServiceModule, PiwikServiceModule,
+    ClaimEntityFormatterModule, PagingModule, HelperModule, Schema2jsonldModule, SEOServiceModule,
     IndexInfoServiceModule, MatSelectModule, SearchInputModule, MatAutocompleteModule, MatChipsModule, MatFormFieldModule, MatSlideToggleModule, InputModule, LoadingModule, NoLoadPaging, IconsModule, DropdownFilterModule
   
   ],

claims/claim-utils/entityFormatter/claimEntityFormatter.component.ts

@@ -1,6 +1,6 @@
 import {Component, Input} from '@angular/core';
 import {EnvProperties} from '../../../utils/properties/env-properties';
-import {ClaimDBContext, ClaimDBProject, ClaimDBResult} from "../claimHelper.class";
+import {ClaimDBContext, ClaimDBOrganization, ClaimDBProject, ClaimDBResult} from "../claimHelper.class";
 import {OpenaireEntities} from "../../../utils/properties/searchFields";
 import {StringUtils} from "../../../utils/string-utils.class";
 
@@ -15,31 +15,37 @@ import {StringUtils} from "../../../utils/string-utils.class";
       <div *ngIf="source" class="uk-text-small">
         {{getEntityName(type)}}
       </div>
-      <div class="uk-flex">
-        <span *ngIf="!source" class="uk-text-meta uk-margin-small-right uk-text-large uk-text-nowrap">Link to:</span>
+      <div>
+        <span *ngIf="!source" class="uk-text-meta uk-text-small uk-margin-small-right uk-text-nowrap">Link to:</span>
         <publication-title [entity]="entity" param="id"
-                           path="/search/result" [externalPortalUrl]=externalPortalUrl></publication-title>
+                           path="/search/result" [externalPortalUrl]=externalPortalUrl [linkAvailable]="linkAvailable"></publication-title>
       </div>
     </div>
-    <div *ngIf="type == 'project'" [attr.uk-tooptip]="getEntityName(type)"
-         class="uk-flex">
-      <span class="uk-text-meta uk-margin-small-right uk-text-large uk-text-nowrap">Link to:</span>
+    <div *ngIf="type == 'project'" [attr.uk-tooptip]="getEntityName(type)">
+      <span class="uk-text-meta uk-text-small uk-margin-small-right uk-text-nowrap">Link to:</span>
       <project-title [project]="entity" [searchLink]=properties.searchLinkToProject
                      [externalPortalUrl]=externalPortalUrl></project-title>
     </div>
-    <div *ngIf="type == 'context'" class="uk-flex uk-text-large">
-      <span class="uk-text-meta uk-margin-small-right uk-text-nowrap">Link to:</span>
-      <span class="uk-text-truncate" uk-tooltip="Concept">{{entity.title}}</span>
+    <div *ngIf="type == 'organization'" [attr.uk-tooptip]="getEntityName(type)">
+      <span class="uk-text-meta uk-text-small uk-margin-small-right uk-text-nowrap">Link to:</span>
+      <organization-title [organization]="entity"></organization-title>
+    </div>
+    <div *ngIf="type == 'context'">
+      <span class="uk-text-meta uk-text-small uk-margin-small-right uk-text-nowrap">Link to:</span>
+      <h6 class="uk-h6 uk-margin-remove">
+        <span class="uk-text-truncate" uk-tooltip="Concept">{{entity.title}}</span>
+      </h6>
     </div>
   `
 })
 
 export class ClaimEntityFormatter {
-  @Input() entity: ClaimDBResult | ClaimDBContext | ClaimDBProject;
+  @Input() entity: ClaimDBResult | ClaimDBContext | ClaimDBProject | ClaimDBOrganization;
   @Input() type: string;
   @Input() properties: EnvProperties;
   @Input() externalPortalUrl: string = null;
   @Input() source: boolean = true;
+  @Input() linkAvailable: boolean = true;
   public openAIREEntities = OpenaireEntities;
 
   constructor() {

claims/claim-utils/entityFormatter/claimEntityFormatter.module.ts

@@ -5,18 +5,19 @@ import { RouterModule } from '@angular/router';
 import {ProjectTitleFormatter} from './projectTitleFormatter.component';
 import {PublicationTitleFormatter} from './publicationTitleFormatter.component';
 import {ClaimEntityFormatter} from './claimEntityFormatter.component';
+import {OrganizationTitleFormatterComponent} from "./organizationTitleFormatter.component";
 
  @NgModule({
   imports: [
     CommonModule, RouterModule
    ],
   declarations: [
-    ProjectTitleFormatter, PublicationTitleFormatter, ClaimEntityFormatter
+    ProjectTitleFormatter, PublicationTitleFormatter, ClaimEntityFormatter, OrganizationTitleFormatterComponent
 
   ],
   providers:    [   ],
   exports: [
-    ProjectTitleFormatter, PublicationTitleFormatter, ClaimEntityFormatter
+    ProjectTitleFormatter, PublicationTitleFormatter, ClaimEntityFormatter, OrganizationTitleFormatterComponent
 
    ]
 })

claims/claim-utils/entityFormatter/organizationTitleFormatter.component.ts

@@ -0,0 +1,18 @@
+import {Component, Input} from '@angular/core';
+
+@Component({
+  selector: 'organization-title',
+  template: `
+       <h6 *ngIf="organization" class="uk-margin-remove multi-line-ellipsis lines-2">
+        <p class="uk-margin-remove">
+            {{(organization.shortName ? ('[' + organization.shortName + '] ') : '')}}{{organization.name}}
+        </p>
+      </h6>
+  `
+})
+
+export class OrganizationTitleFormatterComponent {
+  @Input() organization: any;
+  public url: string;
+
+}

claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts

@@ -10,17 +10,17 @@ import {properties} from "../../../../../environments/environment";
     <ng-container>
       <h6 class="uk-margin-remove multi-line-ellipsis lines-2">
         <p class="uk-margin-remove">
-          <a *ngIf="externalPortalUrl" [href]="externalPortalUrl + projectUrl + '?projectId='+project['openaireId']" class="uk-link uk-link-heading">
+          <a *ngIf="externalPortalUrl" [href]="externalPortalUrl + projectUrl + '?projectId='+project['openaireId']" class="uk-link uk-link-heading" [class.uk-disabled]="project.name == 'unidentified'">
             {{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}}
           </a>
-          <a *ngIf="!externalPortalUrl" [routerLink]="projectUrl"  [queryParams]="routerHelper.createQueryParam('projectId',project['openaireId'])" class="uk-link uk-link-heading">
+          <a *ngIf="!externalPortalUrl" [routerLink]="projectUrl"  [queryParams]="routerHelper.createQueryParam('projectId',project['openaireId'])" class="uk-link uk-link-heading" [class.uk-disabled]="project.name == 'unidentified'">
             {{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}}
           </a>
         </p>
       </h6>
     </ng-container>
     <span *ngIf="project['funderName']" class="uk-margin-small-top">
-      <span class="uk-text-muted">Funder: </span>{{project['funderName']}}
+      <span class="uk-text-meta">Funder: </span>{{project['funderName']}}
     </span>
   `
 })

claims/claim-utils/entityFormatter/publicationTitleFormatter.component.ts

@@ -10,8 +10,8 @@ import {RouterHelper} from '../../../utils/routerHelper.class';
      <h6 class="uk-margin-remove multi-line-ellipsis lines-2">
        <p class="uk-margin-remove">
          <a *ngIf="!externalPortalUrl" [queryParams]="routerHelper.createQueryParam(param,entity.openaireId)"
-            [routerLink]="path" class="uk-link uk-link-heading">{{entity.title?entity.title:"[No title available]"}}</a>
-         <a *ngIf="externalPortalUrl" [href]="externalPortalUrl + path+'?'+param+'='+entity.openaireId" class="uk-link uk-link-heading custom-external">{{entity.title?entity.title:"[No title available]"}}</a>
+            [routerLink]="path" class="uk-link uk-link-heading" [class.uk-disabled]="!linkAvailable">{{entity.title?entity.title:"[No title available]"}}</a>
+         <a *ngIf="externalPortalUrl" [href]="externalPortalUrl + path+'?'+param+'='+entity.openaireId" class="uk-link uk-link-heading custom-external" [class.uk-disabled]="!linkAvailable">{{entity.title?entity.title:"[No title available]"}}</a>
        </p>
      </h6>
     </ng-container>
@@ -23,5 +23,6 @@ export class PublicationTitleFormatter {
   @Input() path: string;
   @Input() entity: any;
   @Input() externalPortalUrl: string = null;
+  @Input() linkAvailable: boolean = true;
   public routerHelper: RouterHelper = new RouterHelper();
 }

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

@@ -10,10 +10,10 @@ export class ClaimsService {
   }
 
   private getClaimRequest(size : number, page : number, url :string, fromCache:boolean):any {
-       return this.http.get(url, CustomOptions.getAuthOptions());
+       return this.http.get(url, CustomOptions.getAuthOptionsWithBody());
   }
-  getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string, apiUrl:string):any {
-    let url = apiUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+(types.length>0?"&"+types:types);
+  getClaims( size : number, page : number, keyword:string, sortby: string, descending: boolean, types: string, apiUrl:string, mine:boolean):any {
+    let url = apiUrl +"claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+(types.length>0?"&"+types:types) + (mine?"&mine=true":"") + (mine?"&mine=true":"");
      return this.getClaimRequest(size,page,url,true);
 
   }
@@ -23,7 +23,7 @@ export class ClaimsService {
      return this.getClaimRequest(size,page,url,false);
 
   }
-  getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string , apiUrl:string):any {
+  getClaimsBycontext( size : number, page : number, contextId:string, keyword:string, sortby: string, descending: boolean, types: string , apiUrl:string, mine:boolean):any {
     //console.info('ClaimsService: getClaims for context : '+contextId);
     let url = apiUrl +"contexts/"+contextId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+(types.length>0?"&"+types:types);
      return this.getClaimRequest(size,page,url,true);
@@ -40,14 +40,15 @@ export class ClaimsService {
     let url = apiUrl +"projects/"+projectId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+(types.length>0?"&"+types:types);
      return this.getClaimRequest(size,page,url,true);
   }
+  getClaimsByOrganization( size : number, page : number, organizationId:string, keyword:string, sortby: string, descending: boolean, types: string, apiUrl:string, mine:boolean):any {
+    let url = apiUrl +"organizations/"+organizationId+"/claims"+"?offset="+(size*(page-1) + "&limit="+size)+"&keyword="+keyword+"&sortby="+sortby+"&descending="+descending+(types.length>0?"&"+types:types) + (mine?"&mine=true":"");
+    return this.getClaimRequest(size,page,url,true);
+  }
 
   deleteClaimById(claimId:string , apiUrl:string):any{
     //console.warn('Trying to delete claim with id : '+claimId);
     let url = apiUrl +"claims/"+claimId;
-    // let headers = new Headers({ 'Content-Type': 'application/json' });
-    // let options = new RequestOptions({ headers: headers });
       return this.http.delete( url,  CustomOptions.getAuthOptionsWithBody())//.map(request => <any> request.json())
-      // .do(request => console.info("After delete" ))
       .pipe(catchError(this.handleError));
 
   }
@@ -61,10 +62,7 @@ export class ClaimsService {
     }
     url= apiUrl +"claims/bulk?"+url;
 
-    // let headers = new Headers({ 'Content-Type': 'application/json' });
-    // let options = new RequestOptions({ headers: headers });
-      return this.http.delete( url,  CustomOptions.getAuthOptions())//.map(request => <any> request.json())
-      // .do(request => console.info("After delete" ))
+      return this.http.delete( url,  CustomOptions.getAuthOptionsWithBody())//.map(request => <any> request.json())
       .pipe(catchError(this.handleError));
 
   }
@@ -72,40 +70,27 @@ export class ClaimsService {
     // console.warn('Trying toinsert claims  : '+claims);
     let url = apiUrl +"claims/bulk";
     let body = JSON.stringify( claims );
-    //console.warn('Json body:  : '+body);
-    // let headers = new Headers({ 'Content-Type': 'application/json' });
-    // let options = new RequestOptions({ headers: headers });
     return this.http.post(url, body,  CustomOptions.getAuthOptionsWithBody())
-                          //.map(res => res.json())
-                          //.do(request => console.info("Insert Response:"+request.status) )
                           .pipe(catchError(this.handleError));
 
     }
-  insertClaim(claim, apiUrl:string):any{
-    //console.warn('Trying toinsert claim  : '+claim);
-   let url = apiUrl +"claims";
-          let body = JSON.stringify( claim );
-          // let headers = new Headers({ 'Content-Type': 'application/json' });
-          // let options = new RequestOptions({ headers: headers });
-          return this.http.post(url, body,  CustomOptions.getAuthOptionsWithBody())
-                          //.map(res => res.json())
-                          //.do(request => console.info("Insert Response:"+request.status) )
-                          .pipe(catchError(this.handleError));
 
-    }
     insertDirectRecords(records, apiUrl:string):any{
       //console.warn('Trying to feedrecords  : '+records);
       let url = apiUrl +"feed/bulk";
       let body = JSON.stringify( records );
-      //console.warn('Json body:  : '+body);
-      // let headers = new Headers({ 'Content-Type': 'application/json' });
-      // let options = new RequestOptions({ headers: headers });
       return this.http.post(url, body, CustomOptions.getAuthOptionsWithBody())
-                            //.map(res => res.json())
-                            //.do(request => console.info("Insert Response:"+request) )
                             .pipe(catchError(this.handleError));
 
       }
+  getStatus(jobId, apiUrl:string):any{
+
+    let url = apiUrl +"jobStatus/" + jobId;
+
+    return this.http.get(url,CustomOptions.getAuthOptionsWithBody())
+      .pipe(catchError(this.handleError));
+
+  }
   private handleError (error: Response) {
     // in a real world app, we may send the error to some remote logging infrastructure
     // instead of just logging it to the console
@@ -113,22 +98,4 @@ export class ClaimsService {
     return observableThrowError(error  || 'Server error');
   }
 
-  // getClaim(id:string, apiUrl:string):any {
-  // let url = apiUrl+"claims/"+id;
-  //     return new Promise((resolve, reject) => {
-  //       this.http.get(url)
-  //         //.map(res => res.json())
-  //         .subscribe(
-  //           data => {
-  //             resolve(data['data']);
-  //           },
-  //           err => {
-  //             reject(err);
-  //           }
-  //         )
-  //       ;
-  //     });
-  //     }
-
-
 }

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

@@ -50,7 +50,6 @@ export class SearchDataciteService {
 
   static parse(response): ClaimEntity[] {
     const results: ClaimEntity[] = [];
-    console.log(response);
     for (let i = 0; i < response.length; i++) {
       const item = response[i];
       const entity: ClaimEntity = new ClaimEntity();
@@ -59,22 +58,20 @@ export class SearchDataciteService {
       entity.result.journal = null;
       entity.result.DOI = item.attributes.doi;
       entity.id = item.attributes.doi;
-      entity.title = item.attributes.title;
+      entity.title = Array.isArray(item.attributes.titles) && item.attributes.titles[0].title?item.attributes.titles[0].title:null;
       entity.result.url = properties.doiURL + item.attributes.doi;
       entity.result.source = 'datacite';
       entity.type = 'dataset';
-      entity.result.date = item.attributes.published;
+      entity.result.date = item.attributes.publicationYear;
       entity.result.accessRights = "OPEN";
-      entity.result.publisher = item.attributes['container-title'];
+      entity.result.publisher = item.attributes['publisher'];
       entity.result.journal = null;
       entity.result.record = item;
-      if (item.attributes.author) {
+      if (item.attributes.creators) {
         entity.result.authors = [];
-        for (let j = 0; j < item.attributes.author.length; j++) {
-          const author = item.attributes.author[j];
-          if(author.family || author.literal) {
-            entity.result.authors.push((author.family) ? author.family + (author.given ? ', ' + author.given : '') : author.literal);
-          }
+        for (let j = 0; j < item.attributes.creators.length; j++) {
+          const author = item.attributes.creators[j].name;
+            entity.result.authors.push(author);
         }
       }
       results.push(entity);

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'])
-                 .pipe(map(res => res['person']))
-                 .pipe(map(res => [res['name']['given-names'],
-                             res['name']['family-name'],
-                             res['name']]))
-                .pipe(map(res => SearchOrcidService.parseOrcidAuthor(res, authorIds, authors, addId)));
-    }
+      //.map(res => res.json()['person'])
+      .pipe(map(res => res['person']))
+      .pipe(map(res => [res['name']['given-names'],
+        res['name']['family-name'],
+        res['name'], res['name']['institution-name']]))
 
+      .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,14 +69,42 @@ 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 })
-        .pipe(map(res => res['group']))
-        .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request)));
-      }
+    return this.http.get(url, { headers: headers })
+      .pipe(map(res => res['group']))
+      .pipe(map(request => (parse ? SearchOrcidService.parse(id, request) : request)));
+  }
 
 
   static parseOrcidAuthor(data: any, authorIds: string[], authors, addId): any {
@@ -72,6 +124,9 @@ export class SearchOrcidService {
       } else {
         author['authorFamilyName'] = "";
       }
+      if (data[3] != null) {
+        author['institution'] = data[3];
+      }
       authors.push(author);
       return true;
     }

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

@@ -1,9 +1,7 @@
 import { NgModule}            from '@angular/core';
 import { CommonModule }        from '@angular/common';
 import { FormsModule }         from '@angular/forms';
-
-import {SearchZenodoCommunitiesService} from './searchZenodoCommunities.service';
-
+import {SearchOrcidService} from "./searchOrcid.service";
 
 
 @NgModule({
@@ -13,9 +11,9 @@ import {SearchZenodoCommunitiesService} from './searchZenodoCommunities.service'
   declarations: [
   ],
   providers:[
-  SearchZenodoCommunitiesService
+    SearchOrcidService
 ],
   exports: [
     ]
 })
-export class SearchZenodoCommunitiesServiceModule { }
+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/claimsAdmin/claimsAdmin.module.ts

@@ -3,9 +3,6 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '../../../openaireLibrary/shared/shared.module';
 import { ClaimsAdminComponent } from './claimsAdmin.component';
 import {DisplayClaimsModule} from '../claim-utils/displayClaims/displayClaims.module';
-import { AdminLoginGuard} from'../../login/adminLoginGuard.guard';
-import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
 
 @NgModule({
   imports: [
@@ -13,7 +10,7 @@ import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
     DisplayClaimsModule
 
   ],
-    providers:[AdminLoginGuard, PreviousRouteRecorder,IsRouteEnabled],
+    providers:[],
   declarations: [
     ClaimsAdminComponent
   ],

claims/claimsByToken/claimsByToken.service.ts

@@ -18,26 +18,12 @@ export class ClaimsByTokenService {
 
         let key = url;
 
-        return this.http.get(url, CustomOptions.getAuthOptions());
-                    //.map(res => <any> res.text())
-                    //.map(request => <any> request.json());
+        return this.http.get(url, CustomOptions.getAuthOptionsWithBody());
+
 
     }
 
 
-/*
-    getClaims(email: string, token: string, user_token: string):any {
-      let url = OpenaireProperties.getClaimsAPIURL();   // What else?
-      let body = JSON.stringify( {"email": email, "token": token} );
-      console.warn('Json body:  : '+body);
-      let headers = new Headers({ 'Content-Type': 'application/json' });
-      let options = new RequestOptions({ headers: headers });
-      return this.http.post(url, body, options)
-                            .map(res => res.json())
-                            .do(request => console.info("Insert Response:"+request.status) )
-                            .catch(this.handleError);
-    }
-*/
 
   updateClaimsCuration( selectedRight: Set<string>, selectedWrong: Set<string>, apiURL:string) {
     let url = apiURL + "curate/bulk";

claims/directLinking/directLinking.component.html

@@ -1,6 +1,7 @@
+<loading *ngIf="validInput === null" [full]="true" class="uk-position-center"></loading>
 <linking-generic *ngIf="validInput" [localStoragePrefix]="localStoragePrefix" [results]="results" [sources]="sources"
                  [communityId]="communityId" [inlineEntity]="inlineEntity"  [showOptions]="showOptions"
-                 [piwikSiteId]="piwikSiteId" pageTitle="Direct Linking">
+                 pageTitle="Direct Linking" [claimsProperties]="claimsProperties">
 </linking-generic>
 
 <div *ngIf="validInput== false" id="tm-main" class=" uk-section  uk-padding-remove-top tm-middle">

claims/directLinking/directLinking.component.ts

@@ -1,7 +1,7 @@
 import {Component, Input, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {EnvProperties} from '../../utils/properties/env-properties';
-import {ClaimEntity, ClaimProject, ShowOptions} from '../claim-utils/claimHelper.class';
+import {ClaimEntity, ClaimOrganization, ClaimProject, ShowOptions} from '../claim-utils/claimHelper.class';
 import {EntitiesSearchService} from '../../utils/entitiesAutoComplete/entitySearch.service';
 import {SearchResearchResultsService} from '../../services/searchResearchResults.service';
 import {LinkingGenericComponent} from "../linking/linkingGeneric.component";
@@ -10,6 +10,8 @@ import {Subscriber} from "rxjs";
 import {properties} from "../../../../environments/environment";
 import {OpenaireEntities} from "../../utils/properties/searchFields";
 import {StringUtils} from "../../utils/string-utils.class";
+import {ClaimProjectsSearchFormComponent} from "../claim-utils/claimProjectSearchForm.component";
+import {ClaimsProperties} from "../claim-utils/claims.properties";
 
 
 @Component({
@@ -17,26 +19,26 @@ import {StringUtils} from "../../utils/string-utils.class";
   templateUrl: 'directLinking.component.html'
 })
 export class DirectLinkingComponent {
-  @Input() piwikSiteId = null;
-
   @ViewChild(LinkingGenericComponent) linking: LinkingGenericComponent;
 
   results: ClaimEntity[] = [];
 
   // linkType: string = "project"; // link type (selected in home page) : project, context, software, etc
   /* url Parameters for inline linking */
-  id: string = null; //entity id
+  @Input() id: string = null; //entity id
   type: string = null; // entity type (publication or dataset)
   // 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", "organization"];
   sources: ClaimEntity[] = [];
   inlineEntity: ClaimEntity = null;
   validInput: boolean = null;//'true;
   properties: EnvProperties;
   @Input() communityId: string = null;
   localStoragePrefix: string = "";
+  @Input() organizationClaim: boolean = false;
+  @Input() claimsProperties:ClaimsProperties = new ClaimsProperties();
   constructor(private _router: Router, private route: ActivatedRoute,private entitySearch:EntitiesSearchService,
               private _searchResearchResultsService: SearchResearchResultsService) {}
   subscriptions = [];
@@ -49,11 +51,18 @@ export class DirectLinkingComponent {
   }
   ngOnInit() {
     this.properties = properties;
-
+  /*  if(!this.claimsProperties){
+      this.claimsProperties = new ClaimsProperties();
+    }*/
     this.subscriptions.push(this.route.queryParams.subscribe(params => {
-      this.id = params['id'];
-      this.type = params['type'];
-      this.showOptions.linkTo = params['linkTo'];
+      if(this.organizationClaim){
+         this.type = "organization";
+        this.showOptions.linkTo = "result";
+      }else {
+        this.id = params['id'];
+        this.type = params['type'];
+        this.showOptions.linkTo = params['linkTo'];
+      }
       if (this.type != null && this.showOptions.linkTo != null) {
         this.type = (this.validEntityTypes.indexOf(this.type) != -1) ? this.type : 'publication';
         this.showOptions.linkTo = (this.validEntityTypes.indexOf(this.showOptions.linkTo) != -1 || this.showOptions.linkTo == "result") ? this.showOptions.linkTo : 'project';
@@ -69,20 +78,22 @@ export class DirectLinkingComponent {
         if (this.type == "project") {
           // this.linkType = "project";
           this.getProjectById(this.id);
+        } else if (this.type == "organization") {
+          this.getOrganizationById(this.id);
         } else if (this.type == "publication") {
           this.getResearchResultById("publication", this.id);
         } else if (this.type == "dataset") {
           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);
         }
         //set which entities it is allowed to link to.
         // add first the
-        if(this.type == "project"){
+        if(this.type == "project" || this.type == "organization"){
           this.showOptions.linkToEntities = ["result"];
           this.showOptions.linkTo = "result";
         }else{
@@ -96,24 +107,27 @@ export class DirectLinkingComponent {
             this.showOptions.linkToEntities = ["result","project","context" ];
           }
 
+          }
+
+        } else {
+          this.validInput = this.isValidInput(null);
+
         }
 
-      } else {
-        this.validInput = this.isValidInput(null);
+      }));
 
-      }
-
-    }));
   }
 
   isValidInput(result: ClaimEntity) {
     if (result == null) {
       return false;
-    } else if (this.type == "project" && this.showOptions.linkTo != "result") {
+    } else if (this.type == "organization" && !this.claimsProperties.ALLOW_ORGANIZATION_LINKING) {
       return false;
-    } else if (["dataset", "publication", "software", "orp"].indexOf(this.type) != -1 && (["project", "context", "result"].indexOf(this.showOptions.linkTo) == -1)) {
+    } else if ((this.type == "project" || this.type == "organization") && this.showOptions.linkTo != "result") {
       return false;
-    } else if (["project", "dataset", "publication", "software", "orp"].indexOf(this.type) == -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", "other", "organization"].indexOf(this.type) == -1) {
       return false;
     } else {
       return true;
@@ -131,6 +145,17 @@ export class DirectLinkingComponent {
         this.handleError("Error getting project by id: " + id, err);
       }));
   }
+  getOrganizationById(id: string) {
+    this.subscriptions.push(this.entitySearch.fetchByType(id,"organization", this.properties).subscribe(
+      data => {
+        this.createClaimEntity(data, "organization");
+      },
+      err => {
+        this.validInput = this.isValidInput(null);
+        //console.log("An error occured")
+        this.handleError("Error getting project by id: " + id, err);
+      }));
+  }
 
   getResearchResultById(resultType: string, id: string) {
     this.subscriptions.push(this._searchResearchResultsService.searchById(resultType, id, this.properties).subscribe(data => {
@@ -152,16 +177,28 @@ export class DirectLinkingComponent {
        entity.type = "project";
        entity.title = project.projectName;
        entity.project = new ClaimProject();
+       entity.project.url = properties.searchLinkToProject + entity.id;
        entity.project.acronym = project.projectAcronym;
        entity.project.code = project.code;
        entity.project.endDate = project.endDate;
        entity.project.funderId = project.funderId;
+       entity.project.funderShortname = project.funderShortName?project.funderShortName:(entity.project.funderId.split("::")[1]);
        entity.project.funderName = project.funderName;
        entity.project.fundingLevel0 = project.fundingLevel0;
        entity.project.jurisdiction = project.jurisdiction;
        entity.project.startDate = project.startDate;
        this.inlineEntity = entity;
-     }else{
+     }else if(type =="organization"){
+      let organization = data[0];
+      let entity:ClaimEntity = new ClaimEntity();
+      entity.id = organization.id;
+      entity.type = "organization";
+      entity.title = organization.label;
+      entity.organization = new ClaimOrganization();
+      // entity.organization.url = properties.searchLinkToOrganization + entity.id;
+       entity.organization.name = organization.label;
+       this.inlineEntity = entity;
+    }else{
       results = ClaimResultSearchFormComponent.openaire2ClaimResults(data, this.properties);
      }
 

claims/directLinking/directLinking.module.ts

@@ -5,20 +5,18 @@ import { DirectLinkingComponent } from './directLinking.component';
 
 import {EntitySearchServiceModule} from '../../utils/entitiesAutoComplete/entitySearchService.module';
 import {SearchResearchResultsServiceModule} from '../../services/searchResearchResultsService.module';
-import {LoginGuard} from'../../login/loginGuard.guard';
-import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
 import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module';
 import { SEOServiceModule } from '../../sharedComponents/SEO/SEOService.module';
 import {LinkingGenericModule} from '../linking/linkingGeneric.module';
+import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
   imports: [
     SharedModule,
     EntitySearchServiceModule, SearchResearchResultsServiceModule,
-    Schema2jsonldModule, SEOServiceModule, LinkingGenericModule
+    Schema2jsonldModule, SEOServiceModule, LinkingGenericModule, LoadingModule
   ],
-  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[],
   declarations: [
     DirectLinkingComponent
   ], exports:[DirectLinkingComponent]

claims/linking/bulkClaim/bulkClaim.component.ts

@@ -133,11 +133,11 @@ export class BulkClaimComponent {
       }
     });
   }
+
   upload() {
     this.enableUpload = false;
     this.showReport = false;
     this.errorMessage = "";
-    console.log(this.filesToUpload);
     if (this.filesToUpload.length == 0) {
       this.errorMessage = "There is no selected file to upload.";
       return;
@@ -269,11 +269,16 @@ export class BulkClaimComponent {
         }
       },
       err => {
-        //console.log(err);
+        // console.log(err);
         BulkClaimComponent.handleError("Error getting crossref by DOIs: " + id, err);
-        this.notFoundIds.push(id);
-        this.notFoundIdsRow.push(row);
-        this.endOfFetching();
+
+        if(err.status == 404) {
+          this.searchInDatacite(id, accessMode, date, row);
+        } else {
+          this.notFoundIds.push(id);
+          this.notFoundIdsRow.push(row);
+          this.endOfFetching();
+        }
       }
     ));
   }

claims/linking/insertClaim/insertClaim.component.ts

@@ -14,7 +14,9 @@ import {
   Message
 } from "../../claim-utils/claimHelper.class";
 import {UserManagementService} from "../../../services/user-management.service";
-import {Subscriber} from "rxjs";
+import {Subscriber, timer} from "rxjs";
+import {map} from "rxjs/operators";
+import {LogService} from "../../../utils/log/log.service";
 
 @Component({
   selector: 'claim-insert',
@@ -30,7 +32,19 @@ import {Subscriber} from "rxjs";
         <div class="uk-width-expand uk-margin-small-left">CONFIRM LINKING</div>
       </button>
     </div>
-    <modal-loading [message]="'Please wait...'"></modal-loading>
+    <modal-loading [message]="'Please wait...'">
+      
+      <div *ngIf="claimsJob">
+        <div *ngIf="claimsJob && claimsJob.insertedIds.length <1"  class="uk-text-meta uk-text-small">
+          Initiating process....</div>
+        <div *ngIf="claimsJob && claimsJob.insertedIds.length >0"  class="uk-text-meta uk-text-small">
+          {{claimsJob.insertedIds.length}}  out of {{claims2Insert}} links created.</div>
+        <div *ngIf="feedRecordsJob && feedRecordsJob.insertedIds.length >0"  class="uk-text-meta uk-text-small">
+          {{feedRecordsJob.insertedIds.length}}  out of {{records2Insert}} records added in the index...</div>
+        <div *ngIf="claimsJob.status != 'COMPLETE'"  class="uk-text-meta uk-text-small">
+          Please don't close the window, process is ongoing...</div>
+      </div>
+    </modal-loading>
     <modal-alert (alertOutput)="confirmClose()">
       <h4 class="modal-title uk-text-bold " id="myModalLabel">Confirmation notice</h4>
       <p>All the links you provided will be published in the OpenAIRE platform. <br>
@@ -46,7 +60,7 @@ import {Subscriber} from "rxjs";
 })
 export class ClaimInsertComponent {
   constructor(private claimService: ClaimsService, private _router: Router, private route: ActivatedRoute,
-              private userManagementService: UserManagementService) {
+              private userManagementService: UserManagementService, private _logService: LogService) {
   }
   subscriptions = [];
   ngOnDestroy() {
@@ -60,6 +74,32 @@ export class ClaimInsertComponent {
     this.subscriptions.push(this.route.queryParams.subscribe(params => {
       this.params = params;
     }));
+    if(localStorage.getItem(this.localStoragePrefix + "claimsJob")){
+      this.claimsJob  = JSON.parse(localStorage.getItem(this.localStoragePrefix + "claimsJob"));
+      this.feedRecordsJob  = JSON.parse(localStorage.getItem(this.localStoragePrefix + "feedRecordsJob"));
+      if(this.claimsJob.status != "COMPLETE"){
+        this.claiming = true;
+        let  loadingTimerSubscription = timer(0, 1000).pipe(
+          map(() => {
+            if(this.loading) {
+              this.loading.open();
+              loadingTimerSubscription.unsubscribe();
+            }
+          })
+        ).subscribe();
+        this.subscriptions.push(loadingTimerSubscription);
+
+        let  timerSubscription = timer(0, 10000).pipe(
+          map(() => {
+            this.getStatus(); // load data contains the http request
+          })
+        ).subscribe();
+        this.subscriptions.push(timerSubscription);
+      }else{
+        this.claimsJob = null;
+      }
+    }
+
   }
 
   params = {};
@@ -84,15 +124,16 @@ export class ClaimInsertComponent {
   private errorInClaims: ClaimRecord2Insert[] = [];
   private insertedRecords = [];
   private errorInRecords = [];
-
+  public claimsJob;
+  public feedRecordsJob;
+  public claims2Insert;
+  public records2Insert
+  infoToLog = [];
   public insert() {
       this.confirmOpen();
   }
   saveAndNavigate(){
-    localStorage.setItem(this.localStoragePrefix + "results", JSON.stringify(this.results));
-    if (this.sources != null) {
-      localStorage.setItem(this.localStoragePrefix + "sources", JSON.stringify(this.sources));
-    }
+    this.saveLocalStorage();
     this._router.navigate(['/user-info'], {
       queryParams: {
         "errorCode": LoginErrorCodes.NOT_VALID,
@@ -106,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();
@@ -114,13 +156,14 @@ export class ClaimInsertComponent {
         this.loading.open();
         let claims: ClaimRecord2Insert[] = [];
         let directclaims: DirectIndexRecord[] = [];
+        let idSuffix = (new Date()).getTime() + "";
         let dashboard = this.properties.environment+"_"+this.properties.dashboard + (this.communityId?("_"+this.communityId):'');
         for (let j = 0; j < this.sources.length; j++) {  // if an external result -> direct insert in the index
           const result: ClaimEntity = this.sources[j];
           if (result.result && ["crossref", "datacite", "orcid"].indexOf(result.result.source) != -1) {
             directclaims.push({
               "id": result.id,
-              "record": ClaimInsertComponent.createDirectClaim(result, this.results)
+              "record": ClaimInsertComponent.createDirectClaim(result, this.results, idSuffix)
             });
           }
         }
@@ -131,12 +174,12 @@ export class ClaimInsertComponent {
             if (this.sources.length > 0) {
               directclaims.push({
                 "id": entity.id,
-                "record": ClaimInsertComponent.createDirectClaim(entity, this.sources)
+                "record": ClaimInsertComponent.createDirectClaim(entity, this.sources, idSuffix)
               });
-            } else if (this.inlineEntity) {
+            } else if (this.inlineEntity && this.inlineEntity.type != "organization") {
               directclaims.push({
                 "id": entity.id,
-                "record": ClaimInsertComponent.createDirectClaim(entity, [this.inlineEntity])
+                "record": ClaimInsertComponent.createDirectClaim(entity, [this.inlineEntity], idSuffix)
               });
             }
 
@@ -145,28 +188,35 @@ export class ClaimInsertComponent {
           for (let j = 0; j < this.sources.length; j++) {
             const result: ClaimEntity = this.sources[j]; // this is a research result
             if (entity.result) {
-              claims.push(ClaimInsertComponent.createResultClaim(result, entity, user.email, dashboard));
+              claims.push(ClaimInsertComponent.createResultClaim(result, entity, user.email, dashboard, idSuffix));
             } else if (entity.context) {
-              claims.push(ClaimInsertComponent.createContextClaim(result, entity, user.email, dashboard));
+              claims.push(ClaimInsertComponent.createContextClaim(result, entity, user.email, dashboard, idSuffix));
             } else if (entity.project) {
-              claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email, dashboard));
+              claims.push(ClaimInsertComponent.createProjectClaim(result, entity, user.email, dashboard, idSuffix));
+           /* } else if (entity.organization) {
+              claims.push(ClaimInsertComponent.createOrganizationClaim(result, entity, user.email, dashboard, idSuffix));*/
             }
-
+            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) {
 
-                claims.push(ClaimInsertComponent.createResultClaim(this.inlineEntity, entity, user.email, dashboard));
+                claims.push(ClaimInsertComponent.createResultClaim(this.inlineEntity, entity, user.email, dashboard, idSuffix));
               } else if (entity.context) {
-                claims.push(ClaimInsertComponent.createContextClaim(this.inlineEntity, entity, user.email, dashboard));
+                claims.push(ClaimInsertComponent.createContextClaim(this.inlineEntity, entity, user.email, dashboard, idSuffix));
               } else if (entity.project) {
-                claims.push(ClaimInsertComponent.createProjectClaim(this.inlineEntity, entity, user.email, dashboard));
+                claims.push(ClaimInsertComponent.createProjectClaim(this.inlineEntity, entity, user.email, dashboard, idSuffix));
               }
             } else if (this.inlineEntity.project) {
               if (entity.result) {
-                claims.push(ClaimInsertComponent.createProjectClaim(entity, this.inlineEntity, user.email, dashboard));
+                claims.push(ClaimInsertComponent.createProjectClaim(entity, this.inlineEntity, user.email, dashboard, idSuffix));
+              }
+            } else if (this.inlineEntity.organization) {
+              if (entity.result) {
+                claims.push(ClaimInsertComponent.createOrganizationClaim(entity, this.inlineEntity, user.email, dashboard, idSuffix));
               }
             }
           }
@@ -177,12 +227,15 @@ export class ClaimInsertComponent {
         //first call direct index service - when call is done (success or error) call isertBulkClaims method to insert claims in DB
         // console.log("directclaims");
         // console.log(directclaims);
-        if (directclaims.length > 0 && this.properties.environment != "development"){
+        if (directclaims.length > 0/* && this.properties.environment != "development"*/){
           this.subscriptions.push(this.claimService.insertDirectRecords(directclaims, this.properties.claimsAPIURL).subscribe(
             data => {
-              this.insertedRecords = data.insertedIds;
-
-              this.errorInRecords = data.errorInClaims;
+              this.feedRecordsJob = data.data;
+              this.records2Insert = directclaims.length;
+              // console.log(data);
+              // this.insertedRecords = data.insertedIds;
+              //
+              // this.errorInRecords = data.errorInClaims;
               this.isertBulkClaims(claims);
             },
             err => {
@@ -190,12 +243,12 @@ export class ClaimInsertComponent {
               if (err.code && err.code == 403) {
                 this.saveAndNavigate();
               }
-              if (err.insertedIds && err.insertedIds.length > 0) {
+             /* if (err.insertedIds && err.insertedIds.length > 0) {
                 this.insertedRecords = err.insertedIds;
               }
               if (err.errorInClaims && err.errorInClaims.length > 0) {
                 this.errorInRecords = err.errorInClaims;
-              }
+              }*/
               this.isertBulkClaims(claims);
 
               ClaimInsertComponent.handleError("Error inserting direct records: " + JSON.stringify(directclaims), err);
@@ -209,30 +262,24 @@ export class ClaimInsertComponent {
   }
 
   private isertBulkClaims(claims: ClaimRecord2Insert[]) {
-    console.log("claims");
-    console.log(claims);
     this.errors.splice(0, this.errors.length);
     this.subscriptions.push(this.claimService.insertBulkClaims(claims, this.properties.claimsAPIURL).subscribe(
       data => {
-        this.insertedClaims = data.insertedIds;
-        this.errorInClaims = data.errorInClaims;
-        //TODO remove - testing having errors in claims
-        // this.insertedClaims.pop();
-        // this.insertedClaims.pop();
-        // this.errorInClaims.push(claims[1]);
-        // this.insertedClaims.splice(0,this.insertedClaims.length);
-        //  this.errorInClaims = claims;
-        //remove till here
-
-        if (claims.length != this.insertedClaims.length) {
-          let error: ClaimsErrorMessage = new ClaimsErrorMessage();
-          error.type = "claimServiceFail2Insert";
-          error.inserted = this.insertedClaims.length;
-          error.failed = this.errorInClaims.length;
-          this.createErrorMessagesPerEntity((this.insertedClaims.length == 0));
-          this.errors.push(error);
+        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.afterclaimsInsertion();
+        this.saveLocalStorage();
+        let  timerSubscription = timer(0, 10000).pipe(
+          map(() => {
+            this.getStatus(); // load data contains the http request
+          })
+        ).subscribe();
+        this.subscriptions.push(timerSubscription);
       },
       err => {
         err = err && err.error?err.error:err;
@@ -335,19 +382,27 @@ export class ClaimInsertComponent {
   }
 
   private afterclaimsInsertion() {
-
-    this.loading.close();
     this.claiming = false;
+    this.loading.close();
+
 
     if (this.errorInClaims.length == 0 && this.insertedClaims.length > 0) {
       localStorage.removeItem(this.localStoragePrefix + "sources");
       localStorage.removeItem(this.localStoragePrefix + "results");
-      this._router.navigate(['/myclaims'], {queryParams: this.params});
+      localStorage.removeItem(this.localStoragePrefix + "claimsJob");
+      localStorage.removeItem(this.localStoragePrefix + "feedRecordsJob");
+      if(this.properties.myClaimsLink &&  this.properties.myClaimsLink.indexOf(".") == -1) {
+        this._router.navigate([this.properties.myClaimsLink], {queryParams: this.params});
+      }else if(this.properties.myClaimsLink &&  this.properties.myClaimsLink.indexOf(".") != -1) {
+        this._router.navigate([this.properties.myClaimsLink], {relativeTo: this.route});
+      }else{
+        this._router.navigate(["/"]);
+      }
     }
   }
 
 
-  private static createContextClaim(resultEntity: ClaimEntity, contextEntity: ClaimEntity, user: any, dashboard:string): ClaimRecord2Insert {
+  private static createContextClaim(resultEntity: ClaimEntity, contextEntity: ClaimEntity, user: any, dashboard:string, idSuffix:string): ClaimRecord2Insert {
     return {
       claimedBy: user,
       sourceId: contextEntity.context.concept.id,
@@ -360,11 +415,12 @@ export class ClaimInsertComponent {
       targetCollectedFrom: resultEntity.result.source,
       targetAccessRights: resultEntity.result.accessRights,
       targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity),
-      claimedInDashboard : dashboard
+      claimedInDashboard : dashboard,
+      idSuffix : idSuffix
     };
   }
 
-  private static createProjectClaim(resultEntity: ClaimEntity, projectEntity: ClaimEntity, user: any, dashboard:string): ClaimRecord2Insert {
+  private static createProjectClaim(resultEntity: ClaimEntity, projectEntity: ClaimEntity, user: any, dashboard:string, idSuffix:string): ClaimRecord2Insert {
     return {
       claimedBy: user,
       sourceId: projectEntity.id,
@@ -377,11 +433,29 @@ export class ClaimInsertComponent {
       targetCollectedFrom: resultEntity.result.source,
       targetAccessRights: resultEntity.result.accessRights,
       targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity),
-      claimedInDashboard : dashboard
+      claimedInDashboard : dashboard,
+      idSuffix : idSuffix
+    };
+  }
+  private static createOrganizationClaim(resultEntity: ClaimEntity, organizationEntity: ClaimEntity, user: any, dashboard:string, idSuffix:string): ClaimRecord2Insert {
+    return {
+      claimedBy: user,
+      sourceId: organizationEntity.id,
+      sourceType: "organization",
+      sourceCollectedFrom: "openaire",
+      sourceAccessRights: "OPEN",
+      sourceEmbargoEndDate: "",
+      targetId: resultEntity.id,
+      targetType: resultEntity.type,
+      targetCollectedFrom: resultEntity.result.source,
+      targetAccessRights: resultEntity.result.accessRights,
+      targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(resultEntity),
+      claimedInDashboard : dashboard,
+      idSuffix : idSuffix
     };
   }
 
-  private static createResultClaim(inlineResult: ClaimEntity, resultEntity: ClaimEntity, user: string, dashboard:string): ClaimRecord2Insert {
+  private static createResultClaim(inlineResult: ClaimEntity, resultEntity: ClaimEntity, user: string, dashboard:string, idSuffix:string): ClaimRecord2Insert {
 
     return {
       claimedBy: user,
@@ -395,7 +469,9 @@ export class ClaimInsertComponent {
       targetCollectedFrom: inlineResult.result.source,
       targetAccessRights: inlineResult.result.accessRights,
       targetEmbargoEndDate: ClaimInsertComponent.getEmbargoEndDate(inlineResult),
-      claimedInDashboard : dashboard
+      claimedInDashboard : dashboard,
+      idSuffix : idSuffix
+      
     };
   }
 
@@ -405,12 +481,13 @@ export class ClaimInsertComponent {
     }
     return ""
   }
-
-  static createDirectClaim(resultEntity: ClaimEntity, results: ClaimEntity[]) {
+  static createOpenAIREId(id, idSuffix:string):string {
+    return  id.indexOf( "::" ) == -1 ? ("userclaim___::" + Md5.hashStr(id + idSuffix)):id;
+  }
+  static createDirectClaim(resultEntity: ClaimEntity, results: ClaimEntity[], idSuffix:string) {
     let entity = {};
-    const md5_id = Md5.hashStr(resultEntity.id);
-    entity["originalId"] = "userclaim___::" + md5_id;
-    entity["openaireId"] = "userclaim___::" + md5_id;
+    entity["originalId"] = this.createOpenAIREId(resultEntity.id, idSuffix);
+    entity["openaireId"] = this.createOpenAIREId(resultEntity.id, idSuffix);
     entity["title"] = resultEntity.title;
     entity["title"] = (Array.isArray(resultEntity.title) && resultEntity.title.length > 0) ? resultEntity.title[0] : resultEntity.title;
 
@@ -459,7 +536,7 @@ export class ClaimInsertComponent {
           entity["linksToProjects"] = [];
         }
         let project: ClaimEntity = results[i];
-        entity["linksToProjects"].push("info:eu-repo/grantAgreement/" + project.project.funderName + "/" + project.project.fundingLevel0 + "/" + project.project.code + "/" + project.project.jurisdiction + "/" + project.title + "/" + project.project.acronym);
+        entity["linksToProjects"].push("info:eu-repo/grantAgreement/" + project.project.funderShortname + "/" + project.project.fundingLevel0 + "/" + project.project.code + "/" + project.project.jurisdiction + "/" + project.title + "/" + project.project.acronym);
 
       } else if (results[i].context) {
 
@@ -517,8 +594,77 @@ export class ClaimInsertComponent {
     }
     if(this.defaultColors){
       buttonClass+=" linksbaskettitles  uk-padding-small ";
-    } 
+    }
     return buttonClass + "uk-text-center ";
   }
+
+  getStatus(){
+    if(this.feedRecordsJob && ! (this.feedRecordsJob.status == "COMPLETE" || this.feedRecordsJob.status == "ERROR") ) {
+      this.subscriptions.push(this.claimService.getStatus(this.feedRecordsJob.id, this.properties.claimsAPIURL).subscribe(data => {
+        this.feedRecordsJob = data.data;
+        // console.log("feed", this.feedRecordsJob.status);
+        if (this.feedRecordsJob.status == "COMPLETE" || data.data.status == "ERROR") {
+          this.insertedRecords = this.feedRecordsJob.insertedIds;
+          this.errorInRecords = this.feedRecordsJob.errorInClaims;
+        }
+        }, err => {
+          let error: ClaimsErrorMessage = new ClaimsErrorMessage();
+          error.type = "jobError";
+          this.createErrorMessagesPerEntity((this.insertedClaims.length == 0));
+          this.errors.push(error);
+          this.afterclaimsInsertion();
+          this.feedRecordsJob =  null;
+        localStorage.removeItem(this.localStoragePrefix + "feedRecordsJob");
+        }
+
+      ));
+    }
+    if(this.claimsJob) {
+      this.subscriptions.push(this.claimService.getStatus(this.claimsJob.id, this.properties.claimsAPIURL).subscribe(data => {
+          this.claimsJob = data.data;
+        // console.log("claim: ", this.claimsJob.status, this.feedRecordsJob.status?this.feedRecordsJob.status:" no feed job");
+        if ((this.claimsJob.status == "COMPLETE" || data.data.status == "ERROR") && ( !this.feedRecordsJob || (this.feedRecordsJob.status == "COMPLETE" || data.data.status == "ERROR")) ) {
+            this.insertedClaims = this.claimsJob.insertedIds;
+            this.errorInClaims = this.claimsJob.errorInClaims;
+
+            if (this.claims2Insert != this.insertedClaims.length) {
+              let error: ClaimsErrorMessage = new ClaimsErrorMessage();
+              error.type = "claimServiceFail2Insert";
+              error.inserted = this.insertedClaims.length;
+              error.failed = this.errorInClaims.length;
+              this.createErrorMessagesPerEntity((this.insertedClaims.length == 0));
+              this.errors.push(error);
+            }
+            this.afterclaimsInsertion();
+
+
+          }
+        }, err => {
+          let error: ClaimsErrorMessage = new ClaimsErrorMessage();
+          error.type = "jobError";
+          this.createErrorMessagesPerEntity((this.insertedClaims.length == 0));
+          this.errors.push(error);
+          this.afterclaimsInsertion();
+          this.claimsJob = null;
+          localStorage.removeItem(this.localStoragePrefix + "claimsJob");
+
+        }
+      ));
+    }
+  }
+  saveLocalStorage(){
+    if (this.results != null) {
+      localStorage.setItem(this.localStoragePrefix + "results", JSON.stringify(this.results));
+    }
+    if (this.sources != null) {
+      localStorage.setItem(this.localStoragePrefix + "sources", JSON.stringify(this.sources));
+    }
+    if (this.claimsJob != null) {
+      localStorage.setItem(this.localStoragePrefix + "claimsJob", JSON.stringify(this.claimsJob));
+    }
+    if (this.feedRecordsJob != null) {
+      localStorage.setItem(this.localStoragePrefix + "feedRecordsJob", JSON.stringify(this.feedRecordsJob));
+    }
+  }
 }
 

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/linking/linkingGeneric.component.html

@@ -1,20 +1,61 @@
+<ng-template #destinations_basket>
+  <div *ngIf="(results.length)> 0 || showOptions.show=='result'" class="uk-padding-small uk-padding-remove-horizontal" style="min-height: 17px;">
+    <start-over *ngIf="  (results.length)> 0"
+                [results]="results" [localStoragePrefix]="localStoragePrefix+'results'"
+                message="all results (projects, communities, research results)"
+                class="uk-float-right"></start-over>
+    <bulk-claim *ngIf="showOptions.show=='result'" [results]="results" [properties]=properties
+                [localStoragePrefix]="localStoragePrefix+'results'"
+                [basketLimit]="basketLimit"></bulk-claim>
+  </div>
+  <div class="uk-padding-small uk-padding-remove-horizontal">
+    <div *ngIf="results.length >= basketLimit "
+         class="uk-alert uk-alert-warning uk-text-center">
+      Basket reached the size limit. No more entities can be added.
+    </div>
+    <claim-selected-results sectionTitle="Selected Results" [results]="results"
+                            [localStoragePrefix]="localStoragePrefix+'results'" type="target">
+    </claim-selected-results>
+    <div *ngIf="(results.length) == 0 " class="  uk-text-center">
+      No entities to link with the sources. Start adding entities from the left panel.
+    </div>
+
+  </div>
+</ng-template>
+
+
 <div class="linking uk-background-default">
   <div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
     <div class="uk-padding-small uk-padding-remove-horizontal">
-      <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
+      <breadcrumbs *ngIf="!inlineEntity" [breadcrumbs]="breadcrumbs"></breadcrumbs>
+<!--      [routerLink]="inlineEntity.result?.url.split('?')[0]"-->
+<!--      [queryParams]="routerHelper.createQueryParam(inlineEntity.result?.url.split('?')[1].split('=')[0], inlineEntity.id)"-->
+      <a *ngIf="inlineEntity && inlineEntity.result"
+         (click)="back()"
+         class="uk-button uk-button-link uk-text-transform-none uk-flex uk-flex-middle">
+        <icon name="west" [flex]="true"></icon>
+        <span class="uk-margin-small-left">Back to {{getEntityName(inlineEntity.type, false)}}</span>
+      </a>
+      <a *ngIf="inlineEntity && inlineEntity.project"
+         [routerLink]="inlineEntity.project?.url?.split('?')[0]"
+         [queryParams]="routerHelper.createQueryParam(inlineEntity.project?.url.split('?')[1].split('=')[0], inlineEntity.id)"
+         class="uk-button uk-button-link uk-text-transform-none uk-flex uk-flex-middle">
+        <icon name="west" [flex]="true"></icon>
+        <span class="uk-margin-small-left">Back to {{getEntityName(inlineEntity.type, false)}}</span>
+      </a>
     </div>
   </div>
-  <div uk-sticky="offset: 65; bottom: #pageBottom; media: @m" class="uk-blur-background">
+  <div *ngIf="!inlineEntity" uk-sticky="offset: 65; end: #pageBottom; media: @m" class="uk-blur-background">
     <div class="uk-section-xsmall">
       <stepper>
-        <step *ngIf="!inlineEntity" [status]="stepStatus('source')" stepId="source" stepNumber="1"
+        <step [status]="stepStatus('source')" stepId="source" stepNumber="1"
               [stepText]="'Find Sources'" (stepChanged)="stepHasChanged($event)"
               [active]="this.showOptions.show" [showStepLine]="false"></step>
-        <step [status]="stepStatus('target')" stepId="target" [stepNumber]="inlineEntity?1:2"
-              [stepText]="'Link Source' + (inlineEntity?'':'s') + ' to Entities'"
+        <step [status]="stepStatus('target')" stepId="target" [stepNumber]="2"
+              [stepText]="'Link Sources to Entities'"
               (stepChanged)="stepHasChanged($event)" [active]="this.showOptions.show"
-              [showStepLine]="!inlineEntity"></step>
-        <step [status]="stepStatus('claim')" stepId="claim" [stepNumber]="inlineEntity?2:3"
+              [showStepLine]="true"></step>
+        <step [status]="stepStatus('claim')" stepId="claim" [stepNumber]="3"
               [stepText]="'Summarize and finish'"
               (stepChanged)="stepHasChanged($event)" [active]="this.showOptions.show"
               [showStepLine]="true"></step>
@@ -26,27 +67,30 @@
                     [results]="results" [sources]="sources"
                     [localStoragePrefix]="localStoragePrefix" [inlineEntity]="inlineEntity"
                     [showOptions]="showOptions" [properties]=properties [pageContents]="pageContents"
-                    [defaultColors]="!communityId" [communityId]="communityId"
+                    [defaultColors]="!communityId" [communityId]="communityId" [claimsProperties]="claimsProperties"
   >
   </metadata-preview>
   <div id="tm-main" class="uk-section uk-padding-remove-top" *ngIf="showOptions.show != 'claim'">
     <div>
       <schema2jsonld *ngIf="url" [URL]="url" name="Link your {{openaireEntities.RESULTS}}" type="other"></schema2jsonld>
-      <div [class]="((showOptions.show == 'claim')?'':' uk-margin-top ')+' uk-container uk-container-large '">
-        <div *ngIf="properties" class="uk-section uk-padding-remove-top">
-          <div [class]="((showOptions.show == 'claim')?'':' uk-margin-top ')+' uk-container uk-container-large '">
+      <div class="uk-container uk-container-large">
+        <div *ngIf="properties && claimsProperties" class="uk-section uk-padding-remove-top">
+          <div class="uk-container uk-container-large">
             <div class="uk-grid basketContainer" *ngIf="showOptions.show!='claim'" uk-grid>
-              <div class="uk-width-2-3 uk-position-z-index">
+              <div class="uk-width-2-3@m uk-position-z-index uk-flex-first@m uk-flex-last uk-margin-medium-top">
+                <h2 *ngIf="inlineEntity && claimsProperties.INLINE_ENTITY.show" class="uk-text-center">Link source to</h2>
+                <div *ngIf="inlineEntity && claimsProperties.INLINE_ENTITY.guideText" class="uk-text-center">{{claimsProperties.INLINE_ENTITY.guideText}}</div>
                 <div *ngIf="showOptions.show=='source'">
                   <claim-result-search-form [selectedResults]="sources" [properties]=properties
                                             [localStoragePrefix]="localStoragePrefix+'sources'"
-                                            [basketLimit]="basketLimit"
+                                            [basketLimit]="basketLimit" [centerAlign]="!!inlineEntity"
                   ></claim-result-search-form>
                 </div>
                 <div *ngIf="showOptions.show=='project'">
                   <claim-projects-search-form [selectedProjects]="results" [properties]=properties
                                               [localStoragePrefix]="localStoragePrefix+'results'"
                                               [basketLimit]="basketLimit" [showOptions]="showOptions"
+                                              [centerAlign]="!!inlineEntity"
                   ></claim-projects-search-form>
                 </div>
                 <div *ngIf="showOptions.show=='context'">
@@ -54,93 +98,87 @@
                                               [properties]=properties
                                               [localStoragePrefix]="localStoragePrefix+'results'"
                                               [basketLimit]="basketLimit" [showOptions]="showOptions"
+                                              [centerAlign]="!!inlineEntity"
                   ></claim-contexts-search-form>
                 </div>
                 <div *ngIf="showOptions.show=='result'">
                   <claim-result-search-form [selectedResults]="results" [properties]=properties
                                             [localStoragePrefix]="localStoragePrefix+'results'"
                                             [basketLimit]="basketLimit" [showOptions]="showOptions"
+                                            [centerAlign]="!!inlineEntity"
                   ></claim-result-search-form>
                 </div>
               </div>
               <!-- Basket-->
-              <div *ngIf="showOptions.show != 'claim'" class="uk-width-1-3">
-                <div id="basket" uk-sticky="offset: 220; bottom: !*; media: @m" style="z-index: 0!important;">
+              <div *ngIf="showOptions.show != 'claim'" class="uk-width-1-3@m uk-flex-last@m uk-flex-first uk-margin-medium-top">
+                <div id="basket" uk-sticky="offset: 220; end: !*; media: @m" style="z-index: 0!important;">
                   <div class="uk-card uk-card-default linkingBasket">
                     <div class="uk-card-body uk-padding-small">
-                      <div class="uk-margin-right">
-                        <ul class="uk-tab" uk-tab>
-                          <li [class.uk-active]="showOptions.basketShowSources"
-                              (click)="showOptions.basketswitchToSources()">
-                            <a>
-                              Sources to link ({{(sources.length + (inlineEntity ? 1 : 0)) |number}})
-                            </a>
-                          </li>
-                          <li [class.uk-disabled]="sources.length == 0 && !inlineEntity"
-                              [class.uk-active]="showOptions.basketShowLinksTo">
-                            <a (click)="showOptions.basketswitchToLinkTo()">Link to <span
-                                *ngIf="results.length> 0">({{(results.length)  | number}})</span>
-                            </a>
-                          </li>
-                        </ul>
-                        <div *ngIf="showOptions.basketShowSources">
-                          <div class="uk-height-medium  uk-overflow-auto">
-                            <div *ngIf="showOptions.show == 'source'" class="uk-padding-small uk-padding-remove-horizontal" style="min-height:17px;">
-                              <start-over *ngIf="showOptions.show == 'source' && sources.length> 0"
-                                          [results]="sources"
-                                          [localStoragePrefix]="localStoragePrefix+'sources'"
-                                          message="all sources" class="uk-float-right"></start-over>
-                              <bulk-claim *ngIf="showOptions.show == 'source'" [results]="sources"
-                                          [properties]=properties
-                                          [localStoragePrefix]="localStoragePrefix+'sources'" [basketLimit]="basketLimit"
-                              >
-                              </bulk-claim>
+                      <div>
+                        <ng-container *ngIf="inlineEntity">
+                          <div *ngIf="claimsProperties.INLINE_ENTITY.show" class="uk-margin-small-bottom">
+                            <div class="uk-text-emphasis uk-text-bolder">{{claimsProperties.BASKET.source_title}}</div>
+                            <claim-selected-results [results]="[inlineEntity]"
+                                                    [localStoragePrefix]="localStoragePrefix+'sources'" class=""
+                                                    [enableRemove]="false" type="source">
+                            </claim-selected-results>
+                          </div>
+                          <div *ngIf="claimsProperties.INLINE_ENTITY.show" class="uk-padding-small uk-padding-remove-horizontal"><hr class="uk-margin-remove"/></div>
+                          <div class="uk-margin-small-top">
+                            <div class="uk-text-emphasis uk-text-bolder">{{claimsProperties.BASKET.target_title}} <span *ngIf="results.length> 0">({{(results.length)  | number}})</span></div>
+                            <ng-container *ngTemplateOutlet="destinations_basket"></ng-container>
+                          </div>
+                        </ng-container>
+
+                        <ng-container *ngIf="!inlineEntity">
+                          <ul class="uk-tab" uk-tab>
+                            <li [class.uk-active]="showOptions.basketShowSources"
+                                (click)="showOptions.basketswitchToSources()">
+                              <a>
+                                Sources to link ({{(sources.length) |number}})
+                              </a>
+                            </li>
+                            <li [class.uk-disabled]="sources.length == 0"
+                                [class.uk-active]="showOptions.basketShowLinksTo">
+                              <a (click)="showOptions.basketswitchToLinkTo()">Link to <span
+                                  *ngIf="results.length> 0">({{(results.length)  | number}})</span>
+                              </a>
+                            </li>
+                          </ul>
+                          <div *ngIf="showOptions.basketShowSources">
+                            <div class="uk-height-max-medium  uk-overflow-auto uk-padding uk-padding-remove-left uk-padding-remove-vertical">
+                              <div *ngIf="showOptions.show == 'source'" class="uk-padding-small uk-padding-remove-horizontal" style="min-height:17px;">
+                                <start-over *ngIf="showOptions.show == 'source' && sources.length> 0"
+                                            [results]="sources"
+                                            [localStoragePrefix]="localStoragePrefix+'sources'"
+                                            message="all sources" class="uk-float-right"></start-over>
+                                <bulk-claim *ngIf="showOptions.show == 'source'" [results]="sources"
+                                            [properties]=properties
+                                            [localStoragePrefix]="localStoragePrefix+'sources'" [basketLimit]="basketLimit"
+                                >
+                                </bulk-claim>
 
-                            </div>
-                            <div class="uk-padding-small uk-padding-remove-horizontal">
-                              <div *ngIf="sources.length == 0 && !inlineEntity " class="uk-text-center uk-text-meta">
-                                No Sources added yet. Start adding sources from the left panel. Or upload a DOI's CSV file.
                               </div>
-                              <div *ngIf="sources.length >= basketLimit " class="uk-alert uk-alert-warning uk-text-center">
-                                Basket reached the size limit. No more sources can be added.
+                              <div class="uk-padding-small uk-padding-remove-horizontal">
+                                <div *ngIf="sources.length == 0" class="uk-text-center uk-text-meta">
+                                  No Sources added yet. Start adding sources from the left panel. Or upload a DOI's CSV file.
+                                </div>
+                                <div *ngIf="sources.length >= basketLimit " class="uk-alert uk-alert-warning uk-text-center">
+                                  Basket reached the size limit. No more sources can be added.
+                                </div>
+                                <claim-selected-results *ngIf="sources.length > 0" [results]="sources"
+                                                        [localStoragePrefix]="localStoragePrefix+'sources'" class=""
+                                                        [enableRemove]="true" type="source">
+                                </claim-selected-results>
                               </div>
-                              <claim-selected-results *ngIf="inlineEntity" [results]="[inlineEntity]"
-                                                      [localStoragePrefix]="localStoragePrefix+'sources'" class=""
-                                                      [enableRemove]="false" type="source">
-                              </claim-selected-results>
-                              <claim-selected-results *ngIf="sources.length > 0" [results]="sources"
-                                                      [localStoragePrefix]="localStoragePrefix+'sources'" class=""
-                                                      [enableRemove]="true" type="source">
-                              </claim-selected-results>
                             </div>
                           </div>
-                        </div>
-                        <div *ngIf="showOptions.basketShowLinksTo">
-                          <div class="uk-height-medium uk-overflow-auto">
-                            <div *ngIf="(results.length)> 0 || showOptions.show=='result'" class="uk-padding-small uk-padding-remove-horizontal" style="min-height: 17px;">
-                              <start-over *ngIf="  (results.length)> 0"
-                                          [results]="results" [localStoragePrefix]="localStoragePrefix+'results'"
-                                          message="all results (projects, communities, research results)"
-                                          class="uk-float-right"></start-over>
-                              <bulk-claim *ngIf="showOptions.show=='result'" [results]="results" [properties]=properties
-                                          [localStoragePrefix]="localStoragePrefix+'results'"
-                                          [basketLimit]="basketLimit"></bulk-claim>
-                            </div>
-                            <div class="uk-padding-small uk-padding-remove-horizontal">
-                              <div *ngIf="results.length >= basketLimit "
-                                   class="uk-alert uk-alert-warning uk-text-center">
-                                Basket reached the size limit. No more entities can be added.
-                              </div>
-                              <claim-selected-results sectionTitle="Selected Results" [results]="results"
-                                                      [localStoragePrefix]="localStoragePrefix+'results'" type="target">
-                              </claim-selected-results>
-                              <div *ngIf="(results.length) == 0 " class="  uk-text-center">
-                                No entities to link with the sources. Start adding entities from the left panel.
-                              </div>
-
+                          <div *ngIf="showOptions.basketShowLinksTo">
+                            <div class="uk-height-max-medium uk-overflow-auto uk-padding uk-padding-remove-left uk-padding-remove-vertical">
+                              <ng-container *ngTemplateOutlet="destinations_basket"></ng-container>
                             </div>
                           </div>
-                        </div>
+                        </ng-container>
                       </div>
                     </div>
                     <div *ngIf="showOptions.show == 'source'"
@@ -164,7 +202,7 @@
                       <button class="uk-flex uk-flex-middle uk-button uk-button-text"
                               [class.uk-disabled]="results.length == 0" [disabled]="results.length == 0">
                         <icon *ngIf="inlineEntity" name="link" visuallyHidden="link" [flex]="true"></icon>
-                        <div class="uk-width-expand uk-margin-small-left">STEP {{inlineEntity ? '2' : '3'}} - FINALISE AND FINISH</div>
+                        <div class="uk-width-expand uk-margin-small-left"><ng-container *ngIf="!inlineEntity">STEP {{inlineEntity ? '2' : '3'}} - </ng-container>SUMMARISE</div>
                       </button>
                     </div>
                   </div>

claims/linking/linkingGeneric.component.ts

@@ -13,13 +13,18 @@ import {Subscriber} from "rxjs";
 import {properties} from "../../../../environments/environment";
 import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component";
 import {OpenaireEntities} from "../../utils/properties/searchFields";
+import {StringUtils} from "../../utils/string-utils.class";
+import {RouterHelper} from "../../utils/routerHelper.class";
+import { Location } from '@angular/common';
+import {LoginErrorCodes} from "../../login/utils/guardHelper.class";
+import {UserManagementService} from "../../services/user-management.service";
+import {ClaimsProperties} from "../claim-utils/claims.properties";
 
 @Component({
     selector: 'linking-generic',
     templateUrl: 'linkingGeneric.component.html'
 })
 export class LinkingGenericComponent {
-  @Input() piwikSiteId = null;
   @Input() pageTitle: string = "Create links between research objects";
   piwiksub:any;
 
@@ -37,34 +42,43 @@ export class LinkingGenericComponent {
   // show linkToEntities /values: result, project, context
 
   @Input() sources:ClaimEntity[] =[];
-  properties:EnvProperties;
+  properties:EnvProperties = properties;
   public openaireEntities = OpenaireEntities;
   @Input() localStoragePrefix:string = "linking_";
   url=null;
   @ViewChild(AlertModal) alert;
   public pageContents = null;
   @Input() breadcrumbs: Breadcrumb[] = [];
-
+  public routerHelper: RouterHelper = new RouterHelper();
+  @Input() claimsProperties:ClaimsProperties = new ClaimsProperties();
   constructor (private _router: Router,  private route: ActivatedRoute, private entitySearch:EntitiesSearchService,
                private _meta: Meta, private _title: Title,  private _piwikService:PiwikService,
-               private seoService: SEOService, private helper: HelperService, private cdr: ChangeDetectorRef ) {
+               private seoService: SEOService, private helper: HelperService, private cdr: ChangeDetectorRef,
+               private location: Location, private userManagementService: UserManagementService) {
   }
   subscriptions = [];
 
   ngOnInit() {
-    if(this.breadcrumbs.length === 0) {
+   /* if(!this.claimsProperties){
+      this.claimsProperties = new ClaimsProperties();
+    }*/
+    this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
+      if (!user) {
+        this.saveStateAndRedirectLogin();
+      }
+    }));
+      if(this.breadcrumbs.length === 0) {
       this.breadcrumbs.push({name: 'home', route: '/'});
       this.breadcrumbs.push({name: "Link", route: null});
     }
     this.showOptions.show = 'source';
-    this.showOptions.initSelectOptions();
+    this.showOptions.initSelectOptions(this.claimsProperties);
     if(this.inlineEntity){
       this.showOptions.showLinkTo();
       // this.showOptions.basketShowLinksTo = true;
       this.showOptions.show = this.showOptions.linkTo;
     }
 
-       this.properties = properties;
        this.url = this.properties.domain + this.properties.baseLink+this._router.url;
 
         var description = "Linking is a functionality provided by OpenAIRE, in order to link research results with a project, a research community or other research results.";
@@ -74,13 +88,13 @@ export class LinkingGenericComponent {
 
         this.seoService.createLinkForCanonicalURL(this.url, false);
 
-        if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
-          this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe());
-        }
+        this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
 
+      if(properties.adminToolsPortalType !== "explore") {
         this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => {
           this.pageContents = contents;
         })
+      }
 
 
       if( typeof localStorage !== 'undefined') {
@@ -92,6 +106,11 @@ export class LinkingGenericComponent {
         if(localStorage.getItem(this.localStoragePrefix + "sources")){
           this.sources  = JSON.parse(localStorage.getItem(this.localStoragePrefix + "sources"));
         }
+        if(localStorage.getItem(this.localStoragePrefix + "claimsJob")){
+          let job  = JSON.parse(localStorage.getItem(this.localStoragePrefix + "claimsJob"));
+          if(job.status != "COMPLETE"){
+            this.showOptions.show = 'claim';          }
+        }
     }
   }
 
@@ -150,18 +169,19 @@ export class LinkingGenericComponent {
   stepHasChanged(stepId){
     
     if(stepId == 'source'){
-      console.log("show source")
+      // console.log("show source")
       this.showOptions.showSource();
     }else if(stepId == 'target'){
-      console.log("show target")
+      // console.log("show target")
       this.showOptions.show = this.showOptions.linkTo;
       this.showOptions.showLinkTo();
     }else if(stepId == 'claim'){
-      console.log("show target")
+      // console.log("show target")
       this.showOptions.show = 'claim';
     }
     this.cdr.detectChanges();
-    console.log('stepHasChanged', stepId, this.showOptions.show)
+    HelperFunctions.scroll(true);
+    // console.log('stepHasChanged', stepId, this.showOptions.show)
   }
 
   stepStatus(stepId){
@@ -193,5 +213,30 @@ export class LinkingGenericComponent {
       }
     }
   }
-  
+
+  private getEntityName (entityType:string, plural:boolean) {
+    return StringUtils.getEntityName(entityType, plural);
+  }
+
+  back(): void {
+    if(typeof document !== 'undefined') {
+      this.location.back();
+    }
+  }
+  saveStateAndRedirectLogin() {
+
+    if (this.results != null) {
+      localStorage.setItem(this.localStoragePrefix + "results", JSON.stringify(this.results));
+    }
+    if (this.sources != null) {
+      localStorage.setItem(this.localStoragePrefix + "sources", JSON.stringify(this.sources));
+    }
+
+    this._router.navigate(['/user-info'], {
+      queryParams: {
+        "errorCode": LoginErrorCodes.NOT_VALID,
+        "redirectUrl": this._router.url
+      }
+    });
+  }
 }

claims/linking/linkingGeneric.module.ts

@@ -7,20 +7,16 @@ import {SelectedContextsModule} from './selected/selectedContexts.module';
 import {SelectedPublicationsModule} from './selected/selectedResults.module';
 import {LinkingGenericComponent} from './linkingGeneric.component';
 import {StartOverModule} from '../claim-utils/startOver.module';
-import {LoginGuard} from '../../login/loginGuard.guard';
-import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
 import {ClaimContextSearchFormModule} from '../claim-utils/claimContextSearchForm.module';
 import {ClaimProjectsSearchFormModule} from '../claim-utils/claimProjectSearchForm.module';
 import {BulkClaimModule} from './bulkClaim/bulkClaim.module';
 import {ClaimResultSearchFormModule} from '../claim-utils/claimResultSearchForm.module';
 import {HelperModule} from '../../utils/helper/helper.module';
-import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
 import {Schema2jsonldModule} from '../../sharedComponents/schema2jsonld/schema2jsonld.module';
 import {SEOServiceModule} from '../../sharedComponents/SEO/SEOService.module';
 import {MetadataPreviewModule} from './selected/metadataPreview.module';
 import {ClaimEntitiesMetadataModule} from "./selected/ClaimEntitiesMetadata.module";
 import {AlertModalModule} from '../../utils/modal/alertModal.module';
-import {PiwikServiceModule} from "../../utils/piwik/piwikService.module";
 import {BreadcrumbsModule} from "../../utils/breadcrumbs/breadcrumbs.module";
 import {StepperModule} from "../../sharedComponents/stepper/stepper.module";
 import {IconsModule} from "../../utils/icons/icons.module";
@@ -34,10 +30,9 @@ import {link} from "../../utils/icons/icons";
     StartOverModule,
     ClaimContextSearchFormModule, ClaimProjectsSearchFormModule, BulkClaimModule, ClaimResultSearchFormModule,
     HelperModule, Schema2jsonldModule, SEOServiceModule, MetadataPreviewModule, ClaimEntitiesMetadataModule, AlertModalModule,
-    PiwikServiceModule,
     MatSelectModule, BreadcrumbsModule, StepperModule, IconsModule
   ],
-  providers: [LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers: [],
   declarations: [
     LinkingGenericComponent
   ], exports: [

claims/linking/selected/ClaimEntitiesMetadata.module.ts

@@ -3,13 +3,21 @@ import {SharedModule} from '../../../../openaireLibrary/shared/shared.module';
 import {ClaimEntityTitleComponent} from "./ClaimEntityTitle.component";
 import {ClaimEntityResultMetadataComponent} from "./ClaimEntityResultMetadata.component";
 import {ClaimEntityProjectMetadataComponent} from "./ClaimEntityProjectMetadata.component";
+import {IconsService} from "../../../utils/icons/icons.service";
+import {coins} from "../../../utils/icons/icons";
+import {IconsModule} from "../../../utils/icons/icons.module";
 
 @NgModule({
   imports: [
-    SharedModule
+    SharedModule,
+    IconsModule
   ],
   declarations: [
      ClaimEntityTitleComponent, ClaimEntityResultMetadataComponent, ClaimEntityProjectMetadataComponent
   ], exports:[ ClaimEntityTitleComponent, ClaimEntityResultMetadataComponent, ClaimEntityProjectMetadataComponent]
 })
-export class ClaimEntitiesMetadataModule { }
+export class ClaimEntitiesMetadataModule {
+  constructor(private _iconsService:IconsService) {
+    this._iconsService.registerIcons([coins])
+  }
+}

claims/linking/selected/ClaimEntityMetadata.component.less

@@ -0,0 +1,11 @@
+@import (reference) "~src/assets/openaire-theme/less/_import-variables";
+
+.claim-entity-metadata {
+
+  & > *:not(:last-child):not(.other-separator)::after {
+    content: "\2022";
+    font-weight: normal;
+    margin-left: @global-xsmall-margin;
+    margin-right: @global-xsmall-margin;
+  }
+}

claims/linking/selected/ClaimEntityProjectMetadata.component.ts

@@ -4,18 +4,36 @@ import {ClaimEntity} from '../../claim-utils/claimHelper.class';
 @Component({
   selector: 'claim-project-metadata',
   template: `
-    <div *ngIf="entity.type == 'project' && entity.project" class="uk-text-small uk-flex uk-flex-wrap" [style.grid-gap]="shortVersion?'10px':'20px'">
-			<div *ngIf="entity.project.funderName">
-				<span class="uk-text-meta">Funder: </span>{{entity.project.funderName}}
-			</div>
-			<div *ngIf="entity.project.code">
-				<span class="uk-text-meta">GrandID: </span>{{entity.project.code}}
-			</div>
-			<div *ngIf=" !shortVersion && (entity.project.startDate || entity.project.endDate)">
-				<span	class="uk-text-meta">Duration: </span>{{(entity.project.startDate) ? entity.project.startDate : 'Unknown'}}{{'-' + ((entity.project.endDate) ? entity.project.endDate : 'Unknown')}}
-			</div>
-    </div>
-  `
+    <ng-container *ngIf="entity.type == 'project' && entity.project">
+      <div *ngIf="!shortVersion" class="claim-entity-metadata uk-flex-inline uk-flex-wrap uk-text-xsmall uk-text-emphasis"
+        [class.uk-margin-xsmall-top]="!shortVersion">
+        <span  class="uk-text-capitalize">
+          {{entity.type == 'project' && entity.project.code == 'unidentified'?'funder':entity.type}}
+        </span>
+        <span *ngIf="entity.project.startDate || entity.project.endDate">
+          {{(entity.project.startDate) ? entity.project.startDate : 'Unknown'}}{{'-' + ((entity.project.endDate) ? entity.project.endDate : 'Unknown')}}
+        </span>
+      </div>
+      <div *ngIf="shortVersion && entity.type == 'project' && entity.project.code == 'unidentified'" class="claim-entity-metadata uk-flex-inline uk-flex-wrap uk-text-xsmall uk-text-emphasis"
+           [class.uk-margin-xsmall-top]="!shortVersion">
+        <span  class="uk-text-capitalize">
+          funder
+        </span>
+         
+      </div>
+      <div *ngIf="entity.project.code!='unidentified'" class="uk-text-small uk-flex uk-flex-wrap" [style.grid-gap]="shortVersion?'0px':'10px'"
+        [class.uk-margin-small-top]="!shortVersion">
+        <div *ngIf="entity.project.code">
+          <span class="uk-text-meta">Project Code: </span>{{entity.project.code}}
+        </div>
+        <div *ngIf="entity.project.funderName || entity.project.funderShortname">
+          <span class="uk-text-meta">Funding: </span>{{entity.project.funderName?entity.project.funderName:entity.project.funderShortname}}
+        </div>
+        
+      </div>
+      </ng-container>
+  `,
+  styleUrls: ['ClaimEntityMetadata.component.less']
 
 
 })

claims/linking/selected/ClaimEntityResultMetadata.component.ts

@@ -4,29 +4,37 @@ import {ClaimEntity} from '../../claim-utils/claimHelper.class';
 @Component({
   selector: 'claim-result-metadata',
   template: `
-    <div *ngIf="entity.result" class="uk-text-small">
-      <div *ngIf="entity.result.authors && entity.result.authors.length >0 " class="uk-margin-small-bottom">
-        <span class="uk-text-meta">Authors: </span>{{sliceArray(entity.result.authors)}}
-      </div>
-      <div *ngIf="!shortVersion && entity.result.editors&& entity.result.editors.length > 0" class="uk-margin-small-bottom">
-        <span class="uk-text-meta">Editors: </span>{{sliceArray(entity.result.editors)}}
-      </div>
-      <div *ngIf="!shortVersion" class="uk-flex uk-flex-wrap" style="grid-gap: 20px;">
-				<span *ngIf="entity.result.publisher!=null">
-					<span class="uk-text-meta uk-margin-small-bottom">Publisher: </span>{{entity.result.publisher}}
+    <div *ngIf="entity.result">
+      <!-- display all existing data similar to entity-metadata -->
+      <div *ngIf="!shortVersion" class="claim-entity-metadata uk-flex-inline uk-flex-wrap uk-text-xsmall uk-text-emphasis uk-margin-xsmall-top">
+        <span class="uk-text-capitalize uk-text-italic">
+          {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
+        </span>
+        <span *ngIf="entity.result.publisher!=null">
+          {{entity.result.publisher}}
 				</span>
-				<span *ngIf="entity.result.journal!=null">
-					<span class="uk-text-meta uk-margin-small-bottom">Journal: </span>{{entity.result.journal}}
-				</span>
-				<span *ngIf="entity.result.date">
-					<span class="uk-text-meta uk-margin-small-bottom">Published: </span>
+        <span *ngIf="entity.result.date">
 					<span [class]="(getProjectDurationMessage(entity)?'uk-text-warning':'')">{{entity.result.date}}</span>
 				</span>
-        <div [class]="(getProjectDurationMessage(entity)?'uk-text-warning':'')">{{getProjectDurationMessage(entity)}}
-				</div>
+        <span *ngIf="entity.result.journal!=null">
+					{{entity.result.journal}}
+				</span>
+        <div *ngIf="entity.result.editors && entity.result.editors.length > 0">
+          {{sliceArray(entity.result.editors)}}
+        </div>
+      </div>
+      <div *ngIf="entity.result.authors && entity.result.authors.length > 0" class="uk-flex uk-flex-wrap uk-text-small uk-text-emphasis uk-text-italic"
+        [class.uk-margin-small-top]="!shortVersion">
+        {{sliceArray(entity.result.authors)}}
+      </div>
+      <div class="uk-text-small uk-margin-top">
+        <span *ngIf="getProjectDurationMessage(entity)" [class]="(getProjectDurationMessage(entity)?'uk-text-warning':'')">
+          {{getProjectDurationMessage(entity)}}
+				</span>
       </div>
     </div>
-  `
+  `,
+  styleUrls: ['ClaimEntityMetadata.component.less']
 
 
 })

claims/linking/selected/ClaimEntityTitle.component.ts

@@ -1,64 +1,80 @@
 import {Component, Input} from '@angular/core';
 import {ClaimEntity} from '../../claim-utils/claimHelper.class';
-import {StringUtils} from "../../../utils/string-utils.class";
 
 @Component({
   selector: 'claim-title',
-  template:
-      `
-  <div class="uk-grid uk-flex uk-flex-middle">
-    <span *ngIf="showIcon"  >
-              <span *ngIf=" entity.result" class="material-icons uk-text-small uk-text-meta" >insert_drive_file
-              </span>
-              <span *ngIf=" entity.project"
-                    class="material-icons uk-text-small uk-text-meta">assignment_turned_in
-              </span>
-            <span *ngIf="entity.type=='community'" style="margin-right: 2px;"
-                  class="material-icons uk-text-small uk-text-meta">people
-              </span></span>
-    <div class="uk-width-expand  " style="word-break: break-word;" [class.uk-h6]="!shortVersion" [class.uk-text-bold]="shortVersion"  [class.uk-text-truncate]="shortVersion"  [class.uk-margin-bottom]="!shortVersion"  [class.uk-padding-remove-left]="showIcon">
-      
-        <a *ngIf="entity.result && entity.result.url" target="_blank" [href]="entity.result.url"
-          class="uk-link uk-link-heading">{{entity.title ? sliceString(entity.title) : '[No title available]'}}</a>
-       <span
-         *ngIf="(entity.result && !entity.result.url)">{{entity.title ? sliceString(entity.title) : '[No title available]'}}</span>
-       <span *ngIf="entity.type=='project' && entity.project"> 
-          <a *ngIf="entity.project && entity.project.url" target="_blank" [href]="entity.project.url"
-             class="uk-text-link">
-           <span *ngIf="!shortVersion"> 
-           {{(entity.project.acronym ? '[' + entity.project.acronym + '] ' : '') + entity.title}}
-         </span>
-         <span *ngIf="shortVersion">
-          {{(entity.project.acronym ?  sliceString(entity.project.acronym):sliceString(entity.title))}}  
-         </span>
+  template: `
+    <div class="uk-grid uk-flex uk-flex-middle">
+      <span *ngIf="showIcon"  class="uk-flex uk-margin-xsmall-right">
+        <icon *ngIf="entity.result" class=" uk-text-small uk-text-meta" name="insert_drive_file">
+          
+        </icon>
+        <icon *ngIf="entity.project && entity.project.code !='unidentified'" class=" uk-text-small uk-text-meta" name="assignment_turned_in">
+        </icon>
+        <icon *ngIf="entity.project && entity.project.code =='unidentified'" class="uk-text-small uk-text-meta" name="coins" [ratio]="1.4">
+        </icon>
+        <icon *ngIf="entity.organization" class=" uk-text-small uk-text-meta" name="account_balance">
+        </icon>
+        <icon *ngIf="entity.type=='community'" class=" uk-text-small uk-text-meta" style="margin-right: 2px;" name="people">
+        </icon>
+      </span>
+      <div class="uk-width-expand multi-line-ellipsis lines-3" style="word-break: break-word;"
+        [class.uk-padding-remove-left]="showIcon" [class.uk-text-truncate]="shortVersion">
+        <div class="uk-margin-remove uk-text-break uk-inline-block"
+          [class.uk-h6]="!shortVersion" [class.uk-text-bold]="shortVersion">
+          <a *ngIf="entity.result && entity.result.url" target="_blank" [href]="entity.result.url"
+            class="uk-link uk-text-decoration-none uk-width-expand">
+            {{entity.title ? sliceString(entity.title) : '[No title available]'}}
           </a>
-       <span
-         *ngIf="(entity.project && !entity.project.url)">
-         <span *ngIf="!shortVersion"> 
-           {{(entity.project.acronym ? '[' + entity.project.acronym + '] ' : '') + entity.title}}
-         </span>
-         <span *ngIf="shortVersion">
-          {{(entity.project.acronym ?  sliceString(entity.project.acronym):sliceString(entity.title))}}  
-         </span>
-       </span>
-
-         
-       </span>
-       <span *ngIf="entity.type=='community' && entity.context">
-         <span *ngIf=" entity.context.community != entity.context.concept.label">
-         {{entity.context.community }} > {{entity.context.category}} >
-        </span>
-         <span> {{entity.context.concept.label}}</span>
-        </span>
+          <span *ngIf="(entity.result && !entity.result.url)">
+            {{entity.title ? sliceString(entity.title) : '[No title available]'}}
+          </span>
+          <span *ngIf="entity.type=='project' && entity.project && entity.project.code =='unidentified'">
+            <span *ngIf="!shortVersion"> 
+                {{(entity.project.funderShortname ? '[' + entity.project.funderShortname + '] ' : '') + entity.project.funderName}}
+              </span>
+              <span *ngIf="shortVersion">
+                {{sliceString(entity.project.funderName)}}  
+              </span>
+          </span>
+          <span *ngIf="entity.type=='project' && entity.project && entity.project.code!='unidentified'">
+            <a *ngIf="entity.project && entity.project.url" target="_blank" [href]="entity.project.url"
+              class="uk-link uk-text-decoration-none uk-width-expand">
+              <span *ngIf="!shortVersion">
+                {{(entity.project.acronym ? '[' + entity.project.acronym + '] ' : '') + entity.title}}
+              </span>
+              <span *ngIf="shortVersion">
+                {{(entity.project.acronym ?  sliceString(entity.project.acronym):sliceString(entity.title))}}  
+              </span>
+            </a>
+            <span *ngIf="(entity.project && !entity.project.url)">
+              <span *ngIf="!shortVersion"> 
+                {{(entity.project.acronym ? '[' + entity.project.acronym + '] ' : '') + entity.title}}
+              </span>
+              <span *ngIf="shortVersion">
+                {{(entity.project.acronym ?  sliceString(entity.project.acronym):sliceString(entity.title))}}  
+              </span>
+            </span>
+          </span>
+          <span *ngIf="entity.type=='organization' && entity.organization">             
+                {{sliceString(entity.title)}}
+          </span>
+          <span *ngIf="entity.type=='community' && entity.context">
+            <span *ngIf=" entity.context.community != entity.context.concept.label">
+              {{entity.context.community }} > {{entity.context.category}} >
+            </span>
+            <span>
+              {{entity.context.concept.label}}
+            </span>
+          </span>
+        </div>
       </div>
-          </div>
+    </div>
   `
 
 
 })
 export class ClaimEntityTitleComponent {
-
-
   @Input() entity: ClaimEntity;
   @Input() slice:boolean = false;
   @Input() sliceSize:number = 45;
@@ -66,14 +82,13 @@ export class ClaimEntityTitleComponent {
   @Input() showIcon: boolean = false;
 
   ngOnInit() {
-
-
   }
+
   sliceString(mystr:string): string {
-     if(this.slice){
+    if(this.slice){
        // return StringUtils.sliceString(mystr,this.sliceSize);
-     }
-     return mystr;
+    }
+    return mystr;
   }
 
 }

claims/linking/selected/metadataPreview.component.html

@@ -6,15 +6,14 @@
           <div class="uk-width-expand">
             <div class="uk-card uk-card-default">
               <div class="uk-card-body">
-                <div class="uk-grid uk-grid-divider uk-child-width-1-2@m uk-child-width-1-1@s" uk-grid>
+                <div class="uk-grid uk-grid-divider uk-child-width-1-1@s" uk-grid [class.uk-child-width-1-2@m] = "claimsProperties.INLINE_ENTITY.show" >
                   <!-- Sources-->
-                  <div>
+                  <div *ngIf="claimsProperties.INLINE_ENTITY.show">
                     <div class=" uk-margin uk-animation-toggle">
-                   <span class="uk-h6  "> SOURCES ({{sources.length + (inlineEntity ? 1 : 0) | number}})
+                   <span class="uk-h6  "> {{claimsProperties.METADATA_PREVIEW.source_title}} ({{sources.length + (inlineEntity ? 1 : 0) | number}})
                    </span>
-                      <a *ngIf="!inlineEntity" class="uk-float-right" (click)="showOptions.showSource() "> <span
-                          uk-icon="pencil"></span>Edit
-                        sources</a>
+                      <a *ngIf="!inlineEntity" class="uk-float-right uk-text-small" (click)="showOptions.showSource() "> <span
+                          uk-icon="pencil" class="uk-margin-xsmall-right"></span>{{claimsProperties.METADATA_PREVIEW.edit_source_title}}</a>
                     </div>
                     <ul *ngIf="inlineEntity" class="uk-list uk-animation-fade uk-list-divider">
                       <li>
@@ -51,10 +50,10 @@
                     <ul *ngIf="!inlineEntity && sources.length > 0 " class="uk-list uk-animation-fade uk-list-divider">
                       <li *ngFor=" let entity of sources ">
                         <div class="uk-grid  uk-text-small uk-margin-top">
-                          <div class="uk-text-muted uk-width-1-2 uk-flex uk-flex-middle">
+                          <!-- <div class="uk-text-muted uk-width-1-2 uk-flex uk-flex-middle">
                             <span class="material-icons uk-text-small uk-text-meta">insert_drive_file</span>
                             {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
-                          </div>
+                          </div> -->
                           <div *ngIf="entity.errorMessages.length > 0"
                                class="uk-text-danger  uk-width-1-2"> Link couldn't be saved
                           </div>
@@ -153,13 +152,15 @@
                   </div>
                   <!--     Results-->
                   <div class=" ">
-                    <div class=" uk-margin ">
-                      <span class=" uk-h6 "> LINK TO ({{results.length | number}})</span>
+                    <div class=" uk-margin uk-grid">
+                      <span class=" uk-h6 uk-width-expand"> {{claimsProperties.METADATA_PREVIEW.target_title}} ({{results.length | number}})</span>
 
+<div class="uk-width-auto uk-flex">
 
-                      <a class="uk-float-right" (click)="showOptions.showLinkTo()"> <span
-                          uk-icon="pencil"></span>Edit
-                        entities</a>
+  <icon [name]="claimsProperties.METADATA_PREVIEW.edit_target_icon" [flex]="true"></icon>
+  <a class=" uk-margin-left-xsmall uk-text-small" (click)="showOptions.showLinkTo()">
+                         {{claimsProperties.METADATA_PREVIEW.edit_target_title}}</a>
+</div>
                     </div>
                     <div *ngIf="results.length == 0">
                       <div class="uk-alert dangerBorder no-selected-message uk-text-center">
@@ -174,7 +175,7 @@
                       <li *ngFor=" let entity of results "
                           style="z-index: 0 !important;">
                         <div class="uk-grid  uk-text-small uk-margin-top">
-                          <div class="uk-text-muted uk-width-1-2 uk-flex uk-flex-middle">
+                          <!-- <div class="uk-text-muted uk-width-1-2 uk-flex uk-flex-middle">
                            <span *ngIf="entity.result" class="material-icons uk-text-small uk-text-meta">insert_drive_file
                                 </span>
                             <span *ngIf="entity.project"
@@ -184,7 +185,7 @@
                                   class="material-icons uk-text-small uk-text-meta">people
                                 </span>
                             {{(!entity.result) ? entity.type : ((entity.result && entity.result.source == 'openaire') ? entity.type : (entity.result && entity.result.source + ' result'))}}
-                          </div>
+                          </div> -->
                           <div *ngIf="entity.errorMessages.length > 0"
                                class="uk-text-danger  uk-width-1-2"> Link couldn't be saved
                           </div>
@@ -250,6 +251,14 @@
                     None of the links saved.
                   </div>
                 </div>
+                <div *ngIf="message.type == 'jobError'">
+
+                  <div class="">
+                    <span class=" uk-text-bold">The saving status of your links can't be fetched. Please check your links or start over. </span>
+                    <br>
+                    <a routerLinkActive="router-link-active" routerLink="/myclaims">Manage your links here</a>
+                  </div>
+                </div>
               </div>
             </div>
             <div *ngIf="warnings.length > 0"

claims/linking/selected/metadataPreview.component.ts

@@ -4,6 +4,7 @@ import {ClaimEntity, ClaimsErrorMessage, Message, ShowOptions} from '../../claim
 import {EnvProperties} from "../../../utils/properties/env-properties";
 import {Dates} from "../../../utils/string-utils.class";
 import {HelperFunctions} from "../../../utils/HelperFunctions.class";
+import {ClaimsProperties} from "../../claim-utils/claims.properties";
 
 @Component({
   selector: 'metadata-preview',
@@ -28,6 +29,7 @@ export class MetadataPreviewComponent {
   @ViewChild(AlertModal) alertApplyAll;
   @Input() localStoragePrefix: string = "";
   @Input() communityId:string= null;
+  @Input() claimsProperties:ClaimsProperties;
   errors:ClaimsErrorMessage[] = [];
   warnings:Message[] = [];
   public commonAccessRights = "OPEN"; // for access rights- changes when user apply a change to every entity

claims/linking/selected/metadataPreview.module.ts

@@ -11,16 +11,17 @@ import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import {HelperModule} from "../../../utils/helper/helper.module";
 import {SelectedPublicationsModule} from "./selectedResults.module";
+import {IconsModule} from "../../../utils/icons/icons.module";
 
 @NgModule({
-    imports: [
-        SharedModule,
-        AlertModalModule,
-        ClaimEntitiesMetadataModule,
-        InsertClaimsModule,
-        MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule, MatSelectModule,
-        HelperModule, SelectedPublicationsModule
-    ],
+  imports: [
+    SharedModule,
+    AlertModalModule,
+    ClaimEntitiesMetadataModule,
+    InsertClaimsModule,
+    MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule, MatSelectModule,
+    HelperModule, SelectedPublicationsModule, IconsModule
+  ],
   declarations: [MetadataPreviewComponent],
   exports:[MetadataPreviewComponent]
 })

claims/myClaims/myClaims.component.ts

@@ -19,7 +19,7 @@ import {Subscriber} from "rxjs";
         <div class="uk-margin-top">
           <displayClaims *ngIf="user" [user]="user" [enableDelete]=true [myClaims]=true [isAdmin]=false [showUserEmail]=false
                           [claimsInfoURL]=claimsInfoURL [communityId]=communityId
-                          [piwikSiteId]="piwikSiteId" pageTitle="My links">
+                          pageTitle="My links">
           </displayClaims>
         </div>
       </div>
@@ -30,8 +30,6 @@ import {Subscriber} from "rxjs";
 export class MyClaimsComponent {
   @Input() claimsInfoURL: string;
   @Input() communityId:string;
-  @Input() piwikSiteId = null;
-  @Input() userInfoURL: string;
   public user: User = null;
 
   constructor(private userManagementService: UserManagementService, private _router: Router) {}

claims/myClaims/myClaims.module.ts

@@ -3,9 +3,6 @@ import { NgModule } from '@angular/core';
 import { SharedModule } from '../../../openaireLibrary/shared/shared.module';
 import { MyClaimsComponent } from './myClaims.component';
 import {DisplayClaimsModule} from '../claim-utils/displayClaims/displayClaims.module';
-import {LoginGuard} from'../../login/loginGuard.guard';
-import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
 
 @NgModule({
   imports: [
@@ -13,7 +10,7 @@ import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
     DisplayClaimsModule
 
   ],
-  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[],
   declarations: [
     MyClaimsComponent
   ], exports: [MyClaimsComponent]

connect/communities/communities.service.ts

@@ -56,12 +56,11 @@ export class CommunitiesService {
             result['description'] = resData.description;
             result['date'] = resData.creationDate;
             result['status'] = 'all';
+            result['claim'] = resData.claim;
+            result['membership'] = resData.membership;
             if (resData.hasOwnProperty('status')) {
                 result['status'] = resData.status;
-                const status = ['all', 'hidden', 'manager'];
-                if (status.indexOf(result['status']) === -1) {
-                    result['status'] = 'hidden';
-                }
+                result.validateStatus();
             }
             if (resData.type != null) {
                 result['type'] = resData.type;

connect/community/CustomizationOptions.ts

@@ -23,7 +23,7 @@ export class Layout {
         variables['@global-background'] = Layout.convertRGBAtoRGB(options.backgrounds.light.color);
         variables['@hero-background-image'] = (options.backgrounds.form.imageFile ? (this.getUrl(properties.utilsService + '/download/' + options.backgrounds.form.imageFile)) : 'none');
         variables['@hero-background-position'] = options.backgrounds.form.position;
-        variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode?'dark':'light';
+        variables['@hero-fonts-mode'] = options.backgrounds.form.fontsDarkMode == true ?'dark':'light';
       }
       if (options.buttons) {
         //general
@@ -174,6 +174,9 @@ export class CustomizationOptions {
   }
   
   public static checkForObsoleteVersion(current: CustomizationOptions, communityId: string) {
+    if(communityId === 'connect') {
+      return null;
+    }
     let defaultCO = new CustomizationOptions(CustomizationOptions.getIdentity(communityId).mainColor, CustomizationOptions.getIdentity(communityId).secondaryColor);
     let updated = Object.assign({}, defaultCO);
     if (!current) {
@@ -197,7 +200,7 @@ export class CustomizationOptions {
       if (!current.backgrounds.form.position) {
         current.backgrounds.form.position = "center bottom"
       }
-      if (!current.backgrounds.form.fontsDarkMode) {
+      if (current.backgrounds.form.fontsDarkMode == undefined) {
         current.backgrounds.form.fontsDarkMode = true;
       }
       if (!current.buttons) {

connect/community/community.service.ts

@@ -98,14 +98,14 @@ export class CommunityService {
     community.description = resData.description;
     community.date = resData.creationDate;
     community.zenodoCommunity = resData.zenodoCommunity;
-    community.status = 'all';
+    community.status = 'PUBLIC';
+    community.claim = resData.claim;
+    community.membership = resData.membership;
     community.type = resData.type;
+    community.otherZenodoCommunities = resData.otherZenodoCommunities;
     if (resData.hasOwnProperty('status')) {
       community.status = resData.status;
-      const status = ['all', 'hidden', 'manager'];
-      if (status.indexOf(community['status']) === -1) {
-        community.status = 'hidden';
-      }
+      community.validateStatus();
     }
     if (resData.subjects != null) {
       community.subjects = Array.isArray(resData.subjects)?resData.subjects:[resData.subjects];

connect/community/communityInfo.ts

@@ -1,5 +1,4 @@
 import {StringUtils} from "../../utils/string-utils.class";
-import {properties} from "../../../../environments/environment";
 import {SelectionCriteria} from "../../utils/entities/contentProvider";
 
 export class CommunityInfo {
@@ -14,8 +13,11 @@ export class CommunityInfo {
   managers: string[];
   date:Date;
   subjects: string[];
-  status:string;
+  status:"all" | "manager" | "hidden" | "PUBLIC" | "RESTRICTED" | "PRIVATE";
+  claim: "all" | "managersOnly" | "membersOnly";
+  membership: "open" | "byInvitation";
   zenodoCommunity:string;
+  otherZenodoCommunities: string[];
   isUpload: boolean;
   isSubscribed: boolean;
   isManager: boolean;
@@ -33,5 +35,24 @@ export class CommunityInfo {
     }
     return response;
   }
+
+  public isOpen() {
+    return !(this.membership && this.membership === 'byInvitation');
+  }
+
+  public isPublic(){
+    return this.status == "all" || this.status == "PUBLIC";
+  }
+  public isRestricted(){
+    return this.status == "manager" || this.status == "RESTRICTED";
+  }
+  public isPrivate(){
+    return this.status == "hidden" || this.status == "PRIVATE";
+  }
+  public validateStatus(){
+    if(!(this.isPrivate() || this.isRestricted() || this.isPublic())){
+      this.status = "PRIVATE";
+    }
+  }
 }
 // export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];

connect/communityGuard/connectAdminLoginGuard.guard.ts

@@ -1,20 +1,13 @@
 import {filter, map, mergeMap, take} from 'rxjs/operators';
 import {Injectable} from '@angular/core';
-import {
-  ActivatedRouteSnapshot,
-  CanActivate,
-  CanActivateChild,
-  Router,
-  RouterStateSnapshot,
-  UrlTree
-} from '@angular/router';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import {Observable, of} from 'rxjs';
 import {Session} from '../../login/utils/helper.class';
 import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
 import {UserManagementService} from "../../services/user-management.service";
 
 @Injectable()
-export class ConnectAdminLoginGuard implements CanActivate, CanActivateChild {
+export class ConnectAdminLoginGuard  {
   
   constructor(private router: Router,
               private userManagementService: UserManagementService) {

connect/communityGuard/isCommunity.guard.ts

@@ -1,11 +1,5 @@
-import { Injectable } from '@angular/core';
-import {
-  Router,
-  CanActivate,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot,
-  CanLoad, Route, UrlSegment, CanActivateChild, UrlTree
-} from '@angular/router';
+import {Injectable} from '@angular/core';
+import {ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlTree} from '@angular/router';
 import {Observable} from 'rxjs';
 
 import {ConnectHelper} from '../connectHelper';
@@ -14,7 +8,7 @@ import {CommunityService} from "../community/community.service";
 import {map} from "rxjs/operators";
 
 @Injectable()
-export class IsCommunity implements CanActivate, CanActivateChild {
+export class IsCommunity  {
 
   constructor(private router: Router,
               private communityService: CommunityService) {

connect/connectHelper.ts

@@ -1,14 +1,18 @@
 import {HttpParams} from '@angular/common/http';
 import {properties} from "../../../environments/environment";
 import {Session} from "../login/utils/helper.class";
+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")) {
-      domain = "test.openaire.eu"; //for testing
+      domain = "covid-19.openaire.eu"; //for testing
     }
     domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix
     if (domain.indexOf('eosc-portal.eu') != -1) {
@@ -53,7 +57,12 @@ export class ConnectHelper {
   }
 
 
-  public static isPrivate(community, user) {
-    return community && (community.status == "hidden" || (community.status == "manager" && !(Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager("community", community.communityId, user))))
+  public static isPrivate(community: CommunityInfo, user) {
+    return community && (community.isPrivate() || (community.isRestricted() && !(
+        Session.isPortalAdministrator(user) ||
+        Session.isCommunityCurator(user) ||
+        Session.isManager("community", community.communityId, user) ||
+        (!community.isOpen() && Session.isMember('community', community.communityId, user))
+    )))
   }
 }

connect/projects/searchProjects.service.ts

@@ -7,15 +7,25 @@ import {map} from "rxjs/operators";
 export class SearchCommunityProjectsService {
     constructor(private http: HttpClient ) {}
 
-    searchProjects (properties:EnvProperties, pid: string):any {
-        let url = properties.communityAPI+pid+"/projects";
-
+    searchProjects (properties:EnvProperties, pid: string, page=1, size=500):any {
+        return this.searchProjectsWithPaging(properties,pid,page, size, null, null);
+    }
+    searchProjectsWithPaging (properties:EnvProperties, pid: string, page=1, size=500, searchFilter, funder, orderBy = "name"):any {
+        let params = funder ? ["funder="+ funder] :[];
+        if (searchFilter) {
+            params.push("searchFilter="+ searchFilter)
+        }
+        params.push("orderBy="+ orderBy);
+        let url = properties.communityAPI+pid+"/projects/"+ (page-1) + "/" + size +  (params.length > 0?"?" + params.join("&"):"");
         return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url);
-                    //.map(res => <any> res.json())
     }
     countTotalProjects(properties:EnvProperties,pid:string) {
-        let url = properties.communityAPI+pid+"/projects";
+        let url = properties.communityAPI+pid+"/projects/0/1";
         return  this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
-          .pipe(map(res => res['length']));
+          .pipe(map(res => res['totalElements']));
+    }
+    getProjectFunders(properties:EnvProperties,pid:string) {
+        let url = properties.communityAPI+pid+"/funders";
+        return  this.http.get<string[]>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
     }
 }

connect/userEmailPreferences/mailPrefs.component.html

@@ -1,55 +0,0 @@
-
-      <div *ngIf="!hidden" class="">
-        <div *ngIf="showSaveResetButtons" class="uk-article-title custom-article-title">
-          User Email Preferences for Claims Notifications
-        </div>
-
-        <div *ngIf="userValidMessage.length > 0" class = "uk-alert uk-alert-danger uk-animation-fade" role="alert">
-            {{userValidMessage}}
-        </div>
-        <div *ngIf="savedMessage.length > 0" class="uk-alert uk-alert-success uk-animation-fade" role="alert">
-            {{savedMessage}}
-        </div>
-        <errorMessages [status]="[status]" [type]="'notification preferences'"></errorMessages>
-
-
-          <div *ngFor="let notification of notifications; let i=index" >
-<!--              <div class="uk-accordion-title">Email preferences for {{preferencesFor}}: <strong>{{notification.openaireName}}</strong></div>-->
-<!--              <div class="uk-accordion-content">-->
-                <form class="uk-form-horizontal"><!-- [formGroup]="myForm"-->
-                  <!--[ngClass]="{'has-error':!myForm.controls.notify.valid && myForm.controls.notify.dirty}"-->
-                  <div class="uk-margin uk-grid">
-                    <div class=" inherit-color uk-width-medium"
-                         title="Get e-mail notification when there are new user links related your community">Notify
-                      for new user links:</div>
-
-                    <mat-slide-toggle [checked]="notification.notify"
-                                      (change)="($event.source.checked = notification.notify);changeNotify(notification, !notification.notify, i)"></mat-slide-toggle>
-                  </div>
-
-                  <div *ngIf="notification.notify" [class]="notification.notify ? 'uk-margin' :
-                  'uk-margin cursor-not-allowed'">
-                    <div class="uk-form-label inherit-color">Frequency:</div>
-                    <div class="uk-form-controls">
-                      <select [class]="notification.notify ? 'uk-select' : 'uk-select uk-disabled'" id="form-horizontal-select"
-                              [(ngModel)]="notification.frequency" (ngModelChange)="changeFrequency(i)" name="select_frequency">
-                        <option [ngValue]="24" >Daily</option>
-                        <option [ngValue]="48" >Every two days</option>
-                        <option [ngValue]="168">Weekly</option>
-                      </select>
-                    </div>
-                  </div>
-
-                  <div *ngIf="showSaveResetButtons" class="uk-float-right">
-                    <button type="submit" class="uk-button uk-button-primary" (click)="saveNotification(i)">Save Changes</button>
-                    <button type="submit" class="uk-button" (click)="restoreNotification(i)">Reset</button>
-                  </div>
-
-                </form>
-
-              </div>
-<!--          </div>-->
-<!--      </ul>-->
-
-      </div>
-

connect/userEmailPreferences/mailPrefs.component.ts

@@ -1,259 +0,0 @@
-import {Component, Input} from '@angular/core';
-import {Location} from '@angular/common';
-import {ActivatedRoute, Router} from '@angular/router';
-import {Session} from '../../login/utils/helper.class';
-import {EnvProperties} from '../../utils/properties/env-properties';
-import {MailPrefsService} from './mailPrefs.service';
-import {ConnectHelper} from '../connectHelper';
-import {ErrorCodes} from '../../utils/properties/errorCodes';
-import {ErrorMessagesComponent}    from '../../utils/errorMessages.component';
-import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
-import {properties} from "../../../../environments/environment";
-import {Subscriber} from "rxjs";
-
-declare var UIkit: any;
-
-@Component({
-  selector: 'mailPrefs',
-  templateUrl: 'mailPrefs.component.html',
-  providers:[MailPrefsService]
-
-})
-export class MailPrefsComponent {
-  properties:EnvProperties;
-  subscriptions = [];
-  @Input()  communityId: string;
-  public preferencesFor: string = "community";
-  public status: number;
-
-  public notifications = [];
-  public initialNotifications = [];
-  public prefsChanged = {};
-  public hidden: boolean = true;
-
-  //public showForbiddenMessage:boolean = false;
-  public userValidMessage:string = "";
-  public savedMessage: string = "";
-
-  private errorCodes: ErrorCodes;
-  private errorMessages: ErrorMessagesComponent;
-
-  @Input() showSaveResetButtons: boolean = true;
-
-  constructor (private _mailPrefsService: MailPrefsService, private route: ActivatedRoute, private _router:Router, private location: Location) {
-    this.errorCodes = new ErrorCodes();
-    this.errorMessages = new ErrorMessagesComponent();
-    this.status = this.errorCodes.LOADING;
-  }
-
-  ngOnInit() {
-    this.properties = properties;
-    this.subscriptions.push(this.route.params.subscribe(params => {
-      this.hidden = true;
-      console.debug(this.communityId);
-      if(!this.communityId){
-        this.communityId  = ConnectHelper.getCommunityFromDomain(this.properties.domain);
-      }
-      if(!this.communityId) {
-        this.communityId = params['community'];
-      }
-      console.debug(this.communityId, params)
-      this.getEmailPreferences();
-    }));
-
-
-  }
-
-  getEmailPreferences() {
-    if(!Session.isLoggedIn()){
-      //this.userValidMessage = "User session has expired. Please login again.";
-      if(this.showSaveResetButtons) {
-        this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
-      }
-    } else {
-      this.status = this.errorCodes.LOADING;
-      this.savedMessage = "";
-
-      if(this.communityId && this.communityId != "openaire") {
-        this.preferencesFor = "community";
-        this.subscriptions.push(this._mailPrefsService.getUserEmailPreferencesForCommunity(this.communityId, this.properties.claimsAPIURL).subscribe(
-          data => {
-            if(data.code == "204") {
-              this.status = this.errorCodes.NONE;
-              this.initialNotifications = [{notify: true, frequency:24, openaireId: this.communityId}];
-            } else {
-              this.initialNotifications = data.data;
-            }
-              this.notifications = JSON.parse(JSON.stringify( this.initialNotifications ));
-
-              this.status = this.errorCodes.DONE;
-              this.hidden = false;
-
-          },
-          err => {
-            this.hidden = false;
-            this.handleErrors(err);
-            this.handleError("Error getting user email preferences for community with id: "+this.communityId, err);
-          }
-        ));
-      } else {
-        this.preferencesFor = "project";
-        this.subscriptions.push(this._mailPrefsService.getUserEmailPreferencesForOpenaire(this.properties.claimsAPIURL).subscribe(
-          data => {
-
-            if(data.code == "204") {
-              this.status = this.errorCodes.NONE;
-            } else {
-
-              this.initialNotifications = data.data;
-              this.notifications = JSON.parse(JSON.stringify( this.initialNotifications ));
-              //this.notifications = this.initialNotifications.map(x => Object.assign({}, x));
-              //this.notifications = this.initialNotifications;
-
-              this.status = this.errorCodes.DONE;
-            }
-          },
-          err => {
-            //console.info(err);
-            this.handleErrors(err);
-            this.handleError("Error getting user email preferences for openaire", err);
-          }
-        ));
-      }
-    }
-  }
-
-  changeNotify(notification: any, checked: boolean, index: number) {
-    if(!Session.isLoggedIn()){
-      //this.userValidMessage = "User session has expired. Please login again.";
-      if(this.showSaveResetButtons) {
-        this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
-      }
-    } else {
-      this.savedMessage = "";
-      this.status = this.errorCodes.DONE;
-      notification.notify = checked;
-      this.prefsChanged[index] = true;
-    }
-  }
-
-  changeFrequency(index: number) {
-    if(!Session.isLoggedIn()){
-      //this.userValidMessage = "User session has expired. Please login again.";
-      if(this.showSaveResetButtons) {
-        this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
-      }
-    } else {
-      this.savedMessage = "";
-      this.status = this.errorCodes.DONE;
-      if(this.initialNotifications[index].frequency != this.notifications[index].frequency) {
-        this.prefsChanged[index] = true;
-      }
-    }
-  }
-
-  saveNotification(index: number) {
-    if(this.notifications.length > 0 && this.initialNotifications.length > 0) {
-      if(!Session.isLoggedIn()){
-        //this.userValidMessage = "User session has expired. Please login again.";
-        if(this.showSaveResetButtons) {
-          this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
-        }
-      } else {
-        if(JSON.stringify(this.notifications[index]) != JSON.stringify(this.initialNotifications[index])) {
-
-          this.status = this.errorCodes.LOADING;
-          this.savedMessage = "";
-
-          this.subscriptions.push(this._mailPrefsService.saveUserEmailPreferences(this.notifications[index], this.properties.claimsAPIURL).subscribe(
-            data => {
-              this.initialNotifications[index] = JSON.parse(JSON.stringify( this.notifications[index] ));
-
-              this.status = this.errorCodes.DONE;
-
-              /*UIkit.notification({
-                  message : '<strong>Your email preferences for '+this.notifications[index].openaireName+' have been successfully changed<strong>',
-                  status  : 'success',
-                  timeout : 3000,
-                  pos     : 'top-center'
-              });*/
-              this.savedMessage = "Notification settings for claims saved!";
-            },
-            err => {
-              //console.log(err);
-              this.handleError("Error saving user email preferences: "+JSON.stringify(this.notifications[index]), err);
-              this.status = this.errorCodes.NOT_SAVED;
-            }
-          ));
-        }
-        else {
-          /*UIkit.notification({
-              message : '<strong>No changes selected for '+this.notifications[index].openaireName+' email preferences<strong>',
-              status  : 'primary',
-              timeout : 3000,
-              pos     : 'top-center'
-          });*/
-          this.savedMessage = "Notification settings for claims saved!";
-        }
-      }
-    }
-  }
-
-  restoreNotification(index: number) {
-    if(!Session.isLoggedIn()){
-      //this.userValidMessage = "User session has expired. Please login again.";
-      if(this.showSaveResetButtons) {
-        this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
-      }
-    } else {
-      if(this.notifications.length > 0 && this.initialNotifications.length > 0) {
-        this.status = this.errorCodes.LOADING;
-        this.savedMessage = "";
-        this.notifications[index] = JSON.parse(JSON.stringify( this.initialNotifications[index] ));
-        this.status = this.errorCodes.DONE;
-        this.prefsChanged[index] = false;
-      }
-    }
-  }
-  /*
-    prefsChanged(index: number) : boolean {
-      if(this.notifications.length > 0 && this.initialNotifications.length > 0) {
-        if(JSON.stringify(this.notifications[index]) != JSON.stringify(this.initialNotifications[index])) {
-          return true;
-        }
-      }
-      return false;
-    }
-  */
-  ngOnDestroy() {
-    this.subscriptions.forEach(subscription => {
-      if (subscription instanceof Subscriber) {
-        subscription.unsubscribe();
-      }
-    });
-  }
-
-
-  handleErrors(err){
-    //this.showErrorMessage = true;
-    //try{
-    var code = "";
-    if(!err.status) {
-      var error =  err.json();
-      code = error.code;
-    } else {
-      code = err.status;
-    }
-    this.status = this.errorMessages.getErrorCode(code);
-  }
-
-  private handleError(message: string, error) {
-    console.error("User mail notification preferences Page (for claims): "+message, error);
-  }
-
-
-  //}catch (e) {
-  //console.log("Couldn't parse answer as json")
-  //this.showErrorMessage = true;
-  //}
-}

connect/userEmailPreferences/mailsPrefs.module.ts

@@ -1,23 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }       from '@angular/common';
-import { RouterModule }       from '@angular/router';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { MailPrefsComponent } from './mailPrefs.component';
-import { MailPrefsService }   from './mailPrefs.service';
-import {ErrorMessagesModule}    from '../../utils/errorMessages.module';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-
-@NgModule({
-  imports: [
-    CommonModule, RouterModule, FormsModule, ReactiveFormsModule, ErrorMessagesModule, MatSlideToggleModule
-  ],
-  declarations: [
-    MailPrefsComponent
-  ],
-  providers:[MailPrefsService],
-  exports: [
-    MailPrefsComponent
-  ]
-})
-export class MailPrefsModule { }

connect/zenodoCommunities/searchZenodoCommunities.service.ts

@@ -1,15 +0,0 @@
-import {Injectable} from '@angular/core';
-import {HttpClient} from "@angular/common/http";
-import{EnvProperties} from '../../utils/properties/env-properties';
-
-@Injectable()
-export class SearchZenodoCommunitiesService {
-    constructor(private http: HttpClient ) {}
-
-    searchZCommunities (properties:EnvProperties, pid: string):any {
-        let url = properties.communityAPI+pid+"/zenodocommunities";
-
-        return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url);
-                    //.map(res => <any> res.json())
-    }
-}

connect/zenodoCommunities/zenodo-communities.service.ts

@@ -16,12 +16,12 @@ export class ZenodoCommunitiesService {
                             //.map(res => <any> res.json())
                             .pipe(map(res => [this.parseZenodoCommunities(res['hits'].hits),res['hits'].total]));
     }
-    getZenodoCommunityById(properties:EnvProperties, url: string, openaireId:string) {
+    getZenodoCommunityById(properties:EnvProperties, id: string) {
+      let url = properties.zenodoCommunities + "/" + id;
             return this.http.get((properties.useLongCache)? (properties.cacheUrl+encodeURIComponent(url)) : url)
                             //.map(res => <any> res.json())
                             .pipe(map(res => {
                               var community = this.parseZenodoCommunity(res);
-                              community["openaireId"]=openaireId;
                               return community;
                             }));
     }
@@ -40,14 +40,14 @@ export class ZenodoCommunitiesService {
 
     parseZenodoCommunity(resData:any):ZenodoCommunityInfo {
       var result: ZenodoCommunityInfo = new ZenodoCommunityInfo();
-
-      result['title'] = resData.title;
+      let metadata = resData["metadata"];
+      result['title'] = metadata.title;
       result['id'] = resData.id;
-      result['description'] = resData.description;
-      result['link'] = resData.links.html;
-      result['logoUrl'] = resData.logo_url;
+      result['description'] = metadata.description;
+      result['link'] = resData.links.self_html;
+      result['logoUrl'] = resData.links.logo;
       result['date'] = resData.updated;
-      result['page'] = resData.page;
+      result['page'] = metadata.page;
       return result;
 
     }

connect/zenodoCommunities/zenodoCommunityInfo.ts

@@ -6,5 +6,4 @@ export class ZenodoCommunityInfo {
   logoUrl: string;
   date: Date;
   page: string;
-  openaireId:string;
 }

contact-us/contact-us.component.html

@@ -4,27 +4,27 @@
 <div class="uk-child-width-1-1 uk-grid uk-grid-margin-large" [attr.uk-scrollspy-class]="scrollspy?'':null"
      [class.uk-grid-column-small]="smallForm" [class.uk-child-width-1-2@s]="!smallForm" [formGroup]="contactForm" uk-grid>
   <div *ngIf="contactForm.get('name')" input placeholder="Name"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('name')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('name')"></div>
   <div *ngIf="contactForm.get('surname')" input placeholder="Surname"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('surname')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('surname')"></div>
   <div *ngIf="contactForm.get('email')" input placeholder="Email"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('email')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('email')"></div>
   <div *ngIf="contactForm.get('job')" input placeholder="Job Title"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('job')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('job')"></div>
   <div *ngIf="contactForm.get('affiliation')" input placeholder="Affiliation"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('affiliation')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('affiliation')"></div>
   <div *ngIf="contactForm.get('community')" input placeholder="Research Community or Infrastructure"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('community')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('community')"></div>
   <div *ngIf="contactForm.get('organization')" input placeholder="Organization"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('organization')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('organization')"></div>
   <div *ngIf="contactForm.get('organizationType')" input type="select" placeholder="Organization Type"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('organizationType')" [options]="organizationTypes"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('organizationType')" [options]="organizationTypes"></div>
   <div *ngIf="contactForm.get('subject')" class="uk-width-1-1" input placeholder="Subject"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('subject')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('subject')"></div>
   <div *ngIf="contactForm.get('message')" class="uk-width-1-1" input type="textarea" rows="4" placeholder="Comments"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('message')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('message')"></div>
   <div *ngIf="contactForm.get('description')" class="uk-width-1-1" input type="textarea" rows="4" placeholder="Description"
-       [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('description')"></div>
+       [inputClass]="'flat' + (smallForm?' x-small':'')" [formInput]="contactForm.get('description')"></div>
   <div *ngIf="contactForm.get('recaptcha')" class="uk-flex uk-flex-center" [class.uk-width-1-1]="smallForm" [class.uk-flex-last@s]="!smallForm">
     <re-captcha #captchaElem (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"></re-captcha>
   </div>

dashboard/divId/divIds.module.ts

@@ -6,14 +6,6 @@ import {AlertModalModule} from '../../utils/modal/alertModal.module';
 import {DivIdsComponent} from './divIds.component';
 import {AdminToolServiceModule} from "../../services/adminToolService.module";
 import {InputModule} from "../../sharedComponents/input/input.module";
-
-
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
-import { MatCheckboxModule } from "@angular/material/checkbox";
-import { MatFormFieldModule } from "@angular/material/form-field";
-
-
-import {MatChipsModule} from '@angular/material/chips';
 import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
 import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
 import {ClassesRoutingModule} from "./classes-routing.module";
@@ -23,9 +15,10 @@ import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
   imports: [
+    ClassesRoutingModule,
     CommonModule, RouterModule, FormsModule,
-    AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
-    MatCheckboxModule, AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule
+    AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule,
+    AdminTabsModule, PageContentModule, SearchInputModule, IconsModule, LoadingModule
   ],
     declarations: [DivIdsComponent],
     exports: [DivIdsComponent]

dashboard/divhelpcontent/class-help-content-form.module.ts

@@ -16,9 +16,10 @@ import {PageContentModule} from '../sharedComponents/page-content/page-content.m
 
 @NgModule({
   imports: [
+    ClassHelpContentFormRoutingModule,
     CommonModule, FormsModule, RouterModule,
     SafeHtmlPipeModule, CKEditorModule,
-    AlertModalModule, ReactiveFormsModule, ClassHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, MatSlideToggleModule, IconsModule, LoadingModule, PageContentModule
+    AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatSlideToggleModule, IconsModule, LoadingModule, PageContentModule
   ],
     declarations: [
       ClassContentFormComponent

dashboard/divhelpcontent/class-help-contents.module.ts

@@ -19,8 +19,9 @@ import {PageContentModule} from '../sharedComponents/page-content/page-content.m
 
 @NgModule({
   imports: [
+    ClassHelpContentsRoutingModule,
     CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
-    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule, ClassHelpContentsRoutingModule,
+    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule,
     SearchInputModule, IconsModule, LoadingModule, HTMLToStringPipeModule, PageContentModule
   ],
     declarations: [

dashboard/entity/entities.module.ts

@@ -17,8 +17,9 @@ import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module";
 
 @NgModule({
   imports: [
+    EntitiesRoutingModule,
     CommonModule, RouterModule, FormsModule, AdminToolServiceModule,
-    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule, PageContentModule, AdminTabsModule, EntitiesRoutingModule, SearchInputModule, IconsModule, LoadingModule, LogoUrlPipeModule
+    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule, PageContentModule, AdminTabsModule, SearchInputModule, IconsModule, LoadingModule, LogoUrlPipeModule
   ],
     declarations: [EntitiesComponent],
     exports: [EntitiesComponent]

dashboard/helpTexts/page-help-content-form.module.ts

@@ -8,21 +8,21 @@ import {PageContentFormComponent} from './page-help-content-form.component';
 import {PageHelpContentFormRoutingModule} from './page-help-content-form-routing.module';
 import {AdminToolServiceModule} from '../../services/adminToolService.module';
 import {InputModule} from '../../sharedComponents/input/input.module';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {IconsModule} from '../../utils/icons/icons.module';
 import {PageContentModule} from '../sharedComponents/page-content/page-content.module';
 import {RouterModule} from '@angular/router';
 import {LoadingModule} from '../../utils/loading/loading.module';
+import {MatSlideToggleModule} from "@angular/material/slide-toggle";
 
 @NgModule({
   imports: [
+    PageHelpContentFormRoutingModule,
     CommonModule, FormsModule, RouterModule,
     SafeHtmlPipeModule, CKEditorModule,
-    AlertModalModule, ReactiveFormsModule, PageHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, MatSlideToggleModule, IconsModule, PageContentModule, LoadingModule
+    AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, IconsModule, PageContentModule, LoadingModule, MatSlideToggleModule
   ],
-    declarations: [
-        PageContentFormComponent
-    ],
-    exports: [PageContentFormComponent]
+  declarations: [PageContentFormComponent],
+  exports: [PageContentFormComponent]
 })
-export class PageHelpContentFormModule {}
+export class PageHelpContentFormModule {
+}

dashboard/helpTexts/page-help-contents.module.ts

@@ -17,8 +17,9 @@ import {HTMLToStringPipeModule} from '../../utils/pipes/HTMLToStringPipe.module'
 
 @NgModule({
   imports: [
+    PageHelpContentsRoutingModule,
     CommonModule, RouterModule, FormsModule, SafeHtmlPipeModule,
-    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule, PageHelpContentsRoutingModule, PageContentModule,
+    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule, PageContentModule,
     SearchInputModule, IconsModule, LoadingModule, HTMLToStringPipeModule
   ],
     declarations: [

dashboard/menu/menu.module.ts

@@ -18,8 +18,9 @@ import {LogoUrlPipeModule} from '../../utils/pipes/logoUrlPipe.module';
 
 @NgModule({
   imports: [
+    MenuRoutingModule,
     CommonModule, RouterModule, FormsModule, AdminToolServiceModule,
-    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule, PageContentModule, AdminTabsModule, MenuRoutingModule, SearchInputModule, IconsModule, LoadingModule,
+    AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, InputModule, PageContentModule, AdminTabsModule, SearchInputModule, IconsModule, LoadingModule,
 		TransitionGroupModule, LogoUrlPipeModule
   ],
     declarations: [MenuComponent],

dashboard/page/pages.module.ts

@@ -20,8 +20,9 @@ import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module";
 
 @NgModule({
   imports: [
+    PagesRoutingModule,
     CommonModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, MatSlideToggleModule, AdminToolServiceModule, InputModule,
-    MatAutocompleteModule, MatFormFieldModule, MatChipsModule, AdminTabsModule, PageContentModule, PagesRoutingModule, SearchInputModule, IconsModule, LoadingModule, LogoUrlPipeModule
+    MatAutocompleteModule, MatFormFieldModule, MatChipsModule, AdminTabsModule, PageContentModule, SearchInputModule, IconsModule, LoadingModule, LogoUrlPipeModule
   ],
     declarations: [PagesComponent],
     exports: [PagesComponent]

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: 'ri', label: StakeholderEntities.RI + ' Dashboard'},
-    {value: 'organization', label: StakeholderEntities.ORGANIZATION + ' Dashboard'},
-    {value: 'project', label: StakeholderEntities.PROJECT + ' Dashboard'}
+    {value: 'funder', label: StakeholderConfiguration.ENTITIES.funder + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'ri', label: StakeholderConfiguration.ENTITIES.ri + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'organization', label: StakeholderConfiguration.ENTITIES.organization + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'project', label: StakeholderConfiguration.ENTITIES.project + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
+    {value: 'country', label: StakeholderConfiguration.ENTITIES.country + ' ' + StakeholderConfiguration.ENTITIES.stakeholder},
   ];
 
 }

dashboard/portal/portals.module.ts

@@ -15,9 +15,10 @@ import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
   imports: [
+    PortalsRoutingModule,
     CommonModule, FormsModule, AlertModalModule,
     ReactiveFormsModule,
-    RouterModule, AdminToolServiceModule, InputModule, AdminTabsModule, PageContentModule, PortalsRoutingModule, IconsModule, SearchInputModule, LoadingModule
+    RouterModule, AdminToolServiceModule, InputModule, AdminTabsModule, PageContentModule, IconsModule, SearchInputModule, LoadingModule
   ],
   declarations: [PortalsComponent],
   exports: [PortalsComponent]

dashboard/sharedComponents/admin-tabs/admin-tabs.component.ts

@@ -11,9 +11,9 @@ import {ActivatedRoute} from "@angular/router";
       <li *ngIf="isPortalAdmin && !portal" [class.uk-active]="tab === 'portal'"><a routerLink="../portals">Portals</a></li>
       <li [class.uk-active]="tab === 'page'"><a  routerLink="../pages">Pages</a></li>
       <li [class.uk-active]="tab === 'entity'"><a  routerLink="../entities">Entities</a></li>
-			<li *ngIf="portal && type === 'community'" [class.uk-active]="tab === 'menu'"><a  routerLink="../menu">Menus</a></li>
-      <li  *ngIf="isPortalAdmin  && !portal" [class.uk-active]="tab === 'class'"><a routerLink="../classes">Classes</a></li>
-      <li  *ngIf="isPortalAdmin  && portal=='connect'" [class.uk-active]="tab === 'customization'"><a routerLink="../customization">Customization</a></li>
+	  <li *ngIf="portal && type === 'community'" [class.uk-active]="tab === 'menu'"><a  routerLink="../menu">Menus</a></li>
+      <li *ngIf="isPortalAdmin  && !portal" [class.uk-active]="tab === 'class'"><a routerLink="../classes">Classes</a></li>
+      <li *ngIf="isPortalAdmin  && portal=='connect'"  [class.uk-active]="tab === 'customization'"><a routerLink="../customization">Customization</a></li>
     </ul>
   `
 })
@@ -25,7 +25,7 @@ export class AdminTabsComponent implements OnInit {
   @Input()
   public user: User;
   @Input()
-  public tab: "portal" | "page" | "entity" | "menu" | "class" | "customization"= 'page';
+  public tab: "portal" | "page" | "entity" | "menu" | "class" | "customization" = 'page';
   private subscriptions: any[] = [];
   
   constructor(private route: ActivatedRoute, private userManagementService: UserManagementService) {

dashboard/sharedComponents/page-content/page-content.component.ts

@@ -80,9 +80,6 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
-    if(this.isBrowser) {
-      this.stickyBugWorkaround();
-    }
     this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
       this.isMobile = isMobile;
       if(this.isBrowser) {
@@ -132,77 +129,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   
   initFooter() {
     let footer_offset = this.calcStickyFooterOffset(this.sticky_footer.nativeElement);
-    this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {bottom: true, offset: footer_offset});
-  }
-
-  /**
-   * Workaround for sticky not update bug when sidebar is toggled.
-   * TODO when UIKit will be updated => remove
-   *
-   * */
-  stickyBugWorkaround() {
-    let sidebarOffset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-width')) -
-      Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-sidebar-mini-width'));
-    let transitionDelay = Number.parseFloat(getComputedStyle(document.documentElement).getPropertyValue('--dashboard-transition-delay')) * 1000;
-    this.subscriptions.push(this.layoutService.isOpen.subscribe(isOpen => {
-      if (this.sticky.header) {
-        if (isOpen) {
-          this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) - sidebarOffset + 'px';
-        } else {
-          this.sticky.header.$el.style.width = Number.parseInt(this.sticky.header.$el.style.width) + sidebarOffset + 'px';
-        }
-        setTimeout(() => {
-          this.sticky.header.$emit();
-        }, transitionDelay);
-      }
-      if (this.sticky.footer) {
-        if (isOpen) {
-          this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) - sidebarOffset + 'px';
-        } else {
-          this.sticky.footer.$el.style.width = Number.parseInt(this.sticky.footer.$el.style.width) + sidebarOffset + 'px';
-        }
-        setTimeout(() => {
-          this.sticky.footer.$emit();
-        }, transitionDelay);
-      }
-      this.cdr.detectChanges();
-    }));
-  }
-
-  /**
-   * @deprecated
-   *
-   * Should be smooth
-   *
-   * */
-  private observeBottom() {
-    let bottom = document.getElementById('bottom');
-    if (bottom) {
-      let bottomObs = new IntersectionObserver(entries => {
-        entries.forEach(entry => {
-          this.shouldSticky = !entry.isIntersecting;
-        })
-      });
-      this.subscriptions.push(bottomObs);
-      bottomObs.observe(bottom);
-    }
-  }
-
-  /**
-   * @deprecated
-   * */
-  private observeHeader() {
-    if (this.header) {
-      let headerObs = new IntersectionObserver(entries => {
-        entries.forEach(entry => {
-          if (entry.boundingClientRect.height > 0) {
-            this.layoutService.setReplaceHeader(!entry.isIntersecting);
-          }
-        })
-      });
-      this.subscriptions.push(headerObs);
-      headerObs.observe(this.header.nativeElement);
-    }
+    this.sticky.footer = UIkit.sticky(this.sticky_footer.nativeElement, {end: true, offset: footer_offset});
   }
 
   private observeStickyFooter() {

dashboard/sharedComponents/sidebar/layout.service.ts

@@ -1,4 +1,4 @@
-import {Injectable} from "@angular/core";
+import {AfterViewInit, Injectable} from "@angular/core";
 import {BehaviorSubject, Observable, Subscriber} from "rxjs";
 import {ActivationStart, Router} from "@angular/router";
 import {Icon} from "../../../sharedComponents/menu";
@@ -75,6 +75,24 @@ export class LayoutService {
   private isMobileSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   /** Active sidebar Item*/
   private activeSidebarItemSubject: BehaviorSubject<SidebarItem> = new BehaviorSubject<SidebarItem>(null);
+  /**
+   *  Add hasMenuSearchBar: false/ nothing on data of route config, if the search bar in the menu should not appear, otherwise true.
+   */
+  private hasMenuSearchBarSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  /**
+   * Add hasStickyHeaderOnMobile: true in order to activate uk-sticky in header of mobile/tablet devices.
+   * */
+  private hasStickyHeaderOnMobileSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  /**
+   * Add a class in root element of the html. (For different theme apply)
+   * Handle it manually in the component, it doesn't use data
+   * */
+  private rootClassSubject: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+  /**
+   * Display help pop-up on non-admin pages. (default true for the rest of the pages)
+   * */
+  private hasHelpPopUpSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  private isBottomIntersectingSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   private subscriptions: any[] = [];
 
   ngOnDestroy() {
@@ -102,6 +120,20 @@ export class LayoutService {
       this.subscriptions.push(resizeObs);
       resizeObs.observe(document.documentElement);
     }
+    if(typeof document !== "undefined") {
+      setTimeout(() => {
+        let bottom = document.getElementById('bottom');
+        if (bottom) {
+          let bottomObs = new IntersectionObserver(entries => {
+            entries.forEach(entry => {
+              this.isBottomIntersectingSubject.next(entry.isIntersecting);
+            })
+          });
+          this.subscriptions.push(bottomObs);
+          bottomObs.observe(bottom);
+        }
+      }, 500)
+    }
   }
 
   constructor(private router: Router) {
@@ -122,7 +154,7 @@ export class LayoutService {
           data['hasHeader'] === false) {
           this.setHasHeader(false);
           if (typeof document !== "undefined") {
-            document.documentElement.style.setProperty('--header-height', '0');
+            document.documentElement.style.setProperty('--header-height', '0px');
           }
         } else {
           this.setHasHeader(true);
@@ -166,6 +198,18 @@ export class LayoutService {
         } else {
           this.setActiveMenuItem('');
         }
+        if (data['hasMenuSearchBar'] !== undefined &&
+          data['hasMenuSearchBar'] === true) {
+          this.setHasMenuSearchBar(true);
+        } else {
+          this.setHasMenuSearchBar(false);
+        }
+        if (data['hasStickyHeaderOnMobile'] !== undefined &&
+            data['hasStickyHeaderOnMobile'] === true) {
+          this.setHasStickyHeaderOnMobile(true);
+        } else {
+          this.setHasStickyHeaderOnMobile(false);
+        }
       }
     }));
     this.setObserver();
@@ -292,4 +336,42 @@ export class LayoutService {
   setActiveSidebarItem(value: SidebarItem) {
     this.activeSidebarItemSubject.next(value);
   }
+
+  get hasMenuSearchBar(): Observable<boolean> {
+    return this.hasMenuSearchBarSubject.asObservable();
+  }
+
+  setHasMenuSearchBar(value: boolean) {
+    this.hasMenuSearchBarSubject.next(value);
+  }
+
+  get hasStickyHeaderOnMobile(): Observable<boolean> {
+    return this.hasStickyHeaderOnMobileSubject.asObservable();
+  }
+
+  setHasStickyHeaderOnMobile(value: boolean) {
+    this.hasStickyHeaderOnMobileSubject.next(value);
+  }
+
+  get rootClass(): Observable<string> {
+    return this.rootClassSubject.asObservable();
+  }
+
+  setRootClass(value: string = null): void {
+    if(this.rootClassSubject.value != value) {
+      this.rootClassSubject.next(value);
+    }
+  }
+
+  get hasHelpPopUp(): Observable<boolean> {
+    return this.hasHelpPopUpSubject.asObservable();
+  }
+
+  setHasHelpPopUp(value: boolean) {
+    this.hasHelpPopUpSubject.next(value);
+  }
+
+  get isBottomIntersecting(): Observable<boolean> {
+    return this.isBottomIntersectingSubject.asObservable();
+  }
 }

dashboard/sharedComponents/sidebar/sideBar.component.html

@@ -1,8 +1,8 @@
-<aside id="sidebar_main" class="uk-visible@m">
+<div id="sidebar_main" uk-sticky="end: .sidebar_main_swipe;" [attr.offset]="offset" class="uk-visible@m">
   <div sidebar-content>
     <ng-container *ngTemplateOutlet="menu; context: {mobile: false}"></ng-container>
   </div>
-</aside>
+</div>
 <div class="uk-hidden@m">
   <div id="sidebar_offcanvas" #sidebar_offcanvas [attr.uk-offcanvas]="'overlay: true'">
     <div class="uk-offcanvas-bar uk-padding-remove">
@@ -28,8 +28,11 @@
               [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 uk-nav-parent-icon" [class.uk-list-large]="mobile"
+    <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">
       <ng-template ngFor [ngForOf]="items" let-item>
         <li [class.uk-active]="item.isActive" [ngClass]="item.customClass"
@@ -37,9 +40,10 @@
           <a [routerLink]="getItemRoute(item)" [title]="item.title" (click)="item.items.length === 0?closeOffcanvas():null"
              [queryParams]="item.route?item.params:null" [queryParamsHandling]="item.route?queryParamsHandling:null" class="uk-flex uk-flex-middle">
             <div *ngIf="item.icon && (item.icon.svg || item.icon.name)" class="uk-width-auto">
-              <icon class="menu-icon" [customClass]="item.icon.class" [name]="item.icon.name" ratio="0.9" [svg]="item.icon.svg" [flex]="true"></icon>
+              <icon class="menu-icon" [customClass]="item.icon.class" [name]="item.icon.name" [ratio]="item.icon.ratio?item.icon.ratio:0.9" [svg]="item.icon.svg" [flex]="true"></icon>
             </div>
             <span [class.hide-on-close]="item.icon" class="uk-width-expand@l uk-text-truncate uk-margin-small-left">{{item.title}}</span>
+            <span *ngIf="item.items.length > 0" class="uk-nav-parent-icon hide-on-close"></span>
           </a>
           <ul *ngIf="item.items?.length > 0 && (isBrowser || item.isActive)" class="uk-nav-sub">
             <li *ngFor="let subItem of item.items" [ngClass]="subItem.customClass"

dashboard/sharedComponents/sidebar/sideBar.component.ts

@@ -28,8 +28,10 @@ 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;
   public properties = properties;
   private subscriptions: any[] = [];
   private init: boolean = false;
@@ -45,6 +47,9 @@ export class SideBarComponent implements OnInit, AfterViewInit, OnDestroy, OnCha
   }
 
   ngOnInit() {
+    if (typeof document !== "undefined") {
+      this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height'));
+    }
     this.setActiveMenuItem();
   }
 

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.html

@@ -8,26 +8,26 @@
 				<div class="uk-flex uk-flex-left@m uk-flex-center uk-width-expand">
 					<ul class="uk-subnav uk-subnav-pill">
 						<li [class.uk-active]="showCurrent" (click)="showCurrent = true">
-							<a class="uk-text-capitalize">{{role}}s</a>
+							<a class="uk-text-capitalize">{{roleUtils.roles[role]}}s</a>
 						</li>
 						<li [class.uk-active]="!showCurrent" (click)="showCurrent = false">
-							<a>Pending {{role}}s</a>
+							<a>Pending {{roleUtils.roles[role]}}s</a>
 						</li>
 					</ul>
 				</div>
 				<div class="uk-width-expand@m uk-width-1-1 uk-grid uk-flex-right@m uk-flex-center uk-flex-middle" uk-grid>
 					<div *ngIf="showCurrent" [disabled]="loadActive" search-input class="uk-width-expand@l uk-width-1-1"
-							 [searchControl]="filterForm.get('active')" [expandable]="true" [placeholder]="'Search ' + role + 's'" searchInputClass="outer">
+							 [searchControl]="filterForm.get('active')" [expandable]="true" [placeholder]="'Search ' + roleUtils.roles[role] + 's'" searchInputClass="outer">
 					</div>
 					<div *ngIf="!showCurrent" [disabled]="loadPending" search-input class="uk-width-expand@l uk-width-1-1"
 							 [searchControl]="filterForm.get('pending')" [expandable]="true" [placeholder]="'Search invitations'" searchInputClass="outer">
 					</div>
 					<div>
-						<button *ngIf="exists" class="uk-button uk-button-default uk-flex uk-flex-middle"
+						<button *ngIf="canInvite" class="uk-button uk-button-default uk-flex uk-flex-middle"
 										[attr.uk-tooltip]="inviteDisableMessage" [class.uk-disabled]="loadPending || loadPending"
 										[disabled]="loadActive || loadPending || !!inviteDisableMessage" (click)="openInviteModal()">
 							<icon name="person_add" [flex]="true" type="filled"></icon>
-							<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Invite {{role}}</span>
+							<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Invite {{roleUtils.roles[role]}}</span>
 						</button>
 						<button *ngIf="!exists && isCurator" class="uk-button uk-button-default uk-flex uk-flex-middle"
 										(click)="openCreateRoleModal()">
@@ -47,16 +47,16 @@
 			<div *ngIf="!loadActive && !loadPending">
 				<div *ngIf="(showCurrent && showActive.length == 0) || (!showCurrent && showPending.length == 0)"
 						 class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
-					<div *ngIf="showCurrent">No {{role}}s found</div>
-					<div *ngIf="!showCurrent">No pending {{role}} invitations found</div>
+					<div *ngIf="showCurrent">No {{roleUtils.roles[role]}}s found</div>
+					<div *ngIf="!showCurrent">No pending {{roleUtils.roles[role]}} invitations found</div>
 				</div>
 				<div *ngIf="(showCurrent && showActive.length > 0) || (!showCurrent && showPending.length > 0)">
-					<no-load-paging *ngIf="showCurrent" [type]="(showActive.length > 1)?(role + 's'):role"
+					<no-load-paging *ngIf="showCurrent" [type]="(showActive.length > 1)?(roleUtils.roles[role] + 's'):role"
 													(pageChange)="updateActivePage($event)"
 													[page]="activePage" [pageSize]="pageSize"
 													[totalResults]="showActive.length">
 					</no-load-paging>
-					<no-load-paging *ngIf="!showCurrent" [type]="role + ' ' + (showPending.length > 1?'invitations':'invitation')"
+					<no-load-paging *ngIf="!showCurrent" [type]="roleUtils.roles[role] + ' ' + (showPending.length > 1?'invitations':'invitation')"
 													(pageChange)="updatePendingPage($event)"
 													[page]="pendingPage" [pageSize]="pageSize"
 													[totalResults]="showPending.length">
@@ -95,23 +95,26 @@
   </div>
 </div>
 <modal-alert #inviteModal (alertOutput)="invite()" [overflowBody]="false" classTitle="uk-background-primary uk-light"
-						 [okDisabled]="invited && invited.invalid">
+						 [okDisabled]="!valid">
 	<div *ngIf="message" class="uk-margin-medium-bottom uk-text-small">
 		<div [innerHTML]="message | safeHtml"></div>
 	</div>
-	<div *ngIf="invited">
-		<div input [formInput]="invited"
-				 placeholder="Email"></div>
+	<div *ngIf="emailsForm">
+		<div #emailInput input [formInput]="emailsForm" type="chips"
+			 placeholder="Recipients" hint="Add a recipient" [visibleChips]="3"
+			 [addExtraChips]="true" [validators]="validators" [separators]="[',']">
+			<div note>Separate emails with commas</div>
+		</div>
 	</div>
 </modal-alert>
 <modal-alert #deleteModal [overflowBody]="false" (alertOutput)="deleteActive()" classTitle="uk-background-primary uk-light">
   <div *ngIf="selectedUser">
-    Are you sure you want to remove <span class="uk-text-bold">{{selectedUser}}</span> from {{role}}s?
+    Are you sure you want to remove <span class="uk-text-bold">{{selectedUser}}</span> from {{roleUtils.roles[role]}}s?
   </div>
 </modal-alert>
 <modal-alert #deletePendingModal [overflowBody]="false" (alertOutput)="deletePending()" classTitle="uk-background-primary uk-light">
   <div *ngIf="selectedUser">
-    Are you sure you want to cancel {{role}} invitation of <span class="uk-text-bold">{{selectedUser}}</span>?
+    Are you sure you want to cancel {{roleUtils.roles[role]}} invitation of <span class="uk-text-bold">{{selectedUser}}</span>?
   </div>
 </modal-alert>
 <modal-alert #createRoleModal [overflowBody]="false" (alertOutput)="createGroup()" classTitle="uk-background-primary uk-light"

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

@@ -1,17 +1,39 @@
-import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild} from '@angular/core';
-import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild
+} from '@angular/core';
+import {UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, ValidatorFn, Validators} from '@angular/forms';
 import {AlertModal} from "../../../utils/modal/alert";
 import {UserRegistryService} from "../../../services/user-registry.service";
 import {EnvProperties} from "../../../utils/properties/env-properties";
 import {properties} from "../../../../../environments/environment";
-import {Role, Session, User} from "../../../login/utils/helper.class";
+import {Role, RoleUtils, Session, User} from "../../../login/utils/helper.class";
 import {UserManagementService} from "../../../services/user-management.service";
 import {Router} from "@angular/router";
 import {StringUtils} from "../../../utils/string-utils.class";
 import {NotificationService} from "../../../notifications/notification.service";
-import {Subscription} from "rxjs";
+import {forkJoin, of, Subscription} from "rxjs";
 import {NotificationHandler} from "../../../utils/notification-handler";
 import {ClearCacheService} from "../../../services/clear-cache.service";
+import {catchError, map, tap} from "rxjs/operators";
+import {InputComponent} from "../../../sharedComponents/input/input.component";
+import {StakeholderUtils} from "../../../monitor-admin/utils/indicator-utils";
+
+class InvitationResponse {
+  email: string;
+  invitation: any;
+
+  constructor(email, invitation) {
+    this.email = email;
+    this.invitation = invitation;
+  }
+}
 
 @Component({
   selector: 'role-users',
@@ -22,7 +44,9 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   @Input()
   public id: string;
   @Input()
-  public type: string;
+  set type(type: string) {
+    this._type = Role.mapType(type);
+  }
   @Input()
   public name: string;
   @Input()
@@ -32,6 +56,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   @Input()
   public deleteAuthorizationLevel: 'curator' | 'manager' = 'curator';
   @Input()
+  public inviteAuthorizationLevel: 'curator' | 'manager' = 'manager';
+  @Input()
   public message: string = null;
   @Input()
   public emailComposer: Function;
@@ -49,7 +75,8 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   public loadActive: boolean = true;
   public loadPending: boolean = true;
   public selectedUser: string = null;
-  public invited: UntypedFormControl;
+  public emailsForm: UntypedFormArray;
+  public validators: ValidatorFn[] = [Validators.email];
   public properties: EnvProperties = properties;
   public exists: boolean = true;
   public roleFb: UntypedFormGroup;
@@ -60,15 +87,19 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   /** Search */
   filterForm: UntypedFormGroup;
   @ViewChild('inviteModal') inviteModal: AlertModal;
+  @ViewChild('emailInput') emailInput: InputComponent;
   @ViewChild('deleteModal') deleteModal: AlertModal;
   @ViewChild('deletePendingModal') deletePendingModal: AlertModal;
   @ViewChild('createRoleModal') createRoleModal: AlertModal;
+  public stakeholderUtils: StakeholderUtils = new StakeholderUtils();
+  public roleUtils: RoleUtils = new RoleUtils();
+  private _type: string;
   
   constructor(private userRegistryService: UserRegistryService,
               private userManagementService: UserManagementService,
               private clearCacheService: ClearCacheService,
               private notificationService: NotificationService,
-              private router: Router,
+              private cdr: ChangeDetectorRef,
               private fb: UntypedFormBuilder) {
   }
   
@@ -116,9 +147,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;
@@ -130,7 +160,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;
@@ -159,7 +189,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   openDeleteModal(item: any) {
     if (this.showCurrent) {
       this.selectedUser = item.email;
-      this.deleteModal.alertTitle = 'Delete ' + this.role;
+      this.deleteModal.alertTitle = 'Delete ' + this.roleUtils.roles[this.role];
       this.deleteModal.open();
     } else {
       this.selectedUser = item;
@@ -169,10 +199,11 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   }
   
   openInviteModal() {
-    this.inviteModal.alertTitle = 'Invite ' + this.role;
+    this.inviteModal.alertTitle = 'Invite ' + this.roleUtils.roles[this.role];
     this.inviteModal.okButtonLeft = false;
     this.inviteModal.okButtonText = 'Send';
-    this.invited = this.fb.control('', [Validators.required, Validators.email]);
+    this.emailsForm = this.fb.array([], Validators.required);
+    this.cdr.detectChanges();
     this.inviteModal.open();
   }
   
@@ -181,8 +212,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),
-      description: 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.roleName(this._type, this.id), Validators.required)
     });
     setTimeout(() => {
       this.roleFb.get('name').disable();
@@ -193,7 +224,7 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   
   deleteActive() {
     this.loadActive = true;
-    this.subs.push(this.userRegistryService.remove(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
+    this.subs.push(this.userRegistryService.remove(this._type, this.id, this.selectedUser, this.role).subscribe(() => {
       this.active = this.active.filter(user => user.email != this.selectedUser);
       if (this.currentActivePage.length === 0) {
         this.activePage = 1;
@@ -211,58 +242,82 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   
   deletePending() {
     this.loadPending = true;
-    this.subs.push(this.userRegistryService.cancelInvitation(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
+    this.subs.push(this.userRegistryService.cancelInvitation(this._type, this.id, this.selectedUser, this.role).subscribe(() => {
       this.pending = this.pending.filter(user => user != this.selectedUser);
       this.filterPendingBySearch(this.filterForm.value.pending);
       if (this.currentPendingPage.length === 0) {
         this.pendingPage = 1;
       }
-      NotificationHandler.rise(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been <b>canceled</b>');
+      NotificationHandler.rise(StringUtils.capitalize(this.roleUtils.roles[this.role]) + ' invitation to ' + this.selectedUser + ' has been <b>canceled</b>');
       this.loadPending = false;
     }, error => {
       NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
       this.loadPending = false;
     }));
   }
-  
+
+  get valid() {
+    return this.emailsForm && this.emailsForm.valid || (this.emailInput && this.emailInput.searchControl.getRawValue() && this.emailInput.searchControl.valid);
+  }
+
   invite() {
+    if(this.emailInput.searchControl.getRawValue() && this.emailInput.searchControl.valid) {
+      this.emailInput.add(null,true);
+    }
     this.showCurrent = false;
     this.loadPending = true;
-    this.selectedUser = this.invited.value;
-    let details = {
-      link: this.link,
-      email: this.emailComposer(this.name, this.invited.value, this.role)
-    }
-    this.subs.push(this.userRegistryService.invite(this.type, this.id, details, this.role).subscribe(invitation => {
-      if (!this.pending.includes(this.invited.value)) {
-        this.pending.push(this.invited.value);
+    let current = null;
+    let invitations = (<Array<any>>this.emailsForm.value).map(email => {
+      current = email;
+      return this.userRegistryService.invite(this._type, this.id, {
+        link: this.link,
+        email: this.emailComposer(this.name, email, this.role)
+      }, this.role).pipe(catchError(error => {
+        return of(null);
+      }), map(invitation => new InvitationResponse(email, invitation)));
+    });
+    this.subs.push(forkJoin(invitations).subscribe(responses => {
+      let notifications = responses.map(response => {
+        if(response.invitation) {
+          NotificationHandler.rise(StringUtils.capitalize(this.role) + ' invitation to ' + response.email + ' has been <b>sent</b>');
+          if (!this.pending.includes(response.email)) {
+            this.pending.push(response.email);
+          }
+          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(() => {
+              NotificationHandler.rise('A notification has been <b>sent</b> successfully to ' + response.email);
+            }), catchError( error => {
+              NotificationHandler.rise('An error has occurred while sending a notification to ' + response.email + '. Please try again later', 'danger');
+              return of(null);
+            }));
+          } else {
+           return of(null);
+          }
+        } else {
+          NotificationHandler.rise('An error has occurred while sending the invitation mail to ' +
+              response.email + '.Check if the user is already a ' + this.roleUtils.roles[this.role] + ' or try again later', 'danger');
+          return of(null);
+        }
+      });
+      this.subs.push(forkJoin(notifications).subscribe(() => {
         this.pendingPage = Math.ceil(this.pending.length / this.pageSize);
         this.filterPendingBySearch(this.filterForm.value.pending);
-      }
-      if (this.notificationFn) {
-        this.subs.push(this.notificationService.sendNotification(this.notificationFn(this.name, this.invited.value, this.role, invitation)).subscribe(notification => {
-          NotificationHandler.rise('A notification has been <b>sent</b> successfully');
-        }, error => {
-          NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
-        }));
-      }
-      NotificationHandler.rise(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been <b>sent</b>');
-      this.loadPending = false;
-    }, error => {
-      NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
-      this.loadPending = false;
+        this.loadPending = false;
+      }))
     }));
   }
   
   createGroup() {
     this.loadActive = true;
     this.loadPending = true;
-    this.userRegistryService.createRole(this.type, this.id).subscribe(() => {
+    this.userRegistryService.createRole(this._type, this.id).subscribe(() => {
       NotificationHandler.rise('Group has been <b> successfully created</b>');
       this.updateLists();
     }, error => {
       if(error.status === 409) {
-        NotificationHandler.rise('Group already exists. You can try to invite a ' + this.role + ' instead.', 'warning');
+        NotificationHandler.rise('Group already exists. You can try to invite a ' + this.roleUtils.roles[this.role] + ' instead.', 'warning');
         this.updateLists();
       } else {
         NotificationHandler.rise('An error has occurred. Please try again later', 'danger');
@@ -275,17 +330,21 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
   public get canDelete() {
     return (this.deleteAuthorizationLevel === 'curator'?this.isCurator:this.isManager);
   }
+
+  public get canInvite() {
+    return this.exists && (this.inviteAuthorizationLevel === 'curator'?this.isCurator:this.isManager);
+  }
   
   public isMe(userId: string) {
     return userId && userId.includes(this.user.id) && !this.isCurator;
   }
   
   public get isManager(): boolean {
-    return this.isCurator || !!Session.isManager(this.type, this.id, this.user);
+    return this.isCurator || !!Session.isManager(this._type, this.id, this.user);
   }
   
   public get isCurator(): boolean {
-    return this.isPortalAdmin || !!Session.isCurator(this.type, this.user);
+    return this.isPortalAdmin || !!Session.isCurator(this._type, this.user);
   }
   
   public get isPortalAdmin(): boolean {

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;
@@ -141,8 +141,8 @@ export class SubscribersComponent 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),
-      description: 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.roleName(this.type, this.id), Validators.required)
     });
     setTimeout(() => {
       this.roleFb.get('name').disable();

deposit/depositFirstPage.component.ts

@@ -15,7 +15,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
 @Component({
   selector: 'deposit-first-page',
   template: `
-		<div class="deposit">
+		<div>
 			<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
 				<div class="uk-padding-small uk-padding-remove-horizontal">
 					<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
@@ -48,7 +48,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
 									1. Find the appropriate repository or journal
 								</div>
 								<div>
-									Find the appropriate repository to deposit your research products of any type (publication, data, software, other) or to include in your data management plan. Search and browse for OpenAIRE compliant repositories registered in OpenDOAR and re3data.
+									Find the appropriate repository to deposit your research products of any type (publication, data, software, other) or to include in your data management plan. Search and browse for OpenAIRE compliant repositories registered in OpenDOAR, re3data and FAIRsharing.
 									Looking for Open Access journals? Find those that suit your needs among the journals registered in the Directory of Open Access Journals (DOAJ).
 									To know more, read the OpenAIRE Open Access primer (<a target="_blank" href="https://www.openaire.eu/oa-basics">https://www.openaire.eu/oa-basics</a>)
 								</div>
@@ -110,7 +110,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
 							<div class="uk-card-body uk-text-small">
 								<img src="assets/common-assets/common/Logo_Horizontal.png" alt="OpenAIRE logo" class="uk-width-small uk-margin-bottom">
 								<div>
-									Search and browse for <span class="uk-text-bold">OpenAIRE compliant repositories</span> registered in OpenDOAR and re3data.
+									Search and browse for <span class="uk-text-bold">OpenAIRE compliant repositories</span> registered in OpenDOAR, re3data and FAIRsharing.
 								</div>
 							</div>
 							<div class="uk-card-footer uk-padding-small uk-tile-primary uk-flex uk-flex-center uk-light">
@@ -152,7 +152,6 @@ export class DepositFirstPageComponent {
   public title: string = "Deposit or publish your research in Open Access";
 
   @Input() public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass();
-  @Input() piwikSiteId = null;
 	@Input() assetsPath: string = 'assets/common-assets/common';
 
   @Input() communityId = null;
@@ -201,10 +200,7 @@ export class DepositFirstPageComponent {
         if (!this.zenodoInformation.name) {
           this.zenodoInformation.name = "Zenodo";
         }
-
-        if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
-          this.subscriptions.push(this._piwikService.trackView(this.properties, this.title, this.piwikSiteId).subscribe());
-        }
+        this.subscriptions.push(this._piwikService.trackView(this.properties, this.title).subscribe());
         this.breadcrumbs.push({name: 'home', route: '/'}, {name: "Deposit", route: null});
   }
 

deposit/depositFirstPage.module.ts

@@ -5,7 +5,6 @@ import { CommonModule }        from '@angular/common';
 import { FormsModule }         from '@angular/forms';
 import { RouterModule } from '@angular/router';
 
-import {PiwikServiceModule} from '../utils/piwik/piwikService.module';
 import {HelperModule} from '../utils/helper/helper.module';
 import {Schema2jsonldModule} from '../sharedComponents/schema2jsonld/schema2jsonld.module';
 import { SEOServiceModule } from '../sharedComponents/SEO/SEOService.module';
@@ -18,7 +17,6 @@ import {FullScreenModalModule} from '../utils/modal/full-screen-modal/full-scree
   imports: [
     CommonModule, FormsModule,
     RouterModule,
-    PiwikServiceModule,
     HelperModule,
     Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, SearchInputModule,
 		FullScreenModalModule

deposit/searchDataprovidersToDeposit.component.ts

@@ -29,7 +29,8 @@ import {SearchForm} from "../searchPages/searchUtils/newSearchPage.component";
       <div class="uk-container uk-container-large">
         <div class="uk-margin-top uk-flex uk-flex-center">
           <div class="uk-width-large" [class.dark]="searchForm.dark">
-            <div search-input [(value)]="keyword" placeholder="Search by name, description, subject..." (searchEmitter)="keywordChanged()"></div>
+            <div search-input [(value)]="keyword" placeholder="Search by name, description, subject..." (searchEmitter)="keywordChanged()" 
+                 [searchInputClass]="'inner background'"></div>
 						<div class="uk-margin-top uk-text-center uk-margin-medium-bottom">
 							<a *ngIf="zenodoInformation.url" [href]="zenodoInformation.url" target="_blank" class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text">
 								<span class="uk-flex uk-flex-middle">
@@ -52,7 +53,6 @@ import {SearchForm} from "../searchPages/searchUtils/newSearchPage.component";
 export class SearchDataprovidersToDepositComponent {
   private errorCodes: ErrorCodes;
   private errorMessages: ErrorMessagesComponent;
-  @Input() piwikSiteId = null;
   @Input() searchForm: SearchForm = {class: null, dark: false};
   public results =[];
   public filters =[];

deposit/searchDataprovidersToDeposit.module.ts

@@ -9,7 +9,6 @@ import {SearchResultsModule } from '../searchPages/searchUtils/searchResults.mod
 
 import {DataProvidersServiceModule} from '../services/dataProvidersService.module';
 import {SearchFormModule} from  '../searchPages/searchUtils/searchForm.module';
-import {IsRouteEnabled} from '../error/isRouteEnabled.guard';
 import {SearchDataProvidersModule} from "../searchPages/searchDataProviders.module";
 import {BreadcrumbsModule} from "../utils/breadcrumbs/breadcrumbs.module";
 import {SearchInputModule} from "../sharedComponents/search-input/search-input.module";
@@ -25,7 +24,7 @@ import {SearchInputModule} from "../sharedComponents/search-input/search-input.m
   declarations: [
     SearchDataprovidersToDepositComponent
   ],
-  providers:[ IsRouteEnabled],
+  providers:[],
   exports: [
     SearchDataprovidersToDepositComponent
   ]

deposit/searchResultsInDeposit.component.html

@@ -19,7 +19,7 @@
   <li *ngFor="let result of results">
 		<result-preview [properties]="properties" [showOrganizations]="true"
 			[showSubjects]="true" [result]="getResultPreview(result)" [promoteWebsiteURL]="true"
-			[isCard]="true" deposit="true">
+			[isCard]="true" deposit="true" [isMobile]="isMobile">
 		</result-preview>
   </li>
 </ul>

deposit/searchResultsInDeposit.component.ts

@@ -19,6 +19,7 @@ export class SearchResultsInDepositComponent {
   @Input() status: number;
   @Input() type: string;
   @Input() properties:EnvProperties;
+  @Input() isMobile: boolean = false;
 
 
   public urlParam: string;

error-interceptor.service.ts

@@ -3,15 +3,25 @@ import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from "@angular/com
 import {Observable, throwError, TimeoutError} from "rxjs";
 import {catchError} from "rxjs/operators";
 import {Session} from "./login/utils/helper.class";
-import {Router} from "@angular/router";
+import {GuardsCheckEnd, GuardsCheckStart, Router} from "@angular/router";
 import {LoginErrorCodes} from "./login/utils/guardHelper.class";
 import {properties} from "../../environments/environment";
+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) {
+    this.router.events.forEach(event => {
+      if(event instanceof GuardsCheckStart) {
+        this.url = event.url;
+      } else if(event instanceof GuardsCheckEnd) {
+        this.url = null;
+      }
+    })
   }
   
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
@@ -42,7 +52,7 @@ export class ErrorInterceptorService implements HttpInterceptor {
     this.router.navigate(['/user-info'], {
       queryParams: {
         'errorCode': LoginErrorCodes.NOT_LOGIN,
-        'redirectUrl': this.router.url
+        'redirectUrl': this.url?this.url:this.router.url
       }
     });
   }
@@ -51,7 +61,7 @@ export class ErrorInterceptorService implements HttpInterceptor {
     this.router.navigate(['/user-info'], {
       queryParams: {
         'errorCode': LoginErrorCodes.NOT_AUTHORIZED,
-        'redirectUrl': this.router.url
+        'redirectUrl': this.url?this.url:this.router.url
       }
     });
   }

error/isDevelopmentGuard.guard.ts

@@ -4,24 +4,18 @@ import {Observable} from 'rxjs';
 
 import {properties} from "../../../environments/environment";
 
-@Injectable()
-export class isDevelopmentGuard implements CanActivate, CanLoad {
+@Injectable({
+	providedIn: 'root'
+})
+export class isDevelopmentGuard {
 	constructor(private router: Router) {
 	}
 	
-	check(): Observable<boolean> | boolean {
+	canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree{
 		if(properties.environment == 'development') {
 			return true;
 		} else {
 			this.router.navigate([properties.errorLink]);
 		}
 	}
-	
-	canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree{
-		return this.check();
-	}
-
-	canLoad(route: Route, segments: UrlSegment[]): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-		return this.check()
-	}
-}
+}

error/isRouteEnabled.guard.ts

@@ -1,13 +1,15 @@
 import {Observable} from 'rxjs';
 import {take, tap} from 'rxjs/operators';
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, Data, Router, RouterStateSnapshot, UrlTree} from '@angular/router';
+import { ActivatedRouteSnapshot, Data, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
 import {ConfigurationService} from '../utils/configuration/configuration.service';
 import {ConnectHelper} from '../connect/connectHelper';
 import {properties} from "../../../environments/environment";
 
-@Injectable()
-export class IsRouteEnabled implements CanActivate {
+@Injectable({
+  providedIn: 'root'
+})
+export class IsRouteEnabled  {
   
   constructor(private router: Router,
               private config: ConfigurationService) {
@@ -23,7 +25,7 @@ export class IsRouteEnabled implements CanActivate {
     if (!community) {
       community = properties.adminToolsCommunity;
     }
-    return this.config.isPageEnabledByState(properties, community, '/' + path).pipe(take(1), tap((enabled) => {
+    return this.config.isPageEnabled(properties, community, '/' + path).pipe(take(1), tap((enabled) => {
       if (!enabled) {
         this.router.navigate([redirect], {queryParams: {'page': path}});
       }

fos/fos-selection/fos-selection.component.html

@@ -22,7 +22,7 @@
 						<ul *ngIf="keyword?.length" class="uk-tab uk-tab-left">
 							<li *ngFor="let item of viewResults; index as i" 
 								class="uk-margin-small-bottom uk-text-capitalize" [class.uk-active]="activeSection === item.id">
-                  <a (click)="scrollToId(item.id)">{{item.id}}</a>
+									<a (click)="scrollToId(item.id)">{{item.id}}</a>
 							</li>
 						</ul>
 					</div>

fos/fos-selection/fos-selection.component.ts

@@ -72,8 +72,9 @@ export class FosSelectionComponent {
           } else {
             this.activeSection = this.fos[0].id;
           }
-
-          this.setObserver();
+          if(typeof IntersectionObserver !== "undefined") {
+            this.setObserver();
+          }
           this.cdr.detectChanges();
         });
       }
@@ -93,7 +94,7 @@ export class FosSelectionComponent {
       this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
         this.keyword = value;
         this.findMatches(this.keyword);
-        if (typeof document !== 'undefined') {
+        if (typeof IntersectionObserver !== 'undefined') {
           setTimeout(() => {
             this.setObserver();
           });

fos/fos.component.html

@@ -7,18 +7,18 @@
 <div class="uk-container uk-container-large uk-section"  uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
 	<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
 		<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
-      <span class="uk-align-left uk-margin-remove-bottom">
-        <span uk-scrollspy-class class="uk-text-large" style="color: #EEB204">Beta</span>
-      </span>
+<!--      <span class="uk-align-left uk-margin-remove-bottom">-->
+<!--        <span uk-scrollspy-class class="uk-text-large" style="color: #EEB204">Beta</span>-->
+<!--      </span>-->
 			<div style="max-width: 600px;">
         <h1 uk-scrollspy-class class="uk-h1 uk-margin-remove-top">
           <span>Fields of Science  <span class="uk-text-primary">.</span></span>
         </h1>
 				<div uk-scrollspy-class>
-					We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Research Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential.
+					We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential.
 				</div>
 				<div class="uk-text-meta uk-margin-top" uk-scrollspy-class>
-					Our work is based on the work from our partner Athena Research Center: SciNoBo : A Hierarchical Multi-Label Classifier of Scientific Publications - <a href="https://doi.org/10.1145/3487553.3524677" target="_blank">https://doi.org/10.1145/3487553.3524677</a>
+					Our work is based on the work from our partner Athena Research Center: SciNoBo : a novel system classifying scholarly communication in a dynamically constructed hierarchical Field-of-Science taxonomy - <a href="https://doi.org/10.3389/frma.2023.1149834" target="_blank">https://doi.org/10.3389/frma.2023.1149834</a>
 				</div>
 				<!-- TODO: We need a page for the button link -->
 				<!-- <div>
@@ -32,13 +32,15 @@
 			</div>
 		</div>
 		<div class="uk-width-2-5@m uk-width-1-1@s uk-text-center" uk-scrollspy-class>
-			<img src="assets/common-assets/fos/fos-hero-img.svg" loading="lazy">
+			<img src="assets/common-assets/fos/fos-hero-img.svg" loading="lazy" alt="FoS logo">
 		</div>
 	</div>
 </div>
-<div *ngIf="fos?.length" class="uk-container uk-container-large uk-section"  uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
+
+<div *ngIf="fos?.length" id="levels" class="uk-container uk-container-large uk-section"
+     uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
 	<div class="uk-visible@m">
-		<div uk-sticky="offset: 50;" class="uk-sticky uk-background-default uk-padding uk-padding-remove-bottom uk-padding-remove-horizontal">
+		<div id="keyword_search" uk-sticky="offset: 50;" class="uk-sticky uk-background-default uk-padding uk-padding-remove-bottom uk-padding-remove-horizontal">
 			<div class="uk-flex uk-flex-right uk-margin-small-bottom">
 				<div search-input [searchControl]="keywordControl" [options]="fosOptions" iconPosition="left" placeholder="Write a key word to filter the content"
 					searchInputClass="border-bottom" class="uk-width-large"></div>
@@ -49,15 +51,33 @@
 		<div class="uk-margin-top uk-padding-small">
 			<div id="parentContainer" class="uk-grid uk-grid-large" uk-grid>
 				<div class="uk-width-1-4@m uk-visible@m">
-					<div class="uk-sticky" uk-sticky="bottom: !#parentContainer; offset: 200;">
+					<div class="uk-sticky" uk-sticky="end: !#parentContainer; offset: 200;">
 						<ul *ngIf="!keyword" class="uk-tab uk-tab-left">
 							<li *ngFor="let item of fos; index as i" [class.uk-active]="activeSection === item.id"
 								class="uk-margin-small-bottom uk-text-capitalize">
-									<a routerLink="./" [fragment]="item.id">{{item.id}}</a>
+									<a (click)="selectedParentLevels=[]" routerLink="./" [fragment]="item.id">
+                    <div>
+                      {{item.id}}
+                      <ng-container *ngIf="selectedParentLevels.length > 0 && selectedParentLevels[0].id==item.id">
+                        <div class="uk-margin-left uk-margin-xsmall-top">
+                          <span class="uk-flex uk-flex-middle">
+                            <icon [flex]="true" ratio="1" name="subdirectory_arrow_right"></icon>
+                            {{selectedParentLevels[1].id}}
+                          </span>
+                          <div class="uk-margin-left uk-margin-xsmall-top">
+                            <span class="uk-flex uk-flex-middle">
+                              <icon [flex]="true" ratio="1" name="subdirectory_arrow_right"></icon>
+                              {{selectedParentLevels[2].label}}
+                            </span>
+                          </div>
+                        </div>
+                      </ng-container>
+                    </div>
+                  </a>
 							</li>
 						</ul>
 						<ul *ngIf="keyword?.length" class="uk-tab uk-tab-left">
-							<li *ngFor="let item of viewResults; index as i" 
+							<li *ngFor="let item of viewResults; index as i"
 								class="uk-margin-small-bottom uk-text-capitalize" [class.uk-active]="activeSection === item.id">
 									<a routerLink="./" [fragment]="item.id">{{item.id}}</a>
 							</li>
@@ -91,11 +111,38 @@
 					</div>
 				</div>
 				<div class="uk-width-expand@m">
-					<ng-container *ngIf="!keyword">
+          <div *ngIf="!keyword && selectedParentLevels.length > 0" [id]="selectedParentLevels[0].id+'||'+selectedParentLevels[1].code+'||'+selectedParentLevels[2].code">
+            <a (click)="backClicked();"
+               class="uk-button-link uk-flex uk-flex-middle uk-margin-bottom">
+              <icon name="arrow_back" visuallyHidden="back" flex="true" ratio="1"></icon>
+              <span class="uk-margin-small-left">Back</span>
+            </a>
+            <div>
+              <h2 class="uk-h4 uk-text-capitalize uk-margin-remove">
+                <a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(selectedParentLevels[2])"
+                   class="uk-link-text">
+                  {{selectedParentLevels[2].label}}
+                </a>
+              </h2>
+              <div class="uk-grid uk-child-width-1-3 uk-margin-large-top uk-margin-xlarge-bottom" uk-grid="masonry: false">
+                <div *ngFor="let level4 of selectedParentLevels[2].children">
+                  <div class="uk-text-capitalize">
+                    <h3 class="uk-h6 uk-margin-small-bottom">
+                      <a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(level4)"
+                         class="uk-link-text">
+                        {{level4.label}}
+                      </a>
+                    </h3>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+					<ng-container *ngIf="!keyword && selectedParentLevels.length == 0">
 						<div [id]="item.id" *ngFor="let item of fos; index as i">
 							<div class="uk-text-capitalize">
 								<h2 class="uk-h4 uk-margin-remove">
-									<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(item.id)}"
+									<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(item)"
 										class="uk-link-text">
 										{{item.id}}
 									</a>
@@ -105,17 +152,56 @@
 								<div *ngFor="let child of item.children">
 									<div class="uk-text-capitalize">
 										<h3 class="uk-h6 uk-margin-small-bottom">
-											<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(child.id)}"
+											<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(child)"
 												class="uk-link-text">
 												{{child.id}}
 											</a>
 										</h3>
-										<div *ngFor="let subChild of child.children" style="margin-bottom: 5px;">
-											<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subChild.id)}"
-												class="uk-link-text">
-												{{subChild.id}}
-											</a>
-										</div>
+<!--                    class="parent uk-transition-toggle" tabindex="0"-->
+										<div *ngFor="let subChild of child.children; let i=index" style="margin-bottom: 7px;"
+                         class="uk-flex uk-flex-middle uk-flex-between uk-transition-toggle" tabindex="0">
+<!--											<span class="uk-flex uk-flex-between">-->
+                        <a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subChild)"
+                           class="uk-link-text uk-width-expand">
+                          {{searchFieldsHelper.getFosParameter() == 'foslabel' ? subChild.label : subChild.id}}
+                        </a>
+                      <span *ngIf="properties.environment == 'development' && subChild.children?.length > 0" (click)="moreClicked(item, child, subChild)"
+                            class="uk-transition-fade uk-width-auto uk-flex uk-flex-middle uk-margin-left label4 uk-text-small uk-text-meta">
+<!--                        <a class="view-more-less-link uk-link-text uk-text-lowercase">-->
+<!--                          +{{subChild.children.length}} more-->
+<!--&lt;!&ndash;                          <icon [flex]="true" ratio="1" name="chevron_right"></icon>&ndash;&gt;-->
+<!--                        </a>-->
+
+                        <icon [flex]="true" ratio="0.7" name="subdirectory_arrow_right"></icon>
+                        <a class="uk-link-text uk-text-lowercase">
+                          more
+                        </a>
+                      </span>
+
+<!--                      <div *ngIf="subChild.children?.length > 0" (click)="selectedParentLevels=[item, child, subChild]"-->
+<!--                           class="uk-flex uk-flex-middle uk-margin-left label4 uk-text-small uk-text-meta">-->
+<!--                        <a class="uk-link-text">{{subChild.children.length}} Subcategories</a>-->
+<!--                        <icon [flex]="true" ratio="1" name="chevron_right"></icon>-->
+<!--                      </div>-->
+
+<!--                        <span *ngIf="subChild?.children?.length > 0" (click)="fosAccordions.set(subChild.id, !fosAccordions.get(subChild.id))" class="uk-accordion-title uk-padding-remove"></span>-->
+<!--                      </span>-->
+<!--                      <div *ngIf="fosAccordions.get(subChild.id)" class="uk-margin-left">-->
+<!--                        <div *ngFor="let level4 of subChild.children" style="margin-bottom: 7px;">-->
+<!--                          <a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(level4)"-->
+<!--                             class="label4 uk-text-small uk-text-meta">-->
+<!--                            {{searchFieldsHelper.getFosParameter() == 'foslabel' ? level4.label : level4.id}}-->
+<!--                          </a>-->
+<!--                        </div>-->
+<!--                      </div>-->
+
+<!--                      uk-transition-slide-top-->
+<!--                      <div *ngIf="subChild.children?.length > 0" class="uk-transition-slide-top">-->
+<!--                        <div class="child">-->
+<!--                          <a class="uk-link uk-margin-left">{{subChild.children.length}} Subcategories ></a>-->
+<!--                        </div>-->
+<!--                      </div>-->
+                    </div>
 									</div>
 								</div>
 							</div>	
@@ -126,21 +212,27 @@
 							<div
 								class="uk-margin-large-bottom uk-padding uk-padding-remove-top uk-padding-remove-horizontal uk-text-capitalize" [class.custom-bottom-border]="i < viewResults.length - 1">
 								<h2 class="uk-h4 uk-margin-remove">
-									<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(item.id)}"
+									<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(item)"
 										class="uk-link-text" [innerHTML]="highlightKeyword(item.id)">
 									</a>
 								</h2>
 								<div class="uk-grid uk-child-width-1-3 uk-margin-large-top uk-margin-medium-bottom" uk-grid="masonry: false">
 									<div *ngFor="let subItem of item.children">
 										<h3 class="uk-h6 uk-margin-small-bottom">
-											<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subItem.id)}"
+											<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subItem)"
 												class="uk-link-text" [innerHTML]="highlightKeyword(subItem.id)">
 											</a>
 										</h3>
-										<div *ngFor="let subSubItem of subItem.children" style="margin-bottom: 5px;">
-											<a [routerLink]="properties.searchLinkToResults" [queryParams]="{'fos': urlEncodeAndQuote(subSubItem.id)}"
-												class="uk-link-text" [innerHTML]="highlightKeyword(subSubItem.id)">
+										<div *ngFor="let subSubItem of subItem.children" style="margin-bottom: 7px;">
+											<a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subSubItem)"
+												class="uk-link-text" [innerHTML]="highlightKeyword(searchFieldsHelper.getFosParameter() == 'foslabel' ? subSubItem.label : subSubItem.id)">
 											</a>
+
+                      <div *ngFor="let level4 of subSubItem?.children" class="uk-margin-left">
+                        <a [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(level4)"
+                           class="uk-text-small uk-text-meta uk-margin-xsmall-bottom" [innerHTML]="highlightKeyword(searchFieldsHelper.getFosParameter() == 'foslabel' ? level4.label : level4.id)">
+                        </a>
+                      </div>
 										</div>
 									</div>
 								</div>

fos/fos.component.ts

@@ -15,6 +15,8 @@ import {PiwikService} from "../utils/piwik/piwik.service";
 import {debounceTime, distinctUntilChanged} from "rxjs/operators";
 import Timeout = NodeJS.Timeout;
 import {ISVocabulariesService} from "../utils/staticAutoComplete/ISVocabularies.service";
+import {SearchFields} from "../utils/properties/searchFields";
+import {HelperFunctions} from "../utils/HelperFunctions.class";
 
 declare var UIkit;
 
@@ -26,9 +28,9 @@ declare var UIkit;
 export class FosComponent implements OnInit, OnDestroy {
 	public url: string = null;
 	public pageTitle: string = "OpenAIRE | Fields of Science";
-	public pageDescription: string = "We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Research Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential.";
-	@Input() piwikSiteId = null;
-
+	public pageDescription: string = "We have integrated a Field-of-Science (FoS) taxonomy into our dataset to organize and discover research more effectively. Using the full capabilities of the OpenAIRE Graph (full-texts, citations, references, venues) we apply AI and bring forward any multidisciplinarity potential.";
+  public scrollPos = 0;
+  public selectedParentLevels = [];
 	public fos: any[] = [];
 	public fosOptions: string[] = [];
 	public activeSection: string;
@@ -48,6 +50,7 @@ export class FosComponent implements OnInit, OnDestroy {
 	private timeout: Timeout;
 	@ViewChild('tabs') tabs: ElementRef;
 	public sliderInit: boolean = false;
+  private searchFieldsHelper: SearchFields = new SearchFields();
 
 	constructor(
 		private vocabulariesService: ISVocabulariesService,
@@ -63,9 +66,7 @@ export class FosComponent implements OnInit, OnDestroy {
 	) {}
 
 	ngOnInit() {
-		if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
-      this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.piwikSiteId).subscribe());
-    }
+		this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
 		this.url = this.properties.domain + this.properties.baseLink + this._router.url;
 		this.seoService.createLinkForCanonicalURL(this.url);
 		this.updateUrl(this.url);
@@ -84,21 +85,43 @@ export class FosComponent implements OnInit, OnDestroy {
 						item.classList.remove('uk-active');
 					});
 					if (this.route.snapshot.fragment) {
-						this.activeSection = this.route.snapshot.fragment;
-						let i = this.fos.findIndex(item => item.id == this.route.snapshot.fragment);
-						slider.show(i);
+            let splitFragment = this.route.snapshot.fragment.split("||");
+						this.activeSection = this.route.snapshot.fragment.split("||")[0];
+						let i = this.fos.findIndex(item => (item.id == this.route.snapshot.fragment || this.route.snapshot.fragment.startsWith(item.id+"||")));
+            if(i <0 || i>this.fos.length-1) {
+              this._router.navigate(['./'], {fragment: "", relativeTo: this.route, state: {disableScroll: true}});
+            } else {
+              if (splitFragment.length > 1) {
+                let level1 = this.fos[i];
+                let level2 = null;
+                let level3 = null;
+                if (level1.children) {
+                  level2 = level1.children.find(item => item.code == splitFragment[1]);
+                  if (level2 && level2.children) {
+                    level3 = level2.children.find(item => item.code == splitFragment[2]);
+                    this.selectedParentLevels = [this.fos[i], level2, level3];
+                  }
+                }
+                if(!level2 || !level3) {
+                  this._router.navigate(['./'], {fragment: level1.id, relativeTo: this.route, state: {disableScroll: true}});
+                }
+              } else {
+                slider.show(i);
+              }
+            }
 					} else {
 						this.activeSection = this.fos[0].id;
 					}
 					this.cdr.detectChanges();
 				});
 			}
+
 			this.subscriptions.push(this.route.fragment.subscribe(fragment => {
 				if(fragment) {
-					this.activeSection = fragment;
+					this.activeSection = fragment.split("||")[0];
 					if(this.tabs) {
 						let slider = UIkit.slider(this.tabs.nativeElement);
-						let i = this.fos.findIndex(item => item.id == fragment);
+						let i = this.fos.findIndex(item => (item.id == fragment || fragment.startsWith(item.id+"||")));
 						slider.show(i);
 					}
 				} else {
@@ -107,13 +130,16 @@ export class FosComponent implements OnInit, OnDestroy {
 			}));
 			this.keywordControl = this.fb.control('');
 			this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
-				this.keyword = value;
-				this.findMatches(this.keyword);
-				if (typeof document !== 'undefined') {
-					setTimeout(() => {
-						this.setObserver();
-					});
-				}
+        if(this.keyword !== undefined || value) {
+          this.selectedParentLevels = [];
+        }
+        this.keyword = value;
+        this.findMatches(this.keyword);
+        if (typeof IntersectionObserver !== 'undefined') {
+          setTimeout(() => {
+            this.setObserver();
+          });
+        }
 			}));
 		});
 	}
@@ -156,11 +182,16 @@ export class FosComponent implements OnInit, OnDestroy {
 		this.fos.forEach(fos => {
 			this.fosOptions.push(fos.id);
 			if(fos.children) {
-				fos.children.forEach(child => {
-					this.fosOptions.push(child.id);
-					if(child.children) {
-						child.children.forEach(child2 => {
-							this.fosOptions.push(child2.id);
+				fos.children.forEach(l2 => {
+					this.fosOptions.push(l2.id);
+					if(l2.children) {
+						l2.children.forEach(l3 => {
+							this.fosOptions.push(l3.id);
+              if(l3.children) {
+                l3.children.forEach(l4 => {
+                  this.fosOptions.push(l4.id);
+                })
+              }
 						});
 					}
 				});
@@ -172,19 +203,29 @@ export class FosComponent implements OnInit, OnDestroy {
 		this.viewResults = JSON.parse(JSON.stringify(this.fos));
 		let matchLevel1: boolean = false;
 		let matchLevel2: boolean = false;
+		let matchLevel3: boolean = false;
 		// 1st level search
 		if(this.viewResults.length) {
 			this.viewResults = this.viewResults.filter(item => {
 				matchLevel1 = !!item.id.includes(value?.toLowerCase());
-				// // 2nd level search
+				// 2nd level search
 				if(item.children?.length && !matchLevel1) {
 					item.children = item.children.filter(subItem => {
 						matchLevel2 = !!subItem.id.includes(value?.toLowerCase());
 						// 3rd level search
 						if(subItem.children?.length && !matchLevel2) {
-							subItem.children = subItem.children.filter(subSubItem => subSubItem.id.includes(value?.toLowerCase()));
+							subItem.children = subItem.children.filter(subSubItem => {
+                matchLevel3 = subSubItem.id.includes(value?.toLowerCase());
+                // 4th level search
+                if(subSubItem.children?.length && !matchLevel3) {
+                  subSubItem.children = subSubItem.children.filter(level4Item => {
+                    return level4Item.id.toLowerCase().includes(value?.toLowerCase())
+                  });
+                }
+                return subSubItem.children?.length > 0 || matchLevel3;
+              });
 						}
-						return subItem.children?.length > 0 || matchLevel2;
+						return subItem.children?.length > 0;
 					});
 				}
 				return item.children?.length > 0;
@@ -193,7 +234,7 @@ export class FosComponent implements OnInit, OnDestroy {
 	}
 
 	highlightKeyword(name) {
-		if(name.includes(this.keyword.toLowerCase())) {
+		if(name.toLowerCase().includes(this.keyword.toLowerCase())) {
 			return name.replace(new RegExp(this.keyword, "gi"), (matchedValue) => `<mark class="highlighted">${matchedValue}</mark>`);
 		} else {
 			return name;
@@ -218,4 +259,46 @@ export class FosComponent implements OnInit, OnDestroy {
     this._meta.updateTag({content: description}, "name='description'");
     this._meta.updateTag({content: description}, "property='og:description'");
   }
+
+  public buildFosQueryParam(fos) {
+    // return {'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)};
+    return (this.searchFieldsHelper.getFosParameter() == 'foslabel' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)}));
+  }
+
+  public backClicked() {
+    let id = this.selectedParentLevels[0].id;
+    this.selectedParentLevels=[];
+    this.cdr.detectChanges();
+
+    if(this.scrollPos) {
+      HelperFunctions.scrollTo(0, this.scrollPos);
+      this._router.navigate(['./'], {fragment: id, relativeTo: this.route, state: {disableScroll: true}});
+    } else {
+      this._router.navigate(['./'], {
+        fragment: id,
+        relativeTo: this.route,
+        state: {disableScroll: false, behavior: 'auto'}
+      });
+    }
+
+    this.cdr.detectChanges();
+    if (typeof IntersectionObserver !== 'undefined') {
+      setTimeout(() => {
+        this.setObserver();
+      }, 200);
+    }
+  }
+
+  public moreClicked(level1, level2, level3) {
+    this.scrollPos = window.scrollY;
+
+    if(this.observer) {
+      this.observer.disconnect();
+    }
+    this.selectedParentLevels=[level1, level2, level3];
+    this.cdr.detectChanges();
+    this._router.navigate(['./'],
+      {fragment: this.selectedParentLevels[0].id+"||"+this.selectedParentLevels[1].code+"||"+this.selectedParentLevels[2].code,
+                        relativeTo: this.route, state: {disableScroll: false, behavior: 'auto'}});
+  }
 }

fos/fos.module.ts

@@ -2,13 +2,11 @@ import {CommonModule} from "@angular/common";
 import {NgModule} from "@angular/core";
 import {FormsModule} from "@angular/forms";
 import {RouterModule} from "@angular/router";
-import {PreviousRouteRecorder} from "../utils/piwik/previousRouteRecorder.guard";
 import {IconsModule} from "../utils/icons/icons.module";
 import {BreadcrumbsModule} from "../utils/breadcrumbs/breadcrumbs.module";
 import {Schema2jsonldModule} from "../sharedComponents/schema2jsonld/schema2jsonld.module";
 import {SearchInputModule} from "../sharedComponents/search-input/search-input.module";
 import {SEOServiceModule} from "../sharedComponents/SEO/SEOService.module";
-import {PiwikService} from "../utils/piwik/piwik.service";
 
 import {FosRoutingModule} from './fos-routing.module';
 import {FosComponent} from './fos.component';
@@ -22,9 +20,7 @@ import {FosComponent} from './fos.component';
 	declarations: [
 		FosComponent
 	],
-	providers: [
-		PreviousRouteRecorder, PiwikService
-	],
+	providers: [],
 	exports: [
 		FosComponent
 	]

http-interceptor.service.ts

@@ -2,7 +2,7 @@ import {Injectable, Inject, PLATFORM_ID, Optional} from '@angular/core';
 import {HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpResponse, HttpHeaders} from '@angular/common/http';
 import {Observable, of} from 'rxjs';
 import {tap} from 'rxjs/operators';
-import {TransferState, makeStateKey, StateKey} from '@angular/platform-browser';
+import {TransferState, makeStateKey, StateKey} from '@angular/core';
 import {isPlatformServer} from '@angular/common';
 import {properties} from "../../environments/environment";
 import {REQUEST} from "./utils/tokens";

landingPages/annotation/annotation.component.ts

@@ -1,225 +0,0 @@
-import {
-  Component,
-  ElementRef,
-  EventEmitter,
-  HostListener,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild
-} from "@angular/core";
-import {Annotation, AnnotationService} from "./annotation.service";
-import {ResultLandingInfo} from "../../utils/entities/resultLandingInfo";
-import {EnvProperties} from "../../utils/properties/env-properties";
-import {properties} from "../../../../environments/environment";
-import {UserManagementService} from "../../services/user-management.service";
-import {COOKIE, Session, User} from "../../login/utils/helper.class";
-import {Subscriber} from "rxjs";
-
-@Component({
-  selector: 'b2note',
-  template: `
-    <div *ngIf="annotations && annotations.length > 0" class="sideInfoTitle uk-margin-small-bottom">Annotations</div>
-    <div class="b2note">
-      <form #form ngNoForm *ngIf="pid && isLoggedIn"
-            [action]="properties.b2noteAPIURL + 'widget'"
-            method="post"
-            target="b2note_iframe"
-            class="uk-padding-small uk-padding-remove-vertical">
-        <!--URL of the annotated record-->
-        <input
-            type="hidden"
-            name="recordurl_tofeed"
-            [value]="url">
-        <!--PID of the annotated record-->
-        <input
-            type="hidden"
-            name="pid_tofeed"
-            [value]="pid">
-      </form>
-      <loading *ngIf="loading" class="uk-margin-medium-top"></loading>
-      <ul *ngIf="annotations && !loading" class="uk-list uk-list-divider">
-        <li *ngFor="let annotation of annotations.slice(0, visibleAnnotations); let i=index" uk-grid
-            class="uk-flex uk-flex-top uk-margin-remove-left">
-          <div [ngClass]="annotation.type" class="type">{{annotation.type}}</div>
-          <div [class.uk-width-1-3]="annotation.targets"
-               [class.uk-width-1-6@s]="annotation.targets">{{annotation.text}}</div>
-          <ul class="uk-width-expand uk-list uk-margin-remove-top" *ngIf="annotation.targets">
-            <li *ngFor="let target of annotation.targets.slice(0, annotation.targetSize)">
-              <a *ngIf="target.url" [href]="target.url" target="_blank">{{target.id}}</a>
-              <a *ngIf="!target.url" routerLink="/search/result"
-                 [queryParams]="searchPid(target.id)">{{target.id}}</a>
-            </li>
-            <li *ngIf="annotation.targetSize < annotation.targets.length"><a
-                (click)="open(i)">+ {{annotation.targets.length - annotation.targetSize}}
-              more</a></li>
-          </ul>
-        </li>
-      </ul>
-      <div *ngIf="visibleAnnotations < annotations.length" class="uk-margin-medium-top uk-text-center">
-        <button class="uk-button uk-button-primary"
-                (click)="visibleAnnotations = (visibleAnnotations + annotationSize)">Load More
-        </button>
-      </div>
-    </div>
-    <div [class.uk-hidden]="!visible">
-      <div class="widget-container" cdkDrag>
-        <button type="button" class="close" aria-label="Close" (click)="toggleAnnotation($event)">
-          <span aria-hidden="true">×</span>
-        </button>
-        <iframe #iframe id="b2note_iframe" name="b2note_iframe" class="b2note-iframe">
-        </iframe>
-      </div>
-    </div>`,
-  styleUrls: ['annotation.css']
-})
-export class AnnotationComponent implements OnInit, OnDestroy {
-  
-  @Input()
-  public landingInfo: ResultLandingInfo = null;
-  @Input()
-  public id: string = null;
-  public properties: EnvProperties = properties;
-  public url: string = null;
-  public pid: string = null;
-  public keywords: string[] = [];
-  public visible: boolean = false;
-  public annotations: Annotation[] = [];
-  public annotationSize: number = 10;
-  public isLoggedIn: boolean = Session.isLoggedIn();
-  public visibleAnnotations: number;
-  public loading: boolean = false;
-  public submitted: boolean = false;
-  @Output()
-  public pidEmitter: EventEmitter<string> = new EventEmitter<string>();
-  @ViewChild('iframe') iframe: ElementRef;
-  @ViewChild('form') form: ElementRef;
-  private subscriptions: any[] = [];
-  
-  constructor(private annotationService: AnnotationService) {
-  }
-  
-  @HostListener('window:message', ['$event'])
-  public onChange(event) {
-    if (this.properties.b2noteAPIURL.includes(event.origin)) {
-      if (event.data === "B2NOTE loaded") {
-        let token = COOKIE.getCookie('AccessToken');
-        this.iframe.nativeElement.contentWindow.postMessage({token: token}, this.properties.b2noteAPIURL);
-      } else {
-        this.getAnnotations();
-      }
-    }
-  }
-  
-  ngOnInit(): void {
-    this.visibleAnnotations = this.annotationSize;
-    if (typeof window !== "undefined") {
-      let id = this.id;
-      this.url = window.location.href;
-      if (this.landingInfo.deletedByInferenceIds) {
-        id = this.landingInfo.deletedByInferenceIds[0];
-        this.url = this.url.replace(this.id, id);
-      }
-      if (this.landingInfo.identifiers && this.landingInfo.identifiers.size > 0) {
-        if (this.landingInfo.identifiers.get('doi')) {
-          this.pid = this.landingInfo.identifiers.get('doi')[0];
-        } else {
-          const key: string = this.landingInfo.identifiers.keys().next().value;
-          if (key) {
-            this.pid = this.landingInfo.identifiers.get(key)[0];
-          }
-        }
-      }
-      if (this.pid) {
-        this.getAnnotations();
-      }
-      this.pidEmitter.emit(this.pid);
-    }
-  }
-  
-  public get enabled(): boolean {
-    return this.pid && this.isLoggedIn;
-  }
-  
-  private clearSubscriptions() {
-    this.subscriptions.forEach(subscription => {
-      if (subscription instanceof Subscriber) {
-        subscription.unsubscribe();
-      }
-    });
-    this.subscriptions = [];
-  }
-  
-  private getAnnotations() {
-    if (!this.annotations || this.annotations.length === 0) {
-      this.loading = true;
-    }
-    this.subscriptions.push(this.annotationService.getAllAnnotations(this.pid).subscribe(annotations => {
-      this.annotations.forEach((annotation, index) => {
-        if (!annotations.find(element => element.type === annotation.type && element.text === annotation.text)) {
-          this.annotations.splice(index, 1);
-        }
-      });
-      annotations.forEach(annotation => {
-        if (!this.annotations.find(element => element.type === annotation.type && element.text === annotation.text)) {
-          annotation.targetSize = 3;
-          this.annotationService.getAnnotationTargets(annotation.text, annotation.type).subscribe(targets => {
-            annotation.targets = targets.filter(target => target.id !== this.pid);
-          });
-          this.annotations.push(annotation);
-        }
-      });
-      this.annotations = this.sort(this.annotations);
-      this.loading = false;
-    }, error => {
-      this.loading = false;
-    }));
-  }
-  
-  public sort(annotations: Annotation[]): Annotation[] {
-    return annotations.sort((a, b) => {
-      if (a.type === b.type) {
-        return 1;
-      } else if (a.type === 'semantic') {
-        return -1;
-      } else if (b.type === 'semantic') {
-        return 1;
-      } else if (a.type === 'keyword') {
-        return -1;
-      } else if (b.type === 'keyword') {
-        return 1;
-      }
-    });
-  }
-  
-  public searchPid(pid: string): { [k: string]: any; } {
-    return {
-      pid: pid
-    }
-  }
-  
-  ngOnDestroy() {
-    this.clearSubscriptions();
-  }
-  
-  toggleAnnotation(event) {
-    if (this.visible) {
-      event.preventDefault();
-    } else if(!this.submitted) {
-      this.form.nativeElement.submit();
-      this.submitted = true;
-    }
-    this.visible = !this.visible;
-  }
-  
-  open(i: number) {
-    this.annotations.forEach((annotation, index) => {
-      if (index != i) {
-        annotation.targetSize = 3;
-      } else {
-        annotation.targetSize = annotation.targets.length
-      }
-    });
-  }
-}

landingPages/annotation/annotation.css

@@ -1,41 +0,0 @@
-.widget-container {
-    position: fixed;
-    left: 50%;
-    top: 50%;
-    z-index: 1000;
-    padding: 19px;
-    margin-left: -167px;
-    margin-top: -311px;
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2),
-    0 2px 2px 0 rgba(0, 0, 0, 0.14),
-    0 1px 5px 0 rgba(0, 0, 0, 0.12);
-    border: 1px solid #e3e3e3;
-    border-radius: 4px;
-    outline: 0;
-    min-height: 20px;
-    background-color: #f5f5f5;
-    cursor: move;
-}
-
-.widget-container:hover, .widget-container:active{
-    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
-    0 8px 10px 1px rgba(0, 0, 0, 0.14),
-    0 3px 14px 2px rgba(0, 0, 0, 0.12);
-}
-
-.close {
-    float: right;
-    padding: 0;
-    cursor: pointer;
-    background: transparent;
-    border: 0;
-    font-size: 21px;
-    font-weight: bold;
-    opacity: 0.2;
-}
-
-.b2note-iframe {
-    width: 100%;
-    height: 600px;
-    border: 1px solid #dddddd;
-}

landingPages/annotation/annotation.module.ts

@@ -1,13 +0,0 @@
-import {NgModule} from "@angular/core";
-import {AnnotationComponent} from "./annotation.component";
-import {CommonModule} from "@angular/common";
-import {DragDropModule} from "@angular/cdk/drag-drop";
-import {RouterModule} from "@angular/router";
-import {LoadingModule} from "../../utils/loading/loading.module";
-
-@NgModule({
-  imports: [CommonModule, DragDropModule, RouterModule, LoadingModule],
-    declarations: [AnnotationComponent],
-    exports: [AnnotationComponent]
-})
-export class AnnotationModule {}