Updating openaireLibrary

explore/src/app/app.component.ts

@@ -30,6 +30,7 @@ import {ISVocabulariesService} from "./openaireLibrary/utils/staticAutoComplete/
             [onlyTop]=false [user]="user"
             [communityId]="properties.adminToolsCommunity" [userMenuItems]=userMenuItems [menuItems]=menuItems></navbar>
     <div *ngIf="loading">
+      loading... {{isClient ? "client" : "server"}}
         <loading [full]="true"></loading>
     </div>
     <schema2jsonld *ngIf="properties" [URL]="properties.domain+properties.baseLink"

explore/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import {APP_ID, NgModule} from '@angular/core';
 import {SharedModule} from './openaireLibrary/shared/shared.module';
-import {BrowserModule} from '@angular/platform-browser';
+import {BrowserModule, provideClientHydration} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
 import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
@@ -38,6 +38,7 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
   declarations: [AppComponent],
   exports: [AppComponent],
   providers: [
+    provideClientHydration(),
     {provide: APP_ID, useValue: 'explore'},
     // {
     //   provide: HTTP_INTERCEPTORS,

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

@@ -118,12 +118,12 @@ export class FundersComponent implements OnInit {
       {value: 'rfo', label: 'Funders with RFO dashboard'}
     ];
     this.sortOptions = [
-      {value: 'alphAsc', label: 'Alphabetically (A-Z)'},
-      {value: 'alphDsc', label: 'Alphabetically (Z-A)'},
-      {value: 'oaDsc', label: 'Openness score'},
-      {value: 'countryAsc', label: 'Country name (A-Z)'},
-      {value: 'researcProductsDsc', label: 'Number of ' + this.openaireEntities.RESULTS},
-      {value: 'projectsDsc', label: 'Number of ' + this.openaireEntities.PROJECTS}
+      {value: 'alphAsc', label: 'Alphabetically asc. (A-Z)'},
+      {value: 'alphDsc', label: 'Alphabetically desc. (Z-A)'},
+      {value: 'oaDsc', label: 'Open Access % desc.'},
+      {value: 'countryAsc', label: 'Country desc. (A-Z)'},
+      {value: 'researcProductsDsc', label: this.openaireEntities.RESULTS+' desc.'},
+      {value: 'projectsDsc', label: this.openaireEntities.PROJECTS+' desc.'}
     ];
     this.getFunders();
     this.keywordControl = this.fb.control('');
@@ -404,7 +404,7 @@ export class FundersComponent implements OnInit {
     }
 
     if(this.show == 'rfo') {
-      displayedFunders = displayedFunders.filter(funder => funder.irishDashboard && funder.irishDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE')));
+      displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE')));
     }
     
     this.displayedFunders = displayedFunders;

explore/src/app/home/home.component.ts

@@ -2,10 +2,10 @@ import {
   AfterViewInit,
   ChangeDetectorRef,
   Component,
-  ElementRef,
+  ElementRef, Inject, makeStateKey,
   OnDestroy,
-  OnInit,
-  QueryList,
+  OnInit, PLATFORM_ID,
+  QueryList, TransferState,
   ViewChild,
   ViewChildren
 } from '@angular/core';
@@ -25,6 +25,7 @@ import {properties} from "../../environments/environment";
 import {Numbers, NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component";
 import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
 import {QuickContactService} from '../openaireLibrary/sharedComponents/quick-contact/quick-contact.service';
+import {isPlatformServer} from "@angular/common";
 
 @Component({
   selector: 'home',
@@ -109,15 +110,20 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   ];
   stringUtils = new StringUtils();
   // disableSelect: boolean = true;
-  
+
+  public isClient: boolean = false;
+
   constructor(
     private _router: Router,
     private _piwikService: PiwikService,
     private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
     private helper: HelperService,
     private cdr: ChangeDetectorRef,
-		private quickContactService: QuickContactService
+		private quickContactService: QuickContactService,
+    @Inject(PLATFORM_ID) private platform: any,
+    private transferState: TransferState
   ) {
+    this.isClient = !isPlatformServer(this.platform);
     let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
     let title = "OpenAIRE | Find and Share research";
     this._title.setTitle(title);
@@ -221,7 +227,12 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
               this.resultTypes.values.push({name: this.openaireEntities.OTHER, id: "other", selected: false, number: 0});
             }
 						if(this.numbersComponent) {
-							this.numbersComponent.init(this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations);
+              let stateKey = makeStateKey<Numbers>("numbers");
+              // if(this.isClient && this.transferState.hasKey(stateKey)) {
+              //   this.numbers = this.transferState.get(stateKey, null);
+              // } else {
+                this.numbersComponent.init(this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations);
+              // }
 						}
           }
         },

explore/src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit f9444fa7c0e565ad5375e0d83dd6d178963c291b
+Subproject commit 0aacac2de9b8779babb5ba5a2a11d3368aee463f

explore/src/assets/common-assets

@@ -1 +1 @@
-Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
+Subproject commit 6bc02125166daa907d39ff523cd635088bdb63c2

explore/src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit c7b96fc688f50d1eb04716087f7ef5e431b7db34
+Subproject commit b4d09b7cd942893c238d4152eeac1bbc822a0b13

services/cache/mecache/dl170-properties.file

@@ -1,4 +0,0 @@
-port = 3000
-utilsService= http://dl170.madgik.di.uoa.gr:8000
-environment = development
-preloadRequests =https://dev-openaire.d4science.org/openaire/info/,https://dev-openaire.d4science.org/openaire/contexts/,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:provenanceActions.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:subject_classification_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:publication_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:dataCite_resource.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:languages.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:access_modes.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasource_typologies.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:datasourceCompatibilityLevel.json,https://dev-openaire.d4science.org/provision/mvc/vocabularies/dnet:countries.json

services/cache/mecache/package.json

@@ -7,8 +7,7 @@
     "start": "node cache.js",
     "prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp cache.js ./dist; cp properties.file ./dist;",
     "prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file",
-    "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file",
-    "prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file"
+    "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file"
   },
   "dependencies": {
     "access-log": "^0.4.1",

services/utils-service/dl170-properties.file

@@ -1,14 +0,0 @@
-userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo
-searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
-monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/
-irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/
-fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/
-ssl = false
-localPath = true
-# photo size in KB
-max.size = 200
-# file size in KB
-big-max.size = 1000
-port = 8000
-
-

services/utils-service/package.json

@@ -7,8 +7,7 @@
     "start": "node uploadService.js",
     "prepare-dist": "rm -rf dist; mkdir dist; cp package.json ./dist; cp uploadService.js ./dist; cp properties.file ./dist;",
     "prepare-beta": " npm run prepare-dist; cp beta-properties.file ./dist/properties.file",
-    "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file",
-    "prepare-dl170": " npm run prepare-dist; cp dl170-properties.file ./dist/properties.file"
+    "prepare-prod": " npm run prepare-dist; cp production-properties.file ./dist/properties.file"
   },
   "keywords": [],
   "author": "",

services/utils-service/properties.file

@@ -1,7 +1,7 @@
-userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo
+userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo
 searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
-monitorAPIUrl = http://dl170.madgik.di.uoa.gr:19380/uoa-monitor-service/
-irishMonitorAPIUrl = http://dl170.madgik.di.uoa.gr:19680/irish-monitor-service/
+monitorAPIUrl = http://duffy.di.uoa.gr:19380/uoa-monitor-service/
+irishMonitorAPIUrl = http://mpagasas.di.uoa.gr:19780/irish-monitor-service/
 fundersServiceAPIUrl = https://dev-openaire.d4science.org/openaire/funders/
 ssl = false
 localPath = true

services/utils-service/uploadService.js

@@ -131,8 +131,7 @@ app.get('/explore/home', async function (req, res) {
             funders: parseNoOfFunders(dataResponses[1].data, dataResponses[4].data),
             datasetsInterlinked:dataResponses[5].data.meta.total,
             softwareInterlinked:dataResponses[6].data.meta.total,
-            success:allRequestsSuccessful,
-            calculated_at: (new Date()).toUTCString()
+            success:allRequestsSuccessful
 
         };
         // Send the aggregated data as the response
@@ -163,8 +162,7 @@ app.get('/explore/search', async function (req, res) {
             datasources: dataResponses[1].data.total,
             organizations: dataResponses[2].data.meta.total,
             projects:dataResponses[3].data.total,
-            success:allRequestsSuccessful,
-            calculated_at: (new Date()).toUTCString()
+            success:allRequestsSuccessful
 
         };
 
@@ -206,8 +204,7 @@ app.get('/portals/countResults', async function (req, res) {
             datasets: dataResponses[1].data.total,
             software: dataResponses[2].data.total,
             other:dataResponses[3].data.total,
-            success:allRequestsSuccessful,
-            calculated_at: (new Date()).toUTCString()
+            success:allRequestsSuccessful
 
         };
 
@@ -360,8 +357,7 @@ app.get('/explore/funders', async function (req, res) {
             results: dataResponses[0].data.meta.total,
             projects: dataResponses[2].data.meta.total,
             funders: Array.from(fundersMap.values()),
-            success:allRequestsSuccessful,
-            calculated_at: (new Date()).toUTCString()
+            success:allRequestsSuccessful
 
         };
         res.status(allRequestsSuccessful?200:207).json(aggregatedData);