From 034a9e00a77b94ed7b9e4d91d390f39ca870529f Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 13 Jul 2020 14:42:34 +0000 Subject: [PATCH] [Library | Trunk]: Replace static links with property url git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59090 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../projectTitleFormatter.component.ts | 6 +- .../claimsByToken.component.html | 2 +- .../claimsByToken/claimsByToken.component.ts | 9 +- .../selected/selectedProjects.component.ts | 162 ++--- deposit/depositResult.component.ts | 576 +++++++++--------- deposit/searchResultsInDeposit.component.html | 62 -- .../dataProvider/dataProvider.component.html | 6 +- .../dataProvider/dataProvider.component.ts | 338 +++++----- .../organizationsTab.component.ts | 4 +- .../relatedDatasourcesTab.component.ts | 108 +--- .../landing-utils/availableOn.component.ts | 7 +- .../result/resultLanding.component.html | 5 +- .../result/resultLanding.component.ts | 1 + utils/authors/showAuthors.component.ts | 8 +- .../result-preview.component.html | 2 +- .../result-preview.component.ts | 1 + 16 files changed, 590 insertions(+), 707 deletions(-) diff --git a/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts b/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts index f967c618..76acba43 100644 --- a/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts +++ b/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts @@ -1,5 +1,6 @@ import {Component, Input} from '@angular/core'; import {RouterHelper} from '../../../utils/routerHelper.class'; +import {properties} from "../../../../../environments/environment"; //Usage Example " " @@ -8,12 +9,12 @@ import {RouterHelper} from '../../../utils/routerHelper.class'; template: ` {{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}} + [href]="externalPortalUrl + projectUrl + '?projectId='+project['openaireId']">{{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}} {{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}} + [routerLink]="projectUrl">{{(project['acronym'] ? ('[' + project['acronym'] + '] ') : '')}}{{project['name']}}
@@ -28,6 +29,7 @@ export class ProjectTitleFormatter { @Input() externalPortalUrl: string = null; public url: string; public routerHelper: RouterHelper = new RouterHelper(); + public projectUrl = properties.searchLinkToProject.split('?')[0]; constructor() { } diff --git a/claims/claimsByToken/claimsByToken.component.html b/claims/claimsByToken/claimsByToken.component.html index 70d96857..86e0cabd 100644 --- a/claims/claimsByToken/claimsByToken.component.html +++ b/claims/claimsByToken/claimsByToken.component.html @@ -14,7 +14,7 @@ Claims Administrator + [routerLink]="properties.searchLinkToProject.split('?')[0]"> {{project['name']}} ({{project['funderName']}}) diff --git a/claims/claimsByToken/claimsByToken.component.ts b/claims/claimsByToken/claimsByToken.component.ts index ba0744fa..c682cb0f 100644 --- a/claims/claimsByToken/claimsByToken.component.ts +++ b/claims/claimsByToken/claimsByToken.component.ts @@ -21,6 +21,7 @@ import {ClaimsByTokenService} from './claimsByToken.service'; import {Session} from '../../login/utils/helper.class'; import {LoginErrorCodes} from '../../login/utils/guardHelper.class'; +import {properties} from "../../../../environments/environment"; @Component({ @@ -69,7 +70,6 @@ export class ClaimsByTokenComponent { public totalPendingResults:any = {count: 0}; public activeCuratedPage:any = {page: 1}; public totalCuratedResults:any = {count: 0}; - dtTrigger: Subject[] = []; private triggered: boolean = false; @@ -82,7 +82,7 @@ export class ClaimsByTokenComponent { @ViewChild (ModalSelect) selectModal : ModalSelect; @ViewChild (ModalLoading) loading : ModalLoading ; - properties:EnvProperties; + properties:EnvProperties = properties; public routerHelper:RouterHelper = new RouterHelper(); @@ -96,11 +96,6 @@ export class ClaimsByTokenComponent { this.curated_status = this.errorCodes.LOADING; } ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - - }); this.sub = this.route.queryParams.subscribe(params => { this.mode = "pending"; this.openaireId = params['openaireId']; diff --git a/claims/linking/selected/selectedProjects.component.ts b/claims/linking/selected/selectedProjects.component.ts index 040ee925..4a00a306 100644 --- a/claims/linking/selected/selectedProjects.component.ts +++ b/claims/linking/selected/selectedProjects.component.ts @@ -1,88 +1,90 @@ -import {Component, Input,Output, EventEmitter} from '@angular/core'; +import {Component, Input, Output, EventEmitter} from '@angular/core'; import {ClaimProject} from '../../claim-utils/claimHelper.class'; import {RouterHelper} from '../../../utils/routerHelper.class'; +import {properties} from "../../../../../environments/environment"; @Component({ - selector: 'claim-selected-projects', - template: ` - - -
- -
- - -
- -
- - - - ` + selector: 'claim-selected-projects', + template: ` +
+
+ +
+ +
` }) export class ClaimSelectedProjectsComponent { - - -ngOnInit() { - var myDate = new Date(); - this.todayDate=( myDate.getFullYear()+ "-" +myDate.getMonth() + 1) + "-" + myDate.getDate() ; - this.nextDate= ( (myDate.getFullYear()+100)+ "-" +myDate.getMonth() + 1) + "-" + myDate.getDate() ; - // if(this.linkType == "project"){ + + + ngOnInit() { + var myDate = new Date(); + this.todayDate = (myDate.getFullYear() + "-" + myDate.getMonth() + 1) + "-" + myDate.getDate(); + this.nextDate = ((myDate.getFullYear() + 100) + "-" + myDate.getMonth() + 1) + "-" + myDate.getDate(); + // if(this.linkType == "project"){ this.showsearch = true - // }else{ - // this.showsearch = false; - // } - //2015-05-01 -} - - -@Input() projects: ClaimProject[]; -@Input() show='home'; -@Input() title='Projects'; -@Input() linkType:string = "project"; -@Input() hideType; -@Input() bulkMode:boolean = false; -@Input() linkToResults:boolean = true; -@Output() projectsChange = new EventEmitter(); -@Output() showChange = new EventEmitter(); -showsearch:boolean = false; -@Input() localStoragePrefix:string = ""; -todayDate = ''; -nextDate = ''; -public routerHelper:RouterHelper = new RouterHelper(); - -removeProject(item:any){ - var index:number =this.projects.indexOf(item); - if (index > -1) { - this.projects.splice(index, 1); - if(this.projects != null){ - localStorage.setItem(this.localStoragePrefix + "projects", JSON.stringify(this.projects)); - } - } - this.projectsChange.emit({ - value: this.projects - }); -} -showType(type){ -if(type != this.show){ - this.show = type; - this.showChange.emit({ - value: this.show - }); -} -} -projectSelected($event) { - // this.showsearch = false; -} - - + // }else{ + // this.showsearch = false; + // } + //2015-05-01 + } + + + @Input() projects: ClaimProject[]; + @Input() show = 'home'; + @Input() title = 'Projects'; + @Input() linkType: string = "project"; + @Input() hideType; + @Input() bulkMode: boolean = false; + @Input() linkToResults: boolean = true; + @Output() projectsChange = new EventEmitter(); + @Output() showChange = new EventEmitter(); + showsearch: boolean = false; + @Input() localStoragePrefix: string = ""; + todayDate = ''; + nextDate = ''; + public routerHelper: RouterHelper = new RouterHelper(); + public projectUrl = properties.searchLinkToProject.split('?')[0]; + + removeProject(item: any) { + var index: number = this.projects.indexOf(item); + if (index > -1) { + this.projects.splice(index, 1); + if (this.projects != null) { + localStorage.setItem(this.localStoragePrefix + "projects", JSON.stringify(this.projects)); + } + } + this.projectsChange.emit({ + value: this.projects + }); + } + + showType(type) { + if (type != this.show) { + this.show = type; + this.showChange.emit({ + value: this.show + }); + } + } + + projectSelected($event) { + // this.showsearch = false; + } + + } diff --git a/deposit/depositResult.component.ts b/deposit/depositResult.component.ts index 81e127d8..bc93826b 100644 --- a/deposit/depositResult.component.ts +++ b/deposit/depositResult.component.ts @@ -1,33 +1,34 @@ -import {Component, Input} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Title, Meta} from '@angular/platform-browser'; +import {Component, Input} from '@angular/core'; +import {Router, ActivatedRoute} from '@angular/router'; +import {Title, Meta} from '@angular/platform-browser'; -import {Observable} from 'rxjs'; -import {ErrorCodes} from '../utils/properties/errorCodes'; +import {Observable} from 'rxjs'; +import {ErrorCodes} from '../utils/properties/errorCodes'; -import{EnvProperties} from '../utils/properties/env-properties'; +import {EnvProperties} from '../utils/properties/env-properties'; import {RouterHelper} from '../utils/routerHelper.class'; -import {FetchDataproviders} from '../utils/fetchEntitiesClasses/fetchDataproviders.class'; +import {FetchDataproviders} from '../utils/fetchEntitiesClasses/fetchDataproviders.class'; import {SearchDataprovidersService} from '../services/searchDataproviders.service'; import {OrganizationService} from '../services/organization.service'; import {PiwikService} from '../utils/piwik/piwik.service'; -import { SEOService } from '../sharedComponents/SEO/SEO.service'; +import {SEOService} from '../sharedComponents/SEO/SEO.service'; import {ZenodoInformationClass} from './utils/zenodoInformation.class'; +import {properties} from "../../../environments/environment"; @Component({ - selector: 'deposit-result', - template: ` -
+ selector: 'deposit-result', + template: ` +
-
- +
+ -
-
- Share {{requestFor}} -
+
+
+ Share {{requestFor}} +
@@ -51,25 +52,31 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';

- - {{organization['name']}} - - {{organization['name']}} + class="organization"> + + {{organization['name']}} + + {{organization['name']}}

-
- + + - +
Keywords: {{subject}} - @@ -78,63 +85,83 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';
-

- Please use the information below and contact your repository to deposit your {{requestFor}}. + Please use the information below and contact your repository to deposit your {{requestFor}}.

- + class="uk-align-center uk-margin-remove-bottom"> +
-
-
+
+
- - + + - + [no title available] -

+

[no title available]

- {{result['type']}} - {{result.compatibility}} + {{result['type']}} + {{result.compatibility}} -
- Organization: - +
+ Organization: + - + {{organization.name}} + *ngIf="!organization.id"> {{organization.name}}, + *ngIf="(i < result['organizations'].length-1) && (i < 9)">, - ... + ...
- Country: {{country}}{{(i < ( result['countries'].slice(0,10).length-1))?", ":""}}{{(i == result['countries'].slice(0,10).length-1 && result['countries'].length > 10)?"...":""}} + Country: {{country}}{{(i < (result['countries'].slice(0, 10).length - 1)) ? ", " : ""}}{{(i == result['countries'].slice(0, 10).length - 1 && result['countries'].length > 10) ? "..." : ""}}
Website URL: - + {{result['websiteURL']}} @@ -142,7 +169,7 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';
OAI-PMH URL: - + {{result['OAIPMHURL']}} @@ -150,50 +177,52 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';
- Subject: {{subject}}{{(i < ( result['subjects'].slice(0,10).length-1))?", ":""}}{{(i == result['subjects'].slice(0,10).length-1 && result['subjects'].length > 10)?"...":""}} + Subject: {{subject}}{{(i < (result['subjects'].slice(0, 10).length - 1)) ? ", " : ""}}{{(i == result['subjects'].slice(0, 10).length - 1 && result['subjects'].length > 10) ? "..." : ""}}
-
- No organization with ID: {{organizationId}} found. -
-
- An error occured. -
- + status == errorCodes.NOT_AVAILABLE || status == errorCodes.NONE" + class="alert alert-warning"> +
+ No organization with ID: {{organizationId}} found. +
+
+ An error occured. +
+ Service temprorarily unavailable. Please try again later. -
- No ID for organization. -
+
+ No ID for organization. +
+ && fetchDataproviders.searchUtils.status != errorCodes.LOADING" class="alert alert-warning"> An error occured. - + Service temprorarily unavailable. Please try again later. - + Requested page out of bounds. -
- No content providers found for institution: - - {{organization['name']}} () - - {{organization['name']}} - . -
-
- No content providers found with classification "{{subject}}". -
+
+ No content providers found for institution: + + {{organization['name']}} () + + {{organization['name']}} + . +
+
+ No content providers found with classification "{{subject}}". +
@@ -202,7 +231,8 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';
Deposit your {{requestFor}} in - + {{zenodoInformation.name}} ()
More Zenodo communities @@ -216,16 +246,20 @@ import {ZenodoInformationClass} from './utils/zenodoInformation.class';
- -
+
- - ` + + ` }) export class DepositResultComponent { @@ -234,208 +268,206 @@ export class DepositResultComponent { @Input() piwikSiteId = null; // Type of entity: Publication or Research Data @Input() requestFor: string = "Publications"; - - public organization: {"name": string, "url": string}; + + public organization: { "name": string, "url": string }; public organizationId: string = ""; - + // Id of the new selected organization to be searched public selectedId: string = ""; - + @Input() subjectResults: boolean = false; @Input() subject: string = ""; - + public status: number; public warningMessage: string = ""; - - public fetchDataproviders : FetchDataproviders; + + public fetchDataproviders: FetchDataproviders; public linkToSearchDataproviders: string = ""; - - public parameterNames:string[] =[]; - public parameterValues:string[] =[]; - - public routerHelper:RouterHelper = new RouterHelper(); - public errorCodes:ErrorCodes = new ErrorCodes(); - - sub: any; piwiksub: any; - properties:EnvProperties; - url=null; - - constructor ( private _router: Router, - private route: ActivatedRoute, - private _searchDataprovidersService: SearchDataprovidersService, - private _organizationService: OrganizationService, - private _meta: Meta, - private _title: Title, - private _piwikService:PiwikService, + + public parameterNames: string[] = []; + public parameterValues: string[] = []; + + public routerHelper: RouterHelper = new RouterHelper(); + public errorCodes: ErrorCodes = new ErrorCodes(); + sub: any; + piwiksub: any; + properties: EnvProperties = properties; + url = null; + + constructor(private _router: Router, + private route: ActivatedRoute, + private _searchDataprovidersService: SearchDataprovidersService, + private _organizationService: OrganizationService, + private _meta: Meta, + private _title: Title, + private _piwikService: PiwikService, private seoService: SEOService) { - - this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - - this.status = this.errorCodes.LOADING; - - - var title = "Deposit "+this.requestFor; - var description = "Openaire, repositories, open access, content provider, compatibility, organization, deposit "+ this.requestFor; - - this.updateTitle(title); - this.updateDescription(description); - + + this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); + + this.status = this.errorCodes.LOADING; + + + var title = "Deposit " + this.requestFor; + var description = "Openaire, repositories, open access, content provider, compatibility, organization, deposit " + this.requestFor; + + this.updateTitle(title); + this.updateDescription(description); + + } + + ngOnInit() { + this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false); + this.updateUrl(this.properties.baseLink + this._router.url); + this.url = this.properties.baseLink + this._router.url; + + if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { + this.piwiksub = this._piwikService.trackView(this.properties, "Deposit " + this.requestFor, this.piwikSiteId).subscribe(); } - ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false); - this.updateUrl(data.envSpecific.baseLink+this._router.url); - this.url = data.envSpecific.baseLink+this._router.url; - - if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ - this.piwiksub = this._piwikService.trackView(this.properties, "Deposit "+this.requestFor, this.piwikSiteId).subscribe(); - } - }); - - this.sub = this.route.queryParams.subscribe(params => { - this.fetchDataproviders.searchUtils.page = (params['page']=== undefined)?1:+params['page']; - - if(this.subjectResults) { - this.status = this.errorCodes.DONE; - - this.subject = params['subject']; - if(!this.subject) { - this.subject = ""; - } - this.parameterNames.push('subject'); - this.parameterValues.push(this.subject); - - this.searchDataprovidersBySubject(); - } else { - if(this.organizationId) { - this.searchDataproviders(); - } else { - this.organizationId = params['organizationId']; - this.parameterNames.push('organizationId'); - this.parameterValues.push(this.organizationId); - - if(this.organizationId){ - this.getOrganizationInfo(); - } - } - this.selectedId = ""; - } - }); - } - - ngDoCheck() { - if(!this.subjectResults && (this.organizationId == "" || this.organizationId == undefined)) { - this.organizationId = ""; - this.status = this.errorCodes.NONE; - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; + this.sub = this.route.queryParams.subscribe(params => { + this.fetchDataproviders.searchUtils.page = (params['page'] === undefined) ? 1 : +params['page']; + + if (this.subjectResults) { + this.status = this.errorCodes.DONE; + + this.subject = params['subject']; + if (!this.subject) { + this.subject = ""; } - } - - ngOnDestroy() { - this.sub.unsubscribe(); - if(this.piwiksub){ - this.piwiksub.unsubscribe(); - } - } - - public newSubject() { - this._router.navigate( ['participate/deposit-subject-result'], { queryParams: { "subject": this.subject } } ); - } - - public searchDataprovidersBySubject() { - this.parameterNames = []; - this.parameterValues = []; this.parameterNames.push('subject'); this.parameterValues.push(this.subject); - - this.fetchDataproviders.getResultsBySubjectsForDeposit( (this.subject =="")?"*":this.subject, this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); - this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; - } - - private searchDataproviders() { - // if(this.organization != undefined) { - // this.fetchDataproviders.getResults(this.organization.name, false, 1, 10); - // } else if(this.organizationId != undefined) { - this.fetchDataproviders.getResultsForDeposit( this.organizationId,this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); - //} - this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; - } - - private getOrganizationInfo () { - this.fetchDataproviders.oldTotalResults = 0; - this.fetchDataproviders.searchUtils.totalResults = 0; - - this._organizationService.getOrganizationNameAndUrlById(this.organizationId,this.properties).subscribe( - data => { - if(data == null) { - this.status = this.errorCodes.NOT_FOUND; - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; - } else { - this.organization = data; - this.status = this.errorCodes.DONE; - this.searchDataproviders(); - } - }, - err => { - //console.log(err) - this.handleError("Error getting organization name and url for id: "+this.organizationId, err); - - this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; - if(err.status == '404') { - this.status = this.errorCodes.NOT_FOUND; - } else if(err.status == '500') { - this.status = this.errorCodes.ERROR; - } else { - this.status = this.errorCodes.NOT_AVAILABLE; - } - } - ); - } - - public goToDeposit() { - if(this.requestFor == "Publications") { - this._router.navigate( ['participate/deposit-publications'] ); - } else if(this.requestFor == "Research Data") { - this._router.navigate( ['participate/deposit-datasets'] ); - } - } - - public valueChanged($event){ - this.selectedId = $event.value; - } - - public organizationSelected(id: string) { - if(id && id.length > 0 && id != this.organizationId){ - this.organization = null; - this.status = this.errorCodes.LOADING; - - if(this.requestFor == "Publications") { - this._router.navigate( ['participate/deposit-publications-result'], { queryParams: { "organizationId": id } } ); - } else if(this.requestFor == "Research Data") { - this._router.navigate( ['participate/deposit-datasets-result'], { queryParams: { "organizationId": id } } ); - } + + this.searchDataprovidersBySubject(); + } else { + if (this.organizationId) { + this.searchDataproviders(); } else { - this.warningMessage = "No new organization selected"; + this.organizationId = params['organizationId']; + this.parameterNames.push('organizationId'); + this.parameterValues.push(this.organizationId); + + if (this.organizationId) { + this.getOrganizationInfo(); + } } + this.selectedId = ""; + } + }); + } + + ngDoCheck() { + if (!this.subjectResults && (this.organizationId == "" || this.organizationId == undefined)) { + this.organizationId = ""; + this.status = this.errorCodes.NONE; + this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; } - - private updateDescription(description:string) { - this._meta.updateTag({content:description},"name='description'"); - this._meta.updateTag({content:description},"property='og:description'"); + } + + ngOnDestroy() { + this.sub.unsubscribe(); + if (this.piwiksub) { + this.piwiksub.unsubscribe(); } - private updateTitle(title:string){ - var _prefix ="OpenAIRE | "; - var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title); - this._title.setTitle(_title); - this._meta.updateTag({content:_title},"property='og:title'"); + } + + public newSubject() { + this._router.navigate(['participate/deposit-subject-result'], {queryParams: {"subject": this.subject}}); + } + + public searchDataprovidersBySubject() { + this.parameterNames = []; + this.parameterValues = []; + this.parameterNames.push('subject'); + this.parameterValues.push(this.subject); + + this.fetchDataproviders.getResultsBySubjectsForDeposit((this.subject == "") ? "*" : this.subject, this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); + this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; + } + + private searchDataproviders() { + // if(this.organization != undefined) { + // this.fetchDataproviders.getResults(this.organization.name, false, 1, 10); + // } else if(this.organizationId != undefined) { + this.fetchDataproviders.getResultsForDeposit(this.organizationId, this.requestFor, this.fetchDataproviders.searchUtils.page, this.fetchDataproviders.searchUtils.size, this.properties); + //} + this.linkToSearchDataproviders = this.properties.searchLinkToDataProviders; + } + + private getOrganizationInfo() { + this.fetchDataproviders.oldTotalResults = 0; + this.fetchDataproviders.searchUtils.totalResults = 0; + + this._organizationService.getOrganizationNameAndUrlById(this.organizationId, this.properties).subscribe( + data => { + if (data == null) { + this.status = this.errorCodes.NOT_FOUND; + this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; + } else { + this.organization = data; + this.status = this.errorCodes.DONE; + this.searchDataproviders(); + } + }, + err => { + //console.log(err) + this.handleError("Error getting organization name and url for id: " + this.organizationId, err); + + this.fetchDataproviders.searchUtils.status = this.errorCodes.NONE; + if (err.status == '404') { + this.status = this.errorCodes.NOT_FOUND; + } else if (err.status == '500') { + this.status = this.errorCodes.ERROR; + } else { + this.status = this.errorCodes.NOT_AVAILABLE; + } + } + ); + } + + public goToDeposit() { + if (this.requestFor == "Publications") { + this._router.navigate(['participate/deposit-publications']); + } else if (this.requestFor == "Research Data") { + this._router.navigate(['participate/deposit-datasets']); } - private updateUrl(url:string){ - this._meta.updateTag({content:url},"property='og:url'"); - } - - private handleError(message: string, error) { - console.error("Deposit Result Page: "+message, error); + } + + public valueChanged($event) { + this.selectedId = $event.value; + } + + public organizationSelected(id: string) { + if (id && id.length > 0 && id != this.organizationId) { + this.organization = null; + this.status = this.errorCodes.LOADING; + + if (this.requestFor == "Publications") { + this._router.navigate(['participate/deposit-publications-result'], {queryParams: {"organizationId": id}}); + } else if (this.requestFor == "Research Data") { + this._router.navigate(['participate/deposit-datasets-result'], {queryParams: {"organizationId": id}}); + } + } else { + this.warningMessage = "No new organization selected"; } + } + + private updateDescription(description: string) { + this._meta.updateTag({content: description}, "name='description'"); + this._meta.updateTag({content: description}, "property='og:description'"); + } + + private updateTitle(title: string) { + var _prefix = "OpenAIRE | "; + var _title = _prefix + ((title.length > 50) ? title.substring(0, 50) : title); + this._title.setTitle(_title); + this._meta.updateTag({content: _title}, "property='og:title'"); + } + + private updateUrl(url: string) { + this._meta.updateTag({content: url}, "property='og:url'"); + } + + private handleError(message: string, error) { + console.error("Deposit Result Page: " + message, error); + } } diff --git a/deposit/searchResultsInDeposit.component.html b/deposit/searchResultsInDeposit.component.html index 0aa7814b..e8f47251 100644 --- a/deposit/searchResultsInDeposit.component.html +++ b/deposit/searchResultsInDeposit.component.html @@ -16,7 +16,6 @@ Deposit in Zenodo
-
  • @@ -25,65 +24,4 @@
    • -
diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index ffb06c1d..ff429ea3 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -41,7 +41,7 @@ title="Compatibility"> + [routerLink]="properties.searchLinkToDataProvider.split('?')[0]"> {{dataProviderInfo.compatibility.info}} @@ -49,7 +49,7 @@ + [routerLink]="properties.searchLinkToDataProvider.split('?')[0]"> {{dataProviderInfo.compatibility.name}} @@ -212,7 +212,7 @@ [title]="organization.name"> + [routerLink]="properties.searchLinkToOrganization.split('?')[0]"> {{(organization.acronym) ? organization.acronym : ''}} {{(!organization.acronym && organization.name) ? organization.name : ''}} diff --git a/landingPages/dataProvider/dataProvider.component.ts b/landingPages/dataProvider/dataProvider.component.ts index a9e805e1..0642d46c 100644 --- a/landingPages/dataProvider/dataProvider.component.ts +++ b/landingPages/dataProvider/dataProvider.component.ts @@ -25,6 +25,7 @@ import {StringUtils} from "../../utils/string-utils.class"; import {SearchResult} from "../../utils/entities/searchResult"; import {ResultPreview} from "../../utils/result-preview/result-preview"; import {IndexInfoService} from "../../utils/indexInfo.service"; +import {properties} from "../../../../environments/environment"; @Component({ @@ -37,16 +38,16 @@ export class DataProviderComponent { @Input() communityId = null; public dataProviderInfo: DataProviderInfo; public datasourceId: string; - + // Message variables public warningMessage = ""; public errorMessage = ""; public showLoading: boolean = true; - + // Variable to specify requests with either collectedFrom or hostedBy public paramsForSearchLink = {}; public resultParamsForSearchLink = {}; - + // Metrics tab variables public metricsClicked: boolean; public viewsFrameUrl: string; @@ -54,7 +55,7 @@ export class DataProviderComponent { public totalViews: number; public totalDownloads: number; public pageViews: number; - + // Statistics tab variables public statsClicked: boolean = false; public docsTimelineUrl: string; @@ -62,10 +63,10 @@ export class DataProviderComponent { public docsFunderUrl: string; public dataProjectsUrl: string; public pubsProjectsUrl: string; - + @ViewChild('statisticsModal') statisticsModal; @ViewChild('relatedDatasourcesModal') relatedDatasourcesModal; - + // Variables for publications, research data, projects, content providers, related content providers tabs public fetchPublications: FetchResearchResults; public fetchDatasets: FetchResearchResults; @@ -79,24 +80,24 @@ export class DataProviderComponent { public fetchAggregatorsOrps: FetchResearchResults; public fetchAggregatorsResults: FetchResearchResults; public searchNumber: number = 5; - + public aggregationStatusIsInitialized: boolean = false; - + public loadingRelatedDatasources: boolean = true; - + // Active tab variable for responsiveness - show tabs only if main request is completed public activeTab: string = ""; public showTabs: boolean = false; - + public firstTab: string = ""; public _numberOfTabs: number = 0; public tabsAreInitialized: boolean = false; - + public routerHelper: RouterHelper = new RouterHelper(); public errorCodes: ErrorCodes = new ErrorCodes(); public pageContents = null; public divContents = null; - + // Request results of each tab only the one time (first time tab is clicked) private reloadPublications: boolean = true; private reloadDatasets: boolean = true; @@ -105,29 +106,29 @@ export class DataProviderComponent { private reloadProjects: boolean = true; private reloadDataproviders: boolean = true; private reloadRelatedDatasources: boolean = true; - + // Organizations variables for view more/less functionality public thresholdOrganizations: number = 20; public showNumOrganizations: number = 20; - + // Subjects variables for view more/less functionality public thresholdSubjects: number = 20; public showNumSubjects: number = 20; - + // Description variables for view more/less functionality public thresholdDescription: number = 670; public showNumDescription: number = 670; - + public indexUpdateDate: Date; public showFeedback: boolean = false; - public feedbackFields: string [] = ['Name', 'Organizations','Country', 'Other']; + public feedbackFields: string [] = ['Name', 'Organizations', 'Country', 'Other']; sub: any; piwiksub: any; subInfo: any; relatedDatasourcesSub: any; - properties: EnvProperties; - + properties: EnvProperties = properties; + constructor(private _dataproviderService: DataProviderService, private _piwikService: PiwikService, private route: ActivatedRoute, @@ -147,43 +148,43 @@ export class DataProviderComponent { this.fetchOrps = new FetchResearchResults(this._searchResearchResultsService); this.fetchProjects = new FetchProjects(this._searchProjectsService); this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService); - + } - + ngOnInit() { - this.route.data - .subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - if (typeof document !== 'undefined') { - this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { - if (lastIndexUpdate) { - this.indexUpdateDate = new Date(lastIndexUpdate); - } else if (this.properties.lastIndexUpdate) { - this.indexUpdateDate = new Date(this.properties.lastIndexUpdate); - } - }); + if (typeof document !== 'undefined') { + this.indexInfoService.getLastIndexDate(this.properties).subscribe(lastIndexUpdate => { + if (lastIndexUpdate) { + this.indexUpdateDate = new Date(lastIndexUpdate); + } else if (this.properties.lastIndexUpdate) { + this.indexUpdateDate = new Date(this.properties.lastIndexUpdate); } - //this.getDivContents(); - this.getPageContents(); - this.updateUrl(data.envSpecific.baseLink + this._router.url); - }); + } + //this.getDivContents(); + this.getPageContents(); + this.updateUrl(this.properties.baseLink + this._router.url); this.sub = this.route.queryParams.subscribe(data => { this.updateTitle("Content provider"); this.updateDescription(""); this.datasourceId = data['datasourceId']; - if (this.datasourceId && StringUtils.isOpenAIREID(this.datasourceId)) { + if (this.datasourceId && StringUtils.isOpenAIREID(this.datasourceId)) { this.initializeValues(); this.getDataProviderInfo(this.datasourceId); } else { this.showLoading = false; - this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "dataprovider"}}); + this._router.navigate(['/error'], { + queryParams: { + "page": this._location.path(true), + "page_type": "dataprovider" + } + }); } - + HelperFunctions.scroll(); }); } - + public initializeValues() { this._numberOfTabs = 0; this.tabsAreInitialized = false; @@ -204,19 +205,19 @@ export class DataProviderComponent { this.statsClicked = false; this.metricsClicked = false; } - + private getPageContents() { this.helper.getPageHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => { this.pageContents = contents; }) } - + private getDivContents() { this.helper.getDivHelpContents(this.properties, this.communityId, this._router.url).subscribe(contents => { this.divContents = contents; }) } - + ngOnDestroy() { if (this.sub) { this.sub.unsubscribe(); @@ -227,19 +228,19 @@ export class DataProviderComponent { if (this.subInfo) { this.subInfo.unsubscribe(); } - + if (this.relatedDatasourcesSub) { this.relatedDatasourcesSub.unsubscribe(); } } - + private getDataProviderInfo(id: string) { this.warningMessage = ''; this.errorMessage = ""; this.showLoading = true; - + this.dataProviderInfo = null; - + this.showTabs = false; if (this.datasourceId == null || this.datasourceId == '') { this.showLoading = false; @@ -263,9 +264,9 @@ export class DataProviderComponent { if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) { this.piwiksub = this._piwikService.trackView(this.properties, this.dataProviderInfo.title.name, this.piwikSiteId).subscribe(); } - + this.showLoading = false; - + // if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) { // this.activeTab = this.dataProviderInfo.tabs[0].name; // } @@ -273,8 +274,13 @@ export class DataProviderComponent { err => { //console.log(err); this.handleError("Error getting content provider for id: " + this.datasourceId, err); - if(err.status == 404) { - this._router.navigate(['/error'], {queryParams: {"page": this._location.path(true), "page_type": "dataprovider"}}); + if (err.status == 404) { + this._router.navigate(['/error'], { + queryParams: { + "page": this._location.path(true), + "page_type": "dataprovider" + } + }); } this.errorMessage = 'No dataProvider found'; this.showLoading = false; @@ -283,7 +289,7 @@ export class DataProviderComponent { ); } } - + private getDataProviderAggregationStatus(originalId: string) { this.subInfo = this._dataproviderService.getDataproviderAggregationStatus(originalId, this.properties).subscribe( data => { @@ -298,12 +304,12 @@ export class DataProviderComponent { } ); } - + private updateDescription(description: string) { this._meta.updateTag({content: description.substring(0, 160)}, "name='description'"); this._meta.updateTag({content: description.substring(0, 160)}, "property='og:description'"); } - + private updateTitle(title: string) { var _prefix = ""; // if(this.communityId) { @@ -313,51 +319,51 @@ export class DataProviderComponent { this._title.setTitle(title); this._meta.updateTag({content: title}, "property='og:title'"); } - + private updateUrl(url: string) { this._meta.updateTag({content: url}, "property='og:url'"); } - + private initTabs() { - + //if (this.dataProviderInfo.tabs != undefined && this.dataProviderInfo.tabs.length > 0) { - this.reloadPublications = true; - this.reloadDatasets = true; - this.reloadSoftware = true; - this.reloadOrps = true; - this.reloadProjects = true; - this.reloadDataproviders = true; - this.reloadRelatedDatasources = true; - this.statsClicked = false; - - //this.search(this.dataProviderInfo.tabs[0].content, 1, 10); - this.count(1, 0); - - this.metricsClicked = false; - - this.viewsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"dtsrcRepoViews","dtsrcName":"' + this.datasourceId + '","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; - /*this.viewsFrameUrl = this.properties.framesAPIURL+'merge.php?com=query&data=[{"query":"dtsrcOpenAIRETimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"dtsrcRepoTimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'; - */ - - this.downloadsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"dtsrcRepoDownloads","dtsrcName":"' + this.datasourceId + '","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; - /* - this.downloadsFrameUrl = this.properties.framesAPIURL +'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'; - */ - - //if({"name": "Publications", "content": "publicationsTab"} in this.dataProviderInfo.tabs) { - //if(this.dataProviderInfo.tabs.some(function (tab) { - // return tab.name === 'Publications'; - //})) { - // this.relatedDataprovidersResultsType = 'publications'; - - // this.fetchAggregatorsPublications = new FetchResearchResults(this._searchResearchResultsService); - // //} else { - // // this.relatedDataprovidersResultsType = 'datasets'; - // this.fetchAggregatorsDatasets = new FetchResearchResults(this._searchResearchResultsService); - // //} - // this.fetchAggregatorsSoftware = new FetchResearchResults(this._searchResearchResultsService); - // this.fetchAggregatorsOrps = new FetchResearchResults(this._searchResearchResultsService); - this.fetchAggregatorsResults = new FetchResearchResults(this._searchResearchResultsService); + this.reloadPublications = true; + this.reloadDatasets = true; + this.reloadSoftware = true; + this.reloadOrps = true; + this.reloadProjects = true; + this.reloadDataproviders = true; + this.reloadRelatedDatasources = true; + this.statsClicked = false; + + //this.search(this.dataProviderInfo.tabs[0].content, 1, 10); + this.count(1, 0); + + this.metricsClicked = false; + + this.viewsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"dtsrcRepoViews","dtsrcName":"' + this.datasourceId + '","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; + /*this.viewsFrameUrl = this.properties.framesAPIURL+'merge.php?com=query&data=[{"query":"dtsrcOpenAIRETimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"OpenAIRE","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]},{"query":"dtsrcRepoTimeline", "dtsrcName":"'+this.datasourceId+'", "table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":" ","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"Repository","yaxisheaders":[""],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["column","column"]&stacking=normal&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'; + */ + + this.downloadsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"dtsrcRepoDownloads","dtsrcName":"' + this.datasourceId + '","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false'; + /* + this.downloadsFrameUrl = this.properties.framesAPIURL +'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true'; + */ + + //if({"name": "Publications", "content": "publicationsTab"} in this.dataProviderInfo.tabs) { + //if(this.dataProviderInfo.tabs.some(function (tab) { + // return tab.name === 'Publications'; + //})) { + // this.relatedDataprovidersResultsType = 'publications'; + + // this.fetchAggregatorsPublications = new FetchResearchResults(this._searchResearchResultsService); + // //} else { + // // this.relatedDataprovidersResultsType = 'datasets'; + // this.fetchAggregatorsDatasets = new FetchResearchResults(this._searchResearchResultsService); + // //} + // this.fetchAggregatorsSoftware = new FetchResearchResults(this._searchResearchResultsService); + // this.fetchAggregatorsOrps = new FetchResearchResults(this._searchResearchResultsService); + this.fetchAggregatorsResults = new FetchResearchResults(this._searchResearchResultsService); //} // if (this.dataProviderInfo.resultsBy == "collectedFrom") { // //this.paramsForSearchLink = "?collectedFrom="+this.datasourceId+"&co=and"; @@ -368,9 +374,9 @@ export class DataProviderComponent { // this.paramsForSearchLink = this.routerHelper.createQueryParams(['f0', 'fv0'], ["resulthostingdatasourceid", this.datasourceId]); // this.resultParamsForSearchLink = this.routerHelper.createQueryParams(['hostedBy', 'hs', 'qf'], [this.datasourceId, 'and', 'false']); // } - + } - + public getParamsForSearchLink(type: string = "") { let resultsBy: string = ""; // if(this.dataProviderInfo.resultsBy == "collectedFrom") { @@ -378,36 +384,36 @@ export class DataProviderComponent { // } else if (this.dataProviderInfo.resultsBy == "hostedBy") { // resultsBy = "resulthostingdatasourceid"; // } - - if(type) { + + if (type) { return this.routerHelper.createQueryParams(['f0', 'fv0', 'f1', 'fv1', 'type', 'qf', 'sortBy'], ["collectedfromdatasourceid", this.datasourceId, "resulthostingdatasourceid,or", this.datasourceId, type, "false", 'resultdateofacceptance,descending']); } else { return this.routerHelper.createQueryParams(['f0', 'fv0', 'f1', 'fv1'], ["collectedfromdatasourceid", this.datasourceId, "resulthostingdatasourceid,or", this.datasourceId]); } } - + private count(page: number, size: number) { //for (let i = 0; i < this.dataProviderInfo.tabs.length; i++) { - //let content: string = this.dataProviderInfo.tabs[i].content; - - //if (content == 'publicationsTab') { - this.countPublications(page, size); - //} else if (content == 'datasetsTab') { - this.countDatasets(page, size); - //} else if (content == 'softwareTab') { - this.countSoftware(page, size); - //} else if (content == 'orpsTab') { - this.countOrps(page, size); - //} else if (content == 'projectsTab') { - this.countProjects(page, size); - //} else if (content == 'datasourcesTab') { - this.countDatasources(page, size); - //}// else if(content=='relatedDatasourcesTab') { - // this.countRelatedDatasources(page, size); - //} + //let content: string = this.dataProviderInfo.tabs[i].content; + + //if (content == 'publicationsTab') { + this.countPublications(page, size); + //} else if (content == 'datasetsTab') { + this.countDatasets(page, size); + //} else if (content == 'softwareTab') { + this.countSoftware(page, size); + //} else if (content == 'orpsTab') { + this.countOrps(page, size); + //} else if (content == 'projectsTab') { + this.countProjects(page, size); + //} else if (content == 'datasourcesTab') { + this.countDatasources(page, size); + //}// else if(content=='relatedDatasourcesTab') { + // this.countRelatedDatasources(page, size); + //} //} } - + public search(content: string, page: number, size: number) { if (content == 'publicationsTab') { this.searchPublications(page, size); @@ -429,7 +435,7 @@ export class DataProviderComponent { this.statsClicked = !this.statsClicked; } } - + private searchPublications(page: number, size: number) { if (this.reloadPublications && (this.fetchPublications.searchUtils.status == this.errorCodes.LOADING || @@ -440,11 +446,11 @@ export class DataProviderComponent { } this.reloadPublications = false; } - + private countPublications(page: number, size: number) { this.fetchPublications.getResultsForDataproviders("publication", this.datasourceId, this.dataProviderInfo.resultsBy, page, size, this.properties); } - + private searchDatasets(page: number, size: number) { if (this.reloadDatasets && (this.fetchDatasets.searchUtils.status == this.errorCodes.LOADING || @@ -455,11 +461,11 @@ export class DataProviderComponent { } this.reloadDatasets = false; } - + private countDatasets(page: number, size: number) { this.fetchDatasets.getResultsForDataproviders("dataset", this.datasourceId, this.dataProviderInfo.resultsBy, page, size, this.properties); } - + private searchSoftware(page: number, size: number) { if (this.reloadSoftware && (this.fetchSoftware.searchUtils.status == this.errorCodes.LOADING || @@ -470,11 +476,11 @@ export class DataProviderComponent { } this.reloadSoftware = false; } - + private countSoftware(page: number, size: number) { this.fetchSoftware.getResultsForDataproviders("software", this.datasourceId, this.dataProviderInfo.resultsBy, page, size, this.properties); } - + private searchOrps(page: number, size: number) { if (this.reloadOrps && (this.fetchOrps.searchUtils.status == this.errorCodes.LOADING || @@ -485,11 +491,11 @@ export class DataProviderComponent { } this.reloadOrps = false; } - + private countOrps(page: number, size: number) { this.fetchOrps.getResultsForDataproviders("other", this.datasourceId, this.dataProviderInfo.resultsBy, page, size, this.properties); } - + private searchProjects(page: number, size: number) { if (this.reloadProjects && (this.fetchProjects.searchUtils.status == this.errorCodes.LOADING || @@ -500,11 +506,11 @@ export class DataProviderComponent { } this.reloadProjects = false; } - + private countProjects(page: number, size: number) { this.fetchProjects.getResultsForDataproviders(this.datasourceId, page, size, this.properties); } - + private searchDatasources(page: number, size: number) { if (this.reloadDataproviders && (this.fetchDataproviders.searchUtils.status == this.errorCodes.LOADING || @@ -515,14 +521,14 @@ export class DataProviderComponent { } this.reloadDataproviders = false; } - + private countDatasources(page: number, size: number) { this.fetchDataproviders.getResultsForDataproviders(this.datasourceId, page, size, this.properties); } - + private searchRelatedDatasources(page: number, size: number) { // Currently no counting is done for this tab. Following condition is always false - + // if (this.reloadRelatedDatasources && // (this.fetchAggregatorsPublications.searchUtils.status == this.errorCodes.LOADING || // this.fetchAggregatorsPublications.searchUtils.status == this.errorCodes.DONE) @@ -557,24 +563,26 @@ export class DataProviderComponent { ) ) { this.relatedDatasourcesSub = this.fetchAggregatorsResults.requestComplete.subscribe( - data => {}, - err => {}, + data => { + }, + err => { + }, () => { - //this.preprocessRelatedDatasources(); + //this.preprocessRelatedDatasources(); this.dataProviderInfo.relatedDatasources = this.fetchAggregatorsResults.results; this.loadingRelatedDatasources = false; } ); - + this.fetchAggregatorsResults.getAggregatorResults("results", this.datasourceId, page, size, this.properties); } else { this.loadingRelatedDatasources = false; } - - + + this.reloadRelatedDatasources = false; } - + private countRelatedDatasources(page: number, size: number) { // this.fetchAggregatorsPublications.getAggregatorResults("publication", this.datasourceId, page, size, this.properties); // this.fetchAggregatorsDatasets.getAggregatorResults("dataset", this.datasourceId, page, size, this.properties); @@ -582,8 +590,8 @@ export class DataProviderComponent { // this.fetchAggregatorsOrps.getAggregatorResults("other", this.datasourceId, page, size, this.properties); this.fetchAggregatorsResults.getAggregatorResults("results", this.datasourceId, page, size, this.properties); } - - + + // private preprocessRelatedDatasources() { // if (this.fetchAggregatorsPublications.searchUtils.status == this.errorCodes.DONE || // this.fetchAggregatorsDatasets.searchUtils.status == this.errorCodes.DONE || @@ -648,7 +656,7 @@ export class DataProviderComponent { // } // this.loadingRelatedDatasources = false; // } - + public metricsResults($event) { this.totalViews = $event.totalViews; this.totalDownloads = $event.totalDownloads; @@ -656,9 +664,9 @@ export class DataProviderComponent { } public get hasMetrics(): boolean { - return !(this.totalViews && this.totalDownloads && this.pageViews) || this.totalViews > 0 || this.totalDownloads > 0||this.pageViews > 0; + return !(this.totalViews && this.totalDownloads && this.pageViews) || this.totalViews > 0 || this.totalDownloads > 0 || this.pageViews > 0; } - + public openStatistics() { this.statsClicked = true; this.statisticsModal.cancelButton = false; @@ -666,7 +674,7 @@ export class DataProviderComponent { this.statisticsModal.alertTitle = "Statistics of"; this.statisticsModal.open(); } - + public openRelatedDatasources() { this.searchRelatedDatasources(1, 0); this.relatedDatasourcesModal.cancelButton = false; @@ -674,41 +682,41 @@ export class DataProviderComponent { this.relatedDatasourcesModal.alertTitle = "Related content providers of"; this.relatedDatasourcesModal.open(); } - + public scroll() { HelperFunctions.scroll(); } - + public removeUnknown(array: string[]): string[] { return array.filter(value => value.toLowerCase() !== 'unknown'); } - + private handleError(message: string, error) { console.error("Content Provider Landing Page: " + message, error); } - - private getEntityName (entityType:string, plural:boolean, full:boolean): string { - if(entityType == "publication") { + + private getEntityName(entityType: string, plural: boolean, full: boolean): string { + if (entityType == "publication") { return "publication" + (plural ? "s" : ""); - } else if(entityType == "dataset") { + } else if (entityType == "dataset") { return (full ? "research data" : ("dataset" + (plural ? "s" : ""))); - } else if(entityType == "software") { + } else if (entityType == "software") { return "software"; - } else if(entityType == "other") { + } else if (entityType == "other") { return (full ? ("other research product" + (plural ? "s" : "")) : "other"); - } else if(entityType == "dataprovider") { + } else if (entityType == "dataprovider") { return (full ? ("content provider" + (plural ? "s" : "")) : "dataprovider" + (plural ? "s" : "")); } else { return entityType + (plural ? "s" : ""); } } - + public getResultPreview(result: SearchResult, type: string): ResultPreview { return ResultPreview.searchResultConvert(result, type); } - + public onSelectActiveTab(activeTabId) { - if(this.activeTab != "activaTabId") { // tab really changed + if (this.activeTab != "activaTabId") { // tab really changed if (activeTabId == 'summary') { this.activeTab = 'summary'; } else if (activeTabId == 'publications') { @@ -723,13 +731,13 @@ export class DataProviderComponent { } else if (activeTabId == 'other') { this.activeTab = "other"; this.searchOrps(1, this.searchNumber); - } else if(activeTabId == 'projects') { + } else if (activeTabId == 'projects') { this.activeTab = "projects"; this.searchProjects(1, this.searchNumber); - } else if(activeTabId == 'datasources') { + } else if (activeTabId == 'datasources') { this.activeTab = "datasources"; this.searchDatasources(1, this.searchNumber); - } else if(activeTabId == 'relatedDatasources') { + } else if (activeTabId == 'relatedDatasources') { this.activeTab = "relatedDatasources"; this.searchRelatedDatasources(1, this.searchNumber); } else if (activeTabId == 'statistics') { @@ -738,14 +746,14 @@ export class DataProviderComponent { } } } - + public get hasAggregationStatusInfo(): boolean { return (!!this.dataProviderInfo.aggregationStatus && ((!!this.dataProviderInfo.aggregationStatus.fulltexts && parseInt(this.dataProviderInfo.aggregationStatus.fulltexts) != -1) || (!!this.dataProviderInfo.aggregationStatus.fundedContent && parseInt(this.dataProviderInfo.aggregationStatus.fundedContent) != -1) || !!this.dataProviderInfo.aggregationStatus.lastUpdateDate)); } - + public get hasJournalInfo(): boolean { return (!!this.dataProviderInfo.journal && ( !!this.dataProviderInfo.journal['journal'] || !!this.dataProviderInfo.journal['issn'] || @@ -754,7 +762,7 @@ export class DataProviderComponent { !!this.dataProviderInfo.journal['start_page'] || !!this.dataProviderInfo.journal['end_page'])); //return true; } - + public get hasPrimaryInfo(): boolean { return !!this.dataProviderInfo && ( !!this.dataProviderInfo.description || @@ -763,14 +771,14 @@ export class DataProviderComponent { !!this.dataProviderInfo.countries || (!!this.dataProviderInfo.subjects && this.dataProviderInfo.subjects.length > 0)); } - + public get hasSecondaryInfo(): boolean { return !!this.dataProviderInfo && ( (!!this.dataProviderInfo.organizations && this.dataProviderInfo.organizations.length > 0) || !!this.dataProviderInfo.oaiPmhURL || !!this.dataProviderInfo.openDoarId || !!this.dataProviderInfo.r3DataId ); } - + // public numberOfTabs(): number { // if(this.tabsAreInitialized) { // return this._numberOfTabs; diff --git a/landingPages/dataProvider/organizationsTab.component.ts b/landingPages/dataProvider/organizationsTab.component.ts index c17c4a6c..bf0a8f53 100644 --- a/landingPages/dataProvider/organizationsTab.component.ts +++ b/landingPages/dataProvider/organizationsTab.component.ts @@ -1,4 +1,5 @@ import {Component, Input} from '@angular/core'; +import {properties} from "../../../../environments/environment"; @Component({ selector: 'organizationsTab', @@ -16,7 +17,7 @@ import {Component, Input} from '@angular/core';

- +

{{item['name']}}

@@ -33,6 +34,7 @@ export class OrganizationsTabComponent { @Input() organizations: {"name": string, "id": string}[]; public organizationsPage: number = 1; public pageSize: number = 10; + public url = properties.searchLinkToDataProvider.split('?')[0]; constructor () {} diff --git a/landingPages/dataProvider/relatedDatasourcesTab.component.ts b/landingPages/dataProvider/relatedDatasourcesTab.component.ts index 9db07d54..fa6c0f64 100644 --- a/landingPages/dataProvider/relatedDatasourcesTab.component.ts +++ b/landingPages/dataProvider/relatedDatasourcesTab.component.ts @@ -6,110 +6,11 @@ import { ErrorCodes} from '../../utils/properties/errorCodes'; import { RouterHelper } from '../../utils/routerHelper.class'; import { EnvProperties } from '../../utils/properties/env-properties'; import {AlertModal} from "../../utils/modal/alert"; +import {properties} from "../../../../environments/environment"; @Component({ selector: 'relatedDatasourcesTab', template: ` - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -140,7 +41,7 @@ import {AlertModal} from "../../utils/modal/alert"; - {{result.name}} @@ -190,10 +91,13 @@ export class RelatedDatasourcesTabComponent { public page: number = 1; public pageSize: number = 10; + public dataProviderUrl; constructor () {} - ngOnInit() {} + ngOnInit() { + this.dataProviderUrl = properties.searchLinkToDataProvider.split('?')[0]; + } ngOnDestroy() {} diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index 21d8bcc1..d5aae48a 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -2,6 +2,7 @@ import {Component, Input} from '@angular/core'; import {HelperFunctions} from "../../utils/HelperFunctions.class"; import {EnvProperties} from "../../utils/properties/env-properties"; import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview"; +import {properties} from "../../../../environments/environment"; @Component({ selector: 'availableOn', @@ -36,7 +37,7 @@ import {HostedByCollectedFrom} from "../../utils/result-preview/result-preview";
Provider: - + {{available.collectedName}} @@ -68,12 +69,12 @@ export class AvailableOnComponent { // "accessMode": string[], "bestAccessMode": string, // "type": string, "year": string, icon: string // }[]; - @Input() properties: EnvProperties; // public open = 'assets/common-assets/unlock.svg'; // public closed = 'assets/common-assets/lock.svg'; // public unknown = 'assets/common-assets/question.svg'; public threshold: number = 4; public showNum: number = 4; + public dataProviderUrl = properties.searchLinkToDataProvider.split('?')[0]; constructor() { } @@ -96,7 +97,7 @@ export class AvailableOnComponent { } public removeUnknown(value: string): string { - if(this.properties.environment === 'production') { + if(properties.environment === 'production') { if (value.toLowerCase() === 'unknown') { return null; } diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 0de2335e..b4a27532 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -167,7 +167,7 @@
Related Organizations
- +
+ routerLinkActive="router-link-active" [routerLink]="properties.searchLinkToAdvancedResults"> Research outcomes
@@ -79,7 +80,7 @@ export class ShowAuthorsComponent { @Input() modal: AlertModal; public numberOfAuthors: number; - public properties: EnvProperties; + public properties: EnvProperties = properties; public routerHelper: RouterHelper = new RouterHelper(); testBrowser: boolean; @@ -89,9 +90,6 @@ export class ShowAuthorsComponent { } ngOnInit() { - this.route.data.subscribe((data: { envSpecific: EnvProperties }) => { - this.properties = data.envSpecific; - }); this.numberOfAuthors = this.authorsLimit; } diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index 213db431..764e5b59 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -242,7 +242,7 @@ Provider: - {{from.collectedName}} diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts index 94042525..11df326b 100644 --- a/utils/result-preview/result-preview.component.ts +++ b/utils/result-preview/result-preview.component.ts @@ -20,6 +20,7 @@ export class ResultPreviewComponent implements OnInit{ public urlParam: string; public url: string; public beforeTitle: string[] = []; + public dataProviderUrl = properties.searchLinkToDataProvider.split('?')[0]; ngOnInit(): void { if (this.result.resultType === "publication") {