Merge remote-tracking branch 'origin/develop'

2023-11-07 13:45:45 +02:00 · 2023-11-07 13:45:45 +02:00 · 7e608daf9b
parent 00d5f538ab 464feea31e
commit 7e608daf9b
12 changed files with 82 additions and 315 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - *Fixed (for any bug fixes)*
 - *Security (in case of vulnerabilities)*

+## [4.0.0] - 07/11/2023
+### Changed
+* Angular 16 upgrade
+* Uikit version to 3.16.24
+
 ## [3.1.0] - 11/09/2023
 ### Added
 * Impact-based indicators - Citations, Popularity, Influence, Impulse 
--- a/angular.json
+++ b/angular.json
@ -220,13 +220,16 @@
            "main": "server.ts",
            "tsConfig": "src/tsconfig.server.json",
            "sourceMap": true,
-            "optimization": false
+            "optimization": false,
+            "buildOptimizer": false
          },
          "configurations": {
            "development": {
              "outputHashing": "media",
              "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "vendorChunk": true,
+              "buildOptimizer": true
            },
            "beta": {
              "outputHashing": "media",
@ -237,7 +240,8 @@
                }
              ],
              "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
            },
            "production": {
              "outputHashing": "media",
@ -248,7 +252,8 @@
                }
              ],
              "sourceMap": false,
-              "optimization": true
+              "optimization": true,
+              "buildOptimizer": true
            }
          },
          "defaultConfiguration": ""
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "eosc",
-  "version": "3.1.0",
+  "version": "4.0.0",
  "scripts": {
    "ng": "ng",
    "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400",
@ -21,40 +21,40 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^14.2.3",
-    "@angular/cdk": "^14.2.2",
-    "@angular/common": "^14.2.3",
-    "@angular/compiler": "^14.2.3",
-    "@angular/core": "^14.2.3",
-    "@angular/forms": "^14.2.3",
-    "@angular/localize": "^14.2.3",
-    "@angular/material": "^14.2.2",
-    "@angular/platform-browser": "^14.2.3",
-    "@angular/platform-browser-dynamic": "^14.2.3",
-    "@angular/platform-server": "^14.2.3",
-    "@angular/router": "^14.2.3",
-    "@nguniversal/express-engine": "^14.2.0",
+    "@angular/animations": "^16.1.8",
+    "@angular/cdk": "^16.1.7",
+    "@angular/common": "^16.1.8",
+    "@angular/compiler": "^16.1.8",
+    "@angular/core": "^16.1.8",
+    "@angular/forms": "^16.1.8",
+    "@angular/localize": "^16.1.8",
+    "@angular/material": "^16.1.7",
+    "@angular/platform-browser": "^16.1.8",
+    "@angular/platform-browser-dynamic": "^16.1.8",
+    "@angular/platform-server": "^16.1.8",
+    "@angular/router": "^16.1.8",
+    "@nguniversal/express-engine": "^16.1.1",
    "clipboard": "^1.5.16",
    "core-js": "^2.5.4",
    "express": "^4.15.2",
    "jquery": "^3.4.1",
-    "ng-recaptcha": "^10.0.0",
+    "ng-recaptcha": "^12.0.2",
    "prom-client": "^11.3.0",
    "rxjs": "^6.5.1",
    "ts-md5": "^1.2.0",
    "tslib": "^2.0.0",
-    "uikit": "3.13.10",
-    "zone.js": "~0.11.4"
+    "uikit": "3.16.14",
+    "zone.js": "~0.13.1"
  },
  "devDependencies": {
-    "@angular-devkit/build-angular": "^14.2.3",
-    "@angular/cli": "^14.2.3",
-    "@angular/compiler-cli": "^14.2.3",
-    "@angular/language-service": "^14.2.3",
-    "@nguniversal/builders": "^14.2.0",
+    "@angular-devkit/build-angular": "^16.1.7",
+    "@angular/cli": "^16.1.7",
+    "@angular/compiler-cli": "^16.1.8",
+    "@angular/language-service": "^16.1.8",
+    "@nguniversal/builders": "^16.1.1",
    "@types/express": "^4.17.0",
    "@types/compression": "^1.7.0",
-    "@types/node": "^12.11.1",
+    "@types/node": "^16.18.50",
    "@types/jasmine": "~3.6.0",
    "@types/jasminewd2": "~2.0.3",
    "codelyzer": "^6.0.0",
@ -67,6 +67,6 @@
    "karma-jasmine-html-reporter": "^1.6.0",
    "protractor": "~7.0.0",
    "ts-node": "~7.0.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.9.5"
  }
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,6 +1,6 @@
-import {NgModule} from '@angular/core';
+import {APP_ID, NgModule} from '@angular/core';
 import {SharedModule} from './shared/shared.module';
-import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
+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';
@ -27,14 +27,14 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
    NavigationBarModule, FeedbackModule, BottomModule,
    CookieLawModule,
    BrowserAnimationsModule,
-    BrowserTransferStateModule,
-    BrowserModule.withServerTransition({appId: 'eosc'}),
+    BrowserModule,
    AppRoutingModule
  ],
  declarations: [AppComponent, OpenaireErrorPageComponent],
  exports: [AppComponent],
  providers: [
    ConfigurationService,
+    {provide: APP_ID, useValue: 'eosc'},
    {
      provide: HTTP_INTERCEPTORS,
      useClass: HttpInterceptorService,
--- a/src/app/app.server.module.ts
+++ b/src/app/app.server.module.ts
@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
+import {ServerModule} from '@angular/platform-server';

 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@ -7,8 +7,7 @@ import { AppComponent } from './app.component';
@NgModule({
  imports: [
    AppModule,
-    ServerModule,
-    ServerTransferStateModule
+    ServerModule
  ],
  bootstrap: [AppComponent],
 })
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@ -4,8 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.

 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
+let props: EnvProperties = {
  environment: "beta",
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
@ -14,48 +15,14 @@ export let properties: EnvProperties = {
  useLongCache: true,
  showAddThis: true,
  enableEoscDataTransfer: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
-  bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
-  useNewStatistisTool: true,
-  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
-  searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
+  statisticsAPIURL: "https://services.openaire.eu/stats-api/",
+  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
+  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
+  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  zenodo: "https://zenodo.org/",
-  openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  helpdeskEmail: "helpdesk@openaire.eu",
  utilsService: "https://explore.openaire.eu/utils-service",
  vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
  piwikSiteId: "594",
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
  feedbackmail: "feedback@openaire.eu",
  cacheUrl: "https://explore.openaire.eu/cache/get?url=",
  datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
@ -64,51 +31,11 @@ export let properties: EnvProperties = {
  useHelpTexts: false,
  contextsAPI: "https://services.openaire.eu/openaire/context",
  communityAPI: "https://services.openaire.eu/openaire/community/",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  "baseLink": "/",
-  "domain": "https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  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=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  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",
-  lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
-  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
+  domain: "https://explore.eosc-portal.eu",
+  lastIndexInformationLink: "https://openaire.eu/aggregation-and-content-provision-workflows",
+  widgetLink: "https://openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
  claimsInformationLink: "https://www.openaire.eu/linking",
-  lastIndexUpdate: "2020-06-15",
-  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
+  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
  reCaptchaSiteKey: null,
  footerGrantText: "",
  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
@ -120,3 +47,7 @@ export let properties: EnvProperties = {
          loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"}
    }]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonBeta, ...props
+}
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@ -4,8 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.

 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
+let props: EnvProperties = {
  environment: "production",
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
@ -14,101 +15,12 @@ export let properties: EnvProperties = {
  useLongCache: true,
  showAddThis: true,
  enableEoscDataTransfer: true,
-  framesAPIURL: "https://www.openaire.eu/stats3/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
-  bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
  useNewStatistisTool: true,
-  claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
-  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  zenodo: "https://zenodo.org/",
-  openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  helpdeskEmail: "helpdesk@openaire.eu",
-  utilsService: "https://explore.openaire.eu/utils-service",
-  vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
  piwikSiteId: "594",
-  loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
-  userInfoUrl: "https://services.openaire.eu/login-service/userInfo",
-  logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
-  cookieDomain: ".openaire.eu",
-  feedbackmail: "feedback@openaire.eu",
-  cacheUrl: "https://explore.openaire.eu/cache/get?url=",
-  datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
  adminToolsCommunity: "eosc",
-  adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
  useHelpTexts:false,
-  contextsAPI: "https://services.openaire.eu/openaire/context",
-  communityAPI: "https://services.openaire.eu/openaire/community/",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  "baseLink" : "/",
-  "domain": "https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  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=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  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",
-  lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
-  widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://www.openaire.eu/linking",
-  lastIndexUpdate: "2020-06-15",
-  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
+  domain: "https://explore.eosc-portal.eu",
  reCaptchaSiteKey: null,
  footerGrantText : "",
  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
@ -125,3 +37,7 @@ export let properties: EnvProperties = {
        {label : "S3",  id: "s3",  auth: "keys"}
    }]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonProd, ...props
+}
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -4,9 +4,9 @@
 // The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.

 import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";

-export let properties: EnvProperties = {
-  environment: "development",
+let props: EnvProperties = {
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
  enablePiwikTrack: false,
@ -14,117 +14,30 @@ export let properties: EnvProperties = {
  useLongCache: false,
  showAddThis: true,
  enableEoscDataTransfer: true,
-  framesAPIURL: "https://beta.openaire.eu/stats3/",
-  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
-  bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
-  useNewStatistisTool: true,
-  claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
+  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
  searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "http://beta.services.openaire.eu/search/v2/api/resources",
-  openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
-  searchCrossrefAPIURL: "https://api.crossref.org/works",
-  searchDataciteAPIURL: "https://api.datacite.org/works",
-  searchOrcidURL: "https://pub.orcid.org/v2.1/",
-  orcidURL: "https://orcid.org/",
-  doiURL: "https://dx.doi.org/",
-  pmcURL: "http://europepmc.org/articles/",
-  pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
-  handleURL: "http://hdl.handle.net/",
-  cordisURL: "http://cordis.europa.eu/projects/",
-  openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
-  r3DataURL: "http://service.re3data.org/repository/",
-  fairSharingURL: "https://fairsharing.org/",
-  eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
-  sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
-  sherpaURLSuffix: "/",
-  zenodo: "https://zenodo.org/",
-  openAccess: "https://www.openaire.eu/support/faq#article-id-234",
-  openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310",
-  fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
-  h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
-  ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
-  helpdesk: "https://www.openaire.eu/support/helpdesk",
-  helpdeskEmail: "helpdesk@openaire.eu",
+  searchResourcesAPIURL: "http://services.openaire.eu/search/v2/api/resources",
+  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
  utilsService: "http://dl170.madgik.di.uoa.gr:8000",
  vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
-  piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
-  piwikSiteId: "6",
-  loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
-  userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
-  logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
-  cookieDomain: ".di.uoa.gr",
-  feedbackmail: "kostis30fylloy@gmail.com",
+  piwikSiteId: "594",
  cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
-  adminToolsCommunity: "aggregator",
+  adminToolsCommunity: "eosc",
  adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/",
  useHelpTexts: false,
  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
  contextsAPI: "https://dev-openaire.d4science.org/openaire/context",
  communityAPI: "https://dev-openaire.d4science.org/openaire/community/",
-  csvLimit: 2000,
-  pagingLimit: 20,
-  resultsPerPage: 10,
-  "baseLink" : "",
-  "domain":"https://explore.eosc-portal.eu",
-  searchLinkToResult: "/search/result?id=",
-  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=",
-  searchLinkToOrganization: "/search/organization?organizationId=",
-  searchLinkToPublications: "/search/find/publications",
-  searchLinkToDataProviders: "/search/find/dataproviders",
-  searchLinkToServices: "/search/find/services",
-  searchLinkToProjects: "/search/find/projects",
-  searchLinkToDatasets: "/search/find/datasets",
-  searchLinkToSoftware: "/search/find/software",
-  searchLinkToOrps: "/search/find/other",
-  searchLinkToOrganizations: "/search/find/organizations",
-  searchLinkToCompatibleDataProviders: "/search/content-providers",
-  searchLinkToEntityRegistriesDataProviders: "/search/entity-registries",
-  searchLinkToJournals: "/search/journals",
-  searchLinkToResults: "/search/find/research-outcomes",
-  searchLinkToAdvancedPublications: "/search/advanced/publications",
-  searchLinkToAdvancedProjects: "/search/advanced/projects",
-  searchLinkToAdvancedDatasets: "/search/advanced/datasets",
-  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",
+  domain:"https://explore.eosc-portal.eu",
  lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
-  showLastIndexInformationLink: true,
  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
  claimsInformationLink: "https://www.openaire.eu/linking-beta",
-  lastIndexUpdate: "2019-11-01",
  indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
-  depositLearnHowPage: "/participate/deposit/learn-how",
-  depositSearchPage: "/participate/deposit/search",
-  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
  reCaptchaSiteKey: null,
  footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452",
  eoscDataTransferAPI : "https://eosc-data-transfer.test.fedcloud.eu",
  eoscDataTransferLoginUrl:"http://rudie.di.uoa.gr:8580/openid_connect_login",
  eoscDataTransferDestinations : [
-    // {label: "dcache", value:
-    //     {label : "EGI dCache",   id: "dcache",
-    //       auth: "token"}
-    // },
-    // {label: "FTP", value:
-    //     {label : "FTP",  id: "ftp", auth: "password"}
-    // },
-    // {label: "S3", value:
-    //     {label : "S3",  id: "s3",  auth: "keys"}
-    // }]
-
    {
      "kind": "StorageInfo",
      "destination": "dcache",
@ -145,5 +58,9 @@ export let properties: EnvProperties = {
      "canBrowse": true,
      "transferWith": "EGI Data Transfer"
    }
-]
+  ]
 };
+
+export let properties: EnvProperties = {
+  ...common, ...commonDev, ...props
+}
--- a/src/main.server.ts
+++ b/src/main.server.ts
@ -12,4 +12,4 @@ if (properties.environment !== "development") {
 }

 export { AppServerModule } from './app/app.server.module';
-export { renderModule } from '@angular/platform-server';
+
--- a/src/test.ts
+++ b/src/test.ts
@ -7,8 +7,6 @@ import {
  platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';

-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
  BrowserDynamicTestingModule,
@ -16,7 +14,3 @@ getTestBed().initTestEnvironment(
    teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
--- a/src/tsconfig.server.json
+++ b/src/tsconfig.server.json
@ -2,7 +2,6 @@
  "extends": "./tsconfig.app.json",
  "compilerOptions": {
    "outDir": "../out-tsc/app-server",
-    "target": "es2016",
    "types": [
      "node"
    ]
--- a/tsconfig.json
+++ b/tsconfig.json
@ -10,13 +10,14 @@
    "moduleResolution": "node",
    "experimentalDecorators": true,
    "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
    "typeRoots": [
      "node_modules/@types"
    ],
    "lib": [
      "es2018",
      "dom"
-    ]
+    ],
+    "useDefineForClassFields": false
  }
 }