[angular-16-irish-monitor]: Merge from develop

landingPages/dataProvider/dataProvider.component.ts

@@ -394,8 +394,8 @@ export class DataProviderComponent {
           this.updateUrl(this.canonicalUrl);
           this.seoService.createLinkForCanonicalURL(this.properties.domain +this.properties.baseLink +  this._router.url);
           if (typeof document !== 'undefined') {
-            this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId);
+            // this.getDataProviderAggregationStatus(this.dataProviderInfo.originalId);
-            // this.getCollectedFulltexts();
+            this.getCollectedFulltexts();
             this.countResultsWithFundingInfo();
           } else {
             this.aggregationStatusIsInitialized = true;
@@ -454,34 +454,34 @@ export class DataProviderComponent {
     }
   }
 
-  private getDataProviderAggregationStatus(originalId: string) {
+  // private getDataProviderAggregationStatus(originalId: string) {
-    this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe(
+  //   this.subscriptions.push(this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe(
-      data => {
+  //     data => {
-        this.dataProviderInfo.aggregationStatus = data;
+  //       this.dataProviderInfo.aggregationStatus = data;
-        this.aggregationStatusIsInitialized = true;
-      },
-      err => {
-        //console.log(err);
-        this.aggregationStatusIsInitialized = true;
-        this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err);
-      }
-    ));
-  }
-
-  // private getCollectedFulltexts() {
-  //   this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe(
-  //     (data: string) => {
-  //       this.dataProviderInfo.aggregationStatus = {"fulltexts": data};
   //       this.aggregationStatusIsInitialized = true;
   //     },
   //     err => {
   //       //console.log(err);
   //       this.aggregationStatusIsInitialized = true;
-  //       this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err);
+  //       this.handleError("Error getting "+this.getTypeName()+" aggregation status for id: " + this.datasourceId, err);
   //     }
   //   ));
   // }
 
+  private getCollectedFulltexts() {
+    this.subscriptions.push(this._dataproviderService.getCollectedFulltexts(this.datasourceId).subscribe(
+      (data: string) => {
+        this.dataProviderInfo.aggregationStatus = {"fulltexts": data};
+        this.aggregationStatusIsInitialized = true;
+      },
+      err => {
+        //console.log(err);
+        this.aggregationStatusIsInitialized = true;
+        this.handleError("Error getting "+this.getTypeName()+" collected fulltexts for id: " + this.datasourceId, err);
+      }
+    ));
+  }
+
   private countResultsWithFundingInfo() {
     this.subscriptions.push(this._searchResearchResultsService.countCollectedResultsWithFundingInfo(this.datasourceId).subscribe(
       fundedContent => {

landingPages/dataProvider/dataProvider.service.ts

@@ -83,10 +83,10 @@ export class DataProviderService {
         .pipe(map(res => this.parseDataproviderAggregationStatus(res)));
     }
 
-    // getCollectedFulltexts(datasourceId: string) {
+    getCollectedFulltexts(datasourceId: string) {
-    //   return this.http.get(properties.pdfStatisticsAPIURL+"/api/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId)
+      return this.http.get(properties.pdfStatisticsAPIURL+"/stats/getNumberOfPayloadsForDatasource?datasourceId="+datasourceId)
-    //     .pipe(map(res => res))
+        .pipe(map(res => res))
-    // }
+    }
 
     private handleError (error: HttpErrorResponse) {
     // in a real world app, we may send the error to some remote logging infrastructure

searchPages/searchUtils/entitiesSelection.component.ts

@@ -40,7 +40,7 @@ export class EntitiesSelectionComponent {
   
   /** TODO change conditions base on PortalType instead of customFilter */
   ngOnInit() {
-    if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'irish'].includes(this.properties.adminToolsPortalType))) {
+    if ((this.customFilter && this.customFilter.queryFieldName == "communityId") || (['explore', 'aggregator', 'eosc', 'irish', 'faircore4eosc'].includes(this.properties.adminToolsPortalType))) {
       this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
         if (data) {
           let showEntity = {};

sharedComponents/input/input.component.ts

@@ -65,8 +65,6 @@ export interface ControlConfiguration {
 declare var UIkit;
 
 /**
- * WARNING! dashboard-input selector is @deprecated, use input instead
- *
  * Autocomplete soft allows values that are not listed in options list. In order to work as expected
  * avoid providing options with different label and value.
  *

utils/properties/env-properties.ts

@@ -1,4 +1,3 @@
-
 export type Environment = "development" | "test" | "beta" | "production";
 export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
 export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc" | "irish";
@@ -15,6 +14,7 @@ export interface EnvProperties {
   showAddThis?: boolean;
   showContent?: boolean;
   enableEoscDataTransfer?:boolean;
+  pdfStatisticsAPIURL?: string;
   statisticsFrameAPIURL?: string; //delete?
   statisticsFrameNewAPIURL?: string;
 	bipFrameAPIURL?: string;
@@ -61,7 +61,6 @@ export interface EnvProperties {
   registryUrl?: string;
   logoutUrl?: string;
   userInfoUrl?: string;
-  clientManagementUrl?: string,
   developersApiUrl?: string,
   cookieDomain?: string;
   feedbackmail?: string;

utils/properties/environments/environment.ts

@@ -38,7 +38,6 @@ export let common: EnvProperties = {
   searchLinkToPublication: "/search/publication?articleId=",
   searchLinkToProject: "/search/project?projectId=",
   searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
-  searchLinkToService: "/search/service?serviceId=",
   searchLinkToDataset: "/search/dataset?datasetId=",
   searchLinkToSoftwareLanding: "/search/software?softwareId=",
   searchLinkToOrp: "/search/other?orpId=",
@@ -46,7 +45,6 @@ export let common: EnvProperties = {
   searchLinkToAll: "/search/find/",
   searchLinkToPublications: "/search/find/publications",
   searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
   searchLinkToProjects: "/search/find/projects",
   searchLinkToDatasets: "/search/find/datasets",
   searchLinkToSoftware: "/search/find/software",
@@ -62,7 +60,6 @@ export let common: EnvProperties = {
   searchLinkToAdvancedSoftware: "/search/advanced/software",
   searchLinkToAdvancedOrps: "/search/advanced/other",
   searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders",
-  searchLinkToAdvancedServices: "/search/advanced/services",
   searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
   searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
   errorLink: '/error',
@@ -75,6 +72,7 @@ export let common: EnvProperties = {
   admins: ['feedback@openaire.eu'],
   b2noteAPIURL: 'https://b2note.eudat.eu/',
   myOrcidLinksPage: "/my-orcid-links",
+
   footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452",
 
   //connect
@@ -90,6 +88,7 @@ export let common: EnvProperties = {
 
 export let commonDev: EnvProperties = {
   environment: "development",
+  pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats",
   statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
@@ -133,6 +132,7 @@ export let commonDev: EnvProperties = {
 
 export let commonTest: EnvProperties = {
   environment: "test",
+  pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
@@ -159,11 +159,11 @@ export let commonTest: EnvProperties = {
   baseOpenaireLink: 'https://explore.openaire.eu',
 
 
-
 }
 
 export let commonBeta: EnvProperties = {
   environment: "beta",
+  pdfStatisticsAPIURL: "https://beta.services.openaire.eu/pdf-stats",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
@@ -186,6 +186,7 @@ export let commonBeta: EnvProperties = {
   widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
   claimsInformationLink: "https://beta.openaire.eu/linking",
   indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
+
   adminPortalURL: "https://beta.admin.connect.openaire.eu",
   baseOpenaireLink: 'https://beta.explore.openaire.eu',
 
@@ -203,6 +204,7 @@ export let commonBeta: EnvProperties = {
 
 export let commonProd: EnvProperties = {
   environment: "production",
+  pdfStatisticsAPIURL: "https://services.openaire.eu/pdf-stats",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
   statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
@@ -275,3 +277,4 @@ eoscDataTransferAPI?;
   eoscDataTransferLoginUrl?;
   eoscDataTransferDestinations?;
 * */
+