diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index 183d3fd1..4b8fa3e7 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -48,7 +48,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc 1. Find the appropriate repository or journal
- Find the appropriate repository to deposit your research products of any type (publication, data, software, other) or to include in your data management plan. Search and browse for OpenAIRE compliant repositories registered in OpenDOAR and re3data. + Find the appropriate repository to deposit your research products of any type (publication, data, software, other) or to include in your data management plan. Search and browse for OpenAIRE compliant repositories registered in OpenDOAR, re3data and FAIRsharing. Looking for Open Access journals? Find those that suit your needs among the journals registered in the Directory of Open Access Journals (DOAJ). To know more, read the OpenAIRE Open Access primer (https://www.openaire.eu/oa-basics)
@@ -110,7 +110,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc
OpenAIRE logo
- Search and browse for OpenAIRE compliant repositories registered in OpenDOAR and re3data. + Search and browse for OpenAIRE compliant repositories registered in OpenDOAR, re3data and FAIRsharing.
diff --git a/fos/fos-selection/fos-selection.component.ts b/fos/fos-selection/fos-selection.component.ts index e978ea88..64d50cfa 100644 --- a/fos/fos-selection/fos-selection.component.ts +++ b/fos/fos-selection/fos-selection.component.ts @@ -72,8 +72,9 @@ export class FosSelectionComponent { } else { this.activeSection = this.fos[0].id; } - - this.setObserver(); + if(typeof IntersectionObserver !== "undefined") { + this.setObserver(); + } this.cdr.detectChanges(); }); } @@ -93,7 +94,7 @@ export class FosSelectionComponent { this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => { this.keyword = value; this.findMatches(this.keyword); - if (typeof document !== 'undefined') { + if (typeof IntersectionObserver !== 'undefined') { setTimeout(() => { this.setObserver(); }); diff --git a/fos/fos.component.html b/fos/fos.component.html index 70b3e068..e29cc133 100644 --- a/fos/fos.component.html +++ b/fos/fos.component.html @@ -95,7 +95,7 @@

- {{item.id}} @@ -105,13 +105,13 @@

- {{child.id}}

- {{subChild.label}} @@ -126,19 +126,19 @@

-

-

-
diff --git a/fos/fos.component.ts b/fos/fos.component.ts index 90664f4b..043e7bd5 100644 --- a/fos/fos.component.ts +++ b/fos/fos.component.ts @@ -105,7 +105,7 @@ export class FosComponent implements OnInit, OnDestroy { this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => { this.keyword = value; this.findMatches(this.keyword); - if (typeof document !== 'undefined') { + if (typeof IntersectionObserver !== 'undefined') { setTimeout(() => { this.setObserver(); }); @@ -214,4 +214,9 @@ export class FosComponent implements OnInit, OnDestroy { this._meta.updateTag({content: description}, "name='description'"); this._meta.updateTag({content: description}, "property='og:description'"); } + + public buildFosQueryParam(fos) { + // return {'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}; + return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + } } diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 0020f149..04e842e5 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -425,32 +425,36 @@
-
- - Share +
+
+
+ + Share +
+
Share this {{openaireEntities.DATASOURCE}} in your social networks
+
-
+
diff --git a/landingPages/dataProvider/dataProvider.module.ts b/landingPages/dataProvider/dataProvider.module.ts index 5aa044ba..6cbdf9b4 100644 --- a/landingPages/dataProvider/dataProvider.module.ts +++ b/landingPages/dataProvider/dataProvider.module.ts @@ -5,7 +5,6 @@ import { RouterModule } from '@angular/router'; import {IFrameModule} from '../../utils/iframe.module'; import {ErrorMessagesModule} from '../../utils/errorMessages.module'; -import {MetricsModule} from '../landing-utils/metrics/metrics.module'; import {LandingModule} from '../landing-utils/landing.module'; import {PagingModule} from '../../utils/paging.module'; @@ -41,7 +40,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod @NgModule({ imports: [CommonModule, FormsModule, RouterModule, - IFrameModule, ErrorMessagesModule, MetricsModule, LandingModule, + IFrameModule, ErrorMessagesModule, LandingModule, DataProvidersServiceModule, ProjectsServiceModule, SearchResearchResultsServiceModule, PagingModule, Schema2jsonldModule, SEOServiceModule, ShowPublisherModule, HelperModule, LandingHeaderModule, AlertModalModule, NoLoadPaging, FeedbackModule, diff --git a/landingPages/landing-utils/availableOn.component.ts b/landingPages/landing-utils/availableOn.component.ts index f89ef4e0..9a1d217c 100644 --- a/landingPages/landing-utils/availableOn.component.ts +++ b/landingPages/landing-utils/availableOn.component.ts @@ -17,7 +17,7 @@ import {RouterHelper} from "../../utils/routerHelper.class"; uk-tooltip [title]="getAccessLabel(availableOn[0].accessRight)"> - + {{sliceString(availableOn[0].downloadNames.join("; "), 20)}} @@ -32,18 +32,21 @@ import {RouterHelper} from "../../utils/routerHelper.class";
- - - {{sliceString(availableOn[0].downloadNames.join("; "), 20)}} + + + {{sliceString(availableOn[0].downloadNames.join("; "), 20)}} - -
+ +
+ Sources +
+
- +
@@ -97,7 +100,6 @@ export class AvailableOnComponent { /** @deprecated */ @Output() viewAllClicked = new EventEmitter(); @ViewChild("dropElement") dropElement: ElementRef; - @ViewChild("availableListFsModal") availableListFsModal: FullScreenModalComponent; public threshold: number = 1; public dataProviderUrl = properties.searchLinkToDataProvider.split('?')[0]; public title: string = "Download from"; @@ -125,12 +127,6 @@ export class AvailableOnComponent { return StringUtils.sliceString(str, size) } - public openAvailableListFsModal() { - this.availableListFsModal.title = "Sources"; - this.availableListFsModal.okButton = false; - this.availableListFsModal.open(); - } - public getAccessLabel(accessRight) : string { if(accessRight) { return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access")); diff --git a/landingPages/landing-utils/citeThis/citation.class.ts b/landingPages/landing-utils/citeThis/citation.class.ts index 986b9244..03a3766c 100644 --- a/landingPages/landing-utils/citeThis/citation.class.ts +++ b/landingPages/landing-utils/citeThis/citation.class.ts @@ -6,7 +6,7 @@ export class Citation{ public fileSuffix:string[]=[".bib", ".ris"]; public fileFormatOptions: Option[]=[{label: "bibtex (.bib)", value: "bibtex"}, {label: "ris (.ris)", value: "ris"}]; //https://github.com/citation-style-language/styles - bibtex:string =``; + bibtex:string =``; ieee:string =` `; chicago:string =` `; science:string =' '; diff --git a/landingPages/landing-utils/entity-metadata.component.ts b/landingPages/landing-utils/entity-metadata.component.ts index f306d388..caad8627 100644 --- a/landingPages/landing-utils/entity-metadata.component.ts +++ b/landingPages/landing-utils/entity-metadata.component.ts @@ -1,4 +1,4 @@ -import {Component, Input} from "@angular/core"; +import {Component, Input, ViewChild} from "@angular/core"; import {EnvProperties} from "../../utils/properties/env-properties"; import {properties} from "../../../../environments/environment"; import {OpenaireEntities} from "../../utils/properties/searchFields"; @@ -60,10 +60,10 @@ import {RouterHelper} from "../../utils/routerHelper.class"; {{year}} - {{startYear}} + From {{startYear}} - {{endYear}} + Until {{endYear}} @@ -151,12 +151,32 @@ import {RouterHelper} from "../../utils/routerHelper.class"; Thematic - - {{projectNames.slice(0,3).join(', ')}} + + {{showInline ? projectNames.join(', ') : projectNames.slice(0, projectsLimit).join(', ')}} + + + +{{projects.length - projectsLimit | number}} projects + + + View less + + - - {{organizationNames.slice(0, 3).join(', ')}} + + {{showInline ? organizationNames.join(', ') : organizationNames.slice(0, organizationsLimit).join(', ')}} + + + +{{organizations.length - organizationsLimit | number}} partners + + + View less + + @@ -169,10 +189,37 @@ import {RouterHelper} from "../../utils/routerHelper.class"; {{relationName}}
+ + + + +
+ +
+ {{item.name}}{{i == organizations.length - 1 ? '' : ','}} +
+ +
+ + + +
+ +
+ {{item['funderShortname'] ? item['funderShortname'] : item['funderName']}} + [no funder available] + | {{ item['acronym'] ? item['acronym'] : item['title']}} + {{i == projects.length - 1 ? '' : ','}} +
+ +
+ `, styleUrls: ['entity-metadata.component.less'] }) export class EntityMetadataComponent { + @Input() isMobile: boolean = false; @Input() entityType: string; @Input() types: string[]; @Input() year: string; // search result @@ -204,6 +251,14 @@ export class EntityMetadataComponent { @Input() subjects: string[]; @Input() prevPath: string = ""; + @ViewChild('partnersModal') partnersModal; + @ViewChild('projectsModal') projectsModal; + + organizationsLimit: number = 5; + projectsLimit: number = 3; + showInline: boolean = false; + lessBtn: boolean = false; + properties: EnvProperties = properties; public openaireEntities = OpenaireEntities; public routerHelper: RouterHelper = new RouterHelper(); @@ -238,9 +293,9 @@ export class EntityMetadataComponent { value = value + ' | ' + (project.acronym ? project.acronym : (project.title.length > 25 ? (project.title.slice(0, 25) + '...'): project.title)); } - if(project.code) { - value = value + ' (' + project.code + ')'; - } + // if(project.code) { + // value = value + ' (' + project.code + ')'; + // } return value; }); } @@ -260,4 +315,48 @@ export class EntityMetadataComponent { } return obj; } -} + + public viewAllPartnersClick() { + if(this.organizations.length <= this.organizationsLimit * 2) { + this.showInline = true; + this.lessBtn = true; + } else { + this.openPartnersModal(); + } + } + + public openPartnersModal() { + if (this.isMobile) { + this.partnersModal.okButton = false; + this.partnersModal.title = "Partners"; + this.partnersModal.open(); + } else { + this.partnersModal.cancelButton = false; + this.partnersModal.okButton = false; + this.partnersModal.alertTitle = "Partners"; + this.partnersModal.open(); + } + } + + public viewAllProjectsClick() { + if(this.projects.length <= this.projectsLimit * 2) { + this.showInline = true; + this.lessBtn = true; + } else { + this.openProjectsModal(); + } + } + + public openProjectsModal() { + if (this.isMobile) { + this.projectsModal.okButton = false; + this.projectsModal.title = "Projects"; + this.projectsModal.open(); + } else { + this.projectsModal.cancelButton = false; + this.projectsModal.okButton = false; + this.projectsModal.alertTitle = "Projects"; + this.projectsModal.open(); + } + } +} \ No newline at end of file diff --git a/landingPages/landing-utils/fos.component.ts b/landingPages/landing-utils/fos.component.ts index 39eaa6c5..ba95bdc8 100644 --- a/landingPages/landing-utils/fos.component.ts +++ b/landingPages/landing-utils/fos.component.ts @@ -31,15 +31,19 @@ import {StringUtils} from "../../utils/string-utils.class";
- + {{subject.label}} + + {{subject.label}} +
-
+
Beta
{{title}} @@ -47,16 +51,28 @@ import {StringUtils} from "../../utils/string-utils.class";
+ [routerLink]="properties.searchLinkToResults" [queryParams]="buildFosQueryParam(subject)"> {{subject.label}} + [href]="'https://explore.openaire.eu'+properties.searchLinkToResults+'?'+buildFosHrefParam(subject)"> {{subject.label}}
+
@@ -103,4 +119,14 @@ export class FosComponent { public urlEncodeAndQuote(str: string): string { return StringUtils.quote(StringUtils.URIEncode(str)); } + + public buildFosQueryParam(fos) { + // return {'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}; + return (properties.environment !== 'production' ? ({'foslabel': this.urlEncodeAndQuote(fos.id+"||"+fos.label)}) : ({'fos': this.urlEncodeAndQuote(fos.id)})); + } + + public buildFosHrefParam(fos): string { + // return ('foslabel='+this.urlEncodeAndQuote(fos.id+"||"+fos.label)); + return (properties.environment !== 'production' ? ('foslabel='+this.urlEncodeAndQuote(fos.id+"||"+fos.label)) : ('fos='+this.urlEncodeAndQuote(fos.id))); + } } diff --git a/landingPages/landing-utils/fundedBy.component.ts b/landingPages/landing-utils/fundedBy.component.ts index 4b1a7c67..c03a5ea1 100644 --- a/landingPages/landing-utils/fundedBy.component.ts +++ b/landingPages/landing-utils/fundedBy.component.ts @@ -34,15 +34,16 @@ import {RouterHelper} from "../../utils/routerHelper.class";
diff --git a/landingPages/landing-utils/landing-header/landing-header.component.ts b/landingPages/landing-utils/landing-header/landing-header.component.ts index 11ab1c0c..adfe3268 100644 --- a/landingPages/landing-utils/landing-header/landing-header.component.ts +++ b/landingPages/landing-utils/landing-header/landing-header.component.ts @@ -21,6 +21,7 @@ import {AlertModal} from "../../../utils/modal/alert"; [languages]="languages" [programmingLanguages]="programmingLanguages" [compatibility]="compatibility" [aggregationStatus]="aggregationStatus" [thematic]="thematic" [type]="type" [prevPath]="prevPath" + [countries]="countries" [projects]="projects" >
@@ -61,4 +62,6 @@ export class LandingHeaderComponent { @Input() thematic: boolean; // data provider landing @Input() type; // data provider landing @Input() prevPath: string = ""; + @Input() countries; + @Input() projects; } diff --git a/landingPages/landing-utils/metrics/metrics.component.less b/landingPages/landing-utils/metrics/metrics.component.less deleted file mode 100644 index 55dbaebd..00000000 --- a/landingPages/landing-utils/metrics/metrics.component.less +++ /dev/null @@ -1,48 +0,0 @@ -.metrics { - @import (reference) "~src/assets/openaire-theme/less/_import-variables"; - position: relative; - display: inline-block; - - .uk-text-primary { - color: @global-primary-background !important; - } - - .uk-text-background { - background-image: @global-primary-gradient; - } - - .uk-dropdown { - - &::before { - position: absolute; - left: 0; - transform: translateX(-100%); - top: 14px; - width: 0; - height: 0; - content: ''; - border-left: 21px solid transparent; - border-right: 21px solid @global-border; - border-bottom: 21px solid transparent; - border-top: 21px solid transparent; - } - - &::after { - position: absolute; - left: 0; - transform: translateX(-100%); - top: 15px; - width: 0; - height: 0; - content: ''; - border-left: 20px solid transparent; - border-right: 20px solid @global-background; - border-bottom: 20px solid transparent; - border-top: 20px solid transparent; - } - } - - .m-badge img { - width: 35px; - } -} diff --git a/landingPages/landing-utils/metrics/metrics.component.ts b/landingPages/landing-utils/metrics/metrics.component.ts deleted file mode 100644 index 56762c46..00000000 --- a/landingPages/landing-utils/metrics/metrics.component.ts +++ /dev/null @@ -1,331 +0,0 @@ -import {Component, Input, Output, EventEmitter, ChangeDetectorRef} from '@angular/core'; -import {Metrics} from '../../../utils/entities/metrics'; -import {MetricsService} from '../../../services/metrics.service'; -import {ErrorCodes} from '../../../utils/properties/errorCodes'; - -import {Subscription, zip} from 'rxjs'; -import {EnvProperties} from '../../../utils/properties/env-properties'; -import {ClickEvent} from "../../../utils/click/click-outside-or-esc.directive"; -import {NumberUtils} from "../../../utils/number-utils.class"; -import {OpenaireEntities} from "../../../utils/properties/searchFields"; -import {StringUtils} from "../../../utils/string-utils.class"; -import {properties} from "../../../../../environments/environment"; -import {RouterHelper} from "../../../utils/routerHelper.class"; - -@Component({ - selector: 'metrics', - template: ` -
- - usage counts -
- {{formatNumber(total)}} - {{total | number}} -
- -
-
-
- {{openaireEntities.PROJECT}} metrics - are derived from aggregating individual {{openaireEntities.RESULTS}} metrics. - -
-
-
-
- - - {{formatNumber(metrics.totalDownloads)}} - - -
-
Downloads
-
-
-
- - - {{formatNumber(pageViews)}} - - -
-
OpenAIRE views
-
-
-
- - - {{formatNumber(metrics.totalViews)}} - - -
-
Total views
-
-
-
-
-
-
    -
  • - - - - - - - - - - - - - - - -
    FromViewsDownloads
    - - {{metrics.infos.get(key).name}} - - - {{formatNumber(metrics.infos.get(key).numOfViews)}} - {{metrics.infos.get(key).numOfViews | number}} - - - {{formatNumber(metrics.infos.get(key).numOfDownloads)}} - {{metrics.infos.get(key).numOfDownloads | number}} - -
    -
    • - -
  • - -
    • -
  • - -
    • -
-
- - -
-
-
- Powered by - - usage counts - -
-
-
-
- `, - styleUrls: ['metrics.component.less'] -}) - -export class MetricsComponent { - @Input() prevPath: string = ""; - @Output() metricsResults = new EventEmitter(); - @Input() id: string; - @Input() entityType: string; - @Input() entity: string; - //@Input() name: string = ""; - @Input() pageViews: number = 0; - @Input() properties: EnvProperties; - @Input() shortView: boolean = false; - @Input() open = false; - @Input() viewsFrameUrl: string; - @Input() downloadsFrameUrl: string; - - public metrics: Metrics; - public errorCodes: ErrorCodes; - private sub: Subscription; - private timeouts: any[] = []; - - public metricsClicked: boolean = false; - - public status: number; - public state: number = -1; - public openaireEntities = OpenaireEntities; - public routerHelper:RouterHelper = new RouterHelper(); - - constructor(private metricsService: MetricsService, private cdr: ChangeDetectorRef) { - } - - ngOnInit() { - this.errorCodes = new ErrorCodes(); - if (typeof document !== 'undefined') { - this.status = this.errorCodes.LOADING; - this.getMetrics(); - } - } - - ngOnDestroy() { - if(this.sub) { - this.sub.unsubscribe(); - } - } - - public get total(): number { - return +this.pageViews + +this.metrics.totalViews + +this.metrics.totalDownloads; - } - - private getMetrics() { - //queries from old API - replaced with queries to the stats tool - /* this.sub = this.metricsService.getMetrics(this.id, this.entityType, this.properties).subscribe( - data => { - this.metrics = data; - this.cdr.detectChanges(); - this.status = this.errorCodes.DONE; - this.metricsResults.emit({ - totalViews: this.metrics.totalViews, - totalDownloads: this.metrics.totalDownloads, - pageViews: this.metrics.pageViews - }); - }, - err => { - 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; - } - this.metricsResults.emit({ - totalViews: 0, - totalDownloads: 0 - }); - } - );*/ - let obs; - if (this.entityType == "results") { - obs = zip(this.metricsService.getMetricsNumber(this.id, "usagestats.results.views", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.results.downloads", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.results.views.openaire", this.properties), - this.metricsService.getMetricsNumbersByRepository(this.id, "usagestats.results.viewsdownloads.repository", this.properties) - - ); - - } else if (this.entityType == "projects") { - obs = zip(this.metricsService.getMetricsNumber(this.id, "usagestats.projects.views", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.projects.downloads", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.projects.views.openaire", this.properties)); - - } else if (this.entityType == "datasources") { - obs = zip(this.metricsService.getMetricsNumber(this.id, "usagestats.views.repository.local", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.downloads.repository.local", this.properties), - this.metricsService.getMetricsNumber(this.id, "usagestats.views.openaire", this.properties), - // this.metricsService.getMetricsNumber(this.id, "usagestats.downloads.repository.openaire", this.properties) - ); - - } - - this.sub = obs.subscribe( - data => { - this.metrics = new Metrics(); - this.metrics.infos = new Map(); - this.metrics.totalViews = data[0] ? data[0] : 0; - this.metrics.totalDownloads = data[1] ? data[1] : 0; - this.metrics.pageViews = data[2] ? data[2] : 0; - this.metrics.infos = data[3] ? data[3] : 0; - this.cdr.detectChanges(); - this.status = this.errorCodes.DONE; - this.metricsResults.emit({ - totalViews: this.metrics.totalViews, - totalDownloads: this.metrics.totalDownloads, - pageViews: this.metrics.pageViews - }); - }, - err => { - 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; - } - this.metricsResults.emit({ - totalViews: 0, - totalDownloads: 0, - pageViews: 0 - }); - } - ); - } - - public close(event: ClickEvent) { - if(event.clicked && this.state !== -1) { - this.timeouts.forEach(timeout => { - clearTimeout(timeout); - }); - this.state = -1; - this.timeouts = []; - } - } - - public clickedMetrics() { - setTimeout( () => { - this.metricsClicked = true; - }); - } - - public toggle(event) { - this.metricsClicked = true; - - event.stopPropagation(); - if(this.state !== -1) { - this.timeouts.forEach(timeout => { - clearTimeout(timeout); - }); - this.state = -1; - this.timeouts = []; - } else { - this.state++; - this.timeouts.push(setTimeout(() => { - this.state++; - this.timeouts.push(setTimeout(() => { - this.state++; - this.timeouts.push(setTimeout(() => { - this.state++; - this.timeouts.push(setTimeout(() => { - this.state++; - }, 400)); - }, 800)); - }, 300)); - }, 100)); - } - this.cdr.detectChanges(); - } - - public getKeys(map) { - return Array.from(map.keys()); - } - - public isNumberLarge(num: number | string, bigNum: boolean = false) { - let limit: number = bigNum ? 100000000 : 100000; - return (+num) >= limit; - } - - public formatNumber(num: number | string) { - let formatted = NumberUtils.roundNumber(+num); - return formatted.number + formatted.size; - } - - public addEoscPrevInParams(obj) { - if(properties.adminToolsPortalType == "eosc" && this.prevPath) { - let splitted: string[] = this.prevPath.split("?"); - obj = this.routerHelper.addQueryParam("return_path", splitted[0], obj); - if(splitted.length > 0) { - obj = this.routerHelper.addQueryParam("search_params", splitted[1], obj); - } - } - return obj; - } -} diff --git a/landingPages/landing-utils/metrics/metrics.module.ts b/landingPages/landing-utils/metrics/metrics.module.ts deleted file mode 100644 index fab8e9a2..00000000 --- a/landingPages/landing-utils/metrics/metrics.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -/* This module contains all common components for all landing pages */ - -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; - -import {MetricsComponent} from './metrics.component'; -import {MetricsService} from '../../../services/metrics.service'; - -import {ErrorMessagesModule} from '../../../utils/errorMessages.module'; -import {IFrameModule} from "../../../utils/iframe.module"; -import {IconsModule} from "../../../utils/icons/icons.module"; -import {RouterModule} from "@angular/router"; - -@NgModule({ - imports: [ - CommonModule, FormsModule, RouterModule, ErrorMessagesModule, IFrameModule, IconsModule - ], - declarations: [ - MetricsComponent - ], - providers:[ - MetricsService - ], - exports: [ - MetricsComponent - ] -}) -export class MetricsModule { } diff --git a/landingPages/landing-utils/projects-in-modal.component.ts b/landingPages/landing-utils/projects-in-modal.component.ts index cf49af6c..b82392f7 100644 --- a/landingPages/landing-utils/projects-in-modal.component.ts +++ b/landingPages/landing-utils/projects-in-modal.component.ts @@ -1,8 +1,6 @@ import {Component, Input} from '@angular/core'; -import {ActivatedRoute} from '@angular/router'; import {FetchProjects} from '../../utils/fetchEntitiesClasses/fetchProjects.class'; -import {SearchProjectsService} from '../../services/searchProjects.service'; import {ErrorCodes} from '../../utils/properties/errorCodes'; import {StringUtils} from '../../utils/string-utils.class'; @@ -18,7 +16,7 @@ import {OpenaireEntities} from '../../utils/properties/searchFields';
+ [name]="filter.title" [count]="filter.countSelectedValues" [isMobile]="isMobile">
0) { diff --git a/landingPages/landing-utils/resultLandingUtils.module.ts b/landingPages/landing-utils/resultLandingUtils.module.ts index ebf29782..7ae62115 100644 --- a/landingPages/landing-utils/resultLandingUtils.module.ts +++ b/landingPages/landing-utils/resultLandingUtils.module.ts @@ -19,14 +19,15 @@ import {AlertModalModule} from "../../utils/modal/alertModal.module"; import { SearchInputModule } from '../../sharedComponents/search-input/search-input.module'; import {EntityMetadataComponent} from "./entity-metadata.component"; import {IconsService} from "../../utils/icons/icons.service"; -import {closed_access, open_access, unknown_access} from "../../utils/icons/icons"; +import {book, closed_access, cog, database, earth, open_access, unknown_access} from "../../utils/icons/icons"; import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module"; +import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, PagingModule, ShowPublisherModule, IconsModule, AlertModalModule, - SearchInputModule, FullScreenModalModule + SearchInputModule, FullScreenModalModule, MobileDropdownModule ], declarations: [ ShowIdentifiersComponent,ShowSubjectsComponent, @@ -44,6 +45,6 @@ import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-sc }) export class ResultLandingUtilsModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([open_access, closed_access, unknown_access]); + this.iconsService.registerIcons([open_access, closed_access, unknown_access, book, cog, database, earth]); } } diff --git a/landingPages/landing-utils/sdg.component.ts b/landingPages/landing-utils/sdg.component.ts index d16b40be..33302d62 100644 --- a/landingPages/landing-utils/sdg.component.ts +++ b/landingPages/landing-utils/sdg.component.ts @@ -46,19 +46,26 @@ import {StringUtils} from "../../utils/string-utils.class";
-
Beta
-
- sdg_colors - SDGs: -
+
+
Beta
+
+ sdg_colors + SDGs: +
+ {{subject}} + ,   +
+ +
+
+
+
{{subject}} - ,  
- -
+
diff --git a/landingPages/landing-utils/showIdentifiers.component.ts b/landingPages/landing-utils/showIdentifiers.component.ts index 2391f877..e4644c34 100644 --- a/landingPages/landing-utils/showIdentifiers.component.ts +++ b/landingPages/landing-utils/showIdentifiers.component.ts @@ -53,7 +53,7 @@ import {properties} from "../../../../environments/environment";
- +
diff --git a/landingPages/landing-utils/showPublisher.component.ts b/landingPages/landing-utils/showPublisher.component.ts index 004c146a..37c0838b 100644 --- a/landingPages/landing-utils/showPublisher.component.ts +++ b/landingPages/landing-utils/showPublisher.component.ts @@ -4,6 +4,12 @@ import {EnvProperties} from "../../utils/properties/env-properties"; @Component({ selector: 'showPublisher, [showPublisher]', template: ` + + {{publisher}} + + ) - - - - {{publisher}} ` }) diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index f5fab784..1332322f 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -208,7 +208,7 @@
-
@@ -336,44 +336,54 @@
-
- - - View all {{organizationInfo.deletedByInferenceIds.length}} versions - +
+
+ + + View all {{organizationInfo.deletedByInferenceIds.length}} versions + +
-
- - Share +
+
+
+ + Share +
+
Share this {{openaireEntities.ORGANIZATION}} in your social networks
+
-
- - Download +
+
+
+ + Download +
+
Download reports
+
-
+
@@ -533,7 +543,7 @@
-
diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index dc3c5648..54aa7d31 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -512,69 +512,90 @@
-
- - Share +
+
+
+ + Share +
+
Share this {{openaireEntities.PROJECT}} in your social networks
+
- - - - Deposit - - -
- - -
- - Embed +
+ +
+ + + Deposit + +
+
Deposit your research
+
-
- - Download +
+
+
+ + Embed +
+
Emded results
+
+
+
+ + +
+
+
+ + Download +
+
Download report
+
- - - - Link to - - +
+ +
+ + + Link to + +
+
Link this project to {{openaireEntities.RESULTS}}
+ +
-
+
diff --git a/landingPages/project/project.component.ts b/landingPages/project/project.component.ts index 34936cd8..4e7eb8ba 100644 --- a/landingPages/project/project.component.ts +++ b/landingPages/project/project.component.ts @@ -464,6 +464,7 @@ export class ProjectComponent { this.subscriptions.push(this._projectService.getProjectInfo(id, this.properties).subscribe( data => { this.projectInfo = data; + this.projectInfo.id = this.projectId; this.actionsAfterGettingProjectInfo(); }, diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts index a85a3a9c..e17a294c 100644 --- a/landingPages/project/project.module.ts +++ b/landingPages/project/project.module.ts @@ -1,4 +1,3 @@ -//import {MaterialModule} from '@angular/material'; import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; @@ -10,8 +9,6 @@ import {ProjectServiceModule} from './projectService.module'; import {HtmlProjectReportService} from "../htmlProjectReport/htmlProjectReport.service"; import {ReportsServiceModule} from '../../services/reportsService.module'; import {SearchResearchResultsServiceModule} from '../../services/searchResearchResultsService.module'; - -import {MetricsModule} from '../landing-utils/metrics/metrics.module'; import {LandingModule} from '../landing-utils/landing.module'; import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module"; @@ -41,7 +38,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod imports: [ CommonModule, FormsModule, RouterModule, LandingModule, LoadingModalModule, AlertModalModule, ErrorMessagesModule, - IFrameModule, MetricsModule, ReportsServiceModule, + IFrameModule, ReportsServiceModule, SearchResearchResultsServiceModule, ProjectServiceModule, Schema2jsonldModule, SEOServiceModule, HelperModule, LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule, diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 6a93da39..a906c918 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -3,7 +3,7 @@
-
+
@@ -205,7 +205,7 @@
@@ -213,7 +213,10 @@
- + + + This {{getTypeName() | lowercase}} is not part of the European Open Science Cloud + + [prevPath]="prevPath" [countries]="resultLandingInfo.countries" + [projects]="resultLandingInfo.fundedByProjects"> @@ -488,6 +492,16 @@
+
+
+
+ + + Go to Search + +
+
+
{{getAccessLabel(resultLandingInfo.hostedBy_collectedFrom[0].accessRight)}}
+ + This {{getTypeName() | lowercase}} is not part of the European Open Science Cloud + Compatible EOSC Services
+
@@ -593,88 +611,118 @@
-
- +
+
+ +
-
- - - View all {{resultLandingInfo.deletedByInferenceIds.length}} versions - +
+
+ + + View all {{resultLandingInfo.deletedByInferenceIds.length}} versions + +
-
- - Share +
+
+
+ + Share +
+
Share this {{getTypeName()}} in your social networks
+
-
- - Cite +
+
+
+ + Cite +
+
Cite this {{getTypeName()}}
+
-
+
+ [pids]="pidsArrayString" [pageType]="'landing'" [isMobile]="true" + class="uk-button-link uk-flex uk-flex-middle uk-h6 uk-margin-remove">
- - - - Link to - - +
+ +
+ + + Link to + +
+
+ Link this {{getTypeName()}} to ... +
+ +
+
+ + +
+
+ +
+
-
-
+
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index ecbaeca2..932901d7 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -28,6 +28,7 @@ import {NumberUtils} from '../../utils/number-utils.class'; import {FullScreenModalComponent} from "../../utils/modal/full-screen-modal/full-screen-modal.component"; import {SdgFosSuggestComponent} from '../landing-utils/sdg-fos-suggest/sdg-fos-suggest.component'; import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service"; +import {ContextsService} from "../../claims/claim-utils/service/contexts.service"; declare var ResizeObserver; @@ -54,6 +55,7 @@ export class ResultLandingComponent { public deleteByInferenceOpened: boolean = false; @Input() public resultFromInput: boolean = false; @Input() public resultLandingInfo: ResultLandingInfo; + public belongsInEOSC: boolean = false; public supplementaryResults: RelationResult[]; public relation: string = 'trust'; public id: string; @@ -174,6 +176,8 @@ export class ResultLandingComponent { @ViewChild('fosFsModal') fosFsModal: FullScreenModalComponent; public noCommunities: boolean = false; + private promise: Promise = null; + private publicCommunities: string[] = []; public rightSidebarOffcanvasClicked: boolean = false; public egiTransferModalOpen = false; @@ -192,7 +196,8 @@ export class ResultLandingComponent { private _location: Location, private indexInfoService: IndexInfoService, private userManagementService: UserManagementService, - private layoutService: LayoutService) { + private layoutService: LayoutService, + private _contextService: ContextsService) { } ngOnInit() { @@ -239,6 +244,7 @@ export class ResultLandingComponent { this.initMetaAndLinks(this.type); } if(data["egiTransfer"] && data["egiTransfer"] == 't'){ + this.mobileContent = 'actions'; this.egiTransferModalOpen = true; } this.updateDescription(""); @@ -255,6 +261,7 @@ export class ResultLandingComponent { this.type="publication"; } if ((this.id && StringUtils.isOpenAIREID(this.id)) || (this.identifier)) { + this.getPublicCommunities(); this.getVocabulariesAndResultLandingInfo(); } else { this.showLoading = false; @@ -495,29 +502,32 @@ export class ResultLandingComponent { this.resultLandingInfo = null; this.hasAltMetrics = false; this.subscriptions.push(this._resultLandingService.getResultLandingInfo(this.id, this.identifier, this.type, subjectsVocabulary, this.properties).subscribe( - data => { + async data => { + let contexts = data.contexts; + data.contexts = []; + this.resultLandingInfo = data; this.id = this.resultLandingInfo.objIdentifier; //old // this.viewsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"resRepoViews", "resTitle":"' + this.id + '", "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":"Repository","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["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(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":"resRepoDownloads", "resTitle":"' + this.id + '", "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":"Repository","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[],"filters":[{"name":"","values":[""],"to":"-1"}]}]&info_types=["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(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'; //new - this.viewsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly views","type":"column","query":{"name":"usagestats.results.views.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly views"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}'); - this.downloadsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + + this.viewsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly views","type":"column","query":{"name":"usagestats.results.views.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly views"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}'); + this.downloadsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json=' + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly downloads","type":"column","query":{"name":"usagestats.results.downloads.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly downloads"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}'); - this.bipFrameUrl = this.properties.bipFrameAPIURL + this.id + (properties.environment == "beta" ? "&src=beta" : ""); - let pid:Identifier = Identifier.getPIDFromIdentifiers(this.resultLandingInfo.identifiers); + this.bipFrameUrl = this.properties.bipFrameAPIURL + this.id + (properties.environment == "beta" ? "&src=beta" : ""); + let pid: Identifier = Identifier.getPIDFromIdentifiers(this.resultLandingInfo.identifiers); if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType this.updateUrlWithType(pid); } - this.canonicalUrl = this.properties.domain+ properties.baseLink + ( pid ? (this.linkToLandingPage.split("?")[0] + "?pid=" + encodeURIComponent(pid.id)): + this.canonicalUrl = this.properties.domain + properties.baseLink + (pid ? (this.linkToLandingPage.split("?")[0] + "?pid=" + encodeURIComponent(pid.id)) : (this.linkToLandingPage + this.resultLandingInfo.relcanId)); this.seoService.createLinkForCanonicalURL(this.canonicalUrl); this.updateUrl(this.canonicalUrl); this.addNoIndexFilter(); if (this.resultLandingInfo.title) { this.updateTitle(this.resultLandingInfo.title); - this.updateDescription((this.resultLandingInfo.description ? (this.resultLandingInfo.description.substr(0,157) + (this.resultLandingInfo.description.substr(0,157).length == 157?"...":"")) : (this.resultLandingInfo.title))); + this.updateDescription((this.resultLandingInfo.description ? (this.resultLandingInfo.description.substr(0, 157) + (this.resultLandingInfo.description.substr(0, 157).length == 157 ? "..." : "")) : (this.resultLandingInfo.title))); } this.subscriptions.push(this._piwikService.trackViewForCustomUrl(this.properties, this.resultLandingInfo.title, this.linkToLandingPage.split("?")[1] + this.id).subscribe()); let bioentitiesNum = 0; @@ -528,9 +538,9 @@ export class ResultLandingComponent { } this.bioentitiesNum = bioentitiesNum; if (typeof document !== 'undefined') { - if(this.resultLandingInfo.identifiers) { + if (this.resultLandingInfo.identifiers) { let pidsArray: string[] = []; - for(let key of Array.from(this.resultLandingInfo.identifiers.keys())) { + for (let key of Array.from(this.resultLandingInfo.identifiers.keys())) { pidsArray = pidsArray.concat(this.resultLandingInfo.identifiers.get(key)); this.pidsArrayString = pidsArray.join(); } @@ -544,14 +554,17 @@ export class ResultLandingComponent { } } } - if(this.communityId && this.communityId == "enermaps" && properties.enermapsURL){ + if (this.communityId && this.communityId == "enermaps" && properties.enermapsURL) { this.enermapsId = ParsingFunctions.getEnermapsConceptId(this.resultLandingInfo.contexts); } this.relatedClassFilters = [{"label": "All relations", "value": ""}]; - if(this.resultLandingInfo.relatedClassFilters.size > 1) { + if (this.resultLandingInfo.relatedClassFilters.size > 1) { for (let relClass of this.resultLandingInfo.relatedClassFilters) { - this.relatedClassFilters.push({"label": HelperFunctions.getVocabularyLabel(relClass, this.relationsVocabulary), "value": relClass}); + this.relatedClassFilters.push({ + "label": HelperFunctions.getVocabularyLabel(relClass, this.relationsVocabulary), + "value": relClass + }); } } else { this.relatedClassFilters.pop(); @@ -561,12 +574,12 @@ export class ResultLandingComponent { this.hasViews = false; this.hasDownloads = false; - if(this.resultLandingInfo.measure && this.resultLandingInfo.measure.counts) { + if (this.resultLandingInfo.measure && this.resultLandingInfo.measure.counts) { this.resultLandingInfo.measure.counts.forEach(measure => { - if(measure.name == "views" && measure.value > 0) { + if (measure.name == "views" && measure.value > 0) { this.hasViews = true; } - if(measure.name == "downloads" && measure.value > 0) { + if (measure.name == "downloads" && measure.value > 0) { this.hasDownloads = true; } }) @@ -576,6 +589,19 @@ export class ResultLandingComponent { this.setActiveTab(); this.cdr.detectChanges(); + + if (contexts) { + await this.promise; + if(this.publicCommunities && this.publicCommunities.length > 0) { + this.resultLandingInfo.contexts = contexts.filter(context => { + if(context.idContext == "eosc") { + this.belongsInEOSC = true; + } + return this.publicCommunities.includes(context.idContext) + }); + this.cdr.detectChanges(); + } + } }, err => { this.handleError("Error getting " + this.type + " for " + (this.id ? ("id: " + this.id) : ("pid: " + this.identifier.id + " ("+this.identifier.class+")")), err); @@ -592,6 +618,21 @@ export class ResultLandingComponent { )); } + public getPublicCommunities() { + this.promise = new Promise(resolve => { + this._contextService.getPublicCommunitiesByState().subscribe( + data => { + this.publicCommunities = data.map(value => value.id); + // this.publicCommunities = data; + resolve(); + }, + error => { + this.handleError("Error getting communities status", error); + resolve(); + }); + }); + } + public metricsResults($event) { this.totalViews = $event.totalViews; this.totalDownloads = $event.totalDownloads; diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts index 2df31ec0..67a0a8fb 100644 --- a/landingPages/result/resultLanding.module.ts +++ b/landingPages/result/resultLanding.module.ts @@ -3,8 +3,7 @@ import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; -import {SharedModule} from '../../../openaireLibrary/shared/shared.module'; -import {MetricsModule} from '../landing-utils/metrics/metrics.module'; +import {SharedModule} from '../../shared/shared.module'; import {LandingModule} from '../landing-utils/landing.module'; import {CiteThisModule} from '../landing-utils/citeThis/citeThis.module'; import {IFrameModule} from '../../utils/iframe.module'; @@ -46,7 +45,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod imports: [ CommonModule, FormsModule, LandingModule, SharedModule, RouterModule, CiteThisModule, PagingModule, IFrameModule, - MetricsModule, AltMetricsModule, Schema2jsonldModule, SEOServiceModule, + AltMetricsModule, Schema2jsonldModule, SEOServiceModule, DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule, AnnotationModule, LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule, OrcidModule, MatFormFieldModule, MatSelectModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule, diff --git a/login/utils/helper.class.ts b/login/utils/helper.class.ts index 53708500..63e15b2f 100644 --- a/login/utils/helper.class.ts +++ b/login/utils/helper.class.ts @@ -131,6 +131,7 @@ export class Session { } else if (type == 'project') { return user && this.isProjectCurator(user); } + return false; } public static isPortalAdministrator(user: User): boolean { diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts index 2fece777..09ab7022 100644 --- a/monitor/entities/stakeholder.ts +++ b/monitor/entities/stakeholder.ts @@ -29,6 +29,7 @@ export class Stakeholder { visibility: Visibility; creationDate: Date = null; updateDate: Date; + projectUpdateDate: Date; /** @warning Use pipe in HTML or StringUtils.getLogoUrl in components */ logoUrl: string; isUpload: boolean = false; @@ -245,6 +246,8 @@ export class IndicatorFilterUtils { }else if (table == "organization"){ return this.getOrganizationFilter(filterType); } + + return ""; } static getResultFilter(table: string = null, filterType:FilterType) { //works for tables ["publication", "software", "dataset", "other", "result"] @@ -257,24 +260,28 @@ export class IndicatorFilterUtils { }else if (filterType == "co-funded") { return '{"groupFilters":[{"field":"' + table + '.No of funders","type":">","values":["1"]}],"op":"AND"}'; } + return ""; } static getProjectFilter( filterType:FilterType) { //works for table "project" if (filterType == "fundingL0") { return '{"groupFilters":[{"field":"project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; } + return ""; } static getOrganizationFilter( filterType:FilterType) { //works for table "organization" if (filterType == "fundingL0") { return '{"groupFilters":[{"field":"organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; } + return ""; } static getCountryFilter( filterType:FilterType) { //works for table "country" if (filterType == "fundingL0") { return '{"groupFilters":[{"field":"country.organization.project.funding level 0","type":"=","values":["' + ChartHelper.prefix + 'fundingL0' + ChartHelper.suffix + '"]}],"op":"AND"}'; } + return ""; } static filterIndexOf(filterToAdd, currentFilters):any{ diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts index 09402cb8..5fbe58b8 100644 --- a/orcid/my-orcid-links/myOrcidLinks.component.ts +++ b/orcid/my-orcid-links/myOrcidLinks.component.ts @@ -104,8 +104,8 @@ export class MyOrcidLinksComponent { private errorCodes: ErrorCodes; private errorMessages: ErrorMessagesComponent; - public results =[]; - public currentResults = []; + public results:Map = new Map(); + public currentResults:{"work":{},results:ResultPreview[]}[] = []; public totalResults:number = 0 ; public baseUrl:string; public searchUtils:SearchUtilsClass = new SearchUtilsClass(); @@ -163,7 +163,7 @@ export class MyOrcidLinksComponent { if(typeof document !== 'undefined') { this.tokenUrl = properties.orcidTokenURL - + "client_id="+properties.orcidClientId + + "client_id=" + properties.orcidClientId // + "&response_type=code&scope=/activities/update" // + "&response_type=code&scope=/authenticate /activities/update /person/update /read-limited" + "&response_type=code&scope=/activities/update /read-limited" @@ -253,6 +253,18 @@ export class MyOrcidLinksComponent { (response: any[]) => { this.works = response;//['results']; + /* this.works=[ + { "id" : "60391ad16c2043536ca44ea4", "pids" : [ "10.5281/zeno(do.4304132", "10.5281/zenodo.3974605" ], "putCode" : "89558576", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-02-26T15:59:13.098Z", "updateDate" : "2021-02-26T15:59:13.098Z", "dashboard" : "production_explore" }, + { "id" : "60391ceb7a767127ea9a4d06", "pids" : [ "10.5281/zenodo.4095044", "10.5281/zenodo.4095043" ], "putCode" : "89559422", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-02-26T16:08:11.930Z", "updateDate" : "2021-02-26T16:27:12.835Z", "dashboard" : "production_explore" }, + { "id" : "604244fb7a767127ea9a4d0b", "pids" : [ "10.5281/zenodo.3467103", "10.5281/zenodo.3467104", "10.1007/978-3-030-30760-8_5", "1822/62856" ], "putCode" : "90020579", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-03-05T14:49:31.972Z", "updateDate" : "2022-06-20T08:28:08.539Z", "dashboard" : "production_explore" }, + { "id" : "60744bb46c20432760765b9f", "pids" : [ "10.5281/zenodo.3701379", "10.5281/zenodo.3701380" ], "putCode" : "92074390", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-04-12T13:31:32.476Z", "updateDate" : "2021-04-12T13:31:32.476Z", "dashboard" : "production_explore" }, + { "id" : "6077f0047a767112e847f9f8", "pids" : [ "10.5281/zenodo.4559726" ], "putCode" : "92235922", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-04-15T07:49:24.078Z", "updateDate" : "2021-04-21T09:43:40.147Z", "dashboard" : "production_explore" }, + { "id" : "6079752b7a767112e847fa5b", "pids" : [ "10.5281/zenodo.4304047", "10.5281/zenodo.3980491" ], "putCode" : "92304809", "orcid" : "0000-0002-3880-0244", "creationDate" : "2021-04-16T11:29:47.905Z", "updateDate" : "2021-04-16T11:29:47.905Z", "dashboard" : "production_explore" }, + { "id" : "63186abb7a767129935f495b", "pids" : [ "10.5281/zenodo.1314672", "10.5281/zenodo.1412509", "10.5281/zenodo.1314671" ], "putCode" : "118582128", "orcid" : "0000-0002-3880-0244", "creationDate" : "2022-09-07T09:56:11.556Z", "updateDate" : "2022-09-07T09:56:11.556Z", "dashboard" : "production_explore" }, + { "id" : "63186ade6c204337f56d97ca", "pids" : [ "10.5281/zenodo.6634431", "10.5281/zenodo.6385204", "10.5281/zenodo.4559725" ], "putCode" : "118582151", "orcid" : "0000-0002-3880-0244", "creationDate" : "2022-09-07T09:56:46.231Z", "updateDate" : "2022-09-07T09:56:46.231Z", "dashboard" : "production_explore" }, + { "id" : "63186ae27a767129935f495c", "pids" : [ "10.5281/zenodo.5801283", "10.5281/zenodo.3516917", "10.5281/zenodo.6616871" ], "putCode" : "118582162", "orcid" : "0000-0002-3880-0244", "creationDate" : "2022-09-07T09:56:50.660Z", "updateDate" : "2022-09-07T09:56:50.660Z", "dashboard" : "production_explore" } + ];*/ + this.totalOrcidResults = this.works.length;//response['total']; this.prepareOrcidQuery(); @@ -266,7 +278,7 @@ export class MyOrcidLinksComponent { public prepareOrcidQuery() { - if(this.results.length >= this.currentPage) { + if(Array.from(this.results.keys()).length >= this.currentPage) { this.currentResults = this.results[this.currentPage-1]; return; } @@ -302,11 +314,7 @@ export class MyOrcidLinksComponent { this.disableForms = true; this.currentResults = []; this.searchUtils.totalResults = 0; - - // let params: string = this.orcidQuery + this.typeQuery; - //this.subs.push(this._searchResearchResultsService.advancedSearchResults(this.resultType, parameters, page, size, sortBy, this.properties, (refine) ? this.searchPage.getRefineFieldsQuery() : null, this.searchPage.getFields(), refineFieldsFilterQuery) this.subscriptions.push(this._searchResearchResultsService.searchForMyOrcidLinks(this.resultType, this.orcidQuery, this.typeQuery, 1, 50) - //this.subs.push(this._searchResearchResultsService.advancedSearchResults(this.resultType, parameters, page, size, sortBy, this.properties, null, this.searchPage.getFields(), refineFieldsFilterQuery) .subscribe( data => { let totalResults = data[0]; @@ -330,28 +338,29 @@ export class MyOrcidLinksComponent { let resultsFound: Map = new Map(); for(let work of works) { + let relatedResults = []; + this.currentResults.push({"work": work, "results" : relatedResults}) results.forEach(result => { let identifierValues: string[] = [].concat(...Array.from(result.identifiers.values())); if(work['pids'].some(pid => identifierValues.includes(pid))) { let index: number = resultsFound.get(identifierValues); if(!index) { - this.currentResults.push(this.getResultPreview(result)); - index = this.currentResults.length - 1; - - this.currentResults[index].orcidPutCodes = []; - this.currentResults[index].orcidCreationDates = []; - this.currentResults[index].orcidUpdateDates = []; + relatedResults.push(this.getResultPreview(result)); + index = relatedResults.length - 1; + relatedResults[index].orcidPutCodes = []; + relatedResults[index].orcidCreationDates = []; + relatedResults[index].orcidUpdateDates = []; } if (work['putCode']) { - this.currentResults[index].orcidPutCodes.push(work['putCode']); + relatedResults[index].orcidPutCodes.push(work['putCode']); } if (work['creationDate']) { - this.currentResults[index].orcidCreationDates.push(work['creationDate']); + relatedResults[index].orcidCreationDates.push(work['creationDate']); } if (work['updateDate']) { - this.currentResults[index].orcidUpdateDates.push(work['updateDate']); + relatedResults[index].orcidUpdateDates.push(work['updateDate']); } } }) @@ -367,44 +376,6 @@ export class MyOrcidLinksComponent { this.disableForms = false; } - public resultsReturned2(results: any, totalResults, works: any[]) { - this.searchUtils.totalResults = totalResults; - - for(let result of results) { - let identifierValues: string[] = [].concat(...Array.from(result.identifiers.values())); - - this.currentResults.push(this.getResultPreview(result)); - - let filteredWorks = works.filter(work => { - return work['pids'].some(pid => identifierValues.includes(pid)); - }) - - this.currentResults[this.currentResults.length - 1].orcidPutCodes = []; - this.currentResults[this.currentResults.length - 1].orcidCreationDates = []; - this.currentResults[this.currentResults.length - 1].orcidUpdateDates = []; - - filteredWorks.forEach(work => { - if(work['putCode']) { - this.currentResults[this.currentResults.length - 1].orcidPutCodes.push(work['putCode']); - } - if(work['creationDate']) { - this.currentResults[this.currentResults.length - 1].orcidCreationDates.push(work['creationDate']); - } - if(work['updateDate']) { - this.currentResults[this.currentResults.length - 1].orcidUpdateDates.push(work['updateDate']); - } - }); - } - - this.results[this.currentPage-1] = this.currentResults; - this.searchUtils.status = this.errorCodes.DONE; - if (this.searchUtils.totalResults == 0) { - this.searchUtils.status = this.errorCodes.NONE; - } - - this.disableForms = false; - } - public getResultPreview(result: SearchResult): ResultPreview { return ResultPreview.searchResultConvert(result, (result.entityType)?result.entityType:this.resultType); } diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.html b/orcid/my-orcid-links/searchMyOrcidResults.component.html index 2eaa8986..4cbd7292 100644 --- a/orcid/my-orcid-links/searchMyOrcidResults.component.html +++ b/orcid/my-orcid-links/searchMyOrcidResults.component.html @@ -1,5 +1,5 @@
- @@ -7,23 +7,57 @@
    -
  • +
  • - - +
    {{resultGroup['results'].length}} results found in OpenAIRE + for PIDs "{{resultGroup['work']['pids'].join("\", \"")}}" +
    You can update your ORCID work with the most preferred result.
    +
    +
    No results found in OpenAIRE + for PIDs "{{resultGroup['work']['pids'].join("\", \"")}}" +
    You can remove the entry from your ORCID profile as well.
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    - + + +
    diff --git a/orcid/my-orcid-links/searchMyOrcidResults.component.ts b/orcid/my-orcid-links/searchMyOrcidResults.component.ts index 4034e75a..03847ba3 100644 --- a/orcid/my-orcid-links/searchMyOrcidResults.component.ts +++ b/orcid/my-orcid-links/searchMyOrcidResults.component.ts @@ -24,7 +24,7 @@ export class searcMyOrcidResultsComponent { @Input() properties:EnvProperties; public openaireEntities = OpenaireEntities; - @Input() previewResults:ResultPreview[]; + @Input() previewResults:{"work":{},results:ResultPreview[]}[]; public urlParam: string; public linkToAdvancedSearchPage: string; @@ -62,11 +62,6 @@ export class searcMyOrcidResultsComponent { } - // ngOnChanges(changes: SimpleChanges): void { - // if (changes.results) { - // this.initialize(); - // } - // } public quote(params: string):string { return '"'+params+'"'; @@ -75,45 +70,6 @@ export class searcMyOrcidResultsComponent { return ResultPreview.searchResultConvert(result, (result.entityType)?result.entityType:this.type); } - initialize() { - this.previewResults = []; - for (let result of this.results) { - this.previewResults.push(this.getResultPreview(result)); - } - - if (Session.isLoggedIn() && this.results && this.results.length > 0) { - this.orcidService.getLocalWorksByPids(this.previewResults.map( - previewResult => { - if (previewResult.identifiers) { - let pidsArray: string[] = []; - for (let key of Array.from(previewResult.identifiers.keys())) { - pidsArray = pidsArray.concat(previewResult.identifiers.get(key)); - } - return pidsArray;//.join(); - } - })).subscribe( - works => { - for (let i = 0; i < this.previewResults.length; i++) { - if (this.previewResults[i].identifiers) { - this.previewResults[i].orcidPutCodes = []; - this.previewResults[i].orcidUpdateDates = []; - - works[i].forEach(work => { - this.previewResults[i].orcidPutCodes.push(work['putCode']); - this.previewResults[i].orcidUpdateDates.push(work['creationDate']); - }); - // this.previewResults[i].orcidPutCodes = works[i].map(work => work['putCode']); - // this.previewResults[i].orcidUpdateDates = works[i] - // console.debug(i, this.previewResults[i].orcidPutCodes); - } - } - }, error => { - - } - ); - } - } - public pageChanged($event) { this.pageChange.emit($event); HelperFunctions.scroll(); diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts index 34173f0c..c7cd5b74 100644 --- a/orcid/orcid-work.component.ts +++ b/orcid/orcid-work.component.ts @@ -20,41 +20,49 @@ declare var UIkit: any; template: ` - + [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))" + name="orcid_add" [ratio]="(isMobile && pageType == 'search') ? 0.7 : 1" visuallyHidden="add"> + [top_margin]="false" [size]="'small'"> Claim +
    - + [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))" + name="orcid_bin" [ratio]="(isMobile && pageType == 'search') ? 0.7 : 1" visuallyHidden="delete"> Remove +
    @@ -106,50 +114,53 @@ declare var UIkit: any; - - ORCID  - -  ACTIONS - + + + ORCID  + +  ACTIONS + + + + + + + + View ORCID work + + + + + + + + + Update ORCID work + + + + + + + + + Claim + + - - - - - - View ORCID work - - - - - - - - Update ORCID work - - - - - - - - Claim - - - - @@ -159,6 +170,7 @@ declare var UIkit: any; Remove + @@ -328,7 +340,10 @@ export class OrcidWorkComponent { @Input() updateDates: string[] = []; @Input() givenPutCode: boolean = false; @Input() pageType: string = "search"; - + + //for myorcid links page + @Input() showOnlyUpdateButton: boolean = false; + @Input() showUpdateButton: boolean = true; public subscriptions: Subscription[] = []; @ViewChild('workModal') workModal; // @ViewChild('saveWorkModal') saveWorkModal; diff --git a/searchPages/find/searchAll.component.html b/searchPages/find/searchAll.component.html index ba82eb23..d6056c69 100644 --- a/searchPages/find/searchAll.component.html +++ b/searchPages/find/searchAll.component.html @@ -28,10 +28,57 @@ -
    -
    -
    +
    +
    + + + + + {{resultsName}} + + ({{fetchPublications.searchUtils.totalResults | number}}) + + + + + + + {{projectName}} + + ({{fetchProjects.searchUtils.totalResults | number}}) + + + + + + + {{dataSourcesName}} + + ({{fetchDataproviders.searchUtils.totalResults | number}}) + + + + + + + {{servicesName}} + + ({{fetchServices.searchUtils.totalResults | number}}) + + + + + + + {{organizationsName}} + + ({{fetchOrganizations.searchUtils.totalResults | number}}) + + + + +
    diff --git a/searchPages/find/searchAll.component.ts b/searchPages/find/searchAll.component.ts index 2f594923..99900b63 100644 --- a/searchPages/find/searchAll.component.ts +++ b/searchPages/find/searchAll.component.ts @@ -89,7 +89,7 @@ export class SearchAllComponent { @Input() name; @Input() customFilter: SearchCustomFilter = null; - @Input() formPlaceholderText = "Search in Explore" + @Input() formPlaceholderText = "Search" // @Input() formPlaceholderText = "Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS+" in OpenAIRE"; @Input() searchForm: SearchForm = {class: 'search-form', dark: true} @Input() breadcrumbs: Breadcrumb[] = []; diff --git a/searchPages/find/searchAll.module.ts b/searchPages/find/searchAll.module.ts index ba4b882d..ae6e9160 100644 --- a/searchPages/find/searchAll.module.ts +++ b/searchPages/find/searchAll.module.ts @@ -22,13 +22,14 @@ import {SearchOrganizationsModule} from "../searchOrganizations.module"; import {SearchDataProvidersModule} from "../searchDataProviders.module"; import {PreviousRouteRecorder} from "../../utils/piwik/previousRouteRecorder.guard"; import {BreadcrumbsModule} from "../../utils/breadcrumbs/breadcrumbs.module"; +import {SliderTabsModule} from "../../sharedComponents/tabs/slider-tabs.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, DataProvidersServiceModule, ProjectsServiceModule, SearchResearchResultsServiceModule, OrganizationsServiceModule, - SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule, SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule, BreadcrumbsModule + SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule, SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule, BreadcrumbsModule, SliderTabsModule ], declarations: [ SearchAllComponent diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts index 5e4e3c59..f4f03fa7 100644 --- a/searchPages/searchResearchResults.component.ts +++ b/searchPages/searchResearchResults.component.ts @@ -160,7 +160,9 @@ export class SearchResearchResultsComponent { this.searchUtils.validateSize(params['size']); this.searchUtils.sortBy = (params['sortBy']) ? params['sortBy'] : ''; - if (this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending") { + if (this.searchUtils.sortBy && this.searchUtils.sortBy != "resultdateofacceptance,descending" && this.searchUtils.sortBy != "resultdateofacceptance,ascending" + && this.searchUtils.sortBy != "citation_count,descending" && this.searchUtils.sortBy != "popularity,descending" + && this.searchUtils.sortBy != "influence,descending" && this.searchUtils.sortBy != "impulse,descending") { this.searchUtils.sortBy = ""; } this.selectedFields = []; diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index 017065de..f0d88901 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -169,7 +169,7 @@ -
    diff --git a/searchPages/searchUtils/advancedSearchForm.component.ts b/searchPages/searchUtils/advancedSearchForm.component.ts index 8a046930..509b4a7f 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/searchPages/searchUtils/advancedSearchForm.component.ts @@ -188,8 +188,10 @@ export class AdvancedSearchFormComponent implements OnInit, OnDestroy, OnChanges fieldIdsChanged(index: number, fieldId: string) { this.selectedFields[index].name = this.fieldIdsMap[fieldId].name; + if(this.selectedFields[index].type !== 'keyword' || this.fieldIdsMap[fieldId].type !== 'keyword') { + this.selectedFields[index].value = ""; + } this.selectedFields[index].type = this.fieldIdsMap[fieldId].type; - this.selectedFields[index].value = ""; this.selectedFields[index].param = this.fieldIdsMap[fieldId].param; if (this.fieldIdsMap[fieldId].type == "boolean") { this.selectedFields[index].value = "true"; diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts index f70ac1cf..e75e3930 100644 --- a/searchPages/searchUtils/searchSorting.component.ts +++ b/searchPages/searchUtils/searchSorting.component.ts @@ -1,5 +1,6 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; import {Option} from "../../sharedComponents/input/input.component"; +import {properties} from "../../../../environments/environment"; @Component({ selector: 'search-sorting', @@ -19,11 +20,21 @@ export class SearchSortingComponent { @Input() entityType: string = ''; @Output() sortByChange = new EventEmitter(); public options: Option[]; - private generalOptions = [ - {value: '', label: 'Relevance'}, - {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, - {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}, - ]; + private generalOptions = properties.environment != "production" ? + [ + {value: '', label: 'Relevance'}, + {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, + {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'}, + {value: 'citation_count,descending', label: 'Citation Count'}, + {value: 'popularity,descending', label: 'Popularity'}, + {value: 'influence,descending', label: 'Influence'}, + {value: 'impulse,descending', label: 'Impulse'} + ] : + [ + {value: '', label: 'Relevance'}, + {value: 'resultdateofacceptance,descending', label: 'Date (most recent)'}, + {value: 'resultdateofacceptance,ascending', label: 'Date (least recent)'} + ]; private communityOptions = [ {value: '', label: 'Title'}, {value: 'creationdate,descending', label: 'Creation Date (most recent)'}, diff --git a/services/metrics.service.ts b/services/metrics.service.ts index 4b3adf99..1e6392f7 100644 --- a/services/metrics.service.ts +++ b/services/metrics.service.ts @@ -6,7 +6,9 @@ import {Metrics} from '../utils/entities/metrics'; import{EnvProperties} from '../utils/properties/env-properties'; import {map} from "rxjs/operators"; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class MetricsService { metrics: Metrics; diff --git a/services/searchDataproviders.service.ts b/services/searchDataproviders.service.ts index 91c4fd14..af05a7f1 100644 --- a/services/searchDataproviders.service.ts +++ b/services/searchDataproviders.service.ts @@ -135,7 +135,7 @@ export class SearchDataprovidersService { // result.description = result.description.substring(0, this.sizeOfDescription) + "..."; // } - let typeid: string = resData['datasourcetype'].classid; + let typeid: string = resData['datasourcetype'] && resData['datasourcetype'].classid; if(typeid != "entityregistry" && typeid != "entityregistry::projects" && typeid != "entityregistry::repositories") { if(resData.hasOwnProperty('accessinfopackage')) { @@ -190,7 +190,7 @@ export class SearchDataprovidersService { return subjects; } getDataproviderType(resData: any): string { - if(resData['datasourcetype'].hasOwnProperty("classname")) { + if(resData.hasOwnProperty('datasourcetype') && resData['datasourcetype'].hasOwnProperty("classname")) { return resData['datasourcetype'].classname; } else { return ''; diff --git a/services/searchProjects.service.ts b/services/searchProjects.service.ts index 2109666f..b513b737 100644 --- a/services/searchProjects.service.ts +++ b/services/searchProjects.service.ts @@ -248,10 +248,10 @@ export class SearchProjectsService { } } } - if(resData.hasOwnProperty("startdate")) { + if(resData.hasOwnProperty("startdate") && resData['startdate']) { result.startYear = resData.startdate.split('-')[0]; } - if(resData.hasOwnProperty("enddate")) { + if(resData.hasOwnProperty("enddate") && resData['enddate']) { result.endYear = resData.enddate.split('-')[0]; } // Measure diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index 775a3b63..296622bb 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -23,6 +23,7 @@ import {properties} from "../../../../environments/environment"; import {ClickEvent} from "../../utils/click/click-outside-or-esc.directive"; import {LayoutService} from "../../dashboard/sharedComponents/sidebar/layout.service"; import {MobileDropdownComponent} from "../../utils/mobile-dropdown/mobile-dropdown.component"; +import {MatDatepicker} from "@angular/material/datepicker"; export type InputType = 'text' @@ -33,7 +34,8 @@ export type InputType = | 'textarea' | 'select' | 'chips' - | 'year-range'; + | 'year-range' + | 'date'; export interface Option { icon?: string, @@ -75,9 +77,9 @@ declare var UIkit;
    -
    @@ -90,8 +92,8 @@ declare var UIkit; [class.uk-text-truncate]="!focused"> - + @@ -163,8 +165,11 @@ declare var UIkit; maxlength="4" (click)="activeIndex = 1;$event.preventDefault()" [formControl]="getFormByName(yearRange.to.control)">
    -
    +
    {{selectADate}}
    +
    {{formAsControl.getRawValue() | date: 'dd-MM-yyyy'}}
    + +
    @@ -174,8 +179,10 @@ declare var UIkit; (click)="resetSearch($event)"> - @@ -188,20 +195,23 @@ declare var UIkit;
    +
    + +
    + uk-dropdown="pos: bottom-justify; mode: none; boundary-align: true;" [attr.boundary]="'#' + id">
    - +
    {{placeholderInfo.label}}
    @@ -279,7 +289,9 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang /** Year Range Configuration */ @Input() yearRange: YearRange; public activeIndex: 0 | 1 | null = null; - + /** Date Configuration*/ + @Input() selectADate: string = 'Select a date'; + public selectedDate: Date; @Input() visibleRows: number = -1; @Input() extendEnter: () => void = null; @Output() focusEmitter: EventEmitter = new EventEmitter(); @@ -299,9 +311,11 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang private subscriptions: any[] = []; @ViewChild('inputBox') inputBox: ElementRef; @ViewChild('optionBox') optionBox: ElementRef; + @ViewChild('calendarBox') calendarBox: ElementRef; @ViewChild('mobileDropdown') mobileDropdown: MobileDropdownComponent; @ViewChild('searchInput') searchInput: ElementRef; @ViewChildren('chip') chips: QueryList; + @ViewChild('datepicker') datepicker: MatDatepicker; @Input() set placeholder(placeholder: string | Placeholder) { @@ -530,8 +544,10 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang ?this.getFormByName(this.yearRange.from.control).errors:this.getFormByName(this.yearRange.to.control).errors)); } else if(this.formAsControl) { return this.formAsControl.errors; - } else { + } else if(this.searchControl) { return this.searchControl.errors; + } else { + return null; } } @@ -564,10 +580,13 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang } })); } - if (this.formAsControl?.validator) { + if (this.formAsControl?.validator || this.formAsArray?.validator) { let validator = this.formControl.validator({} as AbstractControl); this.required = (validator && validator.required); } + if(this.type === 'date') { + this.selectedDate = this.formAsControl.getRawValue()?new Date(this.formAsControl.getRawValue()):null; + } this.subscriptions.push(this.formControl.valueChanges.subscribe(value => { if (this.formControl.enabled) { if(this.type !== 'year-range') { @@ -587,6 +606,9 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang this.open(true); } } + if (this.type === 'date') { + this.selectedDate = value?new Date(value):null; + } } if ((this.value && value && this.value !== value) || (!this.value && value) || this.value && !value) { this.valueChange.emit(this.formControl.value); @@ -735,7 +757,7 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang this.searchInput.nativeElement.focus(); this.activeElement.next(this.chips.last); } - if (this.selectArrow) { + if (this.selectArrow || this.datepicker) { this.open(!this.opened); } else if (this.type !== 'autocomplete' || this.showOptionsOnEmpty || !this.formControl.value) { this.open(true); @@ -774,6 +796,13 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang UIkit.dropdown(this.optionBox.nativeElement).hide(); this.focused = false; } + } else if(this.calendarBox) { + if (this.opened) { + UIkit.dropdown(this.calendarBox.nativeElement).show(); + } else { + UIkit.dropdown(this.calendarBox.nativeElement).hide(); + this.focused = false; + } } else if(this.mobileDropdown) { if(this.opened) { this.mobileDropdown.open(); @@ -810,5 +839,13 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang this.searchControl.setValue(''); } } + if(this.mobileDropdown) { + this.mobileDropdown.close(); + } + } + + dateChanged(event: Date) { + this.focus(false); + this.formAsControl.setValue(event.getTime()); } } diff --git a/sharedComponents/input/input.module.ts b/sharedComponents/input/input.module.ts index d332485a..fea6cc2c 100644 --- a/sharedComponents/input/input.module.ts +++ b/sharedComponents/input/input.module.ts @@ -1,10 +1,13 @@ import {NgModule} from '@angular/core'; import {InputComponent} from "./input.component"; -import {SharedModule} from "../../../openaireLibrary/shared/shared.module"; +import {SharedModule} from "../../shared/shared.module"; import {IconsModule} from "../../utils/icons/icons.module"; import {SafeHtmlPipeModule} from "../../utils/pipes/safeHTMLPipe.module"; import {ClickModule} from "../../utils/click/click.module"; import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown.module"; +import {MatDatepickerModule} from "@angular/material/datepicker"; +import {MatNativeDateModule} from "@angular/material/core"; +import {MatInputModule} from "@angular/material/input"; @NgModule({ imports: [ @@ -12,7 +15,10 @@ import {MobileDropdownModule} from "../../utils/mobile-dropdown/mobile-dropdown. IconsModule, SafeHtmlPipeModule, ClickModule, - MobileDropdownModule + MobileDropdownModule, + MatDatepickerModule, + MatNativeDateModule, + MatInputModule ], exports: [ InputComponent diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 37005d83..3ebaf5d2 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -144,7 +144,7 @@
-
@@ -173,7 +173,7 @@ -
diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts index 38cd9fc7..facfdba2 100644 --- a/sharedComponents/navigationBar.component.ts +++ b/sharedComponents/navigationBar.component.ts @@ -70,6 +70,7 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges { showEntity = {}; showPage = {}; public searchMode: boolean = false; + public portalName: string = ""; public additionalMenuItems: MenuItem[] = []; public featuredMenuItems: MenuItem[] = []; @@ -136,6 +137,9 @@ export class NavigationBarComponent implements OnInit, OnDestroy, OnChanges { //this.config.getCommunityInformation(this.properties, this.communityId).subscribe(data => { this.subs.push(this.config.portalAsObservable.subscribe(data => { if (data) { + if(data.name) { + this.portalName = data.name; + } this.showEntity = {}; this.showPage = {}; if (data['entities']) { diff --git a/sharedComponents/tabs/slider-tab.component.ts b/sharedComponents/tabs/slider-tab.component.ts index 97d5a70b..a9bc8845 100644 --- a/sharedComponents/tabs/slider-tab.component.ts +++ b/sharedComponents/tabs/slider-tab.component.ts @@ -21,4 +21,5 @@ export class SliderTabComponent { public queryParams: any = null; @Input() public customClass: string = ''; + @Input() tabTemplate: any; } diff --git a/sharedComponents/tabs/slider-tabs.component.ts b/sharedComponents/tabs/slider-tabs.component.ts index 59149387..bf05910a 100644 --- a/sharedComponents/tabs/slider-tabs.component.ts +++ b/sharedComponents/tabs/slider-tabs.component.ts @@ -28,34 +28,52 @@ declare var UIkit; [ngClass]="'uk-flex-' + flexPosition + ' ' + tabsClass">
  • - {{tab.title}} + + {{tab.title}} + +
  • - {{tab.title}} + + {{tab.title}} + +
  • {{tab.title}} + class="uk-text-capitalize uk-text-truncate uk-display-block"> + {{tab.title}} + +
  • {{tab.title}} + class="uk-text-capitalize uk-text-truncate uk-display-block"> + {{tab.title}} + +
  • - {{tab.title}} + + {{tab.title}} + +
  • - {{tab.title}} + + {{tab.title}} + +
    • @@ -127,6 +145,13 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy { } ngAfterViewInit() { + this.initTabs(); + this.tabs.changes.subscribe(() => { + this.initTabs(); + }); + } + + public initTabs() { if (typeof document !== 'undefined' && this.tabs.length > 0) { setTimeout(() => { if (this.position === 'horizontal') { diff --git a/utils/authors/showAuthors.component.ts b/utils/authors/showAuthors.component.ts index fdf1cf04..42296345 100644 --- a/utils/authors/showAuthors.component.ts +++ b/utils/authors/showAuthors.component.ts @@ -10,108 +10,129 @@ import {properties} from "../../../../environments/environment"; @Component({ selector: 'showAuthors', template: ` - - + {{author.fullName + ";"}} - - orcid - orcid bw - - {{author.fullName + ";"}} - - -
    -
    -
    {{author.fullName}}
    -
    -
    ORCID
    - -
    - {{" "}} - {{" "}} - - Harvested from ORCID Public Data File - Derived by OpenAIRE algorithms or harvested from 3d party repositories -
    - + + +
    +
    {{author.fullName}}
    +
    +
    ORCID
    -
    -
    - {{author.fullName}} in OpenAIRE -
    -
    - - Search - - - Search in OpenAIRE - -
    -
    -
    -     - -
    +
    + {{" "}} + {{" "}} + + Harvested from ORCID Public Data File + Derived by OpenAIRE algorithms or harvested + from 3d party repositories +
    +
    +
    + + +
    +
    + + VISIT AUTHOR IN ORCID + +
    +
    +
    + +
    +
    + {{author.fullName}} in OpenAIRE +
    +
    + + Search + + + Search in OpenAIRE + +
    +
    + + + + + +
    Authors: - - - - - +{{authors.length-authorsLimit | number}} more + + + + + +{{authors.length - authorsLimit | number}} more - - - +{{authors.length-authorsLimit | number}} Authors + + + +{{authors.length - authorsLimit | number}} Authors -
    - View less +
    + View less +
    -
    - -
    - - - -
    -     + +
    + + + +
    +     - -
    - - - -
    -     + +
    + + + +
    +     ` }) @@ -131,11 +152,11 @@ export class ShowAuthorsComponent { public properties: EnvProperties = properties; public routerHelper: RouterHelper = new RouterHelper(); - testBrowser: boolean; + isBrowser: boolean; public clipboard; constructor(private route: ActivatedRoute, @Inject(PLATFORM_ID) private platformId: string) { - this.testBrowser = isPlatformBrowser(platformId); + this.isBrowser = isPlatformBrowser(platformId); } ngOnInit() {} diff --git a/utils/authors/showAuthors.module.ts b/utils/authors/showAuthors.module.ts index f98f42e5..e01f0f20 100644 --- a/utils/authors/showAuthors.module.ts +++ b/utils/authors/showAuthors.module.ts @@ -6,10 +6,12 @@ import {RouterModule} from '@angular/router'; import {ShowAuthorsComponent} from './showAuthors.component'; import {AlertModalModule} from "../modal/alertModal.module"; import {FullScreenModalModule} from "../modal/full-screen-modal/full-screen-modal.module"; +import {MobileDropdownModule} from "../mobile-dropdown/mobile-dropdown.module"; +import {IconsModule} from "../icons/icons.module"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, AlertModalModule, FullScreenModalModule + CommonModule, FormsModule, RouterModule, AlertModalModule, FullScreenModalModule, MobileDropdownModule, IconsModule ], declarations: [ ShowAuthorsComponent @@ -20,4 +22,4 @@ import {FullScreenModalModule} from "../modal/full-screen-modal/full-screen-moda ShowAuthorsComponent ] }) -export class ShowAuthorsModule { } \ No newline at end of file +export class ShowAuthorsModule { } diff --git a/utils/dataTransfer/transferData.component.html b/utils/dataTransfer/transferData.component.html index f6b84902..687a06a1 100644 --- a/utils/dataTransfer/transferData.component.html +++ b/utils/dataTransfer/transferData.component.html @@ -1,143 +1,156 @@ - - Transfer - - + [title]="'Send data to cloud storage'" + [attr.uk-tooltip]="'pos: bottom; cls: uk-active uk-text-small uk-padding-small'" + class="uk-flex uk-flex-middle uk-button-link" + [class.uk-text-bolder]="!isMobile"> + + Transfer + - -
    -
    - In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in. + + + + + + + + + + + + +
    +
    + In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in. +
    +
    + +
    +
    +
    +
    + You have requested to send the data corresponding to the DOI {{selectedSourceUrl.split(doiPrefix)[1]}} to a cloud storage using the EOSC Data Transfer service +
    +
    + +
    +

    Available DOI URLs:

    +
    +
    +
    {{this.downloadElements.length}} files found:
    +
    +
      +
    • {{ element.name}} +
      • +
    +
    +
    -
    +
    -
    - + +
    + + + + + + + +

    Destination storage type:

    +
    + +

    Destination system (e.g. hostname:8080):

    +
    + + +

    Authentication:

    +
    +
    +
    +
    + +     + +

    Destination path (e.g. /folder1/folder2):

    +
    + +

    or browse to + select a folder.

    +
    + +
    + + + +

    Comming soon!

    +     + +
    + + + *I have read and accepted the data protection policy here. +
    + +
    + +
    +
    -
    -
    - You have requested to send the data corresponding to the DOI {{selectedSourceUrl.split(doiPrefix)[1]}} to a cloud storage using the EOSC Data Transfer service -
    -
    - -
    -

    Available DOI URLs:

    -
    -
    -
    {{this.downloadElements.length}} files found:
    -
    -
      -
    • {{ element.name}} -
      • -
    -
    -
    -
    -
    -
    - -
    - - - - - - - -

    Destination storage type:

    -
    - -

    Destination system (e.g. hostname:8080):

    -
    - - -

    Authentication:

    -
    -
    -
    -
    - -     - -

    Destination path (e.g. /folder1/folder2):

    -
    - -

    or browse to - select a folder.

    -
    - -
    - - - -

    Comming soon!

    -     - -
    - - - *I have read and accepted the data protection policy here. -
    - -
    - -
    - -
    -
    - - -
    -
    - - - -
    -
    + + +
    +
    + + + +
    +
    -
    -
    - - - - - - - + +
    + + + + + + + - -
    - + +
    + diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index 647d6a3c..4ca426d9 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -10,6 +10,7 @@ import {delay, repeat, startWith, switchMap} from "rxjs/operators"; import {StringUtils} from "../string-utils.class"; import {HelperFunctions} from "../HelperFunctions.class"; import {FullScreenModalComponent} from "../modal/full-screen-modal/full-screen-modal.component"; +import {AlertModal} from "../modal/alert"; declare var UIkit; @Component({ @@ -35,6 +36,7 @@ declare var UIkit; `] }) export class EGIDataTransferComponent { + @Input() isMobile: boolean = false; subscriptions = []; statusSub: Subscription[] = []; accessToken = null; @@ -55,7 +57,8 @@ export class EGIDataTransferComponent { downloadElements = null; @Input() isOpen = false; // @Input() selectedDestinationId = "dcache"; - @ViewChild('egiTransferModal') egiTransferModal: FullScreenModalComponent; + @ViewChild('egiTransferModal') egiTransferModal: AlertModal; + @ViewChild('egiTransferFsModal') egiTransferFsModal: FullScreenModalComponent; APIURL = properties.eoscDataTransferAPI; // status: "loading" | "success" | "errorParser" | "errorUser" | "errorTransfer" | "init" | "canceled" = "init"; status: "unused" | "staging" | "submitted" | "active" | "succeeded" | "partial" | "failed" | "canceled" | "errorParser" | "errorUser" | "init" = "init"; @@ -146,20 +149,37 @@ export class EGIDataTransferComponent { this.parse(); } this.isOpen = true; - this.egiTransferModal.back = true; - this.egiTransferModal.cancelButton = false; - this.egiTransferModal.okButton = false; - this.egiTransferModal.okButtonText = ">> Transfer"; - this.egiTransferModal.title = "EOSC Data Transfer"; this.init(); - if(typeof document !== 'undefined') { - this.egiTransferModal.open(); + + if(!this.isMobile) { + this.egiTransferModal.stayOpen = true; + // this.egiTransferModal.back = true; + this.egiTransferModal.cancelButton = false; + this.egiTransferModal.okButton = true; + this.egiTransferModal.okButtonText = ">> Transfer"; + this.egiTransferModal.alertTitle = "EOSC Data Transfer"; + if(typeof document !== 'undefined') { + this.egiTransferModal.open(); + } + } else { + this.egiTransferFsModal.back = false; + this.egiTransferFsModal.cancelButton = true; + this.egiTransferFsModal.okButton = false; + // this.egiTransferFsModal.okButtonText = ">> Transfer"; + this.egiTransferFsModal.title = "EOSC Data Transfer"; + if(typeof document !== 'undefined') { + this.egiTransferFsModal.open(); + } } } close(){ if(this.isOpen) { this.isOpen = false; - this.egiTransferModal.cancel(); + if(!this.isMobile) { + this.egiTransferModal.cancel(); + } else { + this.egiTransferFsModal.cancel(); + } } // this.downloadElements = []; this.init(); @@ -235,7 +255,7 @@ export class EGIDataTransferComponent { "files": [], "params": { "priority": 0, - "overwrite": true, + "overwrite": false, "retry": 3 } }; @@ -541,8 +561,9 @@ export class EGIDataTransferComponent { } } validatePath():boolean { - let exp1 = /^\/([A-z0-9-_+]+\/?)*$/g; - return (this.destinationPath.length > 0 && this.destinationPath.match(exp1) != null) + // let exp1 = /^\/([A-z0-9-_+]+\/?)*$/g; + // let exp1 = /^\/([A-z0-9-_]+[+\/]?)*$/; + return (this.destinationPath.length > 0 && this.destinationPath.startsWith("/")) } diff --git a/utils/dropdown-filter/dropdown-filter.component.ts b/utils/dropdown-filter/dropdown-filter.component.ts index a780286a..2470f49c 100644 --- a/utils/dropdown-filter/dropdown-filter.component.ts +++ b/utils/dropdown-filter/dropdown-filter.component.ts @@ -1,23 +1,32 @@ import {Component, ElementRef, Input, ViewChild} from "@angular/core"; +import {MobileDropdownComponent} from "../mobile-dropdown/mobile-dropdown.component"; declare var UIkit; @Component({ selector: 'dropdown-filter', template: ` - -
    - +
    + +
    + +
    +     + + + ` }) export class DropdownFilterComponent { @@ -33,13 +42,24 @@ export class DropdownFilterComponent { public overflow: boolean = true; @Input() public disabled = false; + @Input() + public isMobile: boolean = false; @ViewChild("dropdownElement") dropdownElement: ElementRef; - + @ViewChild("mobileDropdown") mobileDropdown: MobileDropdownComponent; + get isOpen() { - return (typeof document !== 'undefined') && this.dropdownElement && UIkit.dropdown(this.dropdownElement.nativeElement).isActive(); + if(this.isMobile) { + return this.mobileDropdown?.opened; + } else { + return (typeof document !== 'undefined') && this.dropdownElement && UIkit.dropdown(this.dropdownElement.nativeElement).isActive(); + } } closeDropdown() { - UIkit.dropdown(this.dropdownElement.nativeElement).hide(); + if(this.isMobile) { + this.mobileDropdown.close(); + } else { + UIkit.dropdown(this.dropdownElement.nativeElement).hide(); + } } } diff --git a/utils/dropdown-filter/dropdown-filter.module.ts b/utils/dropdown-filter/dropdown-filter.module.ts index 801ac9c3..8770dd62 100644 --- a/utils/dropdown-filter/dropdown-filter.module.ts +++ b/utils/dropdown-filter/dropdown-filter.module.ts @@ -2,9 +2,10 @@ import {NgModule} from "@angular/core"; import {CommonModule} from "@angular/common"; import {DropdownFilterComponent} from "./dropdown-filter.component"; import {IconsModule} from "../icons/icons.module"; +import {MobileDropdownModule} from "../mobile-dropdown/mobile-dropdown.module"; @NgModule({ - imports: [CommonModule, IconsModule], + imports: [CommonModule, IconsModule, MobileDropdownModule], declarations: [DropdownFilterComponent], exports: [DropdownFilterComponent] }) diff --git a/utils/entities/adminTool/portal.ts b/utils/entities/adminTool/portal.ts index 88ce66ce..7ddb3b7f 100644 --- a/utils/entities/adminTool/portal.ts +++ b/utils/entities/adminTool/portal.ts @@ -186,9 +186,10 @@ export class Portal { }; }; - public static getMockCommunityInfo(pid: string, disabledEntities:string[],disabledPages:string[]): any { + public static getMockCommunityInfo(pid: string, name:string, disabledEntities:string[],disabledPages:string[]): any { let communityInfo = Object.assign({}, Portal.getmockPortalInfo()); communityInfo.pid = pid; + communityInfo.name = name; for(let disabledPage of disabledPages) { for (var i = 0; i < communityInfo.pages.length; i++) { if (communityInfo.pages[i].route == disabledPage) { diff --git a/utils/entity-actions/entity-actions.component.ts b/utils/entity-actions/entity-actions.component.ts index 7f7c1a1e..53cc9cc7 100644 --- a/utils/entity-actions/entity-actions.component.ts +++ b/utils/entity-actions/entity-actions.component.ts @@ -23,6 +23,8 @@ import {EnvProperties} from "../properties/env-properties";
    Share @@ -101,7 +103,6 @@ export class EntityActionsComponent implements OnInit { public routerHelper: RouterHelper = new RouterHelper(); @ViewChild('citeModal') citeModal; @ViewChild('embedResultsModal') embedResultsModal; - @ViewChild('downloadReportModal') downloadReportModal; @ViewChild('addThisModal') addThisModal; properties: EnvProperties = properties; openaireEntities = OpenaireEntities; diff --git a/utils/mobile-dropdown/mobile-dropdown.component.ts b/utils/mobile-dropdown/mobile-dropdown.component.ts index 8a24d7e9..f1b3c2ef 100644 --- a/utils/mobile-dropdown/mobile-dropdown.component.ts +++ b/utils/mobile-dropdown/mobile-dropdown.component.ts @@ -1,10 +1,11 @@ -import {Component, Input, OnInit} from "@angular/core"; +import {Component, ElementRef, EventEmitter, Input, OnInit, Output} from "@angular/core"; +import {NavigationStart, Router} from "@angular/router"; @Component({ selector: 'mobile-dropdown', template: ` -
    -
    +
    +
    @@ -15,22 +16,55 @@ import {Component, Input, OnInit} from "@angular/core";
    ` }) export class MobileDropdownComponent implements OnInit{ - @Input() toggle: HTMLLinkElement; + @Input() toggle: HTMLAnchorElement | HTMLButtonElement; + @Output() onClose: EventEmitter = new EventEmitter; public opened: boolean = false; + private static MOBILE_DROPDOWN_CONTAINER = 'mobile-dropdown-container'; + + constructor(private element: ElementRef, private router: Router) { + this.router.events.subscribe(event => { + if(event instanceof NavigationStart) { + this.element.nativeElement.remove(); + } + }); + } ngOnInit() { if(this.toggle) { this.toggle.onclick = (ev) => { - this.opened = !this.opened; + ev.preventDefault(); + ev.stopPropagation(); + if(this.opened) { + this.close(); + } else { + this.open(); + } } } } open() { - this.opened = true; + if(!this.opened) { + let body = document.getElementsByTagName('body')[0]; + let container = document.getElementById(MobileDropdownComponent.MOBILE_DROPDOWN_CONTAINER); + if(!container) { + container = document.createElement('div'); + container.setAttribute('id', MobileDropdownComponent.MOBILE_DROPDOWN_CONTAINER); + body.append(container); + } + let parent = this.element.nativeElement.parentElement; + parent.removeChild(this.element.nativeElement); + container.append(this.element.nativeElement); + this.opened = true; + body.setAttribute('style', 'overflow-y: hidden'); + } } close() { - this.opened = false; + if(this.opened) { + this.opened = false; + this.onClose.emit(); + document.getElementsByTagName('body')[0].setAttribute('style', ''); + } } } diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 4173ae39..b6458d79 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -19,10 +19,10 @@ declare var UIkit: any;
    -
    {{alertTitle}}
    +
    {{alertTitle}}
    -

    {{title}}

    +
    {{title}}

    {{title}}

    @@ -142,7 +142,7 @@ export class FullScreenModalComponent implements AfterViewInit, OnDestroy { open() { UIkit.modal(this.modal.nativeElement).show(); - HelperFunctions.scroll(); + this.body.nativeElement.scrollTo(0, 0); } cancel() { diff --git a/utils/modal/loading.component.ts b/utils/modal/loading.component.ts index 114961ff..cc3e46e9 100644 --- a/utils/modal/loading.component.ts +++ b/utils/modal/loading.component.ts @@ -13,66 +13,25 @@ declare var UIkit: any; @Component({ selector: 'modal-loading', template: ` - - -
    -
    - - -
    -
    +
    +
    +
    +
    +

    {{title}}

    +
    +
    +
    +

    {{message}}

    - -
    -
    - -
    -
    -
    -
    -

    {{title}}

    -
    -
    -
    -
    -

    {{message}}

    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - `, + `, encapsulation: ViewEncapsulation.None, }) /** diff --git a/utils/properties/searchFields.ts b/utils/properties/searchFields.ts index e8ace190..65ca6a4b 100644 --- a/utils/properties/searchFields.ts +++ b/utils/properties/searchFields.ts @@ -14,7 +14,7 @@ export class SearchFields { // Remove Collected From Filter "collectedfrom","collectedfrom" public RESULT_REFINE_FIELDS = [ - "resultbestaccessright", "instancetypename", (properties.environment !== 'production' ? "foslabel" : "fos"), "relfunder", + "resultbestaccessright", "instancetypename", properties.environment!='production'?"foslabel":'fos', "relfunder", "relfundinglevel0_id", "relfundinglevel1_id", "relfundinglevel2_id", "relproject", "sdg", "country", "resultlanguagename", "resulthostingdatasource", "community"]; diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index f2120b2a..c4574c8d 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -123,7 +123,7 @@
    -
    @@ -214,7 +214,8 @@ - {{result.measure.bip[0].value}} + {{formatNumber(result.measure.bip[0].value)}} + {{result.measure.bip[0].value}}
    @@ -223,7 +224,8 @@ - + +
    {{metric.name}}{{metric.value}}{{metric.value | number}}{{metric.value}}
    @@ -252,7 +254,7 @@
    Powered by BIP! + loading="lazy" alt="Usage counts">
    diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts index 9c041854..6352e9b9 100644 --- a/utils/result-preview/result-preview.component.ts +++ b/utils/result-preview/result-preview.component.ts @@ -223,6 +223,10 @@ export class ResultPreviewComponent implements OnInit, OnChanges { return formatted.number + formatted.size; } + public isNumber(value): boolean { + return typeof value === 'number'; + } + public getAccessLabel(accessRight) : string { if(accessRight) { return (accessRight + (accessRight.toLowerCase().endsWith(" access") ? "" : " access")); diff --git a/utils/string-utils.class.ts b/utils/string-utils.class.ts index c21fa9f1..d05bc57e 100644 --- a/utils/string-utils.class.ts +++ b/utils/string-utils.class.ts @@ -209,19 +209,19 @@ export class Identifier { public static getPIDFromIdentifiers(identifiers: Map): Identifier { let classes:string [] = ["doi", "handle", "pmc", "pmid", "re3data"]; - if(identifiers) { - for (let cl of classes){ - if(identifiers.get(cl)){ - for (let pid of identifiers.get(cl)) { - let identifier = Identifier.getIdentifierFromString(pid); - if (identifier){ - return identifier; - } + if(identifiers) { + for (let cl of classes) { + if (identifiers.get(cl)) { + for (let pid of identifiers.get(cl)) { + let identifier = Identifier.getIdentifierFromString(pid); + if (identifier) { + return identifier; } } + } } - return null; } + return null; } public static isValidDOI(str: string): boolean {