Merge remote-tracking branch 'origin/develop'

explore/src/app/funders/funders.component.ts

@@ -145,9 +145,9 @@ export class FundersComponent implements OnInit {
     let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
     this.subscriptions.push(
       zip(
-        this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties),
-        this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams),
-        this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties),
+        this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties),
+        this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams),
+        this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties),
         this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
       ).subscribe((data: any[]) => {
         // storing all needed data to a map

explore/src/app/home/home.component.html

@@ -109,9 +109,9 @@
                                         <span *ngIf="type=='persistent'">
 												<span>Persistent identifiers and registries</span>
 											</span>
-                                        <span *ngIf="type=='funder' && numbersComponent.showProjects && numbers?.fundersSize && numbers?.projectsSize">
+                                        <span *ngIf="type=='funder' && numbersComponent.showProjects && numbers?.mergedFundersSize && numbers?.projectsSize">
 												<span
-                                                        class="uk-text-bold">{{numbers.fundersSize.number|number}}{{numbers.fundersSize.size}}
+                                                        class="uk-text-bold">{{numbers.mergedFundersSize.number|number}}{{numbers.mergedFundersSize.size}}
                                                     funders</span><span> and</span>
 												<span
                                                         class="uk-text-bold"> {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}}