[Trunk | Library]:
1. [NEW] Added folder and files for "recommend-orcid-links". 2. searchResearchResults.component.ts: Added input fields "usedBy", "orcidQuery", "identifiers" (needed for recommend orcid links page). 3. newSearchPage.component.html: Add cases for "usedBy=='orcid'" | call <orcid-result> component when "usedBy == 'orcid'". 4. newSearchPage.module.ts: Import "SearchResultsForOrcidModule". git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60395 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni
parent
290df028ad
commit
f57e7d4d60
|
|
@ -0,0 +1,173 @@
|
|||
import {Component, Input, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import {ErrorCodes} from "../../utils/properties/errorCodes";
|
||||
import {ErrorMessagesComponent} from "../../utils/errorMessages.component";
|
||||
import {SearchUtilsClass} from "../../searchPages/searchUtils/searchUtils.class";
|
||||
import {RouterHelper} from "../../utils/routerHelper.class";
|
||||
import {EnvProperties} from "../../utils/properties/env-properties";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
import {OrcidService} from "../orcid.service";
|
||||
import {Identifier} from "../../utils/string-utils.class";
|
||||
|
||||
@Component({
|
||||
selector: 'search-recommended-results-for-orcid',
|
||||
template: `
|
||||
|
||||
<!-- <div class="uk-section uk-padding-remove-bottom uk-padding-remove-top">-->
|
||||
<!-- <div class="explorePanelBackground communityPanelBackground uk-padding-small">-->
|
||||
<!-- <div class="uk-container uk-container-large uk-margin-small-top uk-margin-small-bottom">-->
|
||||
<!-- <breadcrumbs [light]="!!(this.communityId)" [breadcrumbs]="breadcrumbs"></breadcrumbs>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<div class="">
|
||||
<div class="uk-container uk-container-large uk-margin-top">
|
||||
<div *ngIf="showLoading" class="uk-animation-fade uk-margin-top uk-width-1-1" role="alert">
|
||||
<span class="loading-gif uk-align-center"></span>
|
||||
</div>
|
||||
<div *ngIf="!showLoading && !orcidQuery" class="uk-animation-fade uk-alert uk-alert-warning" role="alert">
|
||||
An Error Occurred
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="orcidQuery" class="uk-container uk-container-large uk-margin-top">
|
||||
|
||||
<form
|
||||
class="uk-margin-top uk-grid uk-margin-small-left ng-untouched ng-pristine ng-valid uk-form-width-large uk-float-right">
|
||||
|
||||
<div class=" uk-padding-remove-left uk-margin-small-top uk-inline uk-width-expand">
|
||||
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip"
|
||||
(click)="keyword = ''"
|
||||
uk-icon="icon: close"></a>
|
||||
<input type="text" class="uk-input text-input-box uk-width-expand"
|
||||
placeholder="Search by name, description, subject..." aria-describedby="sizing-addon2"
|
||||
[(ngModel)]="keyword" name="keyword">
|
||||
</div>
|
||||
<div class="uk-padding-remove-left">
|
||||
<button (click)="keywordChanged()" type="submit"
|
||||
class="portal-button uk-margin-small-left uk-margin-small-top uk-button">Search
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- <search-research-results [simpleView]="true" type="deposit" simpleSearchLink="/participate/deposit/search" [includeOnlyResultsAndFilter]="true" >-->
|
||||
<!-- </search-research-results>-->
|
||||
<search-research-results *ngIf="orcidQuery"
|
||||
resultType="result" usedBy="orcid" [identifiers]="identifiers"
|
||||
[includeOnlyResultsAndFilter]="true" [orcidQuery]="orcidQuery">
|
||||
</search-research-results>
|
||||
</div>
|
||||
`
|
||||
})
|
||||
export class SearchRecommendedResultsForOrcidComponent {
|
||||
private errorCodes: ErrorCodes;
|
||||
private errorMessages: ErrorMessagesComponent;
|
||||
@Input() piwikSiteId = null;
|
||||
public results =[];
|
||||
public totalResults:number = 0 ;
|
||||
public baseUrl:string;
|
||||
public searchUtils:SearchUtilsClass = new SearchUtilsClass();
|
||||
public subscriptions: any[] = [];
|
||||
public _location:Location;
|
||||
|
||||
public disableForms: boolean = false;
|
||||
public loadPaging: boolean = true;
|
||||
public oldTotalResults: number = 0;
|
||||
pagingLimit = 0;
|
||||
|
||||
properties:EnvProperties;
|
||||
|
||||
@Input() public communityId: string = null;
|
||||
|
||||
depositLearnHowPage: string = null;
|
||||
public routerHelper:RouterHelper = new RouterHelper();
|
||||
// breadcrumbs:Breadcrumb[] = [];
|
||||
parameters = {};
|
||||
keyword = "";
|
||||
|
||||
identifiers: string[] = [];
|
||||
|
||||
orcidQuery: string = "";
|
||||
public showLoading: boolean = true;
|
||||
|
||||
constructor (private route: ActivatedRoute, private router: Router, private _orcidService: OrcidService) {
|
||||
this.errorCodes = new ErrorCodes();
|
||||
this.errorMessages = new ErrorMessagesComponent();
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
this.searchUtils.page =1;
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.properties = properties;
|
||||
this.depositLearnHowPage = this.properties.depositLearnHowPage;
|
||||
this.baseUrl = this.properties.depositSearchPage;
|
||||
this.pagingLimit = this.properties.pagingLimit;
|
||||
// this.breadcrumbs.push({name: 'home', route: '/'}, {
|
||||
// name: "Deposit",
|
||||
// route: this.depositLearnHowPage
|
||||
// }, {name: "Browse repositories", route: null});
|
||||
|
||||
// this.subscriptions.push(this._orcidService.getLocalWorks().subscribe(
|
||||
// works => {
|
||||
// console.debug(works);
|
||||
// for(let work of works) {
|
||||
// for(let pid of work['pids']) {
|
||||
// let identifier: Identifier = Identifier.getIdentifierFromString(pid);
|
||||
// this.pidsQuery += (this.pidsQuery ? " or " : "") + '(pidclassid exact "'+identifier.class+'" and pid="'+identifier.id+'")'
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
// error => {
|
||||
// this.handleError("Could not get user's ORCID works", error);
|
||||
// }
|
||||
// ));
|
||||
|
||||
this.subscriptions.push(this._orcidService.getUserOrcid().subscribe(
|
||||
orcidId => {
|
||||
orcidId = "0000-0001-7291-3210";//"0000-0002-0458-1004";
|
||||
// console.debug("mocked orcidIdrcidId: "+orcidId);
|
||||
this.orcidQuery = 'authorid exact "'+orcidId+'" and (authoridtype exact "orcid_pending")';
|
||||
this.showLoading = false;
|
||||
},
|
||||
error => {
|
||||
this.handleError("Could not get user's ORCID iD", error);
|
||||
this.showLoading = false;
|
||||
}
|
||||
));
|
||||
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(params => {
|
||||
this.parameters = Object.assign({}, params);
|
||||
this.keyword = params["fv0"]?params["fv0"]:'';
|
||||
}));
|
||||
}
|
||||
|
||||
public ngOnDestroy() {
|
||||
for(let sub of this.subscriptions){
|
||||
sub.unsubscribe();
|
||||
}
|
||||
}
|
||||
keywordChanged() {
|
||||
|
||||
if (this.keyword.length > 0) {
|
||||
this.parameters["fv0"] = this.keyword;
|
||||
this.parameters["f0"] = "q";
|
||||
} else {
|
||||
delete this.parameters['fv0'];
|
||||
delete this.parameters['f0'];
|
||||
}
|
||||
|
||||
if (this.parameters["page"]) {
|
||||
//GO to first page
|
||||
delete this.parameters['page'];
|
||||
}
|
||||
|
||||
this.router.navigate(['/recommended-orcid-links'], {queryParams: this.parameters});
|
||||
}
|
||||
|
||||
private handleError(message: string, error) {
|
||||
console.error("Search My Results in Orcid Page: "+message, error);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {SearchRecommendedResultsForOrcidComponent} from './searchRecommendedResultsForOrcid.component';
|
||||
|
||||
import {SearchResultsModule } from '../../searchPages/searchUtils/searchResults.module';
|
||||
|
||||
import {SearchFormModule} from '../../searchPages/searchUtils/searchForm.module';
|
||||
import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
|
||||
import {SearchResearchResultsModule} from "../../searchPages/searchResearchResults.module";
|
||||
import {OrcidService} from "../orcid.service";
|
||||
// import {BreadcrumbsModule} from "../utils/breadcrumbs/breadcrumbs.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
RouterModule,
|
||||
SearchFormModule, SearchResearchResultsModule,
|
||||
// , BreadcrumbsModule
|
||||
],
|
||||
declarations: [
|
||||
SearchRecommendedResultsForOrcidComponent
|
||||
],
|
||||
providers:[ IsRouteEnabled, OrcidService],
|
||||
exports: [
|
||||
SearchRecommendedResultsForOrcidComponent
|
||||
]
|
||||
})
|
||||
export class SearchRecommendedResultsForOrcidModule { }
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages>
|
||||
<div *ngIf="status == errorCodes.NONE" class="uk-text-center uk-margin-large-top uk-width-3-5">
|
||||
<p class="uk-text-large uk-text-muted uk-margin">There are no repositories for your preferences</p>
|
||||
|
||||
<p class="uk-text-large uk-text-muted">We suggest to deposit your research in</p>
|
||||
<!-- <a href="{{zenodoInformation.url}}" target="_blank" class="custom-external custom-icon">{{zenodoInformation.name}}</a>-->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="173" height="56.685" viewBox="0 0 173 56.685"><defs><style>.a{fill:#191919;}</style></defs><path class="a" d="M171.749,22.311a16.158,16.158,0,0,0-3.364-4.953A15.511,15.511,0,0,0,157.4,12.837a15.213,15.213,0,0,0-6.074,1.206,16.4,16.4,0,0,0-2.63,1.424,16.2,16.2,0,0,0-2.325,1.891,14.893,14.893,0,0,0-1.242,1.383,19.241,19.241,0,0,0-1.173,1.7,19.372,19.372,0,0,0-1.482,3.343c.048-1.943.332-4.842,1.482-6.468V3.272a3.081,3.081,0,0,0-.993-2.323,3.251,3.251,0,0,0-5.556,2.323V15.765a17.084,17.084,0,0,0-4.261-2.156,14.8,14.8,0,0,0-4.781-.773,15.314,15.314,0,0,0-6.028,1.206,15.575,15.575,0,0,0-4.959,3.316,16.056,16.056,0,0,0-3.352,4.953c-.063.142-.118.286-.177.43-.056-.144-.111-.288-.173-.43a16.158,16.158,0,0,0-3.364-4.953,15.519,15.519,0,0,0-4.95-3.316,15.795,15.795,0,0,0-12.105,0,16.068,16.068,0,0,0-4.954,3.316,15.182,15.182,0,0,0-3.359,4.953c-.058.136-.109.272-.162.407-.056-.135-.109-.271-.167-.407a16.056,16.056,0,0,0-3.357-4.953,15.532,15.532,0,0,0-4.956-3.316,15.795,15.795,0,0,0-12.105,0,16.084,16.084,0,0,0-4.948,3.316,15.129,15.129,0,0,0-3.366,4.953c-.051.125-.1.253-.148.378-.051-.125-.1-.253-.155-.378a16.165,16.165,0,0,0-3.366-4.953,15.489,15.489,0,0,0-10.979-4.521,15.185,15.185,0,0,0-6.072,1.206,16.01,16.01,0,0,0-4.622,3.017v-.521A3.335,3.335,0,0,0,27.211,13.2H3.837a3.334,3.334,0,0,0,0,6.669h18.37L.658,48.884A3.333,3.333,0,0,0,0,50.872v2.176a3.337,3.337,0,0,0,3.336,3.336H28.214a3.335,3.335,0,0,0,3.324-3.09,15.693,15.693,0,0,0,3.675,2.184,15.189,15.189,0,0,0,6.031,1.207A14.892,14.892,0,0,0,49.857,54.1a15.447,15.447,0,0,0,4.827-5.188v4.5a3.245,3.245,0,0,0,3.277,3.275,3.194,3.194,0,0,0,2.281-.949,3.077,3.077,0,0,0,.991-2.326V41.733h-.012a.087.087,0,0,1,.012-.015h-8.17a3.175,3.175,0,0,0-1.851.558,3.007,3.007,0,0,0-1.161,1.507l-.535,1.1a8.969,8.969,0,0,1-8.271,5.254,9.141,9.141,0,0,1-3.493-.684,8.463,8.463,0,0,1-2.883-1.939,9.963,9.963,0,0,1-1.94-2.888,8.4,8.4,0,0,1-.729-3.447V38.252H61.234V28.34a8.74,8.74,0,0,1,.688-3.442,8.959,8.959,0,0,1,8.355-5.515,9.117,9.117,0,0,1,3.493.687,8.459,8.459,0,0,1,2.883,1.94,10.032,10.032,0,0,1,1.94,2.889,8.36,8.36,0,0,1,.734,3.442V53.409A3.233,3.233,0,0,0,82.6,56.684a3.211,3.211,0,0,0,2.286-.949,3.107,3.107,0,0,0,.986-2.326v-4.5a15.828,15.828,0,0,0,2.482,3.249,15.454,15.454,0,0,0,4.954,3.314,15.671,15.671,0,0,0,12.061,0,16.035,16.035,0,0,0,5-3.314,15.226,15.226,0,0,0,3.359-4.951c.044-.112.087-.225.129-.338.046.113.087.226.134.338a15.068,15.068,0,0,0,3.359,4.951,16.075,16.075,0,0,0,4.951,3.314,15.79,15.79,0,0,0,12.109,0,15.476,15.476,0,0,0,4.946-3.314,16.166,16.166,0,0,0,3.366-4.951c.06-.142.116-.283.173-.426.058.143.111.284.173.426a16.07,16.07,0,0,0,3.359,4.951,15.454,15.454,0,0,0,4.954,3.314,15.671,15.671,0,0,0,12.061,0,16.008,16.008,0,0,0,5-3.314A15.314,15.314,0,0,0,173,41.178V28.341A14.991,14.991,0,0,0,171.749,22.311ZM8.35,49.716,25.794,26.224a16.054,16.054,0,0,0-.143,2.117V41.178A14.759,14.759,0,0,0,26.9,47.211a16.514,16.514,0,0,0,1.366,2.5H8.35ZM50.285,31.7H32.2V28.34a8.738,8.738,0,0,1,.686-3.442,8.951,8.951,0,0,1,8.36-5.515,9.1,9.1,0,0,1,3.486.687,8.423,8.423,0,0,1,2.885,1.94,10.033,10.033,0,0,1,1.94,2.889,8.318,8.318,0,0,1,.729,3.442V31.7Zm58.093,9.48a8.7,8.7,0,0,1-.688,3.447,8.941,8.941,0,0,1-8.352,5.511,9.141,9.141,0,0,1-3.493-.684,8.417,8.417,0,0,1-2.883-1.939,9.917,9.917,0,0,1-1.94-2.888,8.353,8.353,0,0,1-.729-3.447V28.341A8.74,8.74,0,0,1,90.98,24.9a8.935,8.935,0,0,1,1.937-2.889,9.165,9.165,0,0,1,9.9-1.94,8.433,8.433,0,0,1,2.888,1.94,10.129,10.129,0,0,1,1.94,2.889,8.356,8.356,0,0,1,.729,3.442V41.178Zm29.035,0a8.32,8.32,0,0,1-.729,3.447,9.947,9.947,0,0,1-1.94,2.888,8.358,8.358,0,0,1-2.888,1.939,9.337,9.337,0,0,1-7.018,0,9.046,9.046,0,0,1-4.825-4.826,8.735,8.735,0,0,1-.69-3.447V28.341a8.439,8.439,0,0,1,.732-3.442,10.1,10.1,0,0,1,1.94-2.889,8.522,8.522,0,0,1,2.883-1.94,9.152,9.152,0,0,1,3.493-.687,8.985,8.985,0,0,1,8.357,5.515,8.775,8.775,0,0,1,.686,3.442V41.178Zm29.035,0a8.82,8.82,0,0,1-.686,3.447,9.129,9.129,0,0,1-11.85,4.826,8.424,8.424,0,0,1-2.882-1.939,9.946,9.946,0,0,1-1.942-2.888,8.337,8.337,0,0,1-.732-3.447V28.341a8.742,8.742,0,0,1,.69-3.442,8.935,8.935,0,0,1,1.937-2.889,9.169,9.169,0,0,1,9.905-1.94,8.423,8.423,0,0,1,2.885,1.94,10.088,10.088,0,0,1,1.942,2.889,8.356,8.356,0,0,1,.729,3.442V41.178Z"/></svg>
|
||||
<p>The OpenAIRE Catch-all repository hosted at CERN cloud infrastructure. Whatever your field of research is, you can deposit any type of research product, select the proper license, ask for a DOI and link it to the funding projects for easy reporting.</p>
|
||||
</div>
|
||||
<ul class="uk-margin-top uk-list uk-margin search-results ">
|
||||
<li *ngFor="let result of results" class="uk-animation-fade">
|
||||
<div class="uk-card uk-card-default uk-padding uk-card-hover">
|
||||
<result-preview [properties]="properties" [showOrganizations]="true"
|
||||
[showSubjects]="true" [result]="getResultPreview(result)" [promoteWebsiteURL]="true">
|
||||
</result-preview>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
import {Component, Input} from '@angular/core';
|
||||
import {ActivatedRoute} from "@angular/router";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {SearchResult} from "../../utils/entities/searchResult";
|
||||
import {EnvProperties} from "../../utils/properties/env-properties";
|
||||
import {RouterHelper} from "../../utils/routerHelper.class";
|
||||
import {ErrorCodes} from "../../utils/properties/errorCodes";
|
||||
import {ResultPreview} from "../../utils/result-preview/result-preview";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'orcid-result',
|
||||
templateUrl:'searchResultsForOrcid.component.html'
|
||||
})
|
||||
|
||||
export class SearchResultsForOrcidComponent {
|
||||
@Input() results: SearchResult[];
|
||||
@Input() status: number;
|
||||
@Input() type: string;
|
||||
@Input() properties:EnvProperties;
|
||||
|
||||
|
||||
public urlParam: string;
|
||||
public linkToAdvancedSearchPage: string;
|
||||
public errorCodes:ErrorCodes = new ErrorCodes();
|
||||
public routerHelper:RouterHelper = new RouterHelper();
|
||||
public errorMessage: string = "No results found";
|
||||
|
||||
sub;
|
||||
constructor (private route: ActivatedRoute) {}
|
||||
ngOnDestroy() {
|
||||
if (this.sub instanceof Subscriber) {
|
||||
this.sub.unsubscribe();
|
||||
}
|
||||
}
|
||||
ngOnInit() {
|
||||
if(this.type == "publication") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedPublications;
|
||||
this.urlParam = "articleId";
|
||||
} else if(this.type == "dataset") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedDatasets;
|
||||
this.urlParam = "datasetId";
|
||||
} else if(this.type == "software") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedSoftware;
|
||||
this.urlParam = "softwareId";
|
||||
} else if(this.type == "other") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedOrps;
|
||||
this.urlParam = "orpId";
|
||||
} else if(this.type == "project") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedProjects;
|
||||
this.urlParam = "projectId";
|
||||
} else if(this.type == "organization") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedOrganizations;
|
||||
this.urlParam = "organizationId";
|
||||
} else if(this.type == "dataprovider") {
|
||||
this.linkToAdvancedSearchPage = this.properties.searchLinkToAdvancedDataProviders;
|
||||
this.urlParam = "datasourceId";
|
||||
}
|
||||
|
||||
this.properties = properties;
|
||||
|
||||
}
|
||||
|
||||
public quote(params: string):string {
|
||||
return '"'+params+'"';
|
||||
}
|
||||
public getResultPreview(result: SearchResult): ResultPreview {
|
||||
return ResultPreview.searchResultConvert(result, (result.entityType)?result.entityType:this.type);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {SearchResultsForOrcidComponent} from './searchResultsForOrcid.component';
|
||||
import {ResultPreviewModule} from "../../utils/result-preview/result-preview.module";
|
||||
import {ErrorMessagesModule} from "../../utils/errorMessages.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
RouterModule, ErrorMessagesModule,
|
||||
ResultPreviewModule
|
||||
],
|
||||
declarations: [
|
||||
SearchResultsForOrcidComponent
|
||||
],
|
||||
providers:[
|
||||
],
|
||||
exports: [
|
||||
SearchResultsForOrcidComponent
|
||||
]
|
||||
})
|
||||
export class SearchResultsForOrcidModule { }
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import {Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute} from '@angular/router';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {AdvancedField, Filter} from './searchUtils/searchHelperClasses.class';
|
||||
import {SearchResearchResultsService} from '../services/searchResearchResults.service';
|
||||
import {ErrorCodes} from '../utils/properties/errorCodes';
|
||||
|
|
@ -98,7 +98,12 @@ export class SearchResearchResultsComponent {
|
|||
private promise: Promise<boolean> = null;
|
||||
private publicCommunities = null;
|
||||
|
||||
constructor(private route: ActivatedRoute, private _searchResearchResultsService: SearchResearchResultsService,
|
||||
@Input() usedBy: string = "search";
|
||||
@Input() orcidQuery: string = "";
|
||||
@Input() identifiers: string[] = [];
|
||||
|
||||
constructor(private route: ActivatedRoute, private _router: Router,
|
||||
private _searchResearchResultsService: SearchResearchResultsService,
|
||||
private _contextService: ContextsService) {
|
||||
this.results = [];
|
||||
this.errorCodes = new ErrorCodes();
|
||||
|
|
@ -107,6 +112,10 @@ export class SearchResearchResultsComponent {
|
|||
this.searchUtils.refineStatus = this.errorCodes.LOADING;
|
||||
this.getPublicCommunities();
|
||||
}
|
||||
|
||||
getRoute(){
|
||||
return this._router.url.split("?")[0];
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
//TODO add checks about which result types are enabled!
|
||||
|
|
@ -117,11 +126,15 @@ export class SearchResearchResultsComponent {
|
|||
this.simpleSearchLink = this.properties.searchLinkToResults;
|
||||
}
|
||||
this.advancedSearchLink = this.properties.searchLinkToAdvancedResults;
|
||||
this.searchUtils.baseUrl = (this.simpleView) ? this.simpleSearchLink : this.advancedSearchLink;
|
||||
this.searchUtils.baseUrl = this.getRoute();//(this.simpleView) ? this.simpleSearchLink : this.advancedSearchLink;
|
||||
|
||||
this.searchUtils.status = this.errorCodes.LOADING;
|
||||
var firstLoad = true;
|
||||
this.subs.push(this.route.queryParams.subscribe(params => {
|
||||
if(this.usedBy == "orcid"){
|
||||
this.searchPage.usedBy = "orcid";
|
||||
}
|
||||
|
||||
//this.subs.push(this.route.queryParams.switchMap(params => {
|
||||
this.loadPaging = true;
|
||||
if (params['page'] && this.searchUtils.page != params['page']) {
|
||||
|
|
@ -206,6 +219,9 @@ export class SearchResearchResultsComponent {
|
|||
|
||||
|
||||
public _getFilters(parameters: string, page: number, size: number, sortBy: string, refine: boolean, refineFieldsFilterQuery = null) {
|
||||
if(this.usedBy == "orcid" && this.orcidQuery) {
|
||||
parameters += (parameters ? ' and ' : '') + "(" + this.orcidQuery + ")";
|
||||
}
|
||||
if (page <= this.pagingLimit || this.searchUtils.refineStatus == this.errorCodes.LOADING) {
|
||||
this.searchUtils.refineStatus = this.errorCodes.LOADING;
|
||||
this.disableRefineForms = true;
|
||||
|
|
@ -302,6 +318,9 @@ export class SearchResearchResultsComponent {
|
|||
}
|
||||
|
||||
public _getResults(parameters: string, page: number, size: number, sortBy: string, refine: boolean, refineFieldsFilterQuery = null) {
|
||||
if(this.usedBy == "orcid" && this.orcidQuery) {
|
||||
parameters += (parameters ? ' and ' : '') + "(" + this.orcidQuery + ")";
|
||||
}
|
||||
if (page > this.pagingLimit) {
|
||||
size = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -146,17 +146,16 @@
|
|||
</ul>
|
||||
</div>
|
||||
</ng-template>
|
||||
<div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
||||
<div *ngIf="!includeOnlyResultsAndFilter" [class]="usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
||||
(stickyForm?'':' uk-position-relative ') :
|
||||
(+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom uk-padding-remove-top ' + (usedBy
|
||||
|
||||
== 'deposit' ? ' uk-padding-remove-top ' : ' '))"
|
||||
[attr.uk-sticky]="(stickyForm?'{animation:false;offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+(usedBy !=
|
||||
'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
||||
(+ (stickyForm?'':' uk-section') +' uk-padding-remove-bottom uk-padding-remove-top ' +
|
||||
((usedBy == 'deposit' || usedBy == 'orcid') ? ' uk-padding-remove-top ' : ' '))"
|
||||
[attr.uk-sticky]="(stickyForm?'{animation:false;offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+
|
||||
(usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ?
|
||||
' uk-position-relative ' :(' uk-section ' ))+'}':null)">
|
||||
<div style="box-sizing: border-box; "
|
||||
[class]="' uk-background-norepeat uk-background-bottom-center uk-padding-remove-bottom uk-flex uk-flex-middle uk-background-fixed '+searchFormClass
|
||||
+ (usedBy != 'deposit' && (!customFilter || customFilter.queryFieldName != 'communityId') && !dashboard ?
|
||||
+ (usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') && !dashboard ?
|
||||
' image-front-topbar searchFormMinHeight uk-padding-remove-bottom uk-section' : '')
|
||||
+(simpleView?'':' advancedSearchFormBackground ')">
|
||||
<div class="uk-width-1-1">
|
||||
|
|
@ -368,6 +367,12 @@
|
|||
[zenodoInformation]="zenodoInformation"
|
||||
[properties]=properties>
|
||||
</deposit-result>
|
||||
<orcid-result *ngIf="usedBy == 'orcid'"
|
||||
[results]="results"
|
||||
[status]="searchUtils.status"
|
||||
[type]="entityType"
|
||||
[properties]=properties>
|
||||
</orcid-result>
|
||||
<portal-search-result
|
||||
*ngIf="(entityType == 'community' || entityType == 'stakeholder') && usedBy == 'search'"
|
||||
[results]="results"
|
||||
|
|
|
|||
|
|
@ -27,15 +27,17 @@ import {QuickSelectionsModule} from "./quick-selections.module";
|
|||
import {BreadcrumbsModule} from "../../utils/breadcrumbs/breadcrumbs.module";
|
||||
import {AlertModalModule} from "../../utils/modal/alertModal.module";
|
||||
import {ClickModule} from "../../utils/click/click.module";
|
||||
import {SearchResultsForOrcidModule} from "../../orcid/recommend-orcid-links/searchResultsForOrcid.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule, SearchFormModule, SearchResultsModule, PortalSearchResultModule,
|
||||
CommonModule, FormsModule, RouterModule, SearchFormModule, PortalSearchResultModule,
|
||||
LoadingModalModule, ReportsServiceModule,
|
||||
SearchPagingModule, SearchResultsPerPageModule, SearchSortingModule, SearchDownloadModule, ModalModule,
|
||||
SearchFilterModule, RangeFilterModule,
|
||||
PiwikServiceModule, HelperModule, Schema2jsonldModule, SEOServiceModule, SearchResultsModule,
|
||||
SearchResultsInDepositModule, AdvancedSearchFormModule, QuickSelectionsModule, BreadcrumbsModule, AlertModalModule, ClickModule
|
||||
SearchResultsInDepositModule, SearchResultsForOrcidModule,
|
||||
AdvancedSearchFormModule, QuickSelectionsModule, BreadcrumbsModule, AlertModalModule, ClickModule
|
||||
],
|
||||
declarations: [
|
||||
NewSearchPageComponent
|
||||
|
|
|
|||
Loading…
Reference in New Issue