passing resourcesQuery in pages
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45444 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
263ac45f1f
commit
9b641ebf1e
|
@ -4,13 +4,13 @@ import {Component} from '@angular/core';
|
|||
selector: 'deposit-publications',
|
||||
template: `
|
||||
<deposit [compatibility]="'OpenDOAR'" [requestFor]="'Publications'"></deposit>
|
||||
<!--h3>Or locate data provider in map</h3>
|
||||
<h3>Or locate data provider in map</h3>
|
||||
<div class="uk-margin-top">
|
||||
<i-frame [url]="mapUrl"width="100%" height="600"></i-frame>
|
||||
</div-->
|
||||
</div>
|
||||
`
|
||||
})
|
||||
|
||||
export class DepositPublicationsComponent {
|
||||
public mapUrl ="https://beta.openaire.eu/stats/markers.html";
|
||||
public mapUrl ="https://beta.openaire.eu/stats/markers-demo.html";
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -36,6 +36,7 @@ export class AdvancedSearchDataProvidersComponent {
|
|||
public selectedFields:AdvancedField[] = [];
|
||||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
public resourcesQuery = "query=(oaftype exact datasource)";
|
||||
|
||||
|
||||
constructor (private route: ActivatedRoute, private _searchDataProvidersService: SearchDataprovidersService ) {
|
||||
|
|
|
@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -38,6 +38,7 @@ export class AdvancedSearchDatasetsComponent {
|
|||
public selectedFields:AdvancedField[] = [];
|
||||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
public resourcesQuery = "query= ( (oaftype exact result) and (resulttypeid exact dataset) )";
|
||||
|
||||
|
||||
constructor (private route: ActivatedRoute, private _searchDatasetsService: SearchDatasetsService ) {
|
||||
|
|
|
@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -36,7 +36,7 @@ export class AdvancedSearchOrganizationsComponent {
|
|||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
|
||||
|
||||
public resourcesQuery = "query=(oaftype exact organization)";
|
||||
constructor (private route: ActivatedRoute, private _searchOrganizationsService: SearchOrganizationsService ) {
|
||||
|
||||
this.results =[];
|
||||
|
|
|
@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -37,6 +37,7 @@ export class AdvancedSearchPeopleComponent {
|
|||
public selectedFields:AdvancedField[] = [];
|
||||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
public resourcesQuery = "query=(oaftype exact person)";
|
||||
|
||||
|
||||
constructor (private route: ActivatedRoute, private _searchPeopleService: SearchPeopleService ) {
|
||||
|
|
|
@ -17,7 +17,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -36,6 +36,7 @@ export class AdvancedSearchProjectsComponent {
|
|||
public selectedFields:AdvancedField[] = [];
|
||||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
public resourcesQuery = "query=(oaftype exact project)";
|
||||
|
||||
|
||||
constructor (private route: ActivatedRoute, private _searchProjectsService: SearchProjectsService ) {
|
||||
|
|
|
@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
|
|||
[(results)] = "results"
|
||||
[(searchUtils)] = "searchUtils"
|
||||
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
|
||||
(queryChange)="queryChanged($event)">
|
||||
(queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
|
||||
</advanced-search-page>
|
||||
|
||||
`
|
||||
|
@ -34,6 +34,7 @@ export class AdvancedSearchPublicationsComponent {
|
|||
public fieldIds: string[] = this.searchFields.RESULT_ADVANCED_FIELDS;
|
||||
public fieldIdsMap= this.searchFields.RESULT_FIELDS;
|
||||
public selectedFields:AdvancedField[] = [];
|
||||
public resourcesQuery = "query=((oaftype exact result) and (resulttypeid exact publication))";
|
||||
|
||||
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
|
|||
<search-page pageTitle="Compatible Dataproviders" type="datasources" [(filters)] = "filters"
|
||||
[(results)] = "results" [(searchUtils)] = "searchUtils"
|
||||
[baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
|
||||
(downloadClick)="downloadClicked($event)">
|
||||
(downloadClick)="downloadClicked($event)" [resourcesQuery]="resourcesQuery" >
|
||||
</search-page>
|
||||
<!--table-view [(datasources)] = results></table-view-->
|
||||
|
||||
|
@ -43,6 +43,7 @@ export class SearchCompatibleDataprovidersComponent {
|
|||
"export":[]
|
||||
};
|
||||
public CSVDownloaded = false;
|
||||
public resourcesQuery = "query=((oaftype exact datasource) not(datasourcecompatibilityid = UNKNOWN) not(datasourcecompatibilityid = hostedBy) not(datasourcecompatibilityid = notCompatible) not(datasourcetypeuiid = other))";
|
||||
|
||||
@ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
|
|||
<search-page pageTitle="Entity Registries" type="datasources" [(filters)] = "filters"
|
||||
[(results)] = "results" [(searchUtils)] = "searchUtils"
|
||||
[baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
|
||||
(downloadClick)="downloadClicked($event)">
|
||||
(downloadClick)="downloadClicked($event)" [resourcesQuery]="resourcesQuery" >
|
||||
</search-page>
|
||||
|
||||
`
|
||||
|
@ -45,6 +45,7 @@ export class SearchEntityRegistriesComponent {
|
|||
public CSVDownloaded = false;
|
||||
|
||||
@ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
|
||||
public resourcesQuery = "query=((oaftype exact datasource) and(datasourcetypeuiid = other))";
|
||||
|
||||
constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
|
||||
var errorCodes:ErrorCodes = new ErrorCodes();
|
||||
|
|
|
@ -62,6 +62,7 @@ export class AdvancedSearchPageComponent {
|
|||
@Input() selectedFields:AdvancedField[];
|
||||
@Input() simpleSearchUrl: string;
|
||||
@ViewChild (ModalLoading) loading : ModalLoading ;
|
||||
@Input() resourcesQuery = "";
|
||||
|
||||
public baseURLWithParameters:string = '';
|
||||
|
||||
|
|
|
@ -75,6 +75,7 @@ export class SearchPageComponent {
|
|||
@Input() showResultCount:boolean = true;
|
||||
@Input() showRefine:boolean = true;
|
||||
@Input() refineFields = [];
|
||||
@Input() resourcesQuery = "";
|
||||
@ViewChild (ModalLoading) loading : ModalLoading ;
|
||||
public fieldIdsMap;//: { [key:string]:{ name:string, operator:string, type:string, indexField:string, equalityOperator:string }};
|
||||
private searchFieldsHelper:SearchFields = new SearchFields();
|
||||
|
|
Loading…
Reference in New Issue