[beta18 | DONE | CHANGED] uploadService.js: Added the ability to read port either from environment variables or from properties file.

# Conflicts:
#	explore/src/app/openaireLibrary

explore/angular.json

@@ -239,18 +239,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "explore:build"
+            "buildTarget": "explore:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "explore:build:production"
+              "buildTarget": "explore:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "explore:build"
+            "buildTarget": "explore:build"
           }
         },
         "test": {
@@ -327,7 +327,7 @@
           "defaultConfiguration": ""
         },
         "serve-ssr": {
-          "builder": "@nguniversal/builders:ssr-dev-server",
+          "builder": "@angular-devkit/build-angular:ssr-dev-server",
           "options": {
             "browserTarget": "explore:build",
             "serverTarget": "explore:server"
@@ -340,7 +340,7 @@
           }
         },
         "prerender": {
-          "builder": "@nguniversal/builders:prerender",
+          "builder": "@angular-devkit/build-angular:prerender",
           "options": {
             "browserTarget": "explore:build:production",
             "serverTarget": "explore:server:production",

explore/package.json

@@ -23,43 +23,43 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.7",
-    "@angular/cdk": "^16.1.6",
-    "@angular/common": "^16.1.7",
-    "@angular/compiler": "^16.1.7",
-    "@angular/core": "^16.1.7",
-    "@angular/forms": "^16.1.7",
-    "@angular/localize": "^16.1.7",
-    "@angular/material": "^16.1.6",
-    "@angular/platform-browser": "^16.1.7",
-    "@angular/platform-browser-dynamic": "^16.1.7",
-    "@angular/platform-server": "^16.1.7",
-    "@angular/router": "^16.1.7",
-    "@nguniversal/express-engine": "^16.1.1",
+    "@angular/animations": "^18.1.0",
+    "@angular/cdk": "^18.1.0",
+    "@angular/common": "^18.1.0",
+    "@angular/compiler": "^18.1.0",
+    "@angular/core": "^18.1.0",
+    "@angular/forms": "^18.1.0",
+    "@angular/localize": "^18.1.0",
+    "@angular/material": "^18.1.0",
+    "@angular/platform-browser": "^18.1.0",
+    "@angular/platform-browser-dynamic": "^18.1.0",
+    "@angular/platform-server": "^18.1.0",
+    "@angular/router": "^18.1.0",
+    "@angular/ssr": "^18.1.0",
     "clipboard": "^1.5.16",
     "core-js": "^2.5.4",
     "express": "^4.15.2",
     "flag-icons": "^7.2.1",
     "jquery": "^3.4.1",
-    "ng-recaptcha": "^12.0.2",
+    "ng-recaptcha-2": "^14.0.0",
     "prom-client": "^11.3.0",
     "rxjs": "^6.5.1",
     "ts-md5": "^1.2.0",
     "tslib": "^2.0.0",
     "uikit": "3.16.24",
-    "zone.js": "~0.13.1"
+    "zone.js": "~0.14.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.6",
-    "@angular/cli": "^16.1.6",
-    "@angular/compiler-cli": "^16.1.7",
-    "@angular/language-service": "^16.1.7",
-    "@nguniversal/builders": "^16.1.1",
+    "@angular-devkit/build-angular": "^18.1.0",
+    "@angular/cli": "^18.1.0",
+    "@angular/compiler-cli": "^18.1.0",
+    "@angular/language-service": "^18.1.0",
     "@types/compression": "^1.7.0",
     "@types/express": "^4.17.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^16.18.50",
+    "@types/node": "^18.19.1",
+    "browser-sync": "^3.0.0",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
@@ -69,7 +69,8 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.6.0",
     "protractor": "~7.0.0",
+    "replace-in-file": "^8.2.0",
     "ts-node": "~7.0.0",
-    "typescript": "~4.9.5"
+    "typescript": "~5.4.0"
   }
-}
+}

explore/server.ts

@@ -1,33 +1,40 @@
+
 import 'zone.js/node';
 
-import { ngExpressEngine } from '@nguniversal/express-engine';
-import * as express from 'express';
-import * as compression from 'compression';
-import { join } from 'path';
-
-import { AppServerModule } from './src/main.server';
 import { APP_BASE_HREF } from '@angular/common';
-import { existsSync } from 'fs';
+import { CommonEngine } from '@angular/ssr';
+import * as express from 'express';
+import { existsSync } from 'node:fs';
 import * as prom from "prom-client";
+import { join } from 'node:path';
+import {AppServerModule} from "./src/main.server";
 import {routes} from "./routes";
 import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
+import * as compression from "compression";
 
 // The Express app is exported so that it can be used by serverless Functions.
-export function app() {
+export function app(): express.Express {
   const server = express();
   server.use(compression());
   const distFolder = join(process.cwd(), 'dist/explore/browser');
-  const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
-  
+  const indexHtml = existsSync(join(distFolder, 'index.original.html'))
+    ? join(distFolder, 'index.original.html')
+    : join(distFolder, 'index.html');
+
+  const commonEngine = new CommonEngine();
+
+  server.set('view engine', 'html');
+  server.set('views', distFolder);
+
   const register = new prom.Registry();
-  
+
   const responses = new prom.Counter({
     name: 'portal_http_responses_total',
     help: 'A counter for portal response codes for every existed or not existed pages.',
     labelNames: ['route', 'code'],
     registers: [register]
   });
-  
+
   const histogram = new prom.Histogram({
     name: 'portal_http_request_duration_seconds',
     help: 'A Histogram for a portal. Providing information about page visits and load latency in seconds.',
@@ -35,15 +42,6 @@ export function app() {
     registers: [register],
     buckets: [0.1, 0.2, 0.5, 1, 2]
   });
-  
-  // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
-  server.engine('html', ngExpressEngine({
-    bootstrap: AppServerModule,
-    inlineCriticalCss: false
-  }));
-
-  server.set('view engine', 'html');
-  server.set('views', distFolder);
 
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
@@ -51,7 +49,7 @@ export function app() {
   server.get('*.*', express.static(distFolder, {
     maxAge: '1y'
   }));
-  
+
   server.get('/metrics', (req, res) => {
     res.set('Content-Type', register.contentType);
     res.end(register.metrics());
@@ -80,56 +78,59 @@ export function app() {
     }
   });
 
-  // All regular routes use the Universal engine
-  server.get('*', (req, res) => {
+  // All regular routes use the Angular engine
+  server.get('*', (req, res, next) => {
+    const { protocol, originalUrl, baseUrl, headers } = req;
     if (routes.indexOf(req.path) !== -1) {
       const end = histogram.startTimer({route: req.path});
-      res.render(indexHtml, {
-          req, providers: [
-            {
-              provide: APP_BASE_HREF,
-              useValue: req.baseUrl
-            },
-            {
-              provide: REQUEST, useValue: (req)
-            },
-            {
-              provide: RESPONSE, useValue: (res)
-            }
-          ]
-        }
-      );
-      res.on('finish', function () {
-        responses.inc({route: req.path, code: res.statusCode});
-        end();
-      });
+      commonEngine.render({
+        bootstrap: AppServerModule,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: distFolder,
+        inlineCriticalCss: false,
+        providers: [
+          {provide: APP_BASE_HREF, useValue: baseUrl},
+          {provide: REQUEST, useValue: (req)},
+          {provide: RESPONSE, useValue: (res)}
+        ],
+      })
+      .then((html) => {
+        res.on('finish', function () {
+          responses.inc({route: req.path, code: res.statusCode});
+          end();
+        });
+        res.status(200).send(html)
+      })
+      .catch((err) => res.status(500).send('Error during SSR'))
     } else {
-      res.render(indexHtml, {
-          req, providers: [
-            {
-              provide: APP_BASE_HREF,
-              useValue: req.baseUrl
-            },
-            {
-              provide: REQUEST, useValue: (req)
-            },
-            {
-              provide: RESPONSE, useValue: (res)
-            }
-          ]
-        }
-      );
-      res.on('finish', function () {
-        responses.inc({route: '**', code: res.statusCode});
-      });
+      commonEngine.render({
+        bootstrap: AppServerModule,
+        documentFilePath: indexHtml,
+        url: `${protocol}://${headers.host}${originalUrl}`,
+        publicPath: distFolder,
+        inlineCriticalCss: false,
+        providers: [
+          {provide: APP_BASE_HREF, useValue: baseUrl},
+          {provide: REQUEST, useValue: (req)},
+          {provide: RESPONSE, useValue: (res)}
+        ],
+      })
+      .then((html) => {
+        res.on('finish', function () {
+          responses.inc({route: '**', code: res.statusCode});
+        });
+        res.status(200).send(html)
+      })
+      .catch((err) => res.status(500).send('Error during SSR'))
     }
   });
 
   return server;
 }
 
-function run() {
-  const port = process.env.PORT || 4000;
+function run(): void {
+  const port = process.env['PORT'] || 4000;
 
   // Start up the Node server
   const server = app();
@@ -146,6 +147,4 @@ const mainModule = __non_webpack_require__.main;
 const moduleFilename = mainModule && mainModule.filename || '';
 if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
-}
-
-export * from './src/main.server';
+}

explore/src/app/app-routing.module.ts

@@ -1,7 +1,6 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";
-import {SdgModule} from "./openaireLibrary/sdg/sdg.module";
 import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component";
 
 const routes: Routes = [

explore/src/app/app.component.ts

@@ -1,8 +1,7 @@
 import {AfterViewInit, ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
 import {MenuItem} from './openaireLibrary/sharedComponents/menu';
-import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
 import {Session, User} from './openaireLibrary/login/utils/helper.class';
 import {UserManagementService} from "./openaireLibrary/services/user-management.service";
 import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
@@ -87,8 +86,8 @@ export class AppComponent implements AfterViewInit {
 
   subscriptions = [];
   
-  constructor(private  route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
-              private router: Router, private userManagementService: UserManagementService, private smoothScroll: SmoothScroll,
+  constructor(private route: ActivatedRoute,
+              private userManagementService: UserManagementService, private smoothScroll: SmoothScroll,
               private configurationService: ConfigurationService, private _meta: Meta, private seoService: SEOService,
 							private emailService: EmailService, private fb: FormBuilder, private quickContactService: QuickContactService,
 							private layoutService: LayoutService, private cdr: ChangeDetectorRef,
@@ -339,13 +338,13 @@ export class AppComponent implements AfterViewInit {
     this.subscriptions.push(this.layoutService.hasQuickContact.subscribe(hasQuickContact => {
       if(this.showQuickContact !== hasQuickContact) {
         this.showQuickContact = hasQuickContact;
-        this.cdr.detectChanges();
+        this.cdr.markForCheck();
       }
     }));
 		this.subscriptions.push(this.quickContactService.isDisplayed.subscribe(display => {
       if(this.displayQuickContact !== display) {
         this.displayQuickContact = display;
-        this.cdr.detectChanges();
+        this.cdr.markForCheck();
       }
     }));
   }
@@ -368,7 +367,7 @@ export class AppComponent implements AfterViewInit {
       this.createObservers();
       this.subscriptions.push(this.layoutService.rootClass.subscribe(rootClass => {
         this.loading = true;
-        this.cdr.detectChanges();
+        this.cdr.markForCheck();
         if (rootClass && this.isClient) {
           let link = <HTMLLinkElement>document.getElementById('theme');
           let append = false;
@@ -385,10 +384,10 @@ export class AppComponent implements AfterViewInit {
           }
         }
         this.rootClass = rootClass;
-        this.cdr.detectChanges();
+        this.cdr.markForCheck();
         setTimeout(() => {
           this.loading = false;
-          this.cdr.detectChanges();
+          this.cdr.markForCheck();
         }, 500)
       }));
     }
@@ -404,7 +403,7 @@ export class AppComponent implements AfterViewInit {
 			entries.forEach(entry => {
         if(this.bottomNotIntersecting !== (!entry.isIntersecting)) {
           this.bottomNotIntersecting = !entry.isIntersecting;
-          this.cdr.detectChanges();
+          this.cdr.markForCheck();
         }
       });
 		}, options);

explore/src/app/app.module.ts

@@ -3,7 +3,7 @@ import {SharedModule} from './openaireLibrary/shared/shared.module';
 import {BrowserModule} from '@angular/platform-browser';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {CommonModule} from '@angular/common';
-import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
 import {AppComponent} from './app.component';
 import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module';
 import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
@@ -13,52 +13,40 @@ import {AppRoutingModule} from './app-routing.module';
 import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
 import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
 import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
-import {CacheInterceptorService} from "./openaireLibrary/cache-interceptor.service";
 import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
 import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
 import {QuickContactModule} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.module';
 import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module';
 import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
 
-@NgModule({
-  imports: [
-    SharedModule,
-    CommonModule,
-    HttpClientModule,
-    ErrorModule,
-    NavigationBarModule, BottomModule,
-    CookieLawModule,
-    BrowserModule,
-    AppRoutingModule,
-    BrowserAnimationsModule, PageURLResolverModule,
-    Schema2jsonldModule,
-    QuickContactModule,
-    AlertModalModule, LoadingModule
-  ],
-  declarations: [AppComponent],
-  exports: [AppComponent],
-  providers: [
-    {provide: APP_ID, useValue: 'explore'},
-    // {
-    //   provide: HTTP_INTERCEPTORS,
-    //   useClass: CacheInterceptorService,
-    //   multi: true
-    // },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: HttpInterceptorService,
-      multi: true
-    },
-    {
-      provide: HTTP_INTERCEPTORS,
-      useClass: ErrorInterceptorService,
-      multi: true
-    },
-    [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}],
-    [{provide: DEFAULT_TIMEOUT, useValue: 3000}]
-  ],
-  bootstrap: [AppComponent]
-})
-//
+@NgModule({ declarations: [AppComponent],
+    exports: [AppComponent],
+    bootstrap: [AppComponent], imports: [SharedModule,
+        CommonModule,
+        ErrorModule,
+        NavigationBarModule, BottomModule,
+        CookieLawModule,
+        BrowserModule,
+        AppRoutingModule,
+        BrowserAnimationsModule, PageURLResolverModule,
+        Schema2jsonldModule,
+        QuickContactModule,
+        AlertModalModule, LoadingModule], providers: [
+        { provide: APP_ID, useValue: 'explore' },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: HttpInterceptorService,
+            multi: true
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: ErrorInterceptorService,
+            multi: true
+        },
+        [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }],
+        [{ provide: DEFAULT_TIMEOUT, useValue: 3000 }],
+        provideHttpClient(withInterceptorsFromDi())
+    ] })
+
 export class AppModule {
 }

explore/src/app/contact/contact.component.ts

@@ -1,5 +1,5 @@
 import {Component, OnInit, ViewChild} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
+import {Router} from '@angular/router';
 import {EmailService} from "../openaireLibrary/utils/email/email.service";
 import {Email} from "../openaireLibrary/utils/email/email";
 import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
@@ -7,7 +7,6 @@ import {Composer} from "../openaireLibrary/utils/email/composer";
 import {Meta, Title} from "@angular/platform-browser";
 import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
 import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
-import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
 import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@@ -28,8 +27,6 @@ export class ContactComponent implements OnInit {
 	public sending = true;
 	public email: Email;
 	public properties: EnvProperties = properties;
-	public pageContents = null;
-	public divContents = null;
 	public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Contact us'}];
 	public contactForm: FormGroup;
 	@ViewChild('modal') modal;
@@ -44,15 +41,13 @@ export class ContactComponent implements OnInit {
 		});
 	}
 
-	constructor(private route: ActivatedRoute,
-							private _router: Router,
+	constructor(private _router: Router,
 							private _emailService: EmailService,
 							private _meta: Meta,
 							private _title: Title,
 							private seoService: SEOService,
 							private _piwikService: PiwikService,
-							private fb: FormBuilder,
-							private helper: HelperService) {
+							private fb: FormBuilder) {
 	}
 
 	ngOnInit() {
@@ -66,16 +61,9 @@ export class ContactComponent implements OnInit {
 		this.updateTitle(this.pageTitle);
 		this.updateDescription(this.description);
 		this.reset();
-		// this.getPageContents();
 		this.sending = false;
 	}
 
-	private getPageContents() {
-		this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'explore', this._router.url).subscribe(contents => {
-			this.pageContents = contents;
-		}));
-	}
-
 	public send(event) {
 		HelperFunctions.scroll();
 		if(event.valid === true) {

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

@@ -8,8 +8,6 @@ import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
 import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
 import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
 import {properties} from "../../environments/environment";
-import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
-import {StakeholderService} from '../openaireLibrary/monitor/services/stakeholder.service';
 import {Option} from '../openaireLibrary/sharedComponents/input/input.component';
 import {StringUtils} from '../openaireLibrary/utils/string-utils.class';
 import {HelperFunctions} from '../openaireLibrary/utils/HelperFunctions.class';
@@ -91,8 +89,6 @@ export class FundersComponent implements OnInit {
 							private title: Title,
 							private seoService: SEOService,
 							private piwikService: PiwikService,
-              private refineFieldResultsService: RefineFieldResultsService,
-              private stakeholderService: StakeholderService,
               private layoutService: LayoutService,
               private cdr: ChangeDetectorRef,
               private fb: FormBuilder,
@@ -225,102 +221,6 @@ export class FundersComponent implements OnInit {
       this.displayedFunders = this.funders;
       this.showLoading = false;
     }))
-
-    // let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
-    // this.subscriptions.push(
-    //   zip(
-    //     this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties),
-    //     this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams),
-    //     this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties),
-    //     this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
-    //   ).subscribe((data: any[]) => {
-    //     // storing all needed data to a map
-    //     // 1st call
-    //     let queriedFunders1 = data[0][1][0].values;
-    //     queriedFunders1.forEach(queriedFunder => {
-    //       this.fundersMap.set(queriedFunder.id, {
-    //         "id": queriedFunder.id,
-    //         "name": queriedFunder.name,
-    //         "alias": '',
-    //         "researchProducts": +queriedFunder.number,
-    //         "openAccessResearchProducts": 0,
-    //         "openAccessPercentage": 0,
-    //         "projects": 0,
-    //         "monitorDashboard": '',
-    //         "monitorDashboardStatus": '',
-    //         "logoUrl": ''
-    //       });
-    //     });
-    //
-    //     // 2nd call
-    //     let queriedFunders2 = data[1][1][0].values;
-    //     queriedFunders2.forEach(queriedFunder => {
-    //       if(this.fundersMap.has(queriedFunder.id)) {
-    //         this.fundersMap.get(queriedFunder.id).openAccessResearchProducts = +queriedFunder.number;
-    //       }
-    //     });
-    //
-    //     // 3rd call
-    //     let queriedFunders3 = data[2][1][0].values;
-    //     queriedFunders3.forEach(queriedFunder => {
-    //       if(+queriedFunder.number > 1) {
-    //         if (this.fundersMap.has(queriedFunder.id)) {
-    //           this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number;
-    //         } else {
-    //           this.fundersMap.set(queriedFunder.id, {
-    //             "id": queriedFunder.id,
-    //             "name": queriedFunder.name,
-    //             "alias": '',
-    //             "researchProducts": 0,
-    //             "openAccessResearchProducts": 0,
-    //             "openAccessPercentage": 0,
-    //             "projects": +queriedFunder.number,
-    //             "monitorDashboard": '',
-    //             "monitorDashboardStatus": '',
-    //             "logoUrl": ''
-    //           });
-    //         }
-    //       }
-    //     });
-    //
-    //     // 4th call
-    //     let queriedFunders4 = data[3];
-    //     queriedFunders4.forEach(queriedFunder => {
-    //       let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName;
-    //       if(this.fundersMap.has(id) && (
-    //         !this.fundersMap.get(id).monitorDashboardStatus
-    //         ||
-    //         (this.fundersMap.get(id).monitorDashboardStatus == "RESTRICTED" && queriedFunder.visibility == "PUBLIC")
-    //         ||
-    //         (this.fundersMap.get(id).monitorDashboardStatus == "PRIVATE" && (queriedFunder.visibility == "RESTRICTED" || queriedFunder.visibility == "PUBLIC")))) {
-    //         this.fundersMap.get(id).alias = queriedFunder.alias;
-    //         this.fundersMap.get(id).monitorDashboard = queriedFunder.alias;
-    //         this.fundersMap.get(id).monitorDashboardStatus = queriedFunder.visibility;
-    //         this.fundersMap.get(id).logoUrl = (queriedFunder.isUpload ? properties.utilsService + "/download/" : "")+ (queriedFunder.logoUrl);
-    //       }
-    //     });
-    //     this.fundersMap.forEach((value) => {
-    //       if(value.openAccessResearchProducts > 0) {
-    //         value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100);
-    //       }
-    //       if(!value.logoUrl && this.staticLogos.has(value.id)) {
-    //         let split = value.id.split("||");
-    //         let shortname = (split && split.length==3) ? value.id.split("||")[2] : value.id;
-    //         value.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png";
-    //       }
-    //     });
-    //     // convert funders map into an array
-    //     this.funders = Array.from(this.fundersMap.values());
-    //     // calculate total numbers for intro content
-    //     this.calculateNumbers();
-    //     // sort funders
-    //     this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
-    //     // initialize displayedFunders
-    //     this.displayedFunders = this.funders;
-    //     console.log(this.funders);
-    //     this.showLoading = false;
-    //   })
-    // );
   }
 
   private calculateSum(array, property) {

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

@@ -1,6 +1,5 @@
 import {
   AfterViewInit,
-  ChangeDetectorRef,
   Component,
   ElementRef,
   OnDestroy,
@@ -76,12 +75,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
 	@ViewChild('contact') contact: ElementRef;
   subscriptions: any[] = [];
   @ViewChildren('scrolling_element') elements: QueryList<ElementRef>;
-  resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;//{
-    // filter: null,
-    // selected: true,
-    // filterId: "resultbestaccessright",
-    // value: "Open Access"
-  // };
+  resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;
   selectedEntity = "all";
   selectedEntitySimpleUrl;
   selectedEntityAdvancedUrl;
@@ -108,14 +102,13 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
     {value: "lcsh:Technology", label: "Technology"},
   ];
   stringUtils = new StringUtils();
-  // disableSelect: boolean = true;
   
   constructor(
     private _router: Router,
     private _piwikService: PiwikService,
-    private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
+    private config: ConfigurationService, private _meta: Meta, 
+    private _title: Title, private seoService: SEOService,
     private helper: HelperService,
-    private cdr: ChangeDetectorRef,
 		private quickContactService: QuickContactService
   ) {
     let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
@@ -291,29 +284,11 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   goTo() {
     let parameterNames = [];
     let parameterValues = [];
-    // if (this.selectedEntity == "result") {
-    //   if (this.resultTypes) {
-    //     let values = [];
-    //     for (let value of this.resultTypes.values) {
-    //       if (value.selected) {
-    //         values.push(value.id);
-    //       }
-    //     }
-    //     if (values.length > 0 && values.length != 4) {
-    //       parameterNames.push("type");
-    //       parameterValues.push(values.join(","));
-    //     }
-    //     if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
-    //       parameterNames.push(this.resultsQuickFilter.filterId);
-    //       parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
-    //     }
-    //   }
-    // } else if (this.selectedEntity == "all") {
+
     if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
       parameterNames.push(this.resultsQuickFilter.filterId);
       parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
     }
-    // }
     if (this.keyword.length > 0) {
       parameterNames.push("fv0");
       parameterValues.push(this.keyword);
@@ -326,9 +301,4 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
   getSubjectParameter(param) {
     return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
   }
-  
-  // disableSelectChange(event: boolean) {
-  //   this.disableSelect = event;
-  //   this.cdr.detectChanges();
-  // }
-}
+}

explore/src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 799af0ba6afc4c88c00d6a452c5dba772121070b
+Subproject commit 27969dea3ced144c8c0f093351c4ae6f120c9e32

explore/src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 038684a0dca02700164e467abd390bbd865df3d9
+Subproject commit 8bc64939af303a4e309dad892b39be8201ff1777

explore/src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit c6d21a6c027df56ae3bbf5c489b2ee9893924aef
+Subproject commit c7b96fc688f50d1eb04716087f7ef5e431b7db34

services/cache/mecache/beta-properties.file

@@ -1,4 +1,4 @@
-port = 4000
-utilsService = https://beta.explore.openaire.eu/utils-service
+port = 3100
+utilsService = https://beta18.explore.openaire.eu/utils-service
 environment = beta
 preloadRequests =https://beta.services.openaire.eu/openaire/info/,https://beta.services.openaire.eu/openaire/contexts/,https://beta.services.openaire.eu/usagestats/allmetrics,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:provenanceActions.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:subject_classification_typologies.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:relation_relClass.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:publication_resource.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:dataCite_resource.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:languages.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:access_modes.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:datasource_typologies.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:datasourceCompatibilityLevel.json,https://beta.services.openaire.eu/provision/mvc/vocabularies/dnet:countries.json

services/cache/mecache/cache.js

@@ -21,6 +21,8 @@ const lruCache = new LRUCache({ max: cacheMaxSize });
 const register = new prom.Registry();
 prom.collectDefaultMetrics({register: register});
 
+const port = process.env['PORT'] || properties.get('port');
+
 const responses = new prom.Counter({
     name: 'cache_http_responses_total',
     help: 'A counter for cache response codes for every API request.',
@@ -160,7 +162,7 @@ app.use((req, res) => {
     res.status(404).send(getResponse(404, "Not Found")); //not found
 });
 
-const server = app.listen(properties.get('port'), function () {
+const server = app.listen(port, function () {
     console.log(`Example app listening on port`, server.address().port)
     //run the timer
     resetAtMidnight();
@@ -184,14 +186,14 @@ function clearCache() {
 async function initCache() {
     try {
         const  requests = await axios.get(properties.get('utilsService') + '/grouped-requests');
-        const additionalDataPromises = requests.data.map((url) => axios.get('http://localhost:'+properties.get('port') + '/get?url=' + properties.get('utilsService') + url));
+        const additionalDataPromises = requests.data.map((url) => axios.get('http://localhost:'+port + '/get?url=' + properties.get('utilsService') + url));
         const additionalDataResponses = await Promise.all(additionalDataPromises);
         console.log("Cache initialized group queries!")
     } catch (error) {
         console.error('Error fetching data: Cache initialize failed', error);
     }
     try{
-        const additionalDataPromisesPreloadRequests = preloadRequests.map((url) => axios.get('http://localhost:'+properties.get('port') + '/get?url=' + url));
+        const additionalDataPromisesPreloadRequests = preloadRequests.map((url) => axios.get('http://localhost:'+port + '/get?url=' + url));
         const additionalDataResponsesPreloadRequests = await Promise.all(additionalDataPromisesPreloadRequests);
         console.log("Cache initialized preload requests!")
     } catch (error) {

services/utils-service/beta-properties.file

@@ -1,7 +1,7 @@
-userInfoUrl = https://beta.services.openaire.eu/login-service/userInfo
+userInfoUrl = https://beta3.services.openaire.eu/login-service/userInfo
 searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
-monitorAPIUrl = https://beta.services.openaire.eu/uoa-monitor-service/
-irishMonitorAPIUrl = https://beta.services.openaire.eu/irish-monitor-service/
+monitorAPIUrl = https://beta3.services.openaire.eu/uoa-monitor-service/
+irishMonitorAPIUrl = https://beta3.services.openaire.eu/irish-monitor-service/
 fundersServiceAPIUrl = https://beta.services.openaire.eu/openaire/funders/
 ssl = true
 localPath = false
@@ -9,4 +9,5 @@ localPath = false
 max.size = 200
 # file size in KB
 big-max.size = 1000
-port = 8000
+port = 3200
+environment = beta

services/utils-service/dl170-properties.file

@@ -10,5 +10,5 @@ max.size = 200
 # file size in KB
 big-max.size = 1000
 port = 8000
-
+environment = development
 

services/utils-service/production-properties.file

@@ -10,3 +10,4 @@ max.size = 200
 # file size in KB
 big-max.size = 1000
 port = 8000
+environment = production

services/utils-service/properties.file

@@ -1,5 +1,5 @@
 userInfoUrl = http://dl170.madgik.di.uoa.gr:19080/login-service/userInfo
-searchServiceAPIUrl = https://beta.services.openaire.eu/search/v2/api/
+searchServiceAPIUrl = https://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/
@@ -10,3 +10,4 @@ max.size = 200
 # file size in KB
 big-max.size = 1000
 port = 8000
+environment = development

services/utils-service/uploadService.js

@@ -13,6 +13,7 @@ if (properties.get('ssl')) {
 } else {
     http = require("http");
 }
+const port = process.env['PORT'] || properties.get('port');
 var searchServiceAPIUrl = properties.get('searchServiceAPIUrl');
 var monitorServiceAPIUrl = properties.get('monitorAPIUrl');
 var irishMonitorServiceAPIUrl = properties.get('irishMonitorAPIUrl');
@@ -104,12 +105,13 @@ app.delete(['/delete/:filename', '/delete/stakeholder/:filename', '/delete/:type
 
 app.get('/explore/home', async function (req, res) {
     try {
-        // Make requests to multiple APIs
+      let openOrgsId = properties.get('environment') != "production" ? 'openaire____%3A%3A0362fcdb3076765d9c0041ad331553e8' : "";
+      // Make requests to multiple APIs
         let requests= [
-            "http://localhost:" + properties.get('port') + "/portals/countResults",
+            "http://localhost:" + port + "/portals/countResults",
             searchServiceAPIUrl +'results/?fields=relfunder&sf=relfunder&format=json&size=0',
             searchServiceAPIUrl + 'datasources/count?format=json',
-            searchServiceAPIUrl + 'resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)',
+            searchServiceAPIUrl + 'resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=* or reldatasourcecompatibilityid = native'+(openOrgsId ? (' or collectedfromdatasourceid="'+openOrgsId+'"') : "")+')',
             searchServiceAPIUrl + 'projects/?fields=funder&sf=funder&format=json&size=0',
             searchServiceAPIUrl + 'resources?query=(%20(oaftype%20exact%20result)%20and%20(resulttypeid%20exact%20dataset)%20and%20(relresulttype%3Dpublication)%20%20)&page=0&size=0&format=json',
             searchServiceAPIUrl + 'resources?query=(%20(oaftype%20exact%20result)%20and%20(resulttypeid%20exact%20software)%20and%20(relresulttype%3Dpublication)%20%20)&page=0&size=0&format=json'
@@ -146,11 +148,11 @@ app.get('/explore/home', async function (req, res) {
 app.get('/explore/search', async function (req, res) {
     let  aggregatedData = {};
     try {
-        // Make requests to multiple APIs
+        let openOrgsId = properties.get('environment') != "production" ? 'openaire____%3A%3A0362fcdb3076765d9c0041ad331553e8' : "";      // Make requests to multiple APIs
         let requests= [
         searchServiceAPIUrl +'resources2/?format=json&size=0&type=results',
         searchServiceAPIUrl + 'datasources/count?format=json',
-        searchServiceAPIUrl + 'resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=*)',
+        searchServiceAPIUrl + 'resources2/?format=json&size=0&type=organizations&fq=(reldatasourcecompatibilityid exact driver or reldatasourcecompatibilityid exact driver-openaire2.0 or reldatasourcecompatibilityid exact openaire2.0 or reldatasourcecompatibilityid exact openaire3.0 or reldatasourcecompatibilityid exact openaire4.0 or reldatasourcecompatibilityid exact openaire-cris_1.1 or reldatasourcecompatibilityid exact openaire2.0_data or reldatasourcecompatibilityid exact hostedBy or relproject=* or reldatasourcecompatibilityid = native' + (openOrgsId ? (' or collectedfromdatasourceid="'+openOrgsId+'"') : "") +')',
         searchServiceAPIUrl + 'projects/count?format=json&fq=projectcode<>"unidentified"'
         ]
         const dataPromises = requests.map((url) => axios.get( url));
@@ -399,7 +401,7 @@ function parseNoOfFunders(resultRES, projectsRES){
 }
 
 
-const server = app.listen(properties.get('port'), function () {
+const server = app.listen(port, function () {
     console.log("Listening on port %s...", server.address().port);
 });