[develop | DONE | CHANGED] Renamed property "eoscMarketplaceURL" to "openScienceCloudURL" and added new property "eoscMarketplaceURL" (new value) | Updated current domain and marketplace domain from eosc-portal.eu to eosc-beyond.eu.
1. env-properties.ts: Added property openScienceCloudURL?: string. 2. environment.ts: Renamed property "eoscMarketplaceURL" to "openScienceCloudURL" and set value for new property "eoscMarketplaceURL". 3. dataProviderInfo.ts: Use properties.openScienceCloudURL instead of properties.eoscMarketplaceURL. 4. dataProvider.component.ts & organization.component.ts & project.component.ts & resultLanding.component.ts: Updated method "eoscBackLink()" to use "properties.eoscMarketplaceURL" instead of static url "https://search.marketplace.eosc-portal.eu/". 5. parsingFunctions.class.ts: In eoscSubjects use "properties.eoscMarketplaceURL" instead of static url "https://search.marketplace.eosc-portal.eu/". 6. connectHelper.ts: In method "getCommunityFromDomain()", added check domain.indexOf('eosc-beyond.eu') != -1.
This commit is contained in:
parent
e4bfed85ba
commit
99caf5aacc
|
@ -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) {
|
||||
|
|
|
@ -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/";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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/"))) {
|
||||
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/";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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/";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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/";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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" });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -52,6 +52,7 @@ export interface EnvProperties {
|
|||
wikiDataURL?: string;
|
||||
fundRefURL?: string;
|
||||
fairSharingURL?: string,
|
||||
openScienceCloudURL?: string,
|
||||
eoscMarketplaceURL?: string,
|
||||
sherpaURL?: string;
|
||||
sherpaURLSuffix?: string;
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue