-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index d1767ae..975454e 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -64,7 +64,6 @@ export class HomeComponent {
resultTypes:Filter = {values:[],filterId:"type", countSelectedValues: 0, filterType: 'checkbox', originalFilterId: "", valueIsExact: true, title: "Result Types",filterOperator:"or"};
public pageContents = null;
customFilter:SearchCustomFilter= null;
- aggregatorId;
aggregator:AggregatorInfo;
@ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent;
@@ -80,9 +79,8 @@ export class HomeComponent {
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
private helper: HelperService
) {
- this.aggregatorId = ConnectHelper.getCommunityFromDomain(properties.domain);
- this.aggregator = PortalAggregators.getFilterInfoByMenuId(this.aggregatorId);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(this.aggregator);
+ this.aggregator = PortalAggregators.eoscInfo;
+ this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator();
let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
let title = "OpenAIRE - Explore| " +this.aggregator.title;
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index e2792d3..9c194a3 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit e2792d3be661d438fe5e2bde77607b8312b72611
+Subproject commit 9c194a3a56c225da5d97ad88a93aabf8b699bd4d
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index c04de0d..c7e044d 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -1,7 +1,4 @@
import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
-import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {properties} from "../../../environments/environment";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@@ -10,22 +7,18 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-dataprovider',
template: `
-
+
`
})
export class OpenaireAdvancedSearchDataProvidersComponent {
- customFilter: SearchCustomFilter = null;
properties: EnvProperties;
- public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+ public searchForm: SearchForm = {class: 'search-form', dark: false};
constructor ( ) {}
ngOnInit() {
this.properties = properties;
- let id = ConnectHelper.getCommunityFromDomain(properties.domain);
- let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
}
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
index a0e4df6..fdf9016 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@@ -1,7 +1,4 @@
import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
-import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {properties} from "../../../environments/environment";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@@ -10,7 +7,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-organizations',
template: `
-
@@ -18,15 +15,10 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
})
export class OpenaireAdvancedSearchOrganizationsComponent {
-
- customFilter:SearchCustomFilter= null;
properties: EnvProperties;
- public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+ public searchForm: SearchForm = {class: 'search-form', dark: false};
constructor ( ) {}
ngOnInit() {
this.properties = properties;
- let id = ConnectHelper.getCommunityFromDomain(properties.domain);
- let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
}
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 294a0d3..36222ae 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -1,7 +1,4 @@
import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
-import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {properties} from "../../../environments/environment";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@@ -9,7 +6,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-projects',
template: `
-
@@ -17,15 +14,10 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
})
export class OpenaireAdvancedSearchProjectsComponent {
-
- customFilter:SearchCustomFilter= null;
properties: EnvProperties;
- public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+ public searchForm: SearchForm = {class: 'search-form', dark: false};
constructor ( ) {}
ngOnInit() {
this.properties = properties;
- let id = ConnectHelper.getCommunityFromDomain(properties.domain);
- let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
}
diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts
index 741f750..15e05f6 100644
--- a/src/app/searchPages/advanced/advancedSearchServices.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts
@@ -1,7 +1,4 @@
import {Component} from '@angular/core';
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
-import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {properties} from "../../../environments/environment";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields";
@@ -11,25 +8,20 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc
@Component({
selector: 'openaire-advanced-search-service',
template: `
-
-
`
})
export class OpenaireAdvancedSearchServicesComponent {
- customFilter: SearchCustomFilter = null;
properties: EnvProperties;
public openaireEntities = OpenaireEntities;
- public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+ public searchForm: SearchForm = {class: 'search-form', dark: false};
constructor ( ) {}
ngOnInit() {
this.properties = properties;
- let id = ConnectHelper.getCommunityFromDomain(properties.domain);
- let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
}
diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts
index 3a73f55..e83b405 100644
--- a/src/app/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/searchPages/advanced/searchResearchResults.component.ts
@@ -1,29 +1,22 @@
import {Component, Input} from '@angular/core';
-import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
-import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
-import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
import {properties} from "../../../environments/environment";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
@Component({
- selector: 'openaire-search-results',
- template: `
-
-
-
+
-
-
- `
-
+ selector: 'openaire-search-organizations',
+ template: `
+
-
- `
-
+ selector: 'openaire-search-projects',
+ template: `
+
-
`
})
export class OpenaireSearchServicesComponent {
- customFilter: SearchCustomFilter = null;
properties: EnvProperties;
public openaireEntities = OpenaireEntities;
- public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+ public searchForm: SearchForm = {class: 'search-form', dark: false};
constructor ( ) {}
ngOnInit() {
this.properties = properties;
- let id = ConnectHelper.getCommunityFromDomain(properties.domain);
- let agg: AggregatorInfo = PortalAggregators.getFilterInfoByMenuId(id);
- this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
}
}
diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts
index 7ff1450..ed34d13 100644
--- a/src/app/utils/aggregators.ts
+++ b/src/app/utils/aggregators.ts
@@ -1,6 +1,5 @@
import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {Portal} from "../openaireLibrary/utils/entities/adminTool/portal";
-import {properties} from "../../environments/environment";
export class AggregatorInfo {
menuId: string;
@@ -34,43 +33,7 @@ export class AggregatorInfo {
}
export class PortalAggregators {
- static list: AggregatorInfo[] = [
- new AggregatorInfo("canada", "Canadian Aggregator", "assets/canada-logo.png", "Country",
- "country", "CA", "Canada",
- "Portal to Canadian Research Outputs", `
- Welcome to the Portal of Canadian Research Outputs. This has been developed as part of a collaboration between
- Canadian Association of Research Libraries (CARL) and OpenAIRE. The portal presents research results collected
- from Canadian institutional repositories compliant to OpenAIRE guidelines and from the OpenAIRE Research Graph.
- It links them to three Canadian funders, Natural Sciences and Engineering Research Council of Canada, Canadian Institutes of Health Research and
- Social Sciences and Humanities Research Council. For more information, visit the CARL website.
-
-
- - Bienvenue sur le portal des résultats de la recherche canadienne, qui a été développé dans le cadre d'une collaboration entre l'ABRC et OpenAIRE dans le contexte du projet OpenAIRE Advance. Le portail permet aux utilisateurs de repérer et de parcourir le contenu canadien inclus sur la plateforme OpenAIRE. La quantité des résultats de la recherche canadienne disponible sur la plateforme augmentera tout au long de l'année 2021 au fur et à mesure que les dépôts canadiens se conformeront aux directives d'OpenAIRE et que les détails relatifs aux affiliations canadiennes seront améliorés. Pour plus d'informations, - veuillez visiter le site Web de l’ABRC. - `,true, true,` - :root { - --primary-color: #E80000; - --primary-color-rgb: 232,0,0; - --primary-dark-color: #ad0000; - --graph-background: url('/assets/canada-background.svg') no-repeat bottom; - --label-secondary: #E80000; - /* Fonts */ - --text-primary-color: var(primary-color); - --text-gradient-color: linear-gradient(110deg, var(primary-color) 0%, var(--monitor-dark-color) 100%); - - /** Label */ - --label-secondary: var(--primary-color); - - - } - `), - new AggregatorInfo("italy", "Italian Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "IT", "Italy"), - new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece"), + static eoscInfo: AggregatorInfo = new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", null, null, null, null,null,null ,false,false, ` @@ -181,47 +144,25 @@ border-bottom:1px solid #ced4da; padding: 10px; } - `) - - ]; + `); static disabled = { - "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, - "italy": {pages: ["/search/find/services"], entities: ["service"]}, - "greece": {pages: ["/search/find/services"], entities: ["service"]}, - "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", - "/search/find/datasources"] - , entities: ["datasource"]} + pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", + "/search/find/datasources"], + entities: ["datasource"] }; - static defaultAggregator: AggregatorInfo = PortalAggregators.list[0]; - public static getList(): AggregatorInfo[] { - return PortalAggregators.list; + public static getSearchCustomFilterByAggregator(): SearchCustomFilter { + // let filter:SearchCustomFilter = new SearchCustomFilter(PortalAggregators.eoscInfo.fieldName, PortalAggregators.eoscInfo.queryFieldName, PortalAggregators.eoscInfo.valueId, PortalAggregators.eoscInfo.valueName); + // filter.promptToAddFilter = false; + // filter.isHiddenFilter = true; + // console.log(PortalAggregators.eoscInfo.fieldName); + // console.log(filter); + // return filter; + return null; } - public static getFilterInfoByMenuId(menuId: string): AggregatorInfo { - for (let agg of this.getList()) { - if (agg.menuId == menuId) { - return agg; - } - } - return PortalAggregators.defaultAggregator; - } - - public static getSearchCustomFilterByAggregator(agg: AggregatorInfo): SearchCustomFilter { - let filter:SearchCustomFilter = null; - if(agg && agg.fieldName) { - filter = new SearchCustomFilter(agg.fieldName, agg.queryFieldName, agg.valueId, agg.valueName); - filter.promptToAddFilter = false; - filter.isHiddenFilter = true; - } - return filter; - } - - public static getCommunityInfoByMenuId(menuId: string): any { - if(PortalAggregators.disabled[menuId]){ - return Portal.getMockCommunityInfo(PortalAggregators.disabled[menuId].entities,PortalAggregators.disabled[menuId].pages); - } - return Portal.getMockCommunityInfo([],[]); + public static getCommunityInfo(): any { + return Portal.getMockCommunityInfo(PortalAggregators.disabled.entities,PortalAggregators.disabled.pages); } } diff --git a/src/beta/index.html b/src/beta/index.html index 2ddbe29..58bad9a 100644 --- a/src/beta/index.html +++ b/src/beta/index.html @@ -1,56 +1,65 @@ - - - - -Search OpenAIRE
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ EOSC Explore
+
+
+Search OpenAIRE
-
-
- Search OpenAIRE
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ EOSC Explore
+
+
+
+
+
+
-
-Our Canadian Funders
- -
-
-
-
-
-
-
-
-
- 
-
-
-
- {{funder.name}}
-
-
- {{funder.publications | number}}
research outcomes found -
-
- {{(funder.openAccessPublications / funder.publications) * 100 | number : '1.0-0'}}%
Open Access -
-
Our growing Community
-
@@ -224,11 +124,3 @@ this.customFilter.valueId == 'CA')">
- - Bienvenue sur le portal des résultats de la recherche canadienne, qui a été développé dans le cadre d'une collaboration entre l'ABRC et OpenAIRE dans le contexte du projet OpenAIRE Advance. Le portail permet aux utilisateurs de repérer et de parcourir le contenu canadien inclus sur la plateforme OpenAIRE. La quantité des résultats de la recherche canadienne disponible sur la plateforme augmentera tout au long de l'année 2021 au fur et à mesure que les dépôts canadiens se conformeront aux directives d'OpenAIRE et que les détails relatifs aux affiliations canadiennes seront améliorés. Pour plus d'informations, - veuillez visiter le site Web de l’ABRC. - `,true, true,` - :root { - --primary-color: #E80000; - --primary-color-rgb: 232,0,0; - --primary-dark-color: #ad0000; - --graph-background: url('/assets/canada-background.svg') no-repeat bottom; - --label-secondary: #E80000; - /* Fonts */ - --text-primary-color: var(primary-color); - --text-gradient-color: linear-gradient(110deg, var(primary-color) 0%, var(--monitor-dark-color) 100%); - - /** Label */ - --label-secondary: var(--primary-color); - - - } - `), - new AggregatorInfo("italy", "Italian Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "IT", "Italy"), - new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece"), + static eoscInfo: AggregatorInfo = new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", null, null, null, null,null,null ,false,false, ` @@ -181,47 +144,25 @@ border-bottom:1px solid #ced4da; padding: 10px; } - `) - - ]; + `); static disabled = { - "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, - "italy": {pages: ["/search/find/services"], entities: ["service"]}, - "greece": {pages: ["/search/find/services"], entities: ["service"]}, - "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", - "/search/find/datasources"] - , entities: ["datasource"]} + pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", + "/search/find/datasources"], + entities: ["datasource"] }; - static defaultAggregator: AggregatorInfo = PortalAggregators.list[0]; - public static getList(): AggregatorInfo[] { - return PortalAggregators.list; + public static getSearchCustomFilterByAggregator(): SearchCustomFilter { + // let filter:SearchCustomFilter = new SearchCustomFilter(PortalAggregators.eoscInfo.fieldName, PortalAggregators.eoscInfo.queryFieldName, PortalAggregators.eoscInfo.valueId, PortalAggregators.eoscInfo.valueName); + // filter.promptToAddFilter = false; + // filter.isHiddenFilter = true; + // console.log(PortalAggregators.eoscInfo.fieldName); + // console.log(filter); + // return filter; + return null; } - public static getFilterInfoByMenuId(menuId: string): AggregatorInfo { - for (let agg of this.getList()) { - if (agg.menuId == menuId) { - return agg; - } - } - return PortalAggregators.defaultAggregator; - } - - public static getSearchCustomFilterByAggregator(agg: AggregatorInfo): SearchCustomFilter { - let filter:SearchCustomFilter = null; - if(agg && agg.fieldName) { - filter = new SearchCustomFilter(agg.fieldName, agg.queryFieldName, agg.valueId, agg.valueName); - filter.promptToAddFilter = false; - filter.isHiddenFilter = true; - } - return filter; - } - - public static getCommunityInfoByMenuId(menuId: string): any { - if(PortalAggregators.disabled[menuId]){ - return Portal.getMockCommunityInfo(PortalAggregators.disabled[menuId].entities,PortalAggregators.disabled[menuId].pages); - } - return Portal.getMockCommunityInfo([],[]); + public static getCommunityInfo(): any { + return Portal.getMockCommunityInfo(PortalAggregators.disabled.entities,PortalAggregators.disabled.pages); } } diff --git a/src/beta/index.html b/src/beta/index.html index 2ddbe29..58bad9a 100644 --- a/src/beta/index.html +++ b/src/beta/index.html @@ -1,56 +1,65 @@ - - - - -
Beta instance
+
+
+
+
diff --git a/src/environments/environment-aggregator.beta.ts b/src/environments/environment-aggregator.beta.ts
deleted file mode 100644
index f67d7af..0000000
--- a/src/environments/environment-aggregator.beta.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const portalProperties = {};
diff --git a/src/environments/environment-aggregator.prod.ts b/src/environments/environment-aggregator.prod.ts
deleted file mode 100644
index f67d7af..0000000
--- a/src/environments/environment-aggregator.prod.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const portalProperties = {};
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 6aa3ef0..4043cfe 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -1,13 +1,19 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// 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";
export let properties: EnvProperties = {
environment: "beta",
- adminToolsPortalType: "aggregator",
- dashboard: "aggregator",
+ adminToolsPortalType: "eosc",
+ dashboard: "eosc",
enablePiwikTrack: true,
useCache: false,
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/",
@@ -17,12 +23,12 @@ export let properties: EnvProperties = {
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",
+ 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://dx.doi.org/",
+ doiURL: "https://doi.org/",
pmcURL: "http://europepmc.org/articles/",
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
handleURL: "http://hdl.handle.net/",
@@ -41,37 +47,27 @@ export let properties: EnvProperties = {
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/",
-
+ utilsService: "https://explore.openaire.eu/utils-service",
+ vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
- piwikSiteId: "553",
- 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",
-
+ 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://demo.openaire.eu/cache/get?url=",
-
- datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
-
- adminToolsCommunity: "aggregator",
- adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
+ 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://beta.services.openaire.eu/openaire/context",
- communityAPI: "https://beta.services.openaire.eu/openaire/community/",
-
+ contextsAPI: "https://services.openaire.eu/openaire/context",
+ communityAPI: "https://services.openaire.eu/openaire/community/",
csvLimit: 2000,
pagingLimit: 20,
resultsPerPage: 10,
-
- "baseLink" : "",
- "domain":"https://beta.canada.explore.openaire.eu",
-
+ "baseLink": "/",
+ "domain": "https://explore.eosc-portal.eu",
searchLinkToResult: "/search/result?id=",
searchLinkToPublication: "/search/publication?articleId=",
searchLinkToProject: "/search/project?projectId=",
@@ -81,7 +77,6 @@ export let properties: EnvProperties = {
searchLinkToSoftwareLanding: "/search/software?softwareId=",
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
-
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToServices: "/search/find/services",
@@ -94,7 +89,6 @@ export let properties: 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",
@@ -104,20 +98,16 @@ export let properties: EnvProperties = {
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://beta.openaire.eu/linking",
- lastIndexUpdate: "2020-05-11",
+ 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/",
- reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- 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"
-
+ reCaptchaSiteKey: null,
+ footerGrantText: ""
};
diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts
deleted file mode 100644
index d1cf025..0000000
--- a/src/environments/environment.eosc.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
-
-export let properties: EnvProperties = {
- environment: "beta",
- adminToolsPortalType: "eosc",
- dashboard: "aggregator",
- enablePiwikTrack: true,
- useCache: false,
- 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/",
- 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://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: "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: "aggregator",
- 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://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",
- 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 : "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"
-
-};
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index edc5294..1e4ae57 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,13 +1,19 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// 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";
export let properties: EnvProperties = {
environment: "production",
- adminToolsPortalType: "aggregator",
- dashboard: "aggregator",
+ adminToolsPortalType: "eosc",
+ dashboard: "eosc",
enablePiwikTrack: true,
useCache: false,
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/",
@@ -22,7 +28,7 @@ export let properties: EnvProperties = {
searchDataciteAPIURL: "https://api.datacite.org/works",
searchOrcidURL: "https://pub.orcid.org/v2.1/",
orcidURL: "https://orcid.org/",
- doiURL: "https://dx.doi.org/",
+ doiURL: "https://doi.org/",
pmcURL: "http://europepmc.org/articles/",
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
handleURL: "http://hdl.handle.net/",
@@ -42,38 +48,26 @@ export let properties: EnvProperties = {
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: "553",
-
+ 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: "aggregator",
+ 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://canada.explore.openaire.eu",
-
+ "domain": "https://explore.eosc-portal.eu",
searchLinkToResult: "/search/result?id=",
searchLinkToPublication: "/search/publication?articleId=",
searchLinkToProject: "/search/project?projectId=",
@@ -83,7 +77,6 @@ export let properties: EnvProperties = {
searchLinkToSoftwareLanding: "/search/software?softwareId=",
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
-
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToServices: "/search/find/services",
@@ -96,7 +89,6 @@ export let properties: 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",
@@ -106,20 +98,16 @@ export let properties: EnvProperties = {
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: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
- 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"
-
+ reCaptchaSiteKey: null,
+ footerGrantText : ""
};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index aa00db9..946ec4c 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,14 +1,14 @@
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
-// The list of which env maps to which file can be found in `.angular-cli.json`.
+// 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";
export let properties: EnvProperties = {
environment: "development",
adminToolsPortalType: "eosc",
- dashboard: "aggregator",
+ dashboard: "eosc",
enablePiwikTrack: false,
useCache: true,
useLongCache: true,
@@ -48,35 +48,26 @@ export let properties: EnvProperties = {
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:8080/login-service/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo",
logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout",
-
cookieDomain: ".di.uoa.gr",
-
feedbackmail: "kostis30fylloy@gmail.com",
-
cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
-
adminToolsCommunity: "aggregator",
adminToolsAPIURL: "http://duffy.di.uoa.gr:8080/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=",
@@ -86,7 +77,6 @@ export let properties: EnvProperties = {
searchLinkToSoftwareLanding: "/search/software?softwareId=",
searchLinkToOrp: "/search/other?orpId=",
searchLinkToOrganization: "/search/organization?organizationId=",
-
searchLinkToPublications: "/search/find/publications",
searchLinkToDataProviders: "/search/find/dataproviders",
searchLinkToServices: "/search/find/services",
@@ -99,7 +89,6 @@ export let properties: 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",
@@ -109,16 +98,13 @@ export let properties: EnvProperties = {
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/",
diff --git a/src/eosc/index.html b/src/eosc/index.html
deleted file mode 100644
index b835948..0000000
--- a/src/eosc/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
- Beta instance
-
-
-
-
-
diff --git a/src/eosc/robots.txt b/src/eosc/robots.txt
deleted file mode 100644
index c6742d8..0000000
--- a/src/eosc/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-Agent: *
-Disallow: /
diff --git a/src/prod/index.html b/src/prod/index.html
index f90d695..5c0ac78 100644
--- a/src/prod/index.html
+++ b/src/prod/index.html
@@ -1,56 +1,64 @@
-
-
-
-
-