From 5faca0746c9c4370fccc1687d81d411f62b57be5 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Thu, 20 Jun 2024 15:28:22 +0300
Subject: [PATCH 1/2] [develop | DONE | CHANGED]: dataProviderInfo.ts &
 organizationInfo.ts: Mark some fields as deprecated (not used anymore).

---
 utils/entities/dataProviderInfo.ts | 6 ++++++
 utils/entities/organizationInfo.ts | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts
index 0757853f..a532260d 100644
--- a/utils/entities/dataProviderInfo.ts
+++ b/utils/entities/dataProviderInfo.ts
@@ -46,8 +46,11 @@ export class DataProviderInfo {
   // aggregationStatus: {"fundedContent": string, "indexRecords": string, "fulltexts": string, "lastUpdateDate": string};
   aggregationStatus: { "fulltexts": string };
 
+  /** @deprecated*/
   tabs: { "name": string, "content": string }[];
+  /** @deprecated*/
   tabs2: string[] = [];
+  /** @deprecated*/
   tabsInTypes = {
     "publicationsTab": new Set<string>(
         ["aggregator::datarepository",
@@ -196,11 +199,14 @@ export class DataProviderInfo {
   organizations: { "acronym": string, "name": string, "id": string }[] = [];
   //publications: any;
   //datasets: any;
+  /** @deprecated*/
   statistics: any;
   //projects: any;
+  /** @deprecated*/
   datasources: any;
 
   //relatedDatasources: Map<string, {"name": string, "countPublications": string, "countDatasets": string, "countSoftware": string, "countOrps": string}>;
+  // Search query
   relatedDatasources: { "id": string, "name": string, "count": number }[] = [];
 
   belongsTo: boolean = true;
diff --git a/utils/entities/organizationInfo.ts b/utils/entities/organizationInfo.ts
index 09d4ca09..7943db6e 100644
--- a/utils/entities/organizationInfo.ts
+++ b/utils/entities/organizationInfo.ts
@@ -21,8 +21,8 @@ export class OrganizationInfo {
   name: string;
   country: string;
   objIdentifier: string;
-  
-  
+
+  /** @deprecated*/ //deprecated - search query
   projects: Map<string, OrganizationProject[]>;
   //dataProviders: { name: string; url: string; type: string; websiteUrl: string;
   //                    organizations: {name: string; url: string}[]}[];

From 4bd7e822ac64ad593c820a0ee0fd5457400e3f7c Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Tue, 25 Jun 2024 14:04:34 +0300
Subject: [PATCH 2/2] [develop | DONE | CHANGED] Change fields in filters from
 result_country to cross_country

---
 monitor/entities/stakeholder.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts
index 31e74e8a..277e2388 100644
--- a/monitor/entities/stakeholder.ts
+++ b/monitor/entities/stakeholder.ts
@@ -264,7 +264,7 @@ export class IndicatorFilterUtils {
       "indi_pub_downloads":"indi_pub_downloads.result.year",
       "result_apc":"result_apc.result.year",
       "result_apc_affiliations":"result_apc_affiliations.result.year",
-      "result_country":"result_country.result.year",
+      "cross_country":"cross_country.year",
       "indi_impact_measures": "indi_impact_measures.result.year",
       "project": "project.start year"
     },
@@ -286,7 +286,7 @@ export class IndicatorFilterUtils {
        "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl1",
         "result_apc":"result_apc.result.result_fos.lvl1",
         "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl1",
-        "result_country":"result_country.result.result_fos.lvl1",
+        "cross_country":"cross_country.lvl1",
         "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl1"
       },
     "foslvl2":{
@@ -297,7 +297,7 @@ export class IndicatorFilterUtils {
       "indi_impact_measures":"indi_impact_measures.result.result_fos.lvl2",
       "result_apc":"result_apc.result.result_fos.lvl2",
       "result_apc_affiliations":"result_apc_affiliations.result.result_fos.lvl2",
-      "result_country":"result_country.result.result_fos.lvl2",
+      "cross_country":"cross_country.lvl2",
       "historical_snapshots_irish_fos":"historical_snapshots_irish_fos.lvl2"
       },
     "publicly-funded":{
@@ -307,7 +307,7 @@ export class IndicatorFilterUtils {
       "indi_impact_measures":"indi_impact_measures.result.indi_pub_publicly_funded.publicly_funded",
       "result_apc":"result_apc.result.indi_pub_publicly_funded.publicly_funded",
       "result_apc_affiliations":"result_apc_affiliations.result.indi_pub_publicly_funded.publicly_funded",
-      "result_country":"result_country.result.indi_pub_publicly_funded.publicly_funded"
+      "cross_country":"cross_country.publicly_funded"
     }
 
   }