MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Angular 16 Irish Monitor to develop #33

Merged
k.triantafyllou merged 151 commits from angular-16-irish-monitor into develop 2024-02-13 09:32:41 +01:00
Conversation 0 Commits 151 Files Changed 100 +9 -9
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79aa405507 - Show all commits

2
landingPages/dataProvider/dataProvider.component.ts
View File

@ -434,7 +434,7 @@ export class DataProviderComponent {
}, },
err => { err => {
//console.log(err); //console.log(err);
this.handleError("Error getting " + this.type + " for " + (this.datasourceId ? ("id: " + this.datasourceId) : ("pid: " + this.identifier.id + " ("+this.identifier.class+")")), err); this.handleError("Error getting " + this.type + " for " + (this.datasourceId ? ("id: " + this.datasourceId) : ("pid: " + this.identifier.id)), err);
if (err.status == 404) { if (err.status == 404) {
this._router.navigate([this.properties.errorLink], { this._router.navigate([this.properties.errorLink], {
queryParams: { queryParams: {

2
landingPages/dataProvider/dataProvider.service.ts
View File

@ -24,7 +24,7 @@ export class DataProviderService {
if (id) { if (id) {
return properties.searchAPIURLLAst + typePathParam + "/" + id + '?format=json'; return properties.searchAPIURLLAst + typePathParam + "/" + id + '?format=json';
} else if (identifier) { } else if (identifier) {
return properties.searchAPIURLLAst + "resources2?pid="+encodeURIComponent(identifier.id) + "&pidtype=" + identifier.class + "&type="+typePathParam+"&format=json"; return properties.searchAPIURLLAst + "resources2?query=(pid exact \""+encodeURIComponent(identifier.id) + "\")&type="+typePathParam+"&format=json";
} }
} }

2
landingPages/result/resultLanding.component.ts
View File

@ -604,7 +604,7 @@ export class ResultLandingComponent {
} }
}, },
err => { err => {
this.handleError("Error getting " + this.type + " for " + (this.id ? ("id: " + this.id) : ("pid: " + this.identifier.id + " ("+this.identifier.class+")")), err); this.handleError("Error getting " + this.type + " for " + (this.id ? ("id: " + this.id) : ("pid: " + this.identifier.id)), err);
if (err.status == 404) { if (err.status == 404) {
this._router.navigate([this.properties.errorLink], {queryParams: {"page": this._location.path(true), "page_type": this.type}}); this._router.navigate([this.properties.errorLink], {queryParams: {"page": this._location.path(true), "page_type": this.type}});
}else if(err.name == "TimeoutError"){ }else if(err.name == "TimeoutError"){

2
landingPages/result/resultLanding.service.ts
View File

@ -39,7 +39,7 @@ export class ResultLandingService {
} else if (identifier) { } else if (identifier) {
// pid = "10.3389/fphys.2014.00466"; // pid = "10.3389/fphys.2014.00466";
let url = properties.searchAPIURLLAst + "resources2"; let url = properties.searchAPIURLLAst + "resources2";
url += "?pid=" + encodeURIComponent(identifier.id) + "&pidtype=" + identifier.class + "&type="; url += "?query=(pid exact \"" + encodeURIComponent(identifier.id) + "\")&type=";
if (type === 'publication') { if (type === 'publication') {
url += 'publications'; url += 'publications';
} else if (type === 'dataset') { } else if (type === 'dataset') {

2
monitor-admin/topic/topic.component.html
View File

@ -190,7 +190,7 @@
</div> </div>
</div> </div>
</aside> </aside>
<div #pageContent *ngIf="stakeholder && filters" page-content> <div #pageContent *ngIf="stakeholder && filters" class="uk-width-1-1" page-content>
<div actions> <div actions>
<div *ngIf="stakeholder.topics.length > 0" class="uk-flex uk-flex-center uk-margin-medium-top uk-flex-right@m uk-width-1-1"> <div *ngIf="stakeholder.topics.length > 0" class="uk-flex uk-flex-center uk-margin-medium-top uk-flex-right@m uk-width-1-1">
<button class="uk-button uk-button-primary uk-flex uk-flex-middle"> <button class="uk-button uk-button-primary uk-flex uk-flex-middle">

2
orcid/my-orcid-links/myOrcidLinks.component.ts
View File

@ -302,7 +302,7 @@ export class MyOrcidLinksComponent {
for(let work of works) { for(let work of works) {
for(let pid of work['pids']) { for(let pid of work['pids']) {
let identifier: Identifier = Identifier.getIdentifierFromString(pid, false); let identifier: Identifier = Identifier.getIdentifierFromString(pid, false);
this.orcidQuery += (this.orcidQuery ? " or " : "") + ('(pidclassid exact "'+identifier.class+'" and pid="'+StringUtils.URIEncode(identifier.id)+'")'); this.orcidQuery += (this.orcidQuery ? " or " : "") + ('(pid="'+StringUtils.URIEncode(identifier.id)+'")');
} }
} }
this.showLoading = false; this.showLoading = false;

2
searchPages/searchUtils/newSearchPage.component.ts
View File

@ -982,7 +982,7 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
doisParams += (doisParams.length > 0 ? " or " : "") + '(authorid="' + StringUtils.URIEncode(identifier.id) + '")'; doisParams += (doisParams.length > 0 ? " or " : "") + '(authorid="' + StringUtils.URIEncode(identifier.id) + '")';
// doisParams += (doisParams.length > 0 ? " or " : "") +'(authorid="' + StringUtils.URIEncode(identifier.id) + '" and (authoridtype exact "orcid"))'; // doisParams += (doisParams.length > 0 ? " or " : "") +'(authorid="' + StringUtils.URIEncode(identifier.id) + '" and (authoridtype exact "orcid"))';
} else { } else {
doisParams += (doisParams.length > 0 ? " or " : "") + '(pidclassid exact "' + identifier.class + '" and pid="' + StringUtils.URIEncode(identifier.id) + '")'; doisParams += (doisParams.length > 0 ? " or " : "") + '(pid="' + StringUtils.URIEncode(identifier.id) + '")';
// doisParams += (doisParams.length > 0 ? " or " : "") +'(pidclassid exact "' + identifier.class + '" and pid="' + identifier.id + '")'; // doisParams += (doisParams.length > 0 ? " or " : "") +'(pidclassid exact "' + identifier.class + '" and pid="' + identifier.id + '")';
} }
} }

4
utils/properties/env-properties.ts
View File

@ -1,6 +1,6 @@
export type Environment = "development" | "test" | "beta" | "production"; export type Environment = "development" | "test" | "beta" | "production";
export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers"; export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers" | "faircore4eosc";
export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc" | "faircore4eosc";
export interface EnvProperties { export interface EnvProperties {
environment?: Environment; environment?: Environment;