+ class="uk-grid uk-flex-middle uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
For more results please try a new, more specific query
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts
index cf9f105a..e8447acb 100644
--- a/searchPages/searchUtils/newSearchPage.component.ts
+++ b/searchPages/searchUtils/newSearchPage.component.ts
@@ -1085,7 +1085,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
let params = "";
let doisParams = "";
var DOIs: Identifier[] = Identifier.getIdentifiersFromString(value);
- if ((entityType == 'publication' || entityType == 'dataset' || entityType == 'software' || entityType == 'other' || entityType == "result" || entityType == "dataprovider" || entityType == "service")) {
+ if ((entityType == 'publication' || entityType == 'dataset' || entityType == 'software' || entityType == 'other' || entityType == "result" || entityType == "dataprovider" || entityType == "service" || entityType == "organization")) {
for (let identifier of DOIs) {
// console.log(identifier)
// pidclassid exact \"doi\" and pid exact \"10.1016/j.nima.2015.11.134\"
diff --git a/searchPages/searchUtils/searchResult.component.ts b/searchPages/searchUtils/searchResult.component.ts
index 4303238b..33ba74c0 100644
--- a/searchPages/searchUtils/searchResult.component.ts
+++ b/searchPages/searchUtils/searchResult.component.ts
@@ -57,7 +57,7 @@ export class SearchResultComponent implements OnInit, OnChanges {
this.previewResults.push(this.getResultPreview(result));
}
- if ((properties.adminToolsPortalType == "explore" || properties.adminToolsPortalType == "community" || properties.adminToolsPortalType == "aggregator")
+ if ((properties.adminToolsPortalType == "explore" || properties.adminToolsPortalType == "community" || properties.adminToolsPortalType == "aggregator" || properties.dashboard == "irish")
&& Session.isLoggedIn() && this.results && this.results.length > 0
&& (this.type == "result" || this.type == "publication" || this.type == "dataset" || this.type == "software" || this.type == "other")
) {
diff --git a/utils/email/composer.ts b/utils/email/composer.ts
index 676dc4c2..ab3c69f0 100644
--- a/utils/email/composer.ts
+++ b/utils/email/composer.ts
@@ -2,6 +2,7 @@ import {Email} from "./email";
import {Body} from "./body";
import {properties} from "../../../../environments/environment";
import {User} from "../../login/utils/helper.class";
+import {StakeholderConfiguration} from "../../monitor-admin/utils/indicator-utils";
export class Composer {
private static noteBodySize = "14px";
@@ -335,13 +336,13 @@ export class Composer {
email.subject = 'National Open Access Monitor Ireland | ' + name;
email.recipient = recipient;
email.body = '
Dear user,
' +
- '
You have been invited to be a ' + role +' of the for the National Open Access Monitor, Ireland dashboard for the ' + name + '.
' +
+ '
You have been invited to be a ' + StakeholderConfiguration.ROLES[role] +' of the for the National Open Access Monitor, Ireland dashboard for the ' + name + '.
' +
'
Click this URL and use the verification code below to accept the invitation.
' +
'
The verification code is ((__code__)).
' +
'
At your first sign in you will be asked to accept and consent to the "OpenAIRE Personal Data Protection Policy and Consent Form" to be able to use the service.
' +
(role === "manager"?
- '
As a manager of the National Open Access Monitor, Ireland, you will have access to the administration part of the dashboard, where you will be able to also invite other users to become managers.
':
- '
As a member of the OpenAIRE Monitor Dashboard, you will have access to the restricted access areas of the profile for the ' + name + '.') +
+ '
As a ' + StakeholderConfiguration.ROLES[role] + ' of the National Open Access Monitor, Ireland, you will have access to the administration part of the dashboard, where you will be able to also invite other users to become ' + StakeholderConfiguration.ROLES['member'] + 's.
':
+ '
As a ' + StakeholderConfiguration.ROLES[role] + ' of the National Open Access Monitor, Ireland, you will have access to the sandbox of the profile for the ' + name + '.') +
'
Please contact us at ' + properties.helpdeskEmail +
' if you have any questions or concerns.
' +
'
Kind Regards
The OpenAIRE Team
' +
diff --git a/utils/properties/environments/environment.ts b/utils/properties/environments/environment.ts
index 8ee7c15b..74317339 100644
--- a/utils/properties/environments/environment.ts
+++ b/utils/properties/environments/environment.ts
@@ -23,7 +23,7 @@ export let common: EnvProperties = {
rorURL: "https://ror.org/",
isniURL: "https://isni.org/isni/",
wikiDataURL: "https://www.wikidata.org/wiki/",
- fundRefURL: "https://api.crossref.org/funders/",
+ fundRefURL: "https://data.crossref.org/fundingdata/funder/",
fairSharingURL: "https://fairsharing.org/",
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
diff --git a/utils/properties/searchFields.base.ts b/utils/properties/searchFields.base.ts
index eea2a832..4d25b6ec 100644
--- a/utils/properties/searchFields.base.ts
+++ b/utils/properties/searchFields.base.ts
@@ -805,8 +805,8 @@ export class SearchFieldsBase {
//ORGANIZATION
- public ORGANIZATION_REFINE_FIELDS: string[] = ["country"]
- public ORGANIZATION_ADVANCED_FIELDS: string[] = ["q", "organizationlegalname", "organizationlegalshortname", "country"];
+ public ORGANIZATION_REFINE_FIELDS: string[] = ["countrynojurisdiction"]
+ public ORGANIZATION_ADVANCED_FIELDS: string[] = ["q", "organizationlegalname", "organizationlegalshortname", "countrynojurisdiction", "pid"];
public ORGANIZATION_FIELDS: { [key: string]: FieldDetails } = {
["q"]: {name: "Any field", type: "keyword", param: "q", operator: "op", equalityOperator: "=", filterType: null},
@@ -826,7 +826,7 @@ export class SearchFieldsBase {
equalityOperator: "=",
filterType: null
},
- ["country"]: {
+ ["countrynojurisdiction"]: {
name: "Country",
type: "vocabulary",
param: "country",
@@ -834,6 +834,7 @@ export class SearchFieldsBase {
equalityOperator: " exact ",
filterType: "checkbox"
},
+ ["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " exact ", filterType: null}
};
// public ORGANIZATION_INDEX:string[] = ["organizationcountryname"]//,"organizationeclegalbody"];
// public ADVANCED_SEARCH_ORGANIZATION_PARAM:string[] = ["q","contenttype","compatibility","country","type"];
@@ -969,7 +970,7 @@ export class SearchFieldsBase {
return "and";
} else if (fieldId == "instancetypename" || fieldId == "eoscdatasourcetype"
|| fieldId == "resultlanguagename" || fieldId == "datasourceodlanguages"
- || fieldId == "datasourcecompatibilityname" || fieldId == "country" || fieldId == "datasourceodcontenttypes"
+ || fieldId == "datasourcecompatibilityname" || fieldId == "country" || fieldId == "countrynojurisdiction" || fieldId == "datasourceodcontenttypes"
|| fieldId == "resulthostingdatasource" || fieldId == "collectedfrom") {
return "or";
}
diff --git a/utils/string-utils.class.ts b/utils/string-utils.class.ts
index cbce9848..3ccf6e6b 100644
--- a/utils/string-utils.class.ts
+++ b/utils/string-utils.class.ts
@@ -150,7 +150,7 @@ export class DOI {
}
export class Identifier {
- class: "doi" | "pmc" | "pmid" | "handle" | "ORCID" | "re3data" | "swhid" = null;
+ class: "doi" | "pmc" | "pmid" | "handle" | "ORCID" | "re3data" | "swhid" | "ror" | "wikidata" | "fundref" | "isni" = null;
id: string;
public static getDOIsFromString(str: string): string[] {
@@ -205,14 +205,22 @@ export class Identifier {
return {"class": "re3data", "id": pid};
} else if (Identifier.isValidSwhId(pid)) {
return {"class": "swhid", "id": pid};
+ } else if (Identifier.isValidRor(pid)) {
+ return {"class": "ror", "id": pid};
+ } else if (Identifier.isValidFundRef(pid)) {
+ return {"class": "fundref", "id": pid};
+ } else if (Identifier.isValidWikidata(pid)) {
+ return {"class": "wikidata", "id": pid};
+ } else if (Identifier.isValidIsni(pid)) {
+ return {"class": "isni", "id": pid};
}
//set it as a doi, to catch the case that doi has not valid format
return (strict?null:{"class": "doi", "id": pid});
}
public static getPIDFromIdentifiers(identifiers: Map
): Identifier {
- let classes:string [] = ["doi", "handle", "pmc", "pmid", "re3data", "swhid"];
- if(identifiers) {
+ let classes:string [] = ["doi", "handle", "pmc", "pmid", "re3data", "swhid", "ror", "wikidata", "fundref", "isni"];
+ if(identifiers && identifiers.size > 0) {
for (let cl of classes) {
if (identifiers.get(cl)) {
for (let pid of identifiers.get(cl)) {
@@ -258,6 +266,7 @@ export class Identifier {
}
public static isValidHANDLE(str: string): boolean {
+ // let exp = /\b[0-9a-zA-Z-]*\/[0-9a-zA-Z-]*$/g; // resolve with url - need to add method for raw value
let exp = /^[0-9a-zA-Z-]*\/[0-9a-zA-Z-]*$/g;
return str.match(exp) != null;
}
@@ -272,6 +281,28 @@ export class Identifier {
let exp = /swh:1:snp:[0-9a-f]{40}/g;
return str.match(exp) != null;
}
+
+ public static isValidRor(str: string): boolean {
+ let exp = /0[a-z|0-9]{6}[0-9]{2}\b/g;
+ return str.match(exp) != null;
+ }
+
+ public static isValidIsni(str: string): boolean {
+ let exp = /^[0]{7}[0-9]{8}[0-9X]$/g;
+ return str.match(exp) != null;
+ }
+
+ public static isValidWikidata(str: string): boolean {
+ let exp = /^Q\d+$/g;
+ return str.match(exp) != null;
+ }
+
+ public static isValidFundRef(str: string): boolean {
+ // let exp = /aaa/g;
+ let exp = /^[1-9]\d+$/g;
+ return str.match(exp) != null;
+ }
+
}
export class StringUtils {
diff --git a/utils/transition-group/transition-group.component.ts b/utils/transition-group/transition-group.component.ts
index 53530868..8cea910d 100644
--- a/utils/transition-group/transition-group.component.ts
+++ b/utils/transition-group/transition-group.component.ts
@@ -1,6 +1,6 @@
import {TransitionGroupItemDirective} from "./transition-group-item.directive";
import {
- AfterViewInit,
+ AfterViewInit, ChangeDetectorRef,
Component,
ContentChildren,
ElementRef, Input,
@@ -29,15 +29,14 @@ export class TransitionGroupComponent implements AfterViewInit, OnDestroy {
@ContentChildren(TransitionGroupItemDirective) items: QueryList;
@Input()
public id: string;
- private disabled: boolean = false;
+ public size: number;
private subscription: Subscription;
constructor(public element: ElementRef) {}
ngAfterViewInit() {
- this.init();
this.subscription = this.items.changes.subscribe(items => {
- if(!this.disabled) {
+ if(items.length === this.size) {
items.forEach(item => item.prevPos = item.newPos || item.prevPos);
items.forEach(this.runCallback);
this.refreshPosition('newPos');
@@ -80,6 +79,7 @@ export class TransitionGroupComponent implements AfterViewInit, OnDestroy {
init() {
this.refreshPosition('prevPos');
this.refreshPosition('newPos');
+ this.size = this.items.length;
}
runCallback(item: TransitionGroupItemDirective) {
@@ -126,17 +126,17 @@ export class TransitionGroupComponent implements AfterViewInit, OnDestroy {
/**
* Enable transition
- *
+ * @deprecated
* */
enable() {
- this.disabled = false;
+ console.debug('Deprecated')
}
/**
* Disable transition
- *
+ * @deprecated
* */
disable() {
- this.disabled = true;
+ console.debug('Deprecated')
}
}