From c7c1aec26ea7ff3decda4675a7bdb0e6ea83a4ae Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Mon, 27 Nov 2023 18:10:37 +0200
Subject: [PATCH] [develop | DONE | CHANGED]: Updated parsing and display for
 usage counts per data source to show datasource names. 1.
 resultLandingInfo.ts: Added field datasourceName: string in interface
 MetricPerDatasource. 2. parsingFunctions.class.ts: In method
 "parseMeasures()", updated parsing for usage counts per data source
 (countsPerDatasource) to parse datasourceId and datasourceName from
 datasource field of response (split by ||). 3. resultLanding.component.html:
 On display of countsPerDatasource in table, show datasource names.

---
 landingPages/landing-utils/parsingFunctions.class.ts | 4 ++--
 landingPages/result/resultLanding.component.html     | 2 +-
 utils/entities/resultLandingInfo.ts                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts
index a34ba066..846de4a9 100644
--- a/landingPages/landing-utils/parsingFunctions.class.ts
+++ b/landingPages/landing-utils/parsingFunctions.class.ts
@@ -894,7 +894,7 @@ export class ParsingFunctions {
               countsPerDatasource[datasourcePosition.get(element.datasource)].views = element.count;
             } else {
               datasourcePosition.set(element.datasource, countsPerDatasource.length);
-              countsPerDatasource.push({"datasourceId": element.datasource, "views": element.count, "downloads": 0})
+              countsPerDatasource.push({"datasourceId": element.datasource.split("||")[0], "datasourceName": element.datasource.split("||")[1], "views": element.count, "downloads": 0})
             }
           }
           // measure.views = element.count;
@@ -907,7 +907,7 @@ export class ParsingFunctions {
               countsPerDatasource[datasourcePosition.get(element.datasource)].downloads = element.count;
             } else {
               datasourcePosition.set(element.datasource, countsPerDatasource.length);
-              countsPerDatasource.push({"datasourceId": element.datasource, "views": 0, "downloads": element.count})
+              countsPerDatasource.push({"datasourceId": element.datasource.split("||")[0], "datasourceName": element.datasource.split("||")[1], "views": 0, "downloads": element.count})
             }
           }
           // measure.downloads = element.count;
diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html
index dd683993..7d6a9ccd 100644
--- a/landingPages/result/resultLanding.component.html
+++ b/landingPages/result/resultLanding.component.html
@@ -1251,7 +1251,7 @@
             </thead>
             <tbody>
               <tr *ngFor="let datasource of resultLandingInfo.measure.countsPerDatasource">
-                <td class="uk-text-truncate"><a [routerLink]="properties.searchLinkToDataProvider.split('?')[0]" [queryParams]="{'datasourceId': datasource.datasourceId}">{{datasource.datasourceId}}</a></td>
+                <td class="uk-text-truncate"><a [routerLink]="properties.searchLinkToDataProvider.split('?')[0]" [queryParams]="{'datasourceId': datasource.datasourceId}">{{datasource.datasourceName}}</a></td>
                 <td class="uk-text-center">{{datasource.views}}</td>
                 <td class="uk-text-center">{{datasource.downloads}}</td>
               </tr>
diff --git a/utils/entities/resultLandingInfo.ts b/utils/entities/resultLandingInfo.ts
index 8a45393b..1e2f7740 100644
--- a/utils/entities/resultLandingInfo.ts
+++ b/utils/entities/resultLandingInfo.ts
@@ -49,7 +49,7 @@ export interface Measure {
 
 export interface MetricPerDatasource {
   datasourceId: string,
-  // datasourceName: string,
+  datasourceName: string,
   views: number,
   downloads: number
 }