diff --git a/explore/README.md b/explore/README.md index 0f4af8e3..c846f09d 100644 --- a/explore/README.md +++ b/explore/README.md @@ -1,6 +1,6 @@ # Explore -This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14. +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 16.1.7. ## Install packages diff --git a/explore/angular.json b/explore/angular.json index 0262983e..6f089df1 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -274,13 +274,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 }, "test": { "outputHashing": "media", @@ -291,7 +294,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -302,7 +306,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -313,7 +318,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" diff --git a/explore/package.json b/explore/package.json index cd0a248b..6b878b15 100644 --- a/explore/package.json +++ b/explore/package.json @@ -23,42 +23,42 @@ }, "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.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", "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.24", + "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.6", + "@angular/cli": "^16.1.6", + "@angular/compiler-cli": "^16.1.7", + "@angular/language-service": "^16.1.7", + "@nguniversal/builders": "^16.1.1", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "@types/node": "^12.11.1", + "@types/node": "^16.18.50", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", @@ -69,6 +69,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" } } diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index 97a827a5..401b51cd 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -5,7 +5,7 @@ import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver. const routes: Routes = [ // Other Pages - {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)}, + {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}}, {path: 'home', redirectTo: '', pathMatch: 'full'}, {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)}, {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)}, diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts index 75a1a717..81d561fc 100755 --- a/explore/src/app/app.module.ts +++ b/explore/src/app/app.module.ts @@ -1,6 +1,6 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {SharedModule} from './openaireLibrary/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'; @@ -28,9 +28,8 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module' ErrorModule, NavigationBarModule, BottomModule, CookieLawModule, - BrowserModule.withServerTransition({ appId: 'explore' }), + BrowserModule, AppRoutingModule, - BrowserTransferStateModule, BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule, QuickContactModule, @@ -39,6 +38,7 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module' declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ + {provide: APP_ID, useValue: 'explore'}, { provide: HTTP_INTERCEPTORS, useClass: CacheInterceptorService, diff --git a/explore/src/app/app.server.module.ts b/explore/src/app/app.server.module.ts index cc86a559..561695a4 100644 --- a/explore/src/app/app.server.module.ts +++ b/explore/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], }) diff --git a/explore/src/app/funders/funders.component.ts b/explore/src/app/funders/funders.component.ts index b08f1622..2c1f9b54 100644 --- a/explore/src/app/funders/funders.component.ts +++ b/explore/src/app/funders/funders.component.ts @@ -59,7 +59,22 @@ export class FundersComponent implements OnInit { "monitorDashboard": string, "monitorDashboardStatus": string, "logoUrl": string - }>(); + }>(); + staticLogos: Set = new Set([ + "arc_________::ARC||Australian Research Council (ARC)||ARC", + "asap________::ASAP||Aligning Science Across Parkinson's||ASAP", + "cihr________::CIHR||Canadian Institutes of Health Research||CIHR", + "euenvagency_::EEA||European Environment Agency||EEA", + "inca________::INCA||Institut National du Cancer||INCa", + "nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC", + "nih_________::NIH||National Institutes of Health||NIH", + "nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC", + "nsf_________::NSF||National Science Foundation||NSF", + "sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC", + "taraexp_____::tara||Tara Expeditions Foundation||TARA", + "ukri________::UKRI||UK Research and Innovation||UKRI", + "wt__________::WT||Wellcome Trust||WT" + ]); constructor(private router: Router, private meta: Meta, @@ -188,7 +203,12 @@ export class FundersComponent implements OnInit { let queriedFunders4 = data[3]; queriedFunders4.forEach(queriedFunder => { let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName; - if(this.fundersMap.has(id)) { + 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; @@ -199,6 +219,9 @@ export class FundersComponent implements OnInit { if(value.openAccessResearchProducts > 0) { value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100); } + if(!value.logoUrl && this.staticLogos.has(value.id)) { + value.logoUrl = "assets/explore-assets/funders/logos/"+value.id+".png"; + } }); // convert funders map into an array this.funders = Array.from(this.fundersMap.values()); diff --git a/explore/src/app/home/home.component.html b/explore/src/app/home/home.component.html index b2903a90..c63b95d2 100644 --- a/explore/src/app/home/home.component.html +++ b/explore/src/app/home/home.component.html @@ -1,337 +1,315 @@ -
-
- {{logo}} logo +
+
+ {{logo}} logo +
-
-
-
-
-
-

- Discover open linked research. -

- - -
-
- - Advanced search - -
- - - - -
+
+
+
+
+

+ Discover open linked research. +

+ + +
+
+ + Advanced search + +
+ + + + +
- -
-
-
- Try browsing by: -
-
- + +
+
+
+ Try browsing by: +
+
+ SDGs logo - Sustainable Development Goals (SDGs) + Sustainable Development Goals (SDGs) - - + + FOS logo Fields of Science (FoS) - -
-
+ +
+
+
+
+
+ + +
+
+
-
-
- - -
-
-
-
-
-
-
-
-
-
    - - + +
+
- - + + -
-
-
-
- - -
-

- Deposit your research. -

-

- Whether it’s publications, data or software, - select an OpenAIRE compatible repository and - share using community standards. Alternatively - use Zenodo, a catch-all repository hosted by CERN. - All results will be indexed, discoverable and accessible - via EXPLORE. -

-
- Start Deposit -
-
-
-

- Link your work. -

-

- Connect all your research. If you can't find your research - results in OpenAIRE, don't worry! Use our Link service, - that reaches out to many external sources via APIs, and - claim them to your Grant or ORCID. Use the service to provide - meaningful links between publications-datasets-software. -

-
- Start Linking -
-
- - -
-
-
-

Share your research.

-
-
-
-
-
-
-
- ipad - ipad - ipad - ipad - ipad
-
-
-
-
- -
-
-
-
- -
-
-
- ipad - ipad - ipad - ipad - ipad -
-
- -
-
-
-
-
+
+
+
+

Share your research.

+
+ + + + ipad + + + ipad + + + ipad + + + ipad + + + ipad + + + + +
+ Deposit your research. +
+
+ Whether it’s publications, data or software, + select an OpenAIRE compatible repository and + share using community standards. Alternatively + use Zenodo, a catch-all repository hosted by CERN. + All results will be indexed, discoverable and accessible + via EXPLORE. +
+
+ Start + Deposit +
+ + +
+ Link your work. +
+
+ Connect all your research. If you can't find your research + results in OpenAIRE, don't worry! Use our Link service, + that reaches out to many external sources via APIs, and + claim them to your Grant or ORCID. Use the service to provide + meaningful links between publications-datasets-software. +
+
+ Start Linking +
+ + + +
+
- - + + -
-
-
-
-
-
-
-

Linked Open Research.

-
- EXPLORE is built on the OpenAIRE Graph, one of the largest - open scholarly record collections worldwide. Conceived as a public and - transparent good, populated out of data sources trusted by scientists, the - OpenAIRE Graph brings discovery, monitoring, and assessment of science - back in the hands of the scientific community. -
-
-
-
- ipad -
-
-
-
-
-
-
-
- Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving target, continuously integrating new sources, new types or research objects, and embedding access measures. We therefore welcome the community to work with us to improve all its aspects: its coverage (geographic and thematic), quality (disambiguation and semantics) and access (APIs). -
-
- Find information about the OpenAIRE Graph, how to test it and contribute to improving it. -
-
- - Learn more. Contribute - -
-
-
-
-
+
+
+
+
+
+
+
+

Linked Open Research.

+
+ EXPLORE is built on the OpenAIRE Graph, one of the largest + open scholarly record collections worldwide. Conceived as a public and + transparent good, populated out of data sources trusted by scientists, the + OpenAIRE Graph brings discovery, monitoring, and assessment of science + back in the hands of the scientific community. +
+
+
+
+ ipad +
+
+
+
+
+
+
+
+ Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving + target, continuously integrating new sources, new types or research objects, and embedding + access measures. We therefore welcome the community to work with us to improve all its aspects: + its coverage (geographic and thematic), quality (disambiguation and semantics) and access (APIs). +
+
+ Find information about the OpenAIRE Graph, how to test it and contribute to improving it. +
+
+ + Learn more. Contribute + +
+
+
+
+
-
-
-

- Did you know that -

-

- you may -

-
-
- - -
-
-
-
+
+
+

+ Did you know that +

+

+ you may +

+
+
+ + +
+
+
+
-
-
-

- Need more information? -

-

- Get in touch and let us help you. -

- Contact us -
-
+
+
+

+ Need more information? +

+

+ Get in touch and let us help you. +

+ Contact us +
+
diff --git a/explore/src/app/home/home.component.less b/explore/src/app/home/home.component.less index 02bb5a94..83252b19 100644 --- a/explore/src/app/home/home.component.less +++ b/explore/src/app/home/home.component.less @@ -38,14 +38,21 @@ color: @global-secondary-background; } } - } -@media only screen and (min-width: @breakpoint-medium) { +.slider-image { + min-width: 550px; +} + +@media only screen and (min-width: @breakpoint-large) { .explore-dark-logo-background { background-image: url("~src/assets/explore-assets/home/explore-dark-logo.svg"); background-repeat: no-repeat; - background-position: left 95%; - background-size: 65%; + background-position: -5% 102%; + background-size: 35%; + } + + .slider-nav { + max-width: 650px; } } diff --git a/explore/src/app/home/home.module.ts b/explore/src/app/home/home.module.ts index a51ac75b..0116ef4e 100644 --- a/explore/src/app/home/home.module.ts +++ b/explore/src/app/home/home.module.ts @@ -28,6 +28,7 @@ import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module"; import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module"; import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; +import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module"; @NgModule({ imports: [ @@ -38,7 +39,7 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu PiwikServiceModule, HomeRoutingModule, HelperModule, - SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule + SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule ], declarations: [ HomeComponent diff --git a/explore/src/assets/explore-assets/funders/logos/arc_________::ARC||Australian Research Council (ARC)||ARC.png b/explore/src/assets/explore-assets/funders/logos/arc_________::ARC||Australian Research Council (ARC)||ARC.png new file mode 100644 index 00000000..3b46f9bb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/arc_________::ARC||Australian Research Council (ARC)||ARC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png b/explore/src/assets/explore-assets/funders/logos/asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png new file mode 100644 index 00000000..96ccfd25 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/asap________::ASAP||Aligning Science Across Parkinson's||ASAP.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png b/explore/src/assets/explore-assets/funders/logos/cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png new file mode 100644 index 00000000..ad3b65fb Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/cihr________::CIHR||Canadian Institutes of Health Research||CIHR.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/euenvagency_::EEA||European Environment Agency||EEA.png b/explore/src/assets/explore-assets/funders/logos/euenvagency_::EEA||European Environment Agency||EEA.png new file mode 100644 index 00000000..e2c9d290 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/euenvagency_::EEA||European Environment Agency||EEA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/inca________::INCA||Institut National du Cancer||INCa.png b/explore/src/assets/explore-assets/funders/logos/inca________::INCA||Institut National du Cancer||INCa.png new file mode 100644 index 00000000..8ca6f31a Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/inca________::INCA||Institut National du Cancer||INCa.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png b/explore/src/assets/explore-assets/funders/logos/nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png new file mode 100644 index 00000000..12177452 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/nih_________::NIH||National Institutes of Health||NIH.png b/explore/src/assets/explore-assets/funders/logos/nih_________::NIH||National Institutes of Health||NIH.png new file mode 100644 index 00000000..be2451af Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/nih_________::NIH||National Institutes of Health||NIH.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png b/explore/src/assets/explore-assets/funders/logos/nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png new file mode 100644 index 00000000..fddb3ac8 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/nsf_________::NSF||National Science Foundation||NSF.png b/explore/src/assets/explore-assets/funders/logos/nsf_________::NSF||National Science Foundation||NSF.png new file mode 100644 index 00000000..ac7704db Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/nsf_________::NSF||National Science Foundation||NSF.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png b/explore/src/assets/explore-assets/funders/logos/sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png new file mode 100644 index 00000000..6b3c52ce Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/taraexp_____::tara||Tara Expeditions Foundation||TARA.png b/explore/src/assets/explore-assets/funders/logos/taraexp_____::tara||Tara Expeditions Foundation||TARA.png new file mode 100644 index 00000000..fe3336b5 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/taraexp_____::tara||Tara Expeditions Foundation||TARA.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/ukri________::UKRI||UK Research and Innovation||UKRI.png b/explore/src/assets/explore-assets/funders/logos/ukri________::UKRI||UK Research and Innovation||UKRI.png new file mode 100644 index 00000000..9d9b596f Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/ukri________::UKRI||UK Research and Innovation||UKRI.png differ diff --git a/explore/src/assets/explore-assets/funders/logos/wt__________::WT||Wellcome Trust||WT.png b/explore/src/assets/explore-assets/funders/logos/wt__________::WT||Wellcome Trust||WT.png new file mode 100644 index 00000000..52149df8 Binary files /dev/null and b/explore/src/assets/explore-assets/funders/logos/wt__________::WT||Wellcome Trust||WT.png differ diff --git a/explore/src/assets/explore-custom.less b/explore/src/assets/explore-custom.less index 92af8ab6..071f252d 100644 --- a/explore/src/assets/explore-custom.less +++ b/explore/src/assets/explore-custom.less @@ -2,7 +2,6 @@ /* Button */ @button-primary-background: @explore-color; -@inverse-button-primary-background: @explore-color; @button-secondary-border: @explore-color; @button-secondary-color: @explore-color; @button-secondary-hover-background: @global-secondary-background; diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index 78c529f4..b71487ad 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -1,136 +1,20 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment.beta"; - +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { - environment: "beta", - adminToolsPortalType: "explore", - dashboard: "explore", enablePiwikTrack: true, + piwikSiteId: "6", useCache: false, useLongCache: true, showAddThis: 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=", - 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/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL : "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - 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/", - // swhURL: "https://archive.softwareheritage.org/", - 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://demo.openaire.eu/utils-service", - - vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", - - piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", - piwikSiteId: "6", - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - - cacheUrl: "https://demo.openaire.eu/cache/get?url=", - - datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/", - - monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service", - adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", - + domain: "https://beta.explore.openaire.eu", + adminToolsPortalType: "explore", + dashboard: "explore", adminToolsCommunity: "openaire", - contextsAPI: "https://beta.services.openaire.eu/openaire/context", - communityAPI: "https://beta.services.openaire.eu/openaire/community/", - - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, + baseLink : "" - "baseLink" : "", - "domain":"https://beta.explore.openaire.eu", - - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToOrganization: "/search/organization?organizationId=", - - searchLinkToAll: "/search/find/", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - 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", - 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://beta.openaire.eu/linking", - lastIndexUpdate: "2020-05-11", - 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: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ['feedback@openaire.eu'], - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://beta.admin.connect.openaire.eu", - - myOrcidLinksPage: "/my-orcid-links", - footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", - - egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook" }; export let properties: EnvProperties = { - ...props, ...common, ...commonBeta + ...common, ...commonBeta,...props + } diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index 2560b132..f6ec0fd2 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -1,139 +1,19 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonProd} from "../app/openaireLibrary/utils/properties/environments/environment.prod"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; - let props: EnvProperties = { - environment: "production", +let props: EnvProperties = { + enablePiwikTrack: true, + piwikSiteId: "109", + useCache: false, + useLongCache: true, + showAddThis: true, + domain: "https://explore.openaire.eu", adminToolsPortalType: "explore", dashboard: "explore", - enablePiwikTrack: true, - useCache: false, - useLongCache: true, - showAddThis: 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/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL : "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - 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/", - // swhURL: "https://archive.softwareheritage.org/", - 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: "109", - 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/api/", - - monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service", - adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "openaire", - contextsAPI: "https://services.openaire.eu/openaire/context", - - communityAPI: "https://services.openaire.eu/openaire/community/", - - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - - "baseLink" : "", - "domain": "https://explore.openaire.eu", - - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToOrganization: "/search/organization?organizationId=", - - searchLinkToAll: "/search/find/", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - 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", - 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: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ['feedback@openaire.eu'], - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://admin.explore.openaire.eu", - - myOrcidLinksPage: "/my-orcid-links", - footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" + baseLink : "" }; export let properties: EnvProperties = { - ...props, ...common, ...commonProd -} \ No newline at end of file + ...common, ...commonProd, ...props +} diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index 6866186d..8c3d48cd 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -1,137 +1,24 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; -import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonTest} from "../app/openaireLibrary/utils/properties/environments/environment.test"; +import {common, commonTest} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { -// export let properties: EnvProperties = { - environment: "test", - dashboard: "explore", - adminToolsPortalType: "explore", + enablePiwikTrack: false, useCache: false, - useLongCache: true, - showAddThis: false, - framesAPIURL: "https://test.openaire.eu/stats3/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://test.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://services.openaire.eu/stats/", - useNewStatistisTool: false, - claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", - searchAPIURLLAst: "https://services.openaire.eu/shadowSearch/v2/api/", - searchResourcesAPIURL: "https://services.openaire.eu/shadowSearch/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "http://services.openaire.eu:8480/shadowSearch/rest/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/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL : "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - 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/", - // swhURL: "https://archive.softwareheritage.org/", - 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: "109", - 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/api/", - - adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", - + useLongCache: false, + showAddThis: true, + domain: "https://test.explore.openaire.eu", + adminToolsPortalType: "explore", + dashboard: "explore", adminToolsCommunity: "openaire", - contextsAPI: "https://services.openaire.eu/openaire/context", - communityAPI: "https://services.openaire.eu/openaire/community/", - - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - - "baseLink" : "", - "domain": "https://test.explore.openaire.eu", - - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToOrganization: "/search/organization?organizationId=", - - searchLinkToAll: "/search/find/", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - 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", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", + baseLink : "", errorLink: '/error', - - lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: false, - widgetLink: "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://www.openaire.eu/linking", - lastIndexUpdate: "2020-07-31", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ['feedback@openaire.eu'], - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://beta.admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links", - footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" + footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", + piwikSiteId: "109" + }; export let properties: EnvProperties = { - ...props, ...common, ...commonTest -} \ No newline at end of file + ...common, ...commonTest, ...props +} diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index 95a82a05..d9747fbf 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -4,41 +4,47 @@ // The list 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} from "../app/openaireLibrary/utils/properties/environments/environment.all"; -import {commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; let props: EnvProperties = { - environment: "development", + + enablePiwikTrack: false, + piwikSiteId: "109", + useCache: false, + useLongCache: false, + showAddThis: true, + adminToolsPortalType: "explore", + dashboard: "explore", + adminToolsCommunity: "openaire", + baseLink : "", + domain: "https://explore.openaire.eu" + + + /*environment: "development", adminToolsPortalType: "explore", dashboard: "explore", enablePiwikTrack: false, useCache: false, useLongCache: false, showAddThis: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "http://rudie.di.uoa.gr:8980/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", // claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", - // From here searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", - // to here openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", - // From here searchCrossrefAPIURL: "https://api.crossref.org/works", searchDataciteAPIURL: "https://api.datacite.org/works", searchOrcidURL: "https://pub.orcid.org/v2.1/", orcidURL: "https://orcid.org/", - // to here orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?", orcidClientId: "APP-A5M3KTX6NCN67L91", - // From here doiURL: "https://doi.org/", pmcURL: "http://europepmc.org/articles/", pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", @@ -46,52 +52,44 @@ let props: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", - // swhURL: "https://archive.softwareheritage.org/", + swhURL: "https://archive.softwareheritage.org/", fairSharingURL: "https://fairsharing.org/", - // to here eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - // From here 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", - // to here 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/", - + 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=", - + monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service", adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/", - - adminToolsCommunity: "openaire", + + // adminToolsCommunity: "openaire", datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/", 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://beta.explore.openaire.eu", - + searchLinkToResult: "/search/result?id=", searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", @@ -100,7 +98,7 @@ let props: EnvProperties = { searchLinkToSoftwareLanding: "/search/software?softwareId=", searchLinkToOrp: "/search/other?orpId=", searchLinkToOrganization: "/search/organization?organizationId=", - + searchLinkToAll: "/search/find/", searchLinkToPublications: "/search/find/publications", searchLinkToDataProviders: "/search/find/dataproviders", @@ -113,7 +111,7 @@ let props: EnvProperties = { searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", searchLinkToJournals: "/search/journals", searchLinkToResults: "/search/find/research-outcomes", - + searchLinkToAdvancedPublications: "/search/advanced/publications", searchLinkToAdvancedProjects: "/search/advanced/projects", searchLinkToAdvancedDatasets: "/search/advanced/datasets", @@ -129,12 +127,12 @@ let props: EnvProperties = { 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: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu", - admins: ['kostis30fylloy@gmail.com', 'alexandros.martzios@athenarc.gr', 'kgalouni@di.uoa.gr'], + admins: ['kostis30fylloy@gmail.com', 'alexandros.martzios@athenarc.gr', 'kgalouni@di.uoa.gr'], b2noteAPIURL: 'https://b2note.eudat.eu/', impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", adminPortalURL: "https://beta.admin.connect.openaire.eu", @@ -142,9 +140,10 @@ let props: EnvProperties = { myOrcidLinksPage: "/my-orcid-links", footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452", - egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook" + egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook"*/ + }; export let properties: EnvProperties = { - ...props, ...common, ...commonDev -} \ No newline at end of file + ...common, ...commonDev, ...props +} diff --git a/explore/src/main.server.ts b/explore/src/main.server.ts index d2b1d6d1..708bb70f 100644 --- a/explore/src/main.server.ts +++ b/explore/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'; + diff --git a/explore/src/test.ts b/explore/src/test.ts index 6b03dbe8..ae25f27c 100644 --- a/explore/src/test.ts +++ b/explore/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); diff --git a/explore/src/tsconfig.server.json b/explore/src/tsconfig.server.json index 39f85aac..56015022 100644 --- a/explore/src/tsconfig.server.json +++ b/explore/src/tsconfig.server.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "../out-tsc/app-server", - "target": "es2016", "types": [ "node" ] diff --git a/explore/tsconfig.json b/explore/tsconfig.json index f7c5a9bf..282861fd 100644 --- a/explore/tsconfig.json +++ b/explore/tsconfig.json @@ -10,14 +10,15 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false }, // "angularCompilerOptions": { // "strictTemplates": true diff --git a/services/cache/mecache/package.json b/services/cache/mecache/package.json index e98c7edb..e7530a97 100644 --- a/services/cache/mecache/package.json +++ b/services/cache/mecache/package.json @@ -11,14 +11,14 @@ }, "dependencies": { "cors": "^2.8.5", - "express": "^4.15.2", + "express": "^4.18.2", "memory-cache": "^0.2.0", "prom-client": "^11.3.0", "properties-reader": "^2.2.0", "superagent": "^5.0.5" }, "engines": { - "node": ">=16.3.0" + "node": ">=16.14.0" }, "author": "Argiro Kokogiannaki ", "license": "NKUA" diff --git a/services/sitemaps/extractUrlsFromSearch.ts b/services/sitemaps/extractUrlsFromSearch.ts index 383bcd70..d773f4a6 100644 --- a/services/sitemaps/extractUrlsFromSearch.ts +++ b/services/sitemaps/extractUrlsFromSearch.ts @@ -260,7 +260,7 @@ function parseAllUrls(response: any, allUrls: any, resultsType: string, subject: } else { let resultLandingComponent = new ResultLandingComponent(null, null, null, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null, null, null, null, null); if(!resultLandingComponent.checkIfAllowed(resultLandingInfo)) { noIndexedUrls++; diff --git a/services/sitemaps/package.json b/services/sitemaps/package.json index 2aa7c51f..07a619f6 100644 --- a/services/sitemaps/package.json +++ b/services/sitemaps/package.json @@ -10,12 +10,12 @@ "superagent": "^5.0.5" }, "devDependencies": { - "@types/node": "^8.0.30", - "ts-node": "^10.4.0", - "typescript": "^3.2.4" + "@types/node": "^16.18.39", + "ts-node": "^10.9.1", + "typescript": "^4.9.5" }, "engines": { - "node": "16.3.0" + "node": ">=16.14.0" }, "author": "Konstantina Galouni ", "license": "NKUA" diff --git a/services/utils-service/package.json b/services/utils-service/package.json index 6965d570..5ef016df 100644 --- a/services/utils-service/package.json +++ b/services/utils-service/package.json @@ -13,14 +13,14 @@ "author": "", "license": "ISC", "dependencies": { - "body-parser": "^1.15.2", - "cookie-parser": "^1.4.4", - "cors": "^2.8.4", - "express": "^4.15.2", - "multer": "1.4.5-lts.1", + "body-parser": "^1.20.2", + "cookie-parser": "^1.4.6", + "cors": "^2.8.5", + "express": "^4.18.2", + "multer": "^1.4.5-lts.1", "properties-reader": "^2.2.0" }, "engines": { - "node": ">=16.3.0" + "node": ">=16.14.0" } }