Merge remote-tracking branch 'origin/angular-13' into angular-14
This commit is contained in:
commit
ce842a39c6
|
@ -5,8 +5,10 @@ import {Session} from "../login/utils/helper.class";
|
||||||
export class ConnectHelper {
|
export class ConnectHelper {
|
||||||
|
|
||||||
public static getCommunityFromDomain(domain: string): string{
|
public static getCommunityFromDomain(domain: string): string{
|
||||||
if(properties.environment == "development" && (properties.adminToolsPortalType == "connect" || properties.adminToolsPortalType == "community")) {
|
if(properties.environment == "development" &&
|
||||||
domain = "covid-19.openaire.eu"; //for testing
|
(properties.adminToolsPortalType == "connect" || properties.adminToolsPortalType == "community"
|
||||||
|
|| properties.adminToolsPortalType == "aggregator" || properties.adminToolsPortalType == "eosc")) {
|
||||||
|
domain = "canada.explore.openaire.eu"; //for testing
|
||||||
}
|
}
|
||||||
domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix
|
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) {
|
||||||
|
|
|
@ -25,12 +25,9 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
|
||||||
<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
|
<div class="uk-grid uk-grid-large uk-grid-stack uk-padding-small" uk-grid>
|
||||||
<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
|
<div class="uk-width-3-5@m uk-width-1-1@s uk-flex uk-flex-column uk-flex-center">
|
||||||
<div style="max-width: 600px;">
|
<div style="max-width: 600px;">
|
||||||
<h1 class="uk-h2" uk-scrollspy-class>Deposit or publish your research in Open Access.</h1>
|
<h1 class="uk-h2" uk-scrollspy-class>Find a repository to deposit or publish your research in Open Access.</h1>
|
||||||
<div class="uk-text-large uk-margin-medium-top" uk-scrollspy-class>
|
|
||||||
Find the appropriate repository to deposit your research.
|
|
||||||
</div>
|
|
||||||
<div class="uk-margin-medium-top" uk-scrollspy-class>
|
<div class="uk-margin-medium-top" uk-scrollspy-class>
|
||||||
<a class="uk-button uk-button-primary uk-text-uppercase" (click)="openFsModal()">Get Started</a>
|
<a class="uk-button uk-button-primary uk-text-uppercase" (click)="openFsModal()">Find Repository</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -143,7 +143,7 @@ interface Link {
|
||||||
`,
|
`,
|
||||||
})
|
})
|
||||||
export class NumbersComponent implements OnInit, OnDestroy {
|
export class NumbersComponent implements OnInit, OnDestroy {
|
||||||
@Input() colorClass = 'portal-color';
|
@Input() colorClass = 'uk-text-primary';
|
||||||
@Input() backgroundClass = null;
|
@Input() backgroundClass = null;
|
||||||
/** Add a value if you want to apply refine query*/
|
/** Add a value if you want to apply refine query*/
|
||||||
@Input() refineValue = null;
|
@Input() refineValue = null;
|
||||||
|
|
|
@ -78,6 +78,21 @@ export class Composer {
|
||||||
return email;
|
return email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static composeEmailForExplore(contactForm: any, admins: any): Email {
|
||||||
|
let email: Email = new Email();
|
||||||
|
|
||||||
|
email.subject = "OpenAIRE - Explore [" + properties.environment.toUpperCase() + "]";
|
||||||
|
email.body = "<div style='font-size:" + this.noteBodySize + "'>"
|
||||||
|
+ "<span><b>Name</b>: " + contactForm.name + "</span><br>"
|
||||||
|
+ "<span><b>Surname</b>: " + contactForm.surname + "</span><br>"
|
||||||
|
+ "<span><b>Email</b>: " + contactForm.email + "</span><br>"
|
||||||
|
+ "<span><b>Affiliation</b>: " + contactForm.affiliation ? contactForm.affiliation : '-' + "</span><br>"
|
||||||
|
+ "<p>" + contactForm.message + "</p>"
|
||||||
|
+ "</div>";
|
||||||
|
email.recipients = admins;
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
public static composeEmailForUsageCounts(contactForm: any, admins: any): Email {
|
public static composeEmailForUsageCounts(contactForm: any, admins: any): Email {
|
||||||
let email: Email = new Email();
|
let email: Email = new Email();
|
||||||
|
|
||||||
|
|
|
@ -184,8 +184,9 @@ export class Portal {
|
||||||
};;
|
};;
|
||||||
};
|
};
|
||||||
|
|
||||||
public static getMockCommunityInfo(disabledEntities:string[],disabledPages:string[]): any {
|
public static getMockCommunityInfo(pid: string, disabledEntities:string[],disabledPages:string[]): any {
|
||||||
let communityInfo = Object.assign({}, Portal.getmockPortalInfo());
|
let communityInfo = Object.assign({}, Portal.getmockPortalInfo());
|
||||||
|
communityInfo.pid = pid;
|
||||||
for(let disabledPage of disabledPages) {
|
for(let disabledPage of disabledPages) {
|
||||||
for (var i = 0; i < communityInfo.pages.length; i++) {
|
for (var i = 0; i < communityInfo.pages.length; i++) {
|
||||||
if (communityInfo.pages[i].route == disabledPage) {
|
if (communityInfo.pages[i].route == disabledPage) {
|
||||||
|
|
|
@ -46,11 +46,11 @@ export class ISVocabulariesService {
|
||||||
} else if (field == "access" && (entity == "publication" || entity == "dataset" || entity == "software" || entity == "other" || entity == "result")) {
|
} else if (field == "access" && (entity == "publication" || entity == "dataset" || entity == "software" || entity == "other" || entity == "result")) {
|
||||||
vocabulary = "dnet:access_modes.json";
|
vocabulary = "dnet:access_modes.json";
|
||||||
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
||||||
} else if ((field == "type") && (entity == "dataprovider")) {
|
} else if ((field == "type") && (entity == "dataprovider" || entity == "service")) {
|
||||||
vocabulary = "dnet:datasource_typologies.json";
|
vocabulary = "dnet:datasource_typologies.json";
|
||||||
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
||||||
|
|
||||||
} else if (field == "compatibility" && (entity == "dataprovider")) {
|
} else if (field == "compatibility" && (entity == "dataprovider" || entity == "service")) {
|
||||||
vocabulary = "dnet:datasourceCompatibilityLevel.json";
|
vocabulary = "dnet:datasourceCompatibilityLevel.json";
|
||||||
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
return this.getVocabularyFromServiceAsync(vocabulary, properties);
|
||||||
} else if (field == "country") {
|
} else if (field == "country") {
|
||||||
|
|
Loading…
Reference in New Issue