17 changed files with 318 additions and 105 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -14,18 +14,6 @@ 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.1] - 12/12/2023
-### Changed
-* Updated links (to the Marketplace) for Compatible EOSC Services (eosc interoperability framework (eoscif) guidelines)
-
-## [4.0.0] - 29/11/2023
-### Added
-* Research product detailed page: Updated parsing of measures - views/downloads per data source if available
-### Changed
-* Angular 16 upgrade
-* Uikit version to 3.16.24
-* Data source detailed page: Get number of collected fulltexts by new stats API
-
 ## [3.1.0] - 11/09/2023
 ### Added
 * Impact-based indicators - Citations, Popularity, Influence, Impulse 
--- a/README.md
+++ b/README.md
@ -37,15 +37,3 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 ## Running end-to-end tests

 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-
-## System Architecture
-![](./src/assets/architecture.png)
-
-Users can access the EOSC EXPLORE portal via the EOSC Marketplace portal when searching for Publications, Data, Software and Other Research Products.
-
-The EOSC EXPLORE portal serves detailed pages for specific research products, providing an overview of all the metadata available in OpenAIRE Graph and the relationships among the entities of the graph, such as related research, supplementary research, funding projects, related organizations and data sources. Users can navigate through the different entities of OpenAIRE Graph by following the relationships.
-
-In the detailed pages of research data users can transfer files found in Zenodo and other sources in their own data storage, such as dcache or s3  using the Data Transfer Service.
-Metrics, indicators and charts, calculated by OpenAIRE or external tools, are also available in the detailed pages of EOSC EXPLORE.
-
-The detailed pages share the same navigation bar with EOSC Marketplace for easy and quick navigation and users can be redirected easily back to the search page of EOSC Marketplace from which they entered EOSC EXPLORE.
--- a/angular.json
+++ b/angular.json
@ -220,16 +220,13 @@
            "main": "server.ts",
            "tsConfig": "src/tsconfig.server.json",
            "sourceMap": true,
-            "optimization": false,
-            "buildOptimizer": false
+            "optimization": false
          },
          "configurations": {
            "development": {
              "outputHashing": "media",
              "sourceMap": false,
-              "optimization": true,
-              "vendorChunk": true,
-              "buildOptimizer": true
+              "optimization": true
            },
            "beta": {
              "outputHashing": "media",
@ -240,8 +237,7 @@
                }
              ],
              "sourceMap": false,
-              "optimization": true,
-              "buildOptimizer": true
+              "optimization": true
            },
            "production": {
              "outputHashing": "media",
@ -252,8 +248,7 @@
                }
              ],
              "sourceMap": false,
-              "optimization": true,
-              "buildOptimizer": true
+              "optimization": true
            }
          },
          "defaultConfiguration": ""
--- a/package.json
+++ b/package.json
@ -1,7 +1,6 @@
 {
  "name": "eosc",
-  "version": "4.0.1",
-  "license": "Apache-2.0",
+  "version": "3.1.0",
  "scripts": {
    "ng": "ng",
    "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400",
@ -22,40 +21,40 @@
  },
  "private": true,
  "dependencies": {
-    "@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",
+    "@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",
    "clipboard": "^1.5.16",
    "core-js": "^2.5.4",
    "express": "^4.15.2",
    "jquery": "^3.4.1",
-    "ng-recaptcha": "^12.0.2",
+    "ng-recaptcha": "^10.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"
+    "uikit": "3.13.10",
+    "zone.js": "~0.11.4"
  },
  "devDependencies": {
-    "@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",
+    "@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",
    "@types/express": "^4.17.0",
    "@types/compression": "^1.7.0",
-    "@types/node": "^16.18.50",
+    "@types/node": "^12.11.1",
    "@types/jasmine": "~3.6.0",
    "@types/jasminewd2": "~2.0.3",
    "codelyzer": "^6.0.0",
@ -68,6 +67,6 @@
    "karma-jasmine-html-reporter": "^1.6.0",
    "protractor": "~7.0.0",
    "ts-node": "~7.0.0",
-    "typescript": "~4.9.5"
+    "typescript": "~4.6.4"
  }
 }
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@ -1,6 +1,6 @@
-import {APP_ID, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {SharedModule} from './shared/shared.module';
-import {BrowserModule} from '@angular/platform-browser';
+import {BrowserModule, BrowserTransferStateModule} 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,
-    BrowserModule,
+    BrowserTransferStateModule,
+    BrowserModule.withServerTransition({appId: 'eosc'}),
    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} from '@angular/platform-server';
+import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';

 import { AppModule } from './app.module';
 import { AppComponent } from './app.component';
@ -7,7 +7,8 @@ import { AppComponent } from './app.component';
@NgModule({
  imports: [
    AppModule,
-    ServerModule
+    ServerModule,
+    ServerTransferStateModule
  ],
  bootstrap: [AppComponent],
 })
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit c12cadf0f160b965ae91679f72ae8c9743c402cc
+Subproject commit 9b2524c1c72972b593654081e1d917ca8a1a7909
--- a/src/assets/architecture.png
+++ b/src/assets/architecture.png
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@ -1 +1 @@
-Subproject commit 1ec5cb00b5f197db17a5219c9fcf55484ee0bca1
+Subproject commit 031329d5ca890663a0911e3dac5649eb5c00c601
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit f77eefe72c494c11161cfa7e3821f6d408302d8d
+Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@ -4,9 +4,8 @@
 // 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";

-let props: EnvProperties = {
+export let properties: EnvProperties = {
  environment: "beta",
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
@ -15,14 +14,48 @@ let props: EnvProperties = {
  useLongCache: true,
  showAddThis: true,
  enableEoscDataTransfer: true,
-  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",
+  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=",
  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/",
@ -31,11 +64,51 @@ let props: EnvProperties = {
  useHelpTexts: false,
  contextsAPI: "https://services.openaire.eu/openaire/context",
  communityAPI: "https://services.openaire.eu/openaire/community/",
-  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=",
+  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=",
  claimsInformationLink: "https://www.openaire.eu/linking",
-  indexInfoAPI: "https://services.openaire.eu/openaire/info/",
+  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/",
  reCaptchaSiteKey: null,
  footerGrantText: "",
  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
@ -47,7 +120,3 @@ let props: 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,9 +4,8 @@
 // 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";

-let props: EnvProperties = {
+export let properties: EnvProperties = {
  environment: "production",
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
@ -15,12 +14,101 @@ let props: 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,
-  domain: "https://explore.eosc-portal.eu",
+  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/",
  reCaptchaSiteKey: null,
  footerGrantText : "",
  eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu",
@ -37,7 +125,3 @@ let props: 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";

-let props: EnvProperties = {
+export let properties: EnvProperties = {
+  environment: "development",
  adminToolsPortalType: "eosc",
  dashboard: "eosc",
  enablePiwikTrack: false,
@ -14,30 +14,117 @@ let props: EnvProperties = {
  useLongCache: false,
  showAddThis: true,
  enableEoscDataTransfer: true,
-  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
+  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/",
  searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "http://services.openaire.eu/search/v2/api/resources",
-  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
+  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",
  utilsService: "http://dl170.madgik.di.uoa.gr:8000",
  vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
-  piwikSiteId: "594",
+  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",
  cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
-  adminToolsCommunity: "eosc",
+  adminToolsCommunity: "aggregator",
  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/",
-  domain:"https://explore.eosc-portal.eu",
+  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://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",
@ -58,9 +145,5 @@ let props: 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,6 +7,8 @@ import {
  platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';

+declare const require: any;
+
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
  BrowserDynamicTestingModule,
@ -14,3 +16,7 @@ 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,6 +2,7 @@
  "extends": "./tsconfig.app.json",
  "compilerOptions": {
    "outDir": "../out-tsc/app-server",
+    "target": "es2016",
    "types": [
      "node"
    ]
--- a/tsconfig.json
+++ b/tsconfig.json
@ -10,14 +10,13 @@
    "moduleResolution": "node",
    "experimentalDecorators": true,
    "importHelpers": true,
-    "target": "ES2022",
+    "target": "es2020",
    "typeRoots": [
      "node_modules/@types"
    ],
    "lib": [
      "es2018",
      "dom"
-    ],
-    "useDefineForClassFields": false
+    ]
  }
 }