From 31e61d55a033197e23acdfe532578e398f1d1104 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Thu, 11 Apr 2024 16:34:13 +0300
Subject: [PATCH 01/17] [develop | DONE | CHANGED] search page: change the
 coloring of the selected filter pills, based on the new design mocks

---
 searchPages/searchUtils/newSearchPage.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index d59cb0b1..c21270d8 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -15,7 +15,7 @@
           <ng-container *ngFor="let type of resultTypes.values; let i = index;">
             <ng-container *ngIf="type.selected">
               <li class="">
-                <span class="uk-text-capitalize uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle target2">
+                <span class="uk-text-capitalize uk-label uk-label-small uk-label-search-filter uk-flex uk-flex-middle target2">
                   <span class="uk-margin-small-right uk-width-expand uk-text-truncate">{{type.name}}</span>
                   <button [class.uk-disabled]="disabled" (click)="removeResultType(type.id)" class="uk-close uk-icon" [disabled]="disabled">
                     <icon name="close" flex="true" ratio="0.7"></icon>
@@ -29,7 +29,7 @@
           <ng-container *ngFor="let filter of rangeFilters ">
             <ng-container *ngIf="filter.selectedFromAndToValues">
               <li class="">
-                <span class="uk-text-capitalize uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle target3">
+                <span class="uk-text-capitalize uk-label uk-label-small uk-label-search-filter uk-flex uk-flex-middle target3">
                   <span class="uk-margin-small-right uk-width-expand uk-text-truncate">{{filter.selectedFromAndToValues}}</span>
                   <button [class.uk-disabled]="disabled" (click)="removeRangeFilter(filter)" class="uk-close uk-icon" [disabled]="disabled">
                     <icon name="close" flex="true" ratio="0.7"></icon>
@@ -44,7 +44,7 @@
             <ng-container *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; ">
               <li *ngIf="!customFilter || (customFilter.isHiddenFilter && customFilter.valueId != value.id)"
                   class="">
-                <span class="uk-text-capitalize uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle target4">
+                <span class="uk-text-capitalize uk-label uk-label-small uk-label-search-filter uk-flex uk-flex-middle target4">
                   <span
                     class="uk-margin-small-right uk-width-expand uk-text-truncate">
                     <ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
@@ -73,7 +73,7 @@
           <ng-container *ngIf="filter.countSelectedValues > 0">
             <ng-container *ngFor="let value of getSelectedValues(filter); let i = index;  let end = last; ">
               <li *ngIf="!customFilters || (customFilters[0].isHiddenFilter && customFilters[0].valueId != value.id)">
-                <span class="uk-text-capitalize uk-label uk-label-small uk-label-primary uk-flex uk-flex-middle target5">
+                <span class="uk-text-capitalize uk-label uk-label-small uk-label-search-filter uk-flex uk-flex-middle target5">
                   <span class="uk-margin-small-right uk-width-expand uk-text-truncate">
                     <ng-container *ngIf="filter.type && (filter.type == 'boolean' || filter.type == 'triplet') else noboolean">
                       <span>{{filter.title}}:

From c4180c7aa25bd54dba9415fb6a28d7c268cc6f5b Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Thu, 11 Apr 2024 16:46:58 +0300
Subject: [PATCH 02/17] [develop | DONE | CHANGED] search page: change the
 color or customFilter pills as well

---
 searchPages/searchUtils/newSearchPage.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index c21270d8..74028ebd 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -5,7 +5,7 @@
         <ng-container  *ngFor="let customFilter of customFilters">
           <ng-container *ngIf="customFilter.isHiddenFilter">
             <li class="uk-flex uk-flex-middle">
-              <span class="uk-text-capitalize uk-label uk-label-small uk-label-secondary uk-text-truncate target1">
+              <span class="uk-text-capitalize uk-label uk-label-small uk-label-search-filter uk-text-truncate target1">
                 {{customFilter.valueName}}
               </span>
             </li>

From 8f4e653d507ba5a4803404d89b2f495c876069b2 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 12 Apr 2024 11:14:26 +0300
Subject: [PATCH 03/17] [develop | WIP]: Introduce copy field in stakeholder

---
 .../edit-stakeholder.component.ts             | 41 ++++++++++----
 .../edit-stakeholder.module.ts                |  3 +-
 monitor-admin/general/general.component.ts    |  2 +-
 .../manageStakeholders.component.html         |  7 ++-
 monitor-admin/utils/indicator-utils.ts        | 54 -------------------
 monitor/entities/stakeholder.ts               |  2 +
 monitor/services/stakeholder.service.ts       | 12 +++--
 7 files changed, 48 insertions(+), 73 deletions(-)

diff --git a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
index 72be3c8a..05eafbd5 100644
--- a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
+++ b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
@@ -20,7 +20,7 @@ import {StakeholderBaseComponent} from "../../utils/stakeholder-base.component";
   template: `
       <div class="uk-margin-medium-bottom">
           <form *ngIf="stakeholderFb" [formGroup]="stakeholderFb">
-              <div class="uk-grid uk-grid-large" uk-grid>
+              <div class="uk-grid" uk-grid>
                   <div class="uk-width-1-2@m">
                       <div input id="name" [formInput]="stakeholderFb.get('name')"
                            placeholder="Name"></div>
@@ -126,6 +126,19 @@ import {StakeholderBaseComponent} from "../../utils/stakeholder-base.component";
                           </div>
                       </div>
                   </div>
+                  <div *ngIf="canChangeCopy" class="uk-width-1-1">
+                      <h6>Instance Type</h6>
+                      <div class="uk-width-auto uk-flex uk-flex-middle">
+                          <label class="uk-margin-right">
+                              <input type="radio" [value]="true" formControlName="copy"/>
+                              <span class="uk-margin-xsmall-left">Copy</span>
+                          </label>
+                          <label class="uk-margin-right">
+                              <input type="radio" [value]="false" formControlName="copy"/>
+                              <span class="uk-margin-xsmall-left">Reference</span>
+                          </label>
+                      </div>
+                  </div>
               </div>
           </form>
           <div #notify [class.uk-hidden]="!stakeholderFb" notify-form
@@ -145,6 +158,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
   public stakeholder: Stakeholder;
   public isDefault: boolean;
   public isNew: boolean;
+  public isFull: boolean;
   public loading: boolean = false;
   public typesByRole: Option[];
   public statsProfiles: string[];
@@ -172,7 +186,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
     super.ngOnDestroy();
   }
 
-  public init(stakeholder: Stakeholder, alias: string[], defaultStakeholders: Stakeholder[], isDefault: boolean, isNew: boolean) {
+  public init(stakeholder: Stakeholder, alias: string[], defaultStakeholders: Stakeholder[], isDefault: boolean, isNew: boolean, isFull: boolean = false) {
     this.reset();
     this.deleteCurrentPhoto = false;
     this.stakeholder = stakeholder;
@@ -183,6 +197,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
     this.defaultStakeholders = defaultStakeholders;
     this.isDefault = isDefault;
     this.isNew = isNew;
+    this.isFull = isFull;
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
       this.user = user;
       if (this.isCurator) {
@@ -220,6 +235,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
         funderType: this.fb.control(this.stakeholder.funderType),
         topics: this.fb.control(this.stakeholder.topics),
         isUpload: this.fb.control(this.stakeholder.isUpload),
+        copy: this.fb.control(this.stakeholder.copy),
         logoUrl: this.fb.control(this.stakeholder.logoUrl),
       });
       if (this.stakeholder.isUpload) {
@@ -246,7 +262,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
       this.subscriptions.push(this.stakeholderFb.get('type').valueChanges.subscribe(value => {
         this.onTypeChange(value, defaultStakeholders);
       }));
-      this.stakeholderFb.setControl('defaultId', this.fb.control(stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required));
+      this.stakeholderFb.setControl('defaultId', this.fb.control(this.stakeholder.defaultId, (this.isDefault && !this.isNew) ? [] : Validators.required));
       if (!this.isNew) {
         this.notification = NotificationUtils.editStakeholder(this.user.firstname + ' ' + this.user.lastname, this.stakeholder.name);
         this.notify.reset(this.notification.message);
@@ -304,6 +320,13 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
     return this.isNew && this.stakeholderFb.get('type').valid && !!this.defaultStakeholdersOptions;
   }
 
+  public get canChangeCopy(): boolean {
+    return this.isCurator &&
+        !this.stakeholderFb.get('isDefault').getRawValue() &&
+        this.stakeholderFb.get('defaultId').getRawValue() &&
+        this.stakeholderFb.get('defaultId').getRawValue() !== '-1';
+  }
+
   reset() {
     this.uploadError = null;
     this.stakeholderFb = null;
@@ -350,15 +373,15 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
 
   public saveStakeholder(callback: Function, errorCallback: Function = null) {
     if (this.isNew) {
-      let defaultStakeholder = this.defaultStakeholders.find(value => value._id === this.stakeholderFb.getRawValue().defaultId);
-      this.stakeholderFb.setValue(this.stakeholderUtils.createFunderFromDefaultProfile(this.stakeholderFb.getRawValue(),
-          (defaultStakeholder ? defaultStakeholder.topics : []), this.stakeholderFb.getRawValue().isDefault));
-      this.removePhoto();
+      let copyId = null;
       if (this.stakeholderFb.getRawValue().isDefault) {
+        copyId =  this.stakeholderFb.getRawValue().defaultId !== '-1'?this.stakeholderFb.getRawValue().defaultId:null;
         this.stakeholderFb.get('defaultId').setValue(null);
+        this.stakeholderFb.removeControl('isDefault');
       }
+      this.removePhoto();
       this.subscriptions.push(this.stakeholderService.buildStakeholder(this.properties.monitorServiceAPIURL,
-        this.stakeholderFb.getRawValue()).subscribe(stakeholder => {
+        this.stakeholderFb.getRawValue(), copyId).subscribe(stakeholder => {
         this.notification.entity = stakeholder._id;
         this.notification.stakeholder = stakeholder.alias;
         this.notification.stakeholderType = stakeholder.type;
@@ -375,7 +398,7 @@ export class EditStakeholderComponent extends StakeholderBaseComponent {
         this.loading = false;
       }));
     } else {
-      this.subscriptions.push(this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.stakeholderFb.getRawValue()).subscribe(stakeholder => {
+      this.subscriptions.push(this.stakeholderService.saveElement(this.properties.monitorServiceAPIURL, this.stakeholderFb.getRawValue(), [], this.isFull).subscribe(stakeholder => {
         this.notification.entity = stakeholder._id;
         this.notification.stakeholder = stakeholder.alias;
         this.notification.stakeholderType = stakeholder.type;
diff --git a/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts b/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
index 0ebec4d3..5e325317 100644
--- a/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
+++ b/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
@@ -5,9 +5,10 @@ import {InputModule} from "../../../sharedComponents/input/input.module";
 import {ReactiveFormsModule} from "@angular/forms";
 import {IconsModule} from "../../../utils/icons/icons.module";
 import {NotifyFormModule} from "../../../notifications/notify-form/notify-form.module";
+import {MatSlideToggleModule} from "@angular/material/slide-toggle";
 
 @NgModule({
-  imports: [CommonModule, InputModule, ReactiveFormsModule, IconsModule, NotifyFormModule],
+  imports: [CommonModule, InputModule, ReactiveFormsModule, IconsModule, NotifyFormModule, MatSlideToggleModule],
   declarations: [EditStakeholderComponent],
   exports: [EditStakeholderComponent]
 })
diff --git a/monitor-admin/general/general.component.ts b/monitor-admin/general/general.component.ts
index fda34d94..2f28f504 100644
--- a/monitor-admin/general/general.component.ts
+++ b/monitor-admin/general/general.component.ts
@@ -48,7 +48,7 @@ export class GeneralComponent extends BaseComponent implements OnInit {
   }
 
   public reset() {
-    this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, this.stakeholder.defaultId == null, false)
+    this.editStakeholderComponent.init(this.stakeholder, this.alias, this.defaultStakeholders, this.stakeholder.defaultId == null, false, true)
   }
 
   public save() {
diff --git a/monitor-admin/manageStakeholders/manageStakeholders.component.html b/monitor-admin/manageStakeholders/manageStakeholders.component.html
index a876d32a..c96d3f63 100644
--- a/monitor-admin/manageStakeholders/manageStakeholders.component.html
+++ b/monitor-admin/manageStakeholders/manageStakeholders.component.html
@@ -31,7 +31,7 @@
         <div *ngIf="!loading" uk-height-match="target: .titleContainer; row: false">
             <div uk-height-match="target: .logoContainer; row: false">
                 <div *ngIf="tab != 'profiles' && isCurator()" class="uk-section">
-                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-bottom">
                         <h4 class="uk-margin-remove">Profile Templates</h4>
                         <paging-no-load *ngIf="displayDefaultStakeholders?.length > pageSize"
                                         (pageChange)="updateCurrentTemplatesPage($event)"
@@ -39,8 +39,7 @@
                                         [totalResults]="displayDefaultStakeholders.length">
                         </paging-no-load>
                     </div>
-                    <div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match"
-                         uk-grid>
+                    <div class="uk-grid uk-child-width-1-3@l uk-child-width-1-2@m uk-child-width-1-1 uk-grid-match" uk-grid>
                         <ng-template ngFor
                                      [ngForOf]="displayDefaultStakeholders.slice((currentTemplatesPage-1)*pageSize, currentTemplatesPage*pageSize)"
                                      let-stakeholder>
@@ -59,7 +58,7 @@
                     </h4>
                 </div>
                 <div *ngIf="tab != 'templates' && isManager()" class="uk-section">
-                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-small-bottom">
+                    <div class="uk-flex uk-flex-middle uk-flex-between uk-margin-bottom">
                         <h4 class="uk-margin-remove">Profiles</h4>
                         <paging-no-load *ngIf="displayStakeholders?.length > pageSize"
                                         (pageChange)="updateCurrentPage($event)"
diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts
index 3e8cf554..41ecbea3 100644
--- a/monitor-admin/utils/indicator-utils.ts
+++ b/monitor-admin/utils/indicator-utils.ts
@@ -127,60 +127,6 @@ export class StakeholderUtils {
     return types;
   }
 
-  public createFunderFromDefaultProfile(funder: Stakeholder, defaultTopics: Topic[], isDefault: boolean = false): Stakeholder {
-    funder.topics = HelperFunctions.copy(defaultTopics);
-    for (let topic of funder.topics) {
-      topic.defaultId = !isDefault ? topic._id : null;
-      topic._id = null;
-      for (let category of topic.categories) {
-        category.defaultId = !isDefault ? category._id : null;
-        category._id = null;
-        let subTokeep: SubCategory[] = [];
-        for (let subCategory of category.subCategories) {
-          subCategory.defaultId = !isDefault ? subCategory._id : null;
-          subCategory._id = null;
-          subTokeep.push(subCategory);
-          for (let section of subCategory.charts) {
-            let chartsTokeep: Indicator[] = [];
-            section.defaultId = !isDefault ? section._id : null;
-            section.stakeholderAlias = funder.alias;
-            section._id = null;
-            for (let indicator of section.indicators) {
-              indicator.defaultId = !isDefault ? indicator._id : null;
-              indicator._id = null;
-              chartsTokeep.push(indicator);
-              for (let indicatorPath of indicator.indicatorPaths) {
-                if (indicatorPath.parameters) {
-                  Object.keys(indicatorPath.parameters).forEach(key => {
-                    if (key == "index_name") {
-                      indicatorPath.parameters[key] = funder.index_name;
-                    } else if (key == "index_id") {
-                      indicatorPath.parameters[key] = funder.index_id;
-                    } else if (key == "index_shortName") {
-                      indicatorPath.parameters[key] = funder.index_shortName.toLowerCase();
-                    }
-                  });
-                }
-              }
-            }
-            section.indicators = chartsTokeep;
-          }
-          for (let section of subCategory.numbers) {
-            section.defaultId = !isDefault ? section._id : null;
-            section.stakeholderAlias = funder.alias;
-            section._id = null;
-            for (let indicator of section.indicators) {
-              indicator.defaultId = !isDefault ? indicator._id : null;
-              indicator._id = null;
-            }
-          }
-
-        }
-        category.subCategories = subTokeep;
-      }
-    }
-    return funder;
-  }
 
   aliasValidatorString(elements: string[]): ValidatorFn {
     return (control: AbstractControl): { [key: string]: string } | null => {
diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts
index a33506ac..a1670174 100644
--- a/monitor/entities/stakeholder.ts
+++ b/monitor/entities/stakeholder.ts
@@ -37,6 +37,7 @@ export class Stakeholder {
   isUpload: boolean = false;
   description: string;
   topics: any[];
+  copy: boolean = true;
   details?: any;
   
   constructor(_id: string, type: StakeholderType, index_id: string, index_name: string, index_shortName: string, alias: string, visibility: Visibility, logoUrl: string, defaultId: string = null, description: string = null) {
@@ -50,6 +51,7 @@ export class Stakeholder {
     this.visibility = visibility;
     this.logoUrl = logoUrl;
     this.description = description;
+    this.copy = !!this.defaultId && this.defaultId !== '-1';
     this.topics = [];
   }
 
diff --git a/monitor/services/stakeholder.service.ts b/monitor/services/stakeholder.service.ts
index d8b8bf30..4c597cd2 100644
--- a/monitor/services/stakeholder.service.ts
+++ b/monitor/services/stakeholder.service.ts
@@ -116,11 +116,15 @@ export class StakeholderService {
     }));
   }
 
-  buildStakeholder(url: string, stakeholder: Stakeholder): Observable<Stakeholder> {
+  buildStakeholder(url: string, stakeholder: Stakeholder, copyId: string): Observable<Stakeholder> {
     if (stakeholder.alias && stakeholder.alias.startsWith('/')) {
       stakeholder.alias = stakeholder.alias.slice(1);
     }
-    return this.http.post<Stakeholder>(url + '/build-stakeholder', stakeholder, CustomOptions.registryOptions()).pipe(map(stakeholder => {
+    let copy = {
+      stakeholder: stakeholder,
+      copyId: copyId
+    }
+    return this.http.post<Stakeholder>(url + '/build-stakeholder', copy, CustomOptions.registryOptions()).pipe(map(stakeholder => {
       return HelperFunctions.copy(Stakeholder.checkIsUpload(stakeholder));
     }));
   }
@@ -129,12 +133,12 @@ export class StakeholderService {
     return this.http.post<Visibility>(url + '/' + path.join('/') + '/change-visibility' + '?visibility=' + visibility + (propagate ? '&propagate=true' : ''), null, CustomOptions.registryOptions());
   }
 
-  saveElement(url: string, element: any, path: string[] = []): Observable<any> {
+  saveElement(url: string, element: any, path: string[] = [], isFull: boolean = false): Observable<any> {
     if (element.alias && element.alias.startsWith('/')) {
       element.alias = element.alias.slice(1);
     }
     return this.http.post<any>(url + ((path.length > 0) ? '/' : '') + path.join('/') +
-        '/save', element, CustomOptions.registryOptions()).pipe(map(element => {
+        '/save' + (isFull?'/full':''), element, CustomOptions.registryOptions()).pipe(map(element => {
       if (path.length === 0) {
         return HelperFunctions.copy(Stakeholder.checkIsUpload(element));
       } else {

From 438075f8dfca0d78ec9985e08572fd7d2b40ab18 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Fri, 12 Apr 2024 11:19:17 +0300
Subject: [PATCH 04/17] [develop | DONE | FIXED]: Fixes on search projects for
 claims. 1. searchProjects.service.ts: Parse funder name if funder shortname
 is not available. 2. claimProjectSearchForm.component.ts:    a. [BUG FIX] Set
 filter.countAllValues = filter.values.length; to show filter values without
 extra "view all" call    b. [BUG FIX] Call
 projectService.advancedSearchProjects instead of
 projectService.searchProjects to get projects (/resources2 instead of
 /projects) to get 100 first values by default in facets.

---
 .../claimProjectSearchForm.component.ts       | 98 ++++++++++---------
 services/searchProjects.service.ts            |  2 +-
 2 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/claims/claim-utils/claimProjectSearchForm.component.ts b/claims/claim-utils/claimProjectSearchForm.component.ts
index 01e6d8c0..27ec74d5 100644
--- a/claims/claim-utils/claimProjectSearchForm.component.ts
+++ b/claims/claim-utils/claimProjectSearchForm.component.ts
@@ -65,35 +65,36 @@ export class ClaimProjectsSearchFormComponent {
   }
 
   search(page,size) {
-    if(this.keyword.length == 0){
-      this.showResults =false;
+    if (this.keyword.length == 0) {
+      this.showResults = false;
       return;
     }
-    this.showResults =true;
+    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, (page == 1) ? this.refineFieldsQuery : null, (page == 1) ? this.refineFields : [], this.createOpenaireRefineQuery()).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);
+          }
+        } else {
+          this.openaireResultsStatus = this.errorCodes.ERROR;
+        }
+      },
       err => {
         this.openaireResultsStatus = this.errorCodes.ERROR;
         //console.log(err.status);
@@ -202,12 +203,16 @@ 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;
+  }
 
+  createOpenaireRefineQuery(): string {
     /*if(this.startYear.length > 0 ){
       query+='&fq=projectstartyear exact \"'+this.startYear+'\"'
     }
@@ -215,30 +220,30 @@ export class ClaimProjectsSearchFormComponent {
       query+='&fq=projectendyear exact \"'+this.endYear+'\"'
     }*/
     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++){
+    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);
 
@@ -273,20 +278,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;
   }
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index e9c48eaa..6d30b06c 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -230,7 +230,7 @@ export class SearchProjectsService {
                 for(let z=0; z<fundingLength; z++) {
                   let fundingData = Array.isArray(resData['fundingtree']) ? resData['fundingtree'][z] : resData['fundingtree'];
                   if(fundingData.hasOwnProperty("funder")) {
-                    result['funderShortname'] = fundingData['funder'].shortname;
+                    result['funderShortname'] = fundingData['funder'].shortname ? fundingData['funder'].shortname : fundingData['funder'].name;
                     result['funderId'] = fundingData['funder'].id;
                     result['jurisdiction'] = (fundingData['funder']['id']['jurisdiction'] )?fundingData['funder']['id']['jurisdiction']:"";
 

From 6d9d118d575564b1e249b5f673c00c395f14f04c Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Fri, 12 Apr 2024 13:57:56 +0300
Subject: [PATCH 05/17] [develop | DONE | ADDED] topics/indicators: add
 condition to hide all "edit" actions when stakeholder is NOT a copy

---
 monitor-admin/topic/indicators.component.html | 52 +++++++++++--------
 monitor-admin/topic/indicators.component.ts   |  4 ++
 monitor-admin/topic/topic.component.html      | 32 +++++++-----
 monitor-admin/topic/topic.component.ts        |  4 ++
 4 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/monitor-admin/topic/indicators.component.html b/monitor-admin/topic/indicators.component.html
index 69abb1dd..9c7f6ca9 100644
--- a/monitor-admin/topic/indicators.component.html
+++ b/monitor-admin/topic/indicators.component.html
@@ -4,9 +4,9 @@
         <div class="uk-grid uk-grid-large uk-child-width-1-1" uk-grid>
             <div *ngFor="let number of numbers; let i=index">
                 <div class="section">
-                    <div class="tools">
+                    <div *ngIf="isEditable" class="tools">
                         <div class="uk-flex uk-flex-middle">
-                            <a [class.uk-disabled]="editing" class="" (click)="createSection(i, 'number')"
+                            <a *ngIf="isCurator" [class.uk-disabled]="editing" class="" (click)="createSection(i, 'number')"
                                uk-tooltip="Create a new section">
                                 <icon name="add" [flex]="true"></icon>
                             </a>
@@ -17,25 +17,29 @@
                         </div>
                     </div>
                     <div *ngIf="numberSections.at(i)" class="uk-margin-medium-bottom">
-                        <div input [formInput]="numberSections.at(i).get('title')"
+                        <div *ngIf="isEditable" input [formInput]="numberSections.at(i).get('title')"
                              (focusEmitter)="saveSection($event, numberSections.at(i), i, 'number')"
                              class="uk-width-1-3@m uk-width-1-1" placeholder="Title" inputClass="border-bottom"></div>
+                        <h5 *ngIf="!isEditable" class="uk-margin-remove">{{numberSections.at(i).get('title').value}}</h5>
                     </div>
                     <div [id]="'number-' + number._id" class="uk-grid uk-grid-small uk-grid-match"
-                         uk-sortable="group: number" uk-grid>
+                        [attr.uk-sortable]="isEditable ? 'group: number': null" uk-grid>
                         <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
                             <div *ngIf="indicator" [id]="indicator._id"
                                  [ngClass]="getNumberClassBySize(indicator.width)">
                                 <div class="uk-card uk-card-default uk-padding-small number-card uk-position-relative">
                                     <div *ngIf="!dragging"
                                          class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-                                        <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                                            <icon *ngIf="showVisibility" [flex]="true"
+                                        <icon *ngIf="!isEditable && showVisibility" [flex]="true"
+                                          [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
+                                          ratio="0.6"></icon>
+                                        <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
+                                            <icon [flex]="true"
                                                   [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
                                                   ratio="0.6"></icon>
                                             <icon [flex]="true" name="more_vert"></icon>
                                         </a>
-                                        <div #element class="uk-dropdown"
+                                        <div #element *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-dropdown"
                                              uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                                             <ul class="uk-nav uk-dropdown-nav">
                                                 <ng-container *ngIf="isCurator">
@@ -79,7 +83,7 @@
                             </div>
                         </ng-template>
                     </div>
-                    <div *ngIf="isCurator" class="uk-margin-top">
+                    <div *ngIf="isCurator && isEditable" class="uk-margin-top">
                         <div class="uk-grid uk-grid-small" uk-grid>
                             <div [ngClass]="getNumberClassBySize('small')">
                                 <a class="uk-card uk-card-default number-card uk-padding-small uk-flex uk-flex-middle uk-link-reset"
@@ -96,7 +100,7 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div *ngIf="isEditable && isCurator">
                 <ng-container *ngTemplateOutlet="new_section; context:{type: 'number'}"></ng-container>
             </div>
         </div>
@@ -106,9 +110,9 @@
         <div class="uk-grid uk-grid-large uk-child-width-1-1" uk-grid>
             <div *ngFor="let chart of charts; let i=index">
                 <div class="section uk-margin-top uk-padding-small">
-                    <div class="tools">
+                    <div *ngIf="isEditable" class="tools">
                         <div class="uk-flex uk-flex-middle">
-                            <a [class.uk-disabled]="editing" class="" (click)="createSection(i)"
+                            <a *ngIf="isCurator" [class.uk-disabled]="editing" class="" (click)="createSection(i)"
                                title="Create a new section">
                                 <icon name="add" [flex]="true"></icon>
                             </a>
@@ -120,25 +124,29 @@
                     </div>
                     <div *ngIf="chartSections.at(i)"
                          class="uk-margin-medium-bottom">
-                        <div input [formInput]="chartSections.at(i).get('title')"
+                        <div *ngIf="isEditable" input [formInput]="chartSections.at(i).get('title')"
                              (focusEmitter)="saveSection($event, chartSections.at(i), i)"
                              class="uk-width-1-3@m uk-width-1-1" placeholder="Title" inputClass="border-bottom"></div>
+                        <h5 *ngIf="!isEditable" class="uk-margin-remove">{{chartSections.at(i).get('title').value}}</h5>
                     </div>
                     <div [id]="'chart-' + chart._id" class="uk-grid uk-grid-small uk-grid-match"
-                         uk-sortable="group: chart" uk-grid>
+                        [attr.uk-sortable]="isEditable ? 'group: chart': null" uk-grid>
                         <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
                             <div *ngIf="indicator" [id]="indicator._id"
                                  [ngClass]="getChartClassBySize(indicator.width)">
                                 <div class="uk-card uk-card-default uk-card-body uk-position-relative">
                                     <div *ngIf="!dragging"
                                          class="uk-position-top-right uk-margin-small-right uk-margin-small-top">
-                                        <a class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                                            <icon *ngIf="showVisibility" [flex]="true"
+                                        <icon *ngIf="!isEditable && showVisibility" [flex]="true"
+                                          [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
+                                          ratio="0.6"></icon>
+                                        <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
+                                            <icon [flex]="true"
                                                   [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
                                                   ratio="0.6"></icon>
                                             <icon [flex]="true" name="more_vert"></icon>
                                         </a>
-                                        <div #element class="uk-dropdown"
+                                        <div #element *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-dropdown"
                                              uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                                             <ul class="uk-nav uk-dropdown-nav">
                                                 <ng-container *ngIf="isCurator">
@@ -214,7 +222,7 @@
                             </div>
                         </ng-template>
                     </div>
-                    <div *ngIf="isCurator" class="uk-margin-top">
+                    <div *ngIf="isCurator && isEditable" class="uk-margin-top">
                         <div class="uk-grid uk-grid-small uk-grid-match" uk-grid>
                             <div [ngClass]="getChartClassBySize('small')">
                                 <div class=" uk-card uk-card-default uk-card-body clickable"
@@ -236,7 +244,7 @@
                     </div>
                 </div>
             </div>
-            <div>
+            <div *ngIf="isEditable && isCurator">
                 <ng-container *ngTemplateOutlet="new_section; context:{type: 'chart'}"></ng-container>
             </div>
         </div>
@@ -288,10 +296,10 @@
                                   class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
                                   [class.uk-invisible-hover]="indicator.activePath !== i"
                                   (click)="$event.stopPropagation();$event.preventDefault()">
-                            <a class="uk-link-reset uk-flex uk-flex-middle">
+                            <a *ngIf="isEditable && isCurator" class="uk-link-reset uk-flex uk-flex-middle">
                               <icon [flex]="true" name="more_vert"></icon>
                             </a>
-                            <div #element
+                            <div #element *ngIf="isEditable && isCurator"
                                  uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: .uk-modal-body">
                                <ul class="uk-nav uk-dropdown-nav">
                                   <li *ngIf="i > 0">
@@ -486,10 +494,10 @@
                                   class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
                                   [class.uk-invisible-hover]="indicator.activePath !== i"
                                   (click)="$event.stopPropagation();$event.preventDefault()">
-                            <a class="uk-link-reset uk-flex uk-flex-middle">
+                            <a *ngIf="isEditable && isCurator" class="uk-link-reset uk-flex uk-flex-middle">
                               <icon [flex]="true" name="more_vert"></icon>
                             </a>
-                            <div #element
+                            <div #element *ngIf="isEditable && isCurator"
                                  uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: .uk-modal-body">
                                <ul class="uk-nav uk-dropdown-nav">
                                   <li *ngIf="i > 0">
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index e4e4eb9d..cb29946d 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -1566,4 +1566,8 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
     document.body.removeChild(tempBox);
     NotificationHandler.rise('Copied to clipboard');
   }
+
+  get isEditable(): boolean {
+    return this.stakeholder.copy || this.stakeholder.defaultId == null || this.stakeholder.defaultId == '-1';
+  }
 }
diff --git a/monitor-admin/topic/topic.component.html b/monitor-admin/topic/topic.component.html
index 46806ed5..c5d7ecb9 100644
--- a/monitor-admin/topic/topic.component.html
+++ b/monitor-admin/topic/topic.component.html
@@ -28,12 +28,15 @@
               </span>
               <span class="uk-margin-xsmall-left hide-on-close" [class.uk-invisible-hover]="topicIndex !== i"
                     (click)="$event.stopPropagation();$event.preventDefault()">
-                <a class="uk-link-reset uk-flex uk-flex-middle">
-                  <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
+                <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
+                  ratio="0.6"></icon>
+                <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle">
+                  <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
                         ratio="0.6"></icon>
                   <icon [flex]="true" name="more_vert"></icon>
                 </a>
-                <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
+                <div #element *ngIf="isEditable && (isCurator || showVisibillity)" 
+                  uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
                   <ul class="uk-nav uk-dropdown-nav">
                     <ng-container *ngIf="isCurator">
                       <li>
@@ -106,12 +109,14 @@
                     <span class="uk-width-expand uk-text-truncate">{{category.name}}</span>
                     <span class="uk-margin-xsmall-left hide-on-close" [class.uk-invisible-hover]="categoryIndex !== j"
                           (click)="$event.stopPropagation();$event.preventDefault()">
-                    <a class="uk-link-reset uk-flex uk-flex-middle">
-                      <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
+                    <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
+                      ratio="0.6"></icon>
+                    <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle">
+                      <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
                             ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
-                    <div #element
+                    <div #element *ngIf="isEditable && (isCurator || showVisibility)"
                          uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
                       <ul class="uk-nav uk-dropdown-nav">
                         <ng-container *ngIf="isCurator">
@@ -175,7 +180,7 @@
                   </div>
                 </a>
               </li>
-              <li *ngIf="isCurator">
+              <li *ngIf="isCurator && isEditable">
                 <a (click)="editCategoryOpen(); $event.preventDefault()" class="uk-flex uk-flex-middle">
                   <icon name="add" [flex]="true"></icon>
                   <span class="hide-on-close">Create new category</span>
@@ -183,7 +188,7 @@
               </li>
             </ul>
           </li>
-          <li *ngIf="isCurator" class="hide-on-close">
+          <li *ngIf="isCurator && isEditable" class="hide-on-close">
             <a (click)="editTopicOpen(-1); $event.preventDefault()">
               <div class="uk-flex uk-flex-middle">
                 <div class="uk-width-auto">
@@ -235,12 +240,15 @@
             <span class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
                   [class.uk-invisible-hover]="subCategoryIndex !== i"
                   (click)="$event.stopPropagation();$event.preventDefault()">
-            <a class="uk-link-reset uk-flex uk-flex-middle">
-              <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
+            <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
+              ratio="0.6"></icon>
+            <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle">
+              <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
                     ratio="0.6"></icon>
               <icon [flex]="true" name="more_vert"></icon>
             </a>
-            <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: body">
+            <div #element *ngIf="isEditable && (isCurator || showVisibility)"
+              uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: body">
               <ul class="uk-nav uk-dropdown-nav">
                 <ng-container *ngIf="isCurator">
                   <li>
@@ -318,7 +326,7 @@
           </span>
           </li>
         </ng-template>
-        <li *ngIf="isCurator">
+        <li *ngIf="isCurator && isEditable">
           <a (click)="editSubCategoryOpen(); $event.preventDefault()" class="uk-flex uk-flex-middle">
             <icon name="add" [flex]="true"></icon>
             <span class="uk-text-uppercase">Create new subcategory</span>
diff --git a/monitor-admin/topic/topic.component.ts b/monitor-admin/topic/topic.component.ts
index 40d128d8..9c42c135 100644
--- a/monitor-admin/topic/topic.component.ts
+++ b/monitor-admin/topic/topic.component.ts
@@ -759,4 +759,8 @@ export class TopicComponent extends StakeholderBaseComponent implements OnInit,
 		this.visibilityModal.alertFooter = false;
     this.visibilityModal.open();
 	}
+
+  get isEditable(): boolean {
+    return this.stakeholder.copy || this.stakeholder.defaultId == null || this.stakeholder.defaultId == '-1';
+  }
 }

From 9b04260a60c44c71e6c359905ec2805d1d608602 Mon Sep 17 00:00:00 2001
From: Alex Martzios <alexandros.martzios@gmail.com>
Date: Mon, 15 Apr 2024 12:09:35 +0300
Subject: [PATCH 06/17] [develop | DONE | FIXED] showAuthors: fix z-index bug
 for ocrid dropdown inside modal

---
 utils/authors/showAuthors.component.ts             | 3 +--
 utils/result-preview/result-preview.component.html | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts
index 5b2c3710..eccccd6f 100644
--- a/utils/authors/showAuthors.component.ts
+++ b/utils/authors/showAuthors.component.ts
@@ -36,7 +36,7 @@ import {properties} from "../../../../environments/environment";
                 </span>
             </a>
             <div *ngIf="!isMobile" class="default-dropdown uk-margin-remove-top uk-dropdown orcid-dropdown" 
-                 uk-dropdown="mode:click; offset: 4;" style="min-width: 465px !important;" [attr.container]="isModal?'#modal-container':true">
+                 uk-dropdown="mode:click; offset: 4;" style="min-width: 465px !important;" [attr.container]="!modal ? '#modal-container' : true">
                 <ng-container *ngTemplateOutlet="dropdown"></ng-container>
             </div>
             <mobile-dropdown *ngIf="isMobile" [toggle]="toggle">
@@ -153,7 +153,6 @@ export class ShowAuthorsComponent {
   @Input() authorsLimit: number = 7;
   @Input() showAll: boolean = true;
   @Input() modal: AlertModal;
-  @Input() isModal: boolean
   @Input() viewAll: boolean = false;
   @Input() showInline: boolean = false; // do not open modal for "view more" when this is true
   public lessBtn: boolean = false;
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 7e1c1d56..046eb7c0 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -125,7 +125,7 @@
             </div>
             <!-- Authors -->
             <div *ngIf="result.authors" class="uk-margin-xsmall-bottom">
-              <showAuthors [authors]="result.authors" [authorsLimit]=4 [modal]="modal" [isMobile]="isMobile" [isModal]="isDeletedByInferenceModal"
+              <showAuthors [authors]="result.authors" [authorsLimit]=4 [modal]="modal" [isMobile]="isMobile"
                            [showAll]=true [showInline]="showInline"></showAuthors>
             </div>
             <!-- Identifiers -->

From 6886df2caadff2a4f5a1d6b38b7f7d0e491d9a9b Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 15 Apr 2024 17:11:38 +0300
Subject: [PATCH 07/17] [develop | DONE | CHANGED]: Alt attribute on images |
 Set changeDetection: ChangeDetectionStrategy.OnPush on
 result-preview.component.ts. 1. deletedByInference.service.ts: [Bug fix]
 Fixed author check. 2. sdg.component.html & quick-contact.component.html &
 fos.component.html: Added alt attribute on images. 3.
 result-preview.component.ts: Set changeDetection:
 ChangeDetectionStrategy.OnPush | Added get countDots(). 4.
 result-preview.component.html: Changed how number of access routes dots is
 passed into a class (countDots) - needed for ChangeDetectionStrategy.OnPush.
 5. orcid-work.component.ts: Added alt attribute on images | Added
 ChangeDetectorRef and call this.cdr.markForCheck(); on "getPutCode()",
 "saveWork()" and "deleteWorks()" - needed for ChangeDetectionStrategy.OnPush.
 6. searchResult.component.ts: Rebuild previewResults object after getting
 orcidPutCodes to draw html again - needed for ChangeDetectionStrategy.OnPush.
 7. newSearchPage.component.html: Removed uk-flex-wrap for number of results
 and uk-margin-medium-left from desktop sorting.

---
 fos/fos.component.html                        |  2 +-
 .../deletedByInference.service.ts             |  3 +--
 orcid/orcid-work.component.ts                 | 15 +++++++++----
 sdg/sdg.component.html                        |  6 +++---
 .../searchUtils/newSearchPage.component.html  |  4 ++--
 .../searchUtils/searchResult.component.ts     | 21 +++++++++++++++++++
 .../quick-contact.component.html              |  2 +-
 .../result-preview.component.html             |  2 +-
 .../result-preview.component.ts               |  9 ++++++--
 9 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/fos/fos.component.html b/fos/fos.component.html
index 5121aa2f..1d0c8bf5 100644
--- a/fos/fos.component.html
+++ b/fos/fos.component.html
@@ -32,7 +32,7 @@
 			</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>
diff --git a/landingPages/result/deletedByInference/deletedByInference.service.ts b/landingPages/result/deletedByInference/deletedByInference.service.ts
index 5b812e8f..f3b3754c 100644
--- a/landingPages/result/deletedByInference/deletedByInference.service.ts
+++ b/landingPages/result/deletedByInference/deletedByInference.service.ts
@@ -145,8 +145,7 @@ export class DeletedByInferenceService {
                 if(author.orcid_pending) {
                   author.orcid_pending = author.orcid_pending.toUpperCase();
                 }
-
-                if(result['authors'][author.rank] && results['authors'][author.rank].fullName == author.content) {
+                if(result['authors'][author.rank] && result['authors'][author.rank].fullName == author.content) {
                   if(!author.orcid && result['authors'][author.rank].orcid) {
                     author.orcid = result['authors'][author.rank].orcid;
                   } else if(!author.orcid_pending && result['authors'][author.rank].orcid_pending) {
diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts
index 6153d146..8473be66 100644
--- a/orcid/orcid-work.component.ts
+++ b/orcid/orcid-work.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {ChangeDetectorRef, Component, Input, ViewChild} from '@angular/core';
 import {ActivatedRoute, Router} from "@angular/router";
 import {Subscriber, Subscription} from "rxjs";
 import {OrcidService} from "./orcid.service";
@@ -85,7 +85,7 @@ declare var UIkit: any;
       <ng-container *ngIf="!showOnlyUpdateButton">
         <span class="uk-margin-bottom uk-flex uk-flex-middle uk-flex-center">
           <span>ORCID&#160;</span>
-          <img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="" loading="lazy">
+          <img src="assets/common-assets/common/ORCIDiD_icon16x16.png" alt="ORCID logo" loading="lazy">
           <span>&#160;ACTIONS</span>
         </span>
   
@@ -330,7 +330,8 @@ export class OrcidWorkComponent {
               private _router: Router,
               private orcidService: OrcidService,
               private resultLandingService: ResultLandingService,
-              private userManagementService: UserManagementService, private _logService: LogService, private _userProfileService: UserProfileService) {
+              private userManagementService: UserManagementService, private _logService: LogService, private _userProfileService: UserProfileService,
+              private cdr: ChangeDetectorRef) {
     if (typeof document !== 'undefined') {
       this.tokenUrl = properties.orcidTokenURL
         + "client_id=" + properties.orcidClientId
@@ -444,6 +445,8 @@ export class OrcidWorkComponent {
     this.subscriptions.push(this.orcidService.getPutCode(this.pids).subscribe(
       putCodes => {
         this.putCodes = putCodes;
+        this.cdr.markForCheck();
+        // this.cdr.detectChanges();
       }, error => {
       
       }
@@ -525,7 +528,9 @@ export class OrcidWorkComponent {
           this.putCodes.push("" + response['put-code']);
           this.creationDates.push(response['created-date']['value']);
           this.updateDates.push(response['last-modified-date']['value']);
-          
+          this.cdr.markForCheck();
+          // this.cdr.detectChanges();
+
           // this.closeGrantModal();
           // this.message = "You have successfully added work with pids: "+this.pids+" in your ORCID record!";
           this.message = "You have successfully added work \"" + this.resultTitle + "\" in your ORCID record!";
@@ -701,6 +706,8 @@ export class OrcidWorkComponent {
                   deletedAll = false;
                 } else {
                   this.putCodes.splice(i, 1);
+                  this.cdr.markForCheck();
+                  // this.cdr.detectChanges();
                   this.creationDates.splice(i, 1);
                   this.updateDates.splice(i, 1);
                   // this.works.splice(i, 1);
diff --git a/sdg/sdg.component.html b/sdg/sdg.component.html
index 1acb5d08..c1f431fe 100644
--- a/sdg/sdg.component.html
+++ b/sdg/sdg.component.html
@@ -34,9 +34,9 @@
 			</div>
 		</div>
 		<div class="uk-width-2-5@m uk-width-1-1@s uk-text-center uk-position-relative" uk-scrollspy-class>
-			<img src="assets/common-assets/sdg/sdg-hero-img.svg" loading="lazy">
+			<img src="assets/common-assets/sdg/sdg-hero-img.svg" loading="lazy" alt="SDGs logo">
 			<div class="uk-position-bottom-left uk-card uk-card-default uk-padding">
-				<img src="assets/common-assets/sdg/sdg-badge.png" loading="lazy" style="max-width: 215px">
+				<img src="assets/common-assets/sdg/sdg-badge.png" loading="lazy" style="max-width: 215px" alt="SDGs big logo">
 			</div>
 		</div>
 	</div>
@@ -61,7 +61,7 @@
 								</div>
 							</div>
 							<div class="uk-text-center">
-								<img [src]="'assets/common-assets/sdg/icons/g' + sdg.code + '.png'" alt="">
+								<img [src]="'assets/common-assets/sdg/icons/g' + sdg.code + '.png'" [alt]="'SDG code: '+sdg.code">
 							</div>
 							<div class="uk-text-center uk-padding-small uk-background-default" style="border-radius: 0 0 4px 4px;">
 								<span class="uk-text-large uk-text-bold uk-margin-small-bottom">{{sdg.number == null ? '0' : sdg.number | number}}</span>
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html
index 74028ebd..c623abc1 100644
--- a/searchPages/searchUtils/newSearchPage.component.html
+++ b/searchPages/searchUtils/newSearchPage.component.html
@@ -311,7 +311,7 @@
                     target="_blank"> OpenAIRE - Explore</a>.
               </div>
 
-              <div class="uk-flex uk-flex-middle uk-flex-wrap uk-child-width-auto uk-flex-between">
+              <div class="uk-flex uk-flex-middle uk-child-width-auto uk-flex-between">
                 <!-- Total results, number of pages -->
                 <div class="uk-margin-remove-bottom uk-text-truncate" [class.uk-margin-medium-right]="!mobile" [class.uk-margin-right]="mobile" [class.uk-h6]="!mobile">
                   <ng-container *ngIf="results && searchUtils.totalResults > 0">
@@ -347,7 +347,7 @@
                   </ng-container>
                 </div>
 
-                <div *ngIf="!mobile" class="uk-margin-medium-left uk-flex uk-flex-middle">
+                <div *ngIf="!mobile" class="uk-flex uk-flex-middle">
                   <div *ngIf="searchUtils.totalResults > 10 || sort || searchUtils.totalResults > searchUtils.size ||
                     (!loadPaging && oldTotalResults > searchUtils.size && searchUtils.status == errorCodes.LOADING)"
                        class="uk-grid uk-flex-middle uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
diff --git a/searchPages/searchUtils/searchResult.component.ts b/searchPages/searchUtils/searchResult.component.ts
index 33ba74c0..881578d8 100644
--- a/searchPages/searchUtils/searchResult.component.ts
+++ b/searchPages/searchUtils/searchResult.component.ts
@@ -78,6 +78,7 @@ export class SearchResultComponent implements OnInit, OnChanges {
                 // console.debug(i, this.previewResults[i].orcidPutCodes);
               }
             }
+            this.previewResults = JSON.parse(JSON.stringify(this.previewResults, this.replacer), this.reviver);
           }, error => {
 
           }
@@ -85,6 +86,26 @@ export class SearchResultComponent implements OnInit, OnChanges {
     }
   }
 
+  private replacer(key, value) {
+    if(value instanceof Map) {
+      return {
+        dataType: 'Map',
+        value: Array.from(value.entries()), // or with spread: value: [...value]
+      };
+    } else {
+      return value;
+    }
+  }
+
+  private reviver(key, value) {
+    if(typeof value === 'object' && value !== null) {
+      if (value.dataType === 'Map') {
+        return new Map(value.value);
+      }
+    }
+    return value;
+  }
+
   public getResultPreview(result: SearchResult): ResultPreview {
     return ResultPreview.searchResultConvert(result, (result.entityType) ? result.entityType : this.type);
   }
diff --git a/sharedComponents/quick-contact/quick-contact.component.html b/sharedComponents/quick-contact/quick-contact.component.html
index d43d55d4..23e3d1ab 100644
--- a/sharedComponents/quick-contact/quick-contact.component.html
+++ b/sharedComponents/quick-contact/quick-contact.component.html
@@ -12,7 +12,7 @@
 					Send a message
 				</div>
 				<div *ngIf="images.length > 0" class="uk-margin-small avatars">
-					<img *ngFor="let image of images" [src]="image" class="uk-border-circle" >
+					<img *ngFor="let image of images" [src]="image" class="uk-border-circle" alt="contact person">
 				</div>
 				<div class="uk-text-bold">
 					How can we help?
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 046eb7c0..229ab5f9 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -218,7 +218,7 @@
           <div *ngIf="result.oaRoutes" class="uk-first-column">
 <!--               class="metrics uk-text-xsmall uk-width-auto uk-flex uk-flex-middle uk-flex-right uk-text-meta">-->
             <a class="uk-flex uk-flex-middle uk-link-reset">
-              <span #badge class="access-route-badge" [ngClass]="'dots-' + badge.children.length.toString()">
+              <span #badge class="access-route-badge" [ngClass]="'dots-' + countDots">
                 <span *ngIf="result.oaRoutes.green" class="dot green"></span>
                 <span *ngIf="result.oaRoutes.oaColor" class="dot" [ngClass]="result.oaRoutes.oaColor"></span>
                 <span *ngIf="result.oaRoutes.isInDiamondJournal" class="dot diamond"></span>
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index d7a1d0f8..539eccb9 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges} from "@angular/core";
+import {ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, SimpleChanges} from "@angular/core";
 import {ResultPreview} from "./result-preview";
 import {EnvProperties} from "../properties/env-properties";
 import {RouterHelper} from "../routerHelper.class";
@@ -12,7 +12,8 @@ import {NumberUtils} from '../number-utils.class';
 @Component({
   selector: 'result-preview',
   templateUrl: 'result-preview.component.html',
-  styleUrls: ['result-preview.component.less']
+  styleUrls: ['result-preview.component.less'],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResultPreviewComponent implements OnInit, OnChanges {
   @Input() prevPath: string = "";
@@ -255,4 +256,8 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
     }
     return obj;
   }
+
+  public get countDots() {
+    return (this.result.oaRoutes.green ? 1 : 0) + (this.result.oaRoutes.oaColor ? 1 : 0) + (this.result.oaRoutes.isInDiamondJournal ? 1 : 0);
+  }
 }

From c219c8370b223f4f4df2520f2a4ad89dde493637 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 10:07:31 +0300
Subject: [PATCH 08/17] [develop | DONE | REVERTED]: searchResult.component.ts
 & result-preview.component.html & result-preview.component.ts: Reverted
 changes regarding changeDetection: ChangeDetectionStrategy.OnPush - should be
 first introduced in another branch.

---
 searchPages/searchUtils/searchResult.component.ts  | 2 +-
 utils/result-preview/result-preview.component.html | 2 +-
 utils/result-preview/result-preview.component.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/searchPages/searchUtils/searchResult.component.ts b/searchPages/searchUtils/searchResult.component.ts
index 881578d8..d76c1de6 100644
--- a/searchPages/searchUtils/searchResult.component.ts
+++ b/searchPages/searchUtils/searchResult.component.ts
@@ -78,7 +78,7 @@ export class SearchResultComponent implements OnInit, OnChanges {
                 // console.debug(i, this.previewResults[i].orcidPutCodes);
               }
             }
-            this.previewResults = JSON.parse(JSON.stringify(this.previewResults, this.replacer), this.reviver);
+            // this.previewResults = JSON.parse(JSON.stringify(this.previewResults, this.replacer), this.reviver);
           }, error => {
 
           }
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 229ab5f9..046eb7c0 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -218,7 +218,7 @@
           <div *ngIf="result.oaRoutes" class="uk-first-column">
 <!--               class="metrics uk-text-xsmall uk-width-auto uk-flex uk-flex-middle uk-flex-right uk-text-meta">-->
             <a class="uk-flex uk-flex-middle uk-link-reset">
-              <span #badge class="access-route-badge" [ngClass]="'dots-' + countDots">
+              <span #badge class="access-route-badge" [ngClass]="'dots-' + badge.children.length.toString()">
                 <span *ngIf="result.oaRoutes.green" class="dot green"></span>
                 <span *ngIf="result.oaRoutes.oaColor" class="dot" [ngClass]="result.oaRoutes.oaColor"></span>
                 <span *ngIf="result.oaRoutes.isInDiamondJournal" class="dot diamond"></span>
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts
index 539eccb9..ac31bb91 100644
--- a/utils/result-preview/result-preview.component.ts
+++ b/utils/result-preview/result-preview.component.ts
@@ -13,7 +13,7 @@ import {NumberUtils} from '../number-utils.class';
   selector: 'result-preview',
   templateUrl: 'result-preview.component.html',
   styleUrls: ['result-preview.component.less'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  // changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ResultPreviewComponent implements OnInit, OnChanges {
   @Input() prevPath: string = "";

From 4b3e805d311396db3f4ac505fb6b0c93455c8f50 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 11:36:45 +0300
Subject: [PATCH 09/17] [develop | DONE | REVERTED]: searchProjects.service.ts:
 Revert parsing funder name if funder shortname is not available.

---
 services/searchProjects.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index 6d30b06c..e9c48eaa 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -230,7 +230,7 @@ export class SearchProjectsService {
                 for(let z=0; z<fundingLength; z++) {
                   let fundingData = Array.isArray(resData['fundingtree']) ? resData['fundingtree'][z] : resData['fundingtree'];
                   if(fundingData.hasOwnProperty("funder")) {
-                    result['funderShortname'] = fundingData['funder'].shortname ? fundingData['funder'].shortname : fundingData['funder'].name;
+                    result['funderShortname'] = fundingData['funder'].shortname;
                     result['funderId'] = fundingData['funder'].id;
                     result['jurisdiction'] = (fundingData['funder']['id']['jurisdiction'] )?fundingData['funder']['id']['jurisdiction']:"";
 

From eeb63a2de9cdea3e3d41253b124c86a3ab0c2c79 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 11:47:12 +0300
Subject: [PATCH 10/17] [develop | DONE | CHANGED]: In search projects results,
 show funder name by default, and if not available, show funder short name. 1.
 searchResult.ts: Added field funderName: string; in class SearchResult. 2.
 result-preview.ts: Added field funderName: string; in class ResultPreview &
 in method "searchResultConvert()" set resultPreview.funderName =
 result.funderName; 3. searchProjects.service.ts: Added parsing of funderName.
 4. result-preview.component.html: Show funderName and if not available, show
 funderShortname. 5. entity-metadata.component.ts: Added check for funders
 display.

---
 landingPages/landing-utils/entity-metadata.component.ts | 2 +-
 services/searchProjects.service.ts                      | 1 +
 utils/entities/searchResult.ts                          | 1 +
 utils/result-preview/result-preview.component.html      | 8 ++++----
 utils/result-preview/result-preview.ts                  | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts
index 0378f127..4060446c 100644
--- a/landingPages/landing-utils/entity-metadata.component.ts
+++ b/landingPages/landing-utils/entity-metadata.component.ts
@@ -295,7 +295,7 @@ export class EntityMetadataComponent {
       return this.projects.map(project => {
         let value = project.funderShortname ? project.funderShortname : project.funderName;
         if (project.acronym || project.title) {
-          value = value + ' | ' + (project.acronym ? project.acronym :
+          value = (value ? value + ' | ' : '') + (project.acronym ? project.acronym :
             (project.title.length > 25 ? (project.title.slice(0, 25) + '...'): project.title));
         }
         // if(project.code) {
diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts
index e9c48eaa..e9e704b9 100644
--- a/services/searchProjects.service.ts
+++ b/services/searchProjects.service.ts
@@ -231,6 +231,7 @@ export class SearchProjectsService {
                   let fundingData = Array.isArray(resData['fundingtree']) ? resData['fundingtree'][z] : resData['fundingtree'];
                   if(fundingData.hasOwnProperty("funder")) {
                     result['funderShortname'] = fundingData['funder'].shortname;
+                    result['funderName'] = fundingData['funder'].name;
                     result['funderId'] = fundingData['funder'].id;
                     result['jurisdiction'] = (fundingData['funder']['id']['jurisdiction'] )?fundingData['funder']['id']['jurisdiction']:"";
 
diff --git a/utils/entities/searchResult.ts b/utils/entities/searchResult.ts
index e59e56f7..ba762833 100644
--- a/utils/entities/searchResult.ts
+++ b/utils/entities/searchResult.ts
@@ -48,6 +48,7 @@ export class SearchResult {
   acronym: string;
   code: string;
   // callIdentifier?: string; // currently not parsed
+  funderName: string;
   funderShortname: string;
   budget?: string;
   contribution?: string;
diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html
index 046eb7c0..70fa4f30 100644
--- a/utils/result-preview/result-preview.component.html
+++ b/utils/result-preview/result-preview.component.html
@@ -95,12 +95,12 @@
           <!-- 2nd section (funders, budget, authors, PIDs, publisher etc.) -->
           <div class="uk-text-small uk-margin-small-bottom">
             <!-- Funder -->
-            <div *ngIf="result.funderShortname || result.code" class="uk-margin-xsmall-bottom">
-						<span *ngIf="result.funderShortname">
+            <div *ngIf="(result.funderShortname || result.funderName) || result.code" class="uk-margin-xsmall-bottom">
+						<span *ngIf="result.funderShortname || result.funderName">
 							<span class="uk-text-meta">Funder: </span>
-                          {{result.funderShortname}}
+              {{result.funderName ? result.funderName : result.funderShortname}}
 						</span>
-              <span *ngIf="result.code" [class.uk-margin-left]="result.funderShortname">
+              <span *ngIf="result.code" [class.uk-margin-left]="result.funderShortname || result.funderName">
 							<span class="uk-text-meta">{{openaireEntities.PROJECT}} Code: </span>
                 {{result.code}}
 						</span>
diff --git a/utils/result-preview/result-preview.ts b/utils/result-preview/result-preview.ts
index 542e34f2..c8a38e1d 100644
--- a/utils/result-preview/result-preview.ts
+++ b/utils/result-preview/result-preview.ts
@@ -123,6 +123,7 @@ export class ResultPreview {
   acronym: string;
   code: string;
   // callIdentifier: string;  // currently not parsed
+  funderName: string;
   funderShortname: string;
   budget: string;
   contribution: string;
@@ -188,6 +189,7 @@ export class ResultPreview {
     resultPreview.acronym = result.acronym;
     resultPreview.code = result.code;
     // resultPreview.callIdentifier = result.callIdentifier;  // currently not parsed
+    resultPreview.funderName = result.funderName;
     resultPreview.funderShortname = result.funderShortname;
     resultPreview.budget = result.budget;
     resultPreview.contribution = result.contribution;

From b7293411993fc37a422483b092d7cb3cf5ce5efd Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 16 Apr 2024 12:21:02 +0300
Subject: [PATCH 11/17] [develop]: Fix visibility condition in Indicaotrs page

---
 monitor-admin/topic/indicators.component.html | 16 ++++++----------
 monitor-admin/topic/topic.component.html      | 10 +++++-----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/monitor-admin/topic/indicators.component.html b/monitor-admin/topic/indicators.component.html
index 9c7f6ca9..0b5b1aa1 100644
--- a/monitor-admin/topic/indicators.component.html
+++ b/monitor-admin/topic/indicators.component.html
@@ -33,13 +33,11 @@
                                         <icon *ngIf="!isEditable && showVisibility" [flex]="true"
                                           [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
                                           ratio="0.6"></icon>
-                                        <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                                            <icon [flex]="true"
-                                                  [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
-                                                  ratio="0.6"></icon>
+                                        <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
+                                            <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                                             <icon [flex]="true" name="more_vert"></icon>
                                         </a>
-                                        <div #element *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-dropdown"
+                                        <div #element *ngIf="isEditable && (isCurator || showVisibility)" class="uk-dropdown"
                                              uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                                             <ul class="uk-nav uk-dropdown-nav">
                                                 <ng-container *ngIf="isCurator">
@@ -140,13 +138,11 @@
                                         <icon *ngIf="!isEditable && showVisibility" [flex]="true"
                                           [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
                                           ratio="0.6"></icon>
-                                        <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
-                                            <icon [flex]="true"
-                                                  [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)"
-                                                  ratio="0.6"></icon>
+                                        <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle" [class.uk-disabled]="editing">
+                                            <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(indicator.visibility)" ratio="0.6"></icon>
                                             <icon [flex]="true" name="more_vert"></icon>
                                         </a>
-                                        <div #element *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-dropdown"
+                                        <div #element *ngIf="isEditable && (isCurator || showVisibility)" class="uk-dropdown"
                                              uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0">
                                             <ul class="uk-nav uk-dropdown-nav">
                                                 <ng-container *ngIf="isCurator">
diff --git a/monitor-admin/topic/topic.component.html b/monitor-admin/topic/topic.component.html
index c5d7ecb9..c264fee7 100644
--- a/monitor-admin/topic/topic.component.html
+++ b/monitor-admin/topic/topic.component.html
@@ -30,12 +30,12 @@
                     (click)="$event.stopPropagation();$event.preventDefault()">
                 <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
                   ratio="0.6"></icon>
-                <a *ngIf="isEditable && (isCurator || showVisibillity)" class="uk-link-reset uk-flex uk-flex-middle">
-                  <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
+                <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle">
+                  <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(topic.visibility)"
                         ratio="0.6"></icon>
                   <icon [flex]="true" name="more_vert"></icon>
                 </a>
-                <div #element *ngIf="isEditable && (isCurator || showVisibillity)" 
+                <div #element *ngIf="isEditable && (isCurator || showVisibility)"
                   uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; flip: false; container: body">
                   <ul class="uk-nav uk-dropdown-nav">
                     <ng-container *ngIf="isCurator">
@@ -112,7 +112,7 @@
                     <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
                       ratio="0.6"></icon>
                     <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle">
-                      <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
+                      <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(category.visibility)"
                             ratio="0.6"></icon>
                       <icon [flex]="true" name="more_vert"></icon>
                     </a>
@@ -243,7 +243,7 @@
             <icon *ngIf="!isEditable && showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
               ratio="0.6"></icon>
             <a *ngIf="isEditable && (isCurator || showVisibility)" class="uk-link-reset uk-flex uk-flex-middle">
-              <icon [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
+              <icon *ngIf="showVisibility" [flex]="true" [name]="stakeholderUtils.visibilityIcon.get(subCategory.visibility)"
                     ratio="0.6"></icon>
               <icon [flex]="true" name="more_vert"></icon>
             </a>

From cc435043060dec17966eddea9cd5b931d62e8ddc Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 12:28:14 +0300
Subject: [PATCH 12/17] [develop | DONE | ADDED]: Added method get
 calcCurrentMonth() to calculate and display current month of the project
 life, if status is on going (project has started and not yet ended).

---
 .../landing-utils/entity-metadata.component.ts   | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts
index 4060446c..d27eb26e 100644
--- a/landingPages/landing-utils/entity-metadata.component.ts
+++ b/landingPages/landing-utils/entity-metadata.component.ts
@@ -89,7 +89,7 @@ import {RouterHelper} from "../../utils/routerHelper.class";
         </ng-container>
       </span>
       <ng-container *ngIf="status">
-        <span>{{status}}</span>
+        <span>{{status}} <ng-container *ngIf="currentDate <= endDate && currentDate >= startDate">(M{{calcCurrentMonth}})</ng-container></span>
       </ng-container>
       <ng-container *ngIf="date">
         <span>{{date | date: 'dd MMM yyyy': 'UTC'}}</span>
@@ -364,4 +364,18 @@ export class EntityMetadataComponent {
       this.projectsModal.open();
     }
   }
+
+  public get calcCurrentMonth() {
+    let currentDate = new Date(this.currentDate);
+    let startDate = new Date(this.startDate);
+
+    var months;
+    months = (currentDate.getFullYear() - startDate.getFullYear()) * 12;
+    months -= startDate.getMonth();
+    months += currentDate.getMonth();
+    if(startDate.getDate() > currentDate.getDate()) {
+      months--;
+    }
+    return months <= 0 ? 0 : months+1;
+  }
 }
\ No newline at end of file

From 559220c77c47761d43819bdbaca11b2d849fb053 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 16 Apr 2024 13:25:54 +0300
Subject: [PATCH 13/17] [develop | DONE | CHANGED]: landing.module.ts: Removed
 TabPagingComponent from declarations and exports |
 deletedByInference.module.ts: Removed LandingModule from imports |
 resultLanding.module.ts: Import SearchTabModule | Deleted
 tabPaging.component.ts.

---
 landingPages/landing-utils/landing.module.ts  |  5 ++--
 .../landing-utils/tabPaging.component.ts      | 24 -------------------
 .../deletedByInference.module.ts              |  2 +-
 landingPages/result/resultLanding.module.ts   |  1 +
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 landingPages/landing-utils/tabPaging.component.ts

diff --git a/landingPages/landing-utils/landing.module.ts b/landingPages/landing-utils/landing.module.ts
index 3eedae91..d97b32a0 100644
--- a/landingPages/landing-utils/landing.module.ts
+++ b/landingPages/landing-utils/landing.module.ts
@@ -5,7 +5,6 @@ import { CommonModule }        from '@angular/common';
 import { FormsModule }         from '@angular/forms';
 import { RouterModule } from '@angular/router';
 
-import {TabPagingComponent} from './tabPaging.component';
 import {ShowTitleComponent} from './showTitle.component';
 import {AddThisComponent} from './addThis.component';
 
@@ -14,11 +13,11 @@ import {AddThisComponent} from './addThis.component';
     CommonModule, FormsModule, RouterModule
   ],
   declarations: [
-      TabPagingComponent,  ShowTitleComponent, AddThisComponent
+    ShowTitleComponent, AddThisComponent
   ],
   providers:[],
   exports: [
-     TabPagingComponent, ShowTitleComponent, AddThisComponent
+     ShowTitleComponent, AddThisComponent
     ]
 })
 export class LandingModule { }
diff --git a/landingPages/landing-utils/tabPaging.component.ts b/landingPages/landing-utils/tabPaging.component.ts
deleted file mode 100644
index 1eb6bd08..00000000
--- a/landingPages/landing-utils/tabPaging.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {Component, Input, Output, EventEmitter} from '@angular/core';
-
-@Component({
-    selector: 'tabPaging',
-    template: `
-        <div class="uk-panel" *ngIf="!showAll && length > 10">
-            <a (click)="changeShowAll.emit({value: true});">
-                <div class="uk-float-right">view all {{length | number}}</div>
-            </a>
-        </div>
-    `
-    })
-
-export class TabPagingComponent {
-    @Input() showAll: boolean;
-    @Input() length: number;
-    @Output() changeShowAll: EventEmitter<any> = new EventEmitter();
-
-    constructor () {
-    }
-
-    ngOnInit() {
-    }
-}
diff --git a/landingPages/organization/deletedByInference/deletedByInference.module.ts b/landingPages/organization/deletedByInference/deletedByInference.module.ts
index c327c902..eb09712b 100644
--- a/landingPages/organization/deletedByInference/deletedByInference.module.ts
+++ b/landingPages/organization/deletedByInference/deletedByInference.module.ts
@@ -18,7 +18,7 @@ import {ResultPreviewModule} from "../../../utils/result-preview/result-preview.
 @NgModule({
   imports: [
     CommonModule, FormsModule, ResultLandingUtilsModule,
-    PagingModule, ErrorMessagesModule, ShowAuthorsModule, LandingModule, NoLoadPaging, ResultPreviewModule
+    PagingModule, ErrorMessagesModule, ShowAuthorsModule, NoLoadPaging, ResultPreviewModule
   ],
   declarations: [
     OrganizationsDeletedByInferenceComponent
diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts
index 2d7dfc11..d1792e55 100644
--- a/landingPages/result/resultLanding.module.ts
+++ b/landingPages/result/resultLanding.module.ts
@@ -38,6 +38,7 @@ import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
 import {ResultLandingRoutingModule} from "./resultLanding-routing.module";
 import {OrcidCoreModule} from "../../orcid/orcid-core.module";
+import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
 
 @NgModule({
   imports: [

From a2b1bb8f7047042793acb512b0eecbe0b24be051 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 16 Apr 2024 16:08:05 +0300
Subject: [PATCH 14/17] [develop | FIXED | DONE]: Multi indicators paths fix
 dropdowns

---
 monitor-admin/topic/indicators.component.html | 22 +++++++++----------
 monitor-admin/topic/indicators.component.ts   | 20 +++++++++++------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/monitor-admin/topic/indicators.component.html b/monitor-admin/topic/indicators.component.html
index 0b5b1aa1..7452df47 100644
--- a/monitor-admin/topic/indicators.component.html
+++ b/monitor-admin/topic/indicators.component.html
@@ -276,7 +276,7 @@
             <hr class="uk-width-1-1">
             <div *ngIf="numberIndicatorPaths" formArrayName="indicatorPaths">
                 <div *ngIf="stakeholderUtils.hasMultiNumberIndicatorPaths" class="uk-margin-medium-bottom">
-                    <ul #transitionGroup class="uk-subnav uk-subnav-pill uk-subnav-small" transition-group>
+                    <ul #numbersTransition class="uk-subnav uk-subnav-pill uk-subnav-small" transition-group>
                         <li *ngFor="let indicatorPath of numberIndicatorPaths.controls; let i=index"
                             class="uk-visible-toggle uk-flex uk-margin-small-top" transition-group-item
                             [class.uk-active]="(!indicator.activePath && i == 0) || indicator.activePath === i">
@@ -292,14 +292,13 @@
                                   class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
                                   [class.uk-invisible-hover]="indicator.activePath !== i"
                                   (click)="$event.stopPropagation();$event.preventDefault()">
-                            <a *ngIf="isEditable && isCurator" class="uk-link-reset uk-flex uk-flex-middle">
+                            <a *ngIf="isCurator" class="uk-link-reset uk-flex uk-flex-middle">
                               <icon [flex]="true" name="more_vert"></icon>
                             </a>
-                            <div #element *ngIf="isEditable && isCurator"
-                                 uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: .uk-modal-body">
+                            <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
                                <ul class="uk-nav uk-dropdown-nav">
                                   <li *ngIf="i > 0">
-                                    <a (click)="hide(element);moveIndicatorPath(numberIndicatorFb, numberIndicatorPaths, i)">
+                                    <a (click)="hide(element);moveIndicatorPath(numberIndicatorFb, 'number', i)">
                                       <div class="uk-flex uk-flex-middle">
                                          <icon [flex]="true" name="west" ratio="0.6"></icon>
                                          <span class="uk-margin-small-left uk-width-expand">Move Left</span>
@@ -307,7 +306,7 @@
                                     </a>
                                   </li>
                                   <li *ngIf="i < numberIndicatorPaths.length - 1">
-                                    <a (click)="hide(element);moveIndicatorPath(numberIndicatorFb, numberIndicatorPaths, i, i + 1)">
+                                    <a (click)="hide(element);moveIndicatorPath(numberIndicatorFb, 'number', i, i + 1)">
                                       <div class="uk-flex uk-flex-middle">
                                          <icon [flex]="true" name="east" ratio="0.6"></icon>
                                          <span class="uk-margin-small-left uk-width-expand">Move Right</span>
@@ -479,7 +478,7 @@
             </div>
             <div *ngIf="chartIndicatorPaths" formArrayName="indicatorPaths" class="uk-width-1-1">
                 <div *ngIf="stakeholderUtils.hasMultiChartIndicatorPaths" class="uk-margin-medium-bottom">
-                    <ul #transitionGroup class="uk-subnav uk-subnav-pill uk-subnav-small" transition-group>
+                    <ul #chartsTransition class="uk-subnav uk-subnav-pill uk-subnav-small" transition-group>
                         <li *ngFor="let indicatorPath of chartIndicatorPaths.controls; let i=index"
                             class="uk-visible-toggle uk-flex uk-margin-small-top" transition-group-item
                             [class.uk-active]="(!indicator.activePath && i == 0) || indicator.activePath === i">
@@ -490,14 +489,13 @@
                                   class="uk-flex uk-flex-column uk-flex-center uk-margin-small-left"
                                   [class.uk-invisible-hover]="indicator.activePath !== i"
                                   (click)="$event.stopPropagation();$event.preventDefault()">
-                            <a *ngIf="isEditable && isCurator" class="uk-link-reset uk-flex uk-flex-middle">
+                            <a *ngIf="isCurator" class="uk-link-reset uk-flex uk-flex-middle">
                               <icon [flex]="true" name="more_vert"></icon>
                             </a>
-                            <div #element *ngIf="isEditable && isCurator"
-                                 uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0; container: .uk-modal-body">
+                            <div #element uk-dropdown="mode: click; pos: bottom-left; offset: 5; delay-hide: 0;">
                                <ul class="uk-nav uk-dropdown-nav">
                                   <li *ngIf="i > 0">
-                                    <a (click)="hide(element);moveIndicatorPath(chartIndicatorFb, chartIndicatorPaths, i)">
+                                    <a (click)="hide(element);moveIndicatorPath(chartIndicatorFb, 'chart', i)">
                                       <div class="uk-flex uk-flex-middle">
                                          <icon [flex]="true" name="west" ratio="0.6"></icon>
                                          <span class="uk-margin-small-left uk-width-expand">Move Left</span>
@@ -505,7 +503,7 @@
                                     </a>
                                   </li>
                                   <li *ngIf="i < chartIndicatorPaths.length - 1">
-                                    <a (click)="hide(element);moveIndicatorPath(chartIndicatorFb, chartIndicatorPaths, i, i + 1)">
+                                    <a (click)="hide(element);moveIndicatorPath(chartIndicatorFb, 'chart', i, i + 1)">
                                       <div class="uk-flex uk-flex-middle">
                                          <icon [flex]="true" name="east" ratio="0.6"></icon>
                                          <span class="uk-margin-small-left uk-width-expand">Move Right</span>
diff --git a/monitor-admin/topic/indicators.component.ts b/monitor-admin/topic/indicators.component.ts
index cb29946d..715fba78 100644
--- a/monitor-admin/topic/indicators.component.ts
+++ b/monitor-admin/topic/indicators.component.ts
@@ -102,7 +102,8 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
   @ViewChild('editChartNotify', {static: true}) editChartNotify: NotifyFormComponent;
   @ViewChild('deleteNotify', {static: true}) deleteNotify: NotifyFormComponent;
   /* Transition Groups */
-  @ViewChild('transitionGroup') transitionGroup: TransitionGroupComponent;
+  @ViewChild('numbersTransition') numbersTransition: TransitionGroupComponent;
+  @ViewChild('chartsTransition') chartsTransition: TransitionGroupComponent;
 
   public isFullscreen: boolean = false;
 
@@ -590,7 +591,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
   public removeNumberIndicatorPath(index: number) {
     this.numberIndicatorPaths.removeAt(index);
     this.indicator.indicatorPaths.splice(index, 1);
-    this.transitionGroup.init();
+    this.numbersTransition.init();
     if (this.indicator.activePath === index) {
       this.activeNumberIndicatorPath(Math.max(0, index - 1));
     } else if (this.indicator.activePath > index) {
@@ -602,7 +603,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
   public removeChartIndicatorPath(index: number) {
     this.chartIndicatorPaths.removeAt(index);
     this.indicator.indicatorPaths.splice(index, 1);
-    this.transitionGroup.init();
+    this.chartsTransition.init();
     if (this.indicator.activePath === index) {
       this.activeChartIndicatorPath(Math.max(0, index - 1));
     } else if (this.indicator.activePath > index) {
@@ -612,9 +613,14 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
   }
 
   public moveIndicatorPath(form: FormGroup,
-                           indicatorPaths: FormArray, index: number,
+                           type: 'number' | 'chart', index: number,
                            newIndex: number = index - 1) {
-    this.transitionGroup.init();
+    let indicatorPaths = type == 'number'?this.numberIndicatorPaths:this.chartIndicatorPaths;
+    if(type == 'number') {
+      this.numbersTransition.init();
+    } else {
+      this.chartsTransition.init();
+    }
     let a = indicatorPaths.at(index);
     let b = indicatorPaths.at(newIndex);
     indicatorPaths.setControl(index, b);
@@ -632,7 +638,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
     let paths = this.numberIndicatorPaths;
     if (index == paths.length) {
       this.addNumberIndicatorPath();
-      this.transitionGroup.init();
+      this.numbersTransition.init();
     }
     this.indicator.activePath = index;
   }
@@ -641,7 +647,7 @@ export class IndicatorsComponent extends IndicatorStakeholderBaseComponent imple
     let paths = this.chartIndicatorPaths;
     if (index == paths.length) {
       this.addChartIndicatorPath();
-      this.transitionGroup.init();
+      this.chartsTransition.init();
     }
     this.indicator.activePath = index;
   }

From afdf6bf9648d4b4cfebeb848286c7fb80a585dd0 Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Thu, 18 Apr 2024 11:08:41 +0300
Subject: [PATCH 15/17] [develop | DONE | CHANGED] in filters use
 "publication", "software", "dataset", "other" table instead of the result one

---
 monitor/entities/stakeholder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts
index a1670174..75b88d74 100644
--- a/monitor/entities/stakeholder.ts
+++ b/monitor/entities/stakeholder.ts
@@ -296,7 +296,7 @@ export class IndicatorFilterUtils {
   }
  static getFieldForTable(field, table){
     if(["publication", "software", "dataset", "other", "result"].indexOf(table)!=-1 && IndicatorFilterUtils.filteredFields[field]["result"]){
-      return IndicatorFilterUtils.filteredFields[field]["result"];
+      return IndicatorFilterUtils.filteredFields[field]["result"].replace("result.",table + ".");
     }else{
       return IndicatorFilterUtils.filteredFields[field][table];
     }

From 474a73e2f791abdfd354471f8be27af204008f7b Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Thu, 18 Apr 2024 15:08:17 +0300
Subject: [PATCH 16/17] [develop | DONE | CHANGED] indicator utils: user date
 range overrides the default range a chart may have

---
 monitor-admin/utils/indicator-utils.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts
index 41ecbea3..3e76c8fc 100644
--- a/monitor-admin/utils/indicator-utils.ts
+++ b/monitor-admin/utils/indicator-utils.ts
@@ -554,11 +554,11 @@ export class IndicatorUtils {
                 filterApplied = true;
               } else if (filterType == "start_year" || filterType == "end_year") {
                 //if has date filter already
-                if (filterType == "start_year" && parseInt(filterValue) > parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
+                // if (filterType == "start_year" && parseInt(filterValue) > parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
                   queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
-                } else if (filterType == "end_year" && parseInt(filterValue) < parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
+                // } else if (filterType == "end_year" && parseInt(filterValue) < parseInt(queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0])) {
                   queries["query"]["filters"][filterposition.filter]['groupFilters'][filterposition.groupFilter]["values"][0] = filterValue;
-                }
+                // }
                 filterApplied = true;
               }
             } else {

From 68125b35774dddea903732074f206ade9311dbbd Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Fri, 19 Apr 2024 12:09:00 +0300
Subject: [PATCH 17/17] [develop | DONE | CHANGED] Claims: keep both shortname
 and funderName, in cards show fundername. For unidentified, hide code and
 link

---
 claims/claim-utils/claimHelper.class.ts                     | 1 +
 claims/claim-utils/claimProjectSearchForm.component.ts      | 5 +++--
 claims/directLinking/directLinking.component.ts             | 1 +
 claims/linking/insertClaim/insertClaim.component.ts         | 2 +-
 .../selected/ClaimEntityProjectMetadata.component.ts        | 6 +++---
 services/servicesUtils/refineResults.class.ts               | 2 +-
 utils/entitiesAutoComplete/entitySearch.service.ts          | 3 ++-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/claims/claim-utils/claimHelper.class.ts b/claims/claim-utils/claimHelper.class.ts
index 74349800..d3fb38f4 100644
--- a/claims/claim-utils/claimHelper.class.ts
+++ b/claims/claim-utils/claimHelper.class.ts
@@ -28,6 +28,7 @@ export class ClaimResult {
 
 export class ClaimProject {
   public funderId: string;
+  public funderShortname: string;
   public funderName: string;
   public acronym: string;
   public startDate: string;
diff --git a/claims/claim-utils/claimProjectSearchForm.component.ts b/claims/claim-utils/claimProjectSearchForm.component.ts
index 27ec74d5..70b154e6 100644
--- a/claims/claim-utils/claimProjectSearchForm.component.ts
+++ b/claims/claim-utils/claimProjectSearchForm.component.ts
@@ -178,9 +178,10 @@ export class ClaimProjectsSearchFormComponent {
       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.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;
diff --git a/claims/directLinking/directLinking.component.ts b/claims/directLinking/directLinking.component.ts
index 3fcd7537..70d46032 100644
--- a/claims/directLinking/directLinking.component.ts
+++ b/claims/directLinking/directLinking.component.ts
@@ -156,6 +156,7 @@ export class DirectLinkingComponent {
        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;
diff --git a/claims/linking/insertClaim/insertClaim.component.ts b/claims/linking/insertClaim/insertClaim.component.ts
index 05615ba9..0cf983e5 100644
--- a/claims/linking/insertClaim/insertClaim.component.ts
+++ b/claims/linking/insertClaim/insertClaim.component.ts
@@ -508,7 +508,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) {
 
diff --git a/claims/linking/selected/ClaimEntityProjectMetadata.component.ts b/claims/linking/selected/ClaimEntityProjectMetadata.component.ts
index 0b90acc6..229ebeca 100644
--- a/claims/linking/selected/ClaimEntityProjectMetadata.component.ts
+++ b/claims/linking/selected/ClaimEntityProjectMetadata.component.ts
@@ -16,10 +16,10 @@ import {ClaimEntity} from '../../claim-utils/claimHelper.class';
       </div>
       <div class="uk-text-small uk-flex uk-flex-wrap" [style.grid-gap]="shortVersion?'10px':'20px'"
         [class.uk-margin-small-top]="!shortVersion">
-        <div *ngIf="entity.project.funderName">
-          <span class="uk-text-meta">Funder: </span>{{entity.project.funderName}}
+        <div *ngIf="entity.project.funderName || entity.project.funderShortname">
+          <span class="uk-text-meta">Funder: </span>{{entity.project.funderName?entity.project.funderName:entity.project.funderShortname}}
         </div>
-        <div *ngIf="entity.project.code">
+        <div *ngIf="entity.project.code && entity.project.code!='unidentified'">
           <span class="uk-text-meta">Project Code: </span>{{entity.project.code}}
         </div>  
       </div>
diff --git a/services/servicesUtils/refineResults.class.ts b/services/servicesUtils/refineResults.class.ts
index dcd48d17..dd802f32 100644
--- a/services/servicesUtils/refineResults.class.ts
+++ b/services/servicesUtils/refineResults.class.ts
@@ -70,7 +70,7 @@ export class RefineResultsUtils {
    }
    public static inParenthesisThePartAfterCharacters(field, characters):string {
      if( field.name.indexOf(characters) !=-1){
-       return field.name.split(characters)[0]+" ("+field.name.split(characters)[1]+")";
+       return field.name.split(characters)[0]+ (field.name.split(characters)[1]?(" ("+field.name.split(characters)[1]+")"):"");
 
      }
      return field.name;
diff --git a/utils/entitiesAutoComplete/entitySearch.service.ts b/utils/entitiesAutoComplete/entitySearch.service.ts
index f7cc9478..5580445f 100644
--- a/utils/entitiesAutoComplete/entitySearch.service.ts
+++ b/utils/entitiesAutoComplete/entitySearch.service.ts
@@ -237,7 +237,8 @@ private fetch (link,id,oafEntityType,type, properties:EnvProperties ){
 
                   if(resData['fundingtree'] && resData['fundingtree']['funder']){
                     value.funderId = (resData['fundingtree']['funder']['id'] )?resData['fundingtree']['funder']['id']:"";
-                    value.funderName = (resData['fundingtree']['funder']['shortname'] )?resData['fundingtree']['funder']['shortname']:"";
+                    value.funderName = (resData['fundingtree']['funder']['name'] )?resData['fundingtree']['funder']['name']:"";
+                    value.funderShortName = (resData['fundingtree']['funder']['shortname'] )?resData['fundingtree']['funder']['shortname']:"";
                     value.jurisdiction = (resData['fundingtree']['funder']['jurisdiction'] )?resData['fundingtree']['funder']['jurisdiction']:"";
                     if(resData['fundingtree']['funding_level_2']){
                       value.fundingLevel0 = (resData['fundingtree']['funding_level_2'] && resData['fundingtree']['funding_level_2']['parent'] &&