From 7ccd9c625b82c5a955522388803ad5e6d1f12bfa Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Thu, 28 Dec 2023 15:41:17 +0200
Subject: [PATCH 1/2] [develop | DONE | FIXED]: searchAll.component.ts: Updated
 entitytype parameter to method "NewSearchPageComponent.createKeywordQuery()"
 for querying number of datasurces and services also by pid.

---
 searchPages/find/searchAll.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/searchPages/find/searchAll.component.ts b/searchPages/find/searchAll.component.ts
index 99900b63..c59d975a 100644
--- a/searchPages/find/searchAll.component.ts
+++ b/searchPages/find/searchAll.component.ts
@@ -444,7 +444,7 @@ export class SearchAllComponent {
       this.fetchDataproviders.results = [];
       this.reload["datasources"] = false;
       // this.fetchDataproviders.getNumForSearch(this.keyword, this.properties, refineParams);
-      this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("datasources",this.keyword,"q","="):"", this.properties, refineParams).subscribe(
+      this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("dataprovider",this.keyword,"q","="):"", this.properties, refineParams).subscribe(
         data => {
           this.fetchDataproviders.searchUtils.totalResults = data;
           this.fetchDataproviders.searchUtils.status = this.errorCodes.DONE;
@@ -463,7 +463,7 @@ export class SearchAllComponent {
     if (this.activeEntity != "services"  && this.reload["services"] && this.showServices) {
       this.fetchServices.results = [];
       this.reload["services"] = false;
-      this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("datasources",this.keyword,"q","="):"", this.properties, refineParams, "services").subscribe(
+      this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders2(this.keyword.length>0?NewSearchPageComponent.createKeywordQuery("service",this.keyword,"q","="):"", this.properties, refineParams, "services").subscribe(
         data => {
           this.fetchServices.searchUtils.totalResults = data;
           this.fetchServices.searchUtils.status = this.errorCodes.DONE;
-- 
2.17.1


From 84c2451521dc366224b23d8e27e149b449cdb77e Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Thu, 28 Dec 2023 16:34:43 +0200
Subject: [PATCH 2/2] [develop | DONE | CHANGED]: dataProvider.component.html &
 project.component.html & resultLanding.component.html: Changed uk-flex-middle
 to uk-flex-top for .landing-metrics-card, after min-height was introduced.

---
 landingPages/dataProvider/dataProvider.component.html | 2 +-
 landingPages/project/project.component.html           | 2 +-
 landingPages/result/resultLanding.component.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html
index 569bc81f..59528c96 100644
--- a/landingPages/dataProvider/dataProvider.component.html
+++ b/landingPages/dataProvider/dataProvider.component.html
@@ -188,7 +188,7 @@
                     </div>
                     <div *ngIf="dataProviderInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s">
                       <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
-                        <div class="uk-width-expand uk-flex uk-flex-middle">
+                        <div class="uk-width-expand uk-flex uk-flex-top">
                           <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
                             <div>
                               <ng-container>
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html
index 241fd84d..1c0742a9 100644
--- a/landingPages/project/project.component.html
+++ b/landingPages/project/project.component.html
@@ -321,7 +321,7 @@
                     </div>
                     <div *ngIf="projectInfo && hasMetrics" class="uk-width-1-1 uk-width-medium@s">
                       <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
-                        <div class="uk-width-expand uk-flex uk-flex-middle">
+                        <div class="uk-width-expand uk-flex uk-flex-top">
                           <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
                             <div>
                               <ng-container>
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index 7d6a9ccd..dc4e35d5 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -385,7 +385,7 @@
         <div *ngIf="resultLandingInfo && resultLandingInfo.measure && (resultLandingInfo.measure.bip.length || resultLandingInfo.measure.counts.length) && !viewAll"
           class="uk-margin-medium-top uk-padding uk-padding-remove-vertical">
           <div class="landing-metrics-card uk-text-small uk-flex uk-padding-small">
-            <div class="uk-width-expand uk-flex uk-flex-middle">
+            <div class="uk-width-expand uk-flex uk-flex-top">
               <div class="uk-grid uk-grid-small uk-flex-nowrap" uk-grid uk-height-match="target: > div > .cell">
                 <div>
                   <ng-container *ngIf="resultLandingInfo.measure.bip.length">
-- 
2.17.1