diff --git a/connect/connectHelper.ts b/connect/connectHelper.ts index 0e9d1e43..8d940b48 100644 --- a/connect/connectHelper.ts +++ b/connect/connectHelper.ts @@ -15,7 +15,7 @@ export class ConnectHelper { // domain = "covid-19.openaire.eu"; //for testing } domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix - if (domain.indexOf('eosc-portal.eu') != -1) { + if (domain.indexOf('eosc-portal.eu') != -1 || domain.indexOf('eosc-beyond.eu') != -1) { return "eosc"; } if (domain.indexOf('openaire.eu') === -1) { diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index 60c954ec..92c5b553 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -988,10 +988,11 @@ export class DataProviderComponent { } public get eoscBackLink() { - if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == "https://beta.search.marketplace.eosc-portal.eu/") || (this.referrer == "https://search.marketplace.eosc-portal.eu/"))) { + if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == this.properties.eoscMarketplaceURL))) { return this.referrer+this.prevPath; } else { - return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; + return this.properties.eoscMarketplaceURL; + // return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; } } } diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 240c7093..837ca6ee 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -14,11 +14,11 @@ import {StringUtils} from "../../utils/string-utils.class"; }) export class ParsingFunctions { public eoscSubjects = [ - {label: 'EOSC::Jupyter Notebook', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'search.marketplace.eosc-portal.eu/search/service?q=*&fq=eosc_if:%22Jupyter%20Notebook%22', value: 'Jupyter Notebook'}, - {label: 'EOSC::RO-crate', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'search.marketplace.eosc-portal.eu/search/service?q=*&fq=eosc_if:%22RO%5C-crate%22', value: 'RO-crate'}, - {label: 'EOSC::Galaxy Workflow', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'search.marketplace.eosc-portal.eu/search/service?q=*&fq=eosc_if:%22Galaxy%20Workflow%22', value: 'Galaxy Workflow'}, - {label: 'EOSC::Twitter Data', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'search.marketplace.eosc-portal.eu/search/service?q=*&fq=eosc_if:%22Twitter%20Data%22', value: 'Twitter Data'}, - {label: 'EOSC::Data Cube', link: 'https://' + (properties.environment != 'production'?'beta.':'') + 'search.marketplace.eosc-portal.eu/search/service?q=*&fq=eosc_if:%22Data%20Cube%22', value: 'Data Cube'} + {label: 'EOSC::Jupyter Notebook', link: properties.eoscMarketplaceURL+'search/service?q=*&fq=eosc_if:%22Jupyter%20Notebook%22', value: 'Jupyter Notebook'}, + {label: 'EOSC::RO-crate', link: properties.eoscMarketplaceURL+'search/service?q=*&fq=eosc_if:%22RO%5C-crate%22', value: 'RO-crate'}, + {label: 'EOSC::Galaxy Workflow', link: properties.eoscMarketplaceURL+'search/service?q=*&fq=eosc_if:%22Galaxy%20Workflow%22', value: 'Galaxy Workflow'}, + {label: 'EOSC::Twitter Data', link: properties.eoscMarketplaceURL+'search/service?q=*&fq=eosc_if:%22Twitter%20Data%22', value: 'Twitter Data'}, + {label: 'EOSC::Data Cube', link: properties.eoscMarketplaceURL+'search/service?q=*&fq=eosc_if:%22Data%20Cube%22', value: 'Data Cube'} ] public notebookInSubjects: boolean = false; private notebookKeyword: string = "eosc jupyter notebook"; diff --git a/landingPages/organization/organization.component.ts b/landingPages/organization/organization.component.ts index ad7f77c8..d32a336b 100644 --- a/landingPages/organization/organization.component.ts +++ b/landingPages/organization/organization.component.ts @@ -830,10 +830,11 @@ export class OrganizationComponent { } public get eoscBackLink() { - if (this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == "https://beta.search.marketplace.eosc-portal.eu/") || (this.referrer == "https://search.marketplace.eosc-portal.eu/"))) { - return this.referrer + this.prevPath; + if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == this.properties.eoscMarketplaceURL))) { + return this.referrer+this.prevPath; } else { - return "https://" + (this.properties.environment == "beta" ? "beta." : "") + "search.marketplace.eosc-portal.eu/"; + return this.properties.eoscMarketplaceURL; + // return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; } } } diff --git a/landingPages/project/project.component.ts b/landingPages/project/project.component.ts index 4ae72222..928a968f 100644 --- a/landingPages/project/project.component.ts +++ b/landingPages/project/project.component.ts @@ -1098,10 +1098,11 @@ export class ProjectComponent { } public get eoscBackLink() { - if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == "https://beta.search.marketplace.eosc-portal.eu/") || (this.referrer == "https://search.marketplace.eosc-portal.eu/"))) { + if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == this.properties.eoscMarketplaceURL))) { return this.referrer+this.prevPath; } else { - return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; + return this.properties.eoscMarketplaceURL; + // return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; } } } diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 910897ff..a3136619 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -1246,10 +1246,11 @@ export class ResultLandingComponent { } public get eoscBackLink() { - if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == "https://beta.search.marketplace.eosc-portal.eu/") || (this.referrer == "https://search.marketplace.eosc-portal.eu/"))) { + if(this.prevPath && this.referrer && ((this.referrer == "https://eosc-search-service.grid.cyfronet.pl/") || (this.referrer == this.properties.eoscMarketplaceURL))) { return this.referrer+this.prevPath; } else { - return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; + return this.properties.eoscMarketplaceURL; + // return "https://"+(this.properties.environment == "beta" ? "beta." : "")+"search.marketplace.eosc-portal.eu/"; } } } diff --git a/utils/entities/dataProviderInfo.ts b/utils/entities/dataProviderInfo.ts index 7ed87639..8054e5cb 100644 --- a/utils/entities/dataProviderInfo.ts +++ b/utils/entities/dataProviderInfo.ts @@ -10,7 +10,7 @@ export class DataproviderProvenance { this.provenance.set("re3data_____::", {"urlPrefix": properties.r3DataURL, "name": "re3data.org"}); this.provenance.set("fairsharing_::", {"urlPrefix": properties.fairSharingURL, "name": "FAIRsharing"}); this.provenance.set("eosc________::", { - "urlPrefix": properties.eoscMarketplaceURL, + "urlPrefix": properties.openScienceCloudURL, "name": "EOSC Resource Hub" }); } } diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index f518f97f..daa1534d 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -52,6 +52,7 @@ export interface EnvProperties { wikiDataURL?: string; fundRefURL?: string; fairSharingURL?: string, + openScienceCloudURL?: string, eoscMarketplaceURL?: string, sherpaURL?: string; sherpaURLSuffix?: string; diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts index 94f0cea2..6d6a7617 100644 --- a/utils/properties/environments/environment.ts +++ b/utils/properties/environments/environment.ts @@ -25,7 +25,7 @@ export let common: EnvProperties = { wikiDataURL: "https://www.wikidata.org/wiki/", fundRefURL: "https://data.crossref.org/fundingdata/funder/", fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://open-science-cloud.ec.europa.eu/resources/services/", + openScienceCloudURL: "https://open-science-cloud.ec.europa.eu/resources/services/", sherpaURL: "http://sherpa.ac.uk/romeo/issn/", sherpaURLSuffix: "/", zenodo: "https://zenodo.org/", @@ -135,6 +135,8 @@ export let commonDev: EnvProperties = { miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining', feedbackmailForMissingEntities: 'feedback@openaire.eu', connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200', + // eosc urls + eoscMarketplaceURL: "https://search.marketplace.sandbox.eosc-beyond.eu" } export let commonTest: EnvProperties = { @@ -163,7 +165,8 @@ export let commonTest: EnvProperties = { adminPortalURL: "https://admin.connect.openaire.eu", baseOpenaireLink: 'https://explore.openaire.eu', - + // eosc urls + eoscMarketplaceURL: "https://search.marketplace.sandbox.eosc-beyond.eu" } export let commonBeta: EnvProperties = { @@ -203,6 +206,8 @@ export let commonBeta: EnvProperties = { deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache', connectPortalUrl: 'https://beta.connect.openaire.eu', + // eosc urls + eoscMarketplaceURL: "https://search.marketplace.sandbox.eosc-beyond.eu/" } export let commonProd: EnvProperties = { @@ -243,7 +248,10 @@ export let commonProd: EnvProperties = { connectPortalUrl: 'https://connect.openaire.eu', //irish - openOrgsUrl:"https://orgs.openaire.eu" + openOrgsUrl:"https://orgs.openaire.eu", + + // eosc urls + eoscMarketplaceURL: "https://search.marketplace.eosc-beyond.eu" }