MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

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:
argiro.kokogiannaki 2017-01-18 12:13:20 +00:00
parent 263ac45f1f
commit 9b641ebf1e
11 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
portal-2/src/app/deposit/depositPublications.component.ts
View File

@ -4,13 +4,13 @@ import {Component} from '@angular/core';
selector: 'deposit-publications', selector: 'deposit-publications',
template: ` template: `
<deposit [compatibility]="'OpenDOAR'" [requestFor]="'Publications'"></deposit> <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"> <div class="uk-margin-top">
<i-frame [url]="mapUrl"width="100%" height="600"></i-frame> <i-frame [url]="mapUrl"width="100%" height="600"></i-frame>
</div--> </div>
` `
}) })
export class DepositPublicationsComponent { export class DepositPublicationsComponent {
public mapUrl ="https://beta.openaire.eu/stats/markers.html"; public mapUrl ="https://beta.openaire.eu/stats/markers-demo.html";
} }

3
portal-2/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -19,7 +19,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -36,6 +36,7 @@ export class AdvancedSearchDataProvidersComponent {
public selectedFields:AdvancedField[] = []; public selectedFields:AdvancedField[] = [];
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
public resourcesQuery = "query=(oaftype exact datasource)";
constructor (private route: ActivatedRoute, private _searchDataProvidersService: SearchDataprovidersService ) { constructor (private route: ActivatedRoute, private _searchDataProvidersService: SearchDataprovidersService ) {

3
portal-2/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
View File

@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -38,6 +38,7 @@ export class AdvancedSearchDatasetsComponent {
public selectedFields:AdvancedField[] = []; public selectedFields:AdvancedField[] = [];
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
public resourcesQuery = "query= ( (oaftype exact result) and (resulttypeid exact dataset) )";
constructor (private route: ActivatedRoute, private _searchDatasetsService: SearchDatasetsService ) { constructor (private route: ActivatedRoute, private _searchDatasetsService: SearchDatasetsService ) {

4
portal-2/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -36,7 +36,7 @@ export class AdvancedSearchOrganizationsComponent {
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
public resourcesQuery = "query=(oaftype exact organization)";
constructor (private route: ActivatedRoute, private _searchOrganizationsService: SearchOrganizationsService ) { constructor (private route: ActivatedRoute, private _searchOrganizationsService: SearchOrganizationsService ) {
this.results =[]; this.results =[];

3
portal-2/src/app/searchPages/advanced/advancedSearchPeople.component.ts
View File

@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -37,6 +37,7 @@ export class AdvancedSearchPeopleComponent {
public selectedFields:AdvancedField[] = []; public selectedFields:AdvancedField[] = [];
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
public resourcesQuery = "query=(oaftype exact person)";
constructor (private route: ActivatedRoute, private _searchPeopleService: SearchPeopleService ) { constructor (private route: ActivatedRoute, private _searchPeopleService: SearchPeopleService ) {

3
portal-2/src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -17,7 +17,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -36,6 +36,7 @@ export class AdvancedSearchProjectsComponent {
public selectedFields:AdvancedField[] = []; public selectedFields:AdvancedField[] = [];
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
public resourcesQuery = "query=(oaftype exact project)";
constructor (private route: ActivatedRoute, private _searchProjectsService: SearchProjectsService ) { constructor (private route: ActivatedRoute, private _searchProjectsService: SearchProjectsService ) {

3
portal-2/src/app/searchPages/advanced/advancedSearchPublications.component.ts
View File

@ -18,7 +18,7 @@ import {SearchUtilsClass } from '../searchUtils/searchUtils.class';
[(results)] = "results" [(results)] = "results"
[(searchUtils)] = "searchUtils" [(searchUtils)] = "searchUtils"
[(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields" [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap" [(selectedFields)]="selectedFields"
(queryChange)="queryChanged($event)"> (queryChange)="queryChanged($event)" [resourcesQuery]="resourcesQuery">
</advanced-search-page> </advanced-search-page>
` `
@ -34,6 +34,7 @@ export class AdvancedSearchPublicationsComponent {
public fieldIds: string[] = this.searchFields.RESULT_ADVANCED_FIELDS; public fieldIds: string[] = this.searchFields.RESULT_ADVANCED_FIELDS;
public fieldIdsMap= this.searchFields.RESULT_FIELDS; public fieldIdsMap= this.searchFields.RESULT_FIELDS;
public selectedFields:AdvancedField[] = []; public selectedFields:AdvancedField[] = [];
public resourcesQuery = "query=((oaftype exact result) and (resulttypeid exact publication))";
@ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ; @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;

3
portal-2/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
View File

@ -18,7 +18,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
<search-page pageTitle="Compatible Dataproviders" type="datasources" [(filters)] = "filters" <search-page pageTitle="Compatible Dataproviders" type="datasources" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils" [(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)" [baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
(downloadClick)="downloadClicked($event)"> (downloadClick)="downloadClicked($event)" [resourcesQuery]="resourcesQuery" >
</search-page> </search-page>
<!--table-view [(datasources)] = results></table-view--> <!--table-view [(datasources)] = results></table-view-->
@ -43,6 +43,7 @@ export class SearchCompatibleDataprovidersComponent {
"export":[] "export":[]
}; };
public CSVDownloaded = false; 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 ; @ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;

3
portal-2/src/app/searchPages/dataProviders/entityRegistries.component.ts
View File

@ -18,7 +18,7 @@ import {ExportCSVComponent} from '../../utils/exportCSV.component';
<search-page pageTitle="Entity Registries" type="datasources" [(filters)] = "filters" <search-page pageTitle="Entity Registries" type="datasources" [(filters)] = "filters"
[(results)] = "results" [(searchUtils)] = "searchUtils" [(results)] = "results" [(searchUtils)] = "searchUtils"
[baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)" [baseUrl] = "baseUrl" [showResultCount]=false (queryChange)="queryChanged($event)"
(downloadClick)="downloadClicked($event)"> (downloadClick)="downloadClicked($event)" [resourcesQuery]="resourcesQuery" >
</search-page> </search-page>
` `
@ -45,6 +45,7 @@ export class SearchEntityRegistriesComponent {
public CSVDownloaded = false; public CSVDownloaded = false;
@ViewChild (SearchPageComponent) searchPage : SearchPageComponent ; @ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
public resourcesQuery = "query=((oaftype exact datasource) and(datasourcetypeuiid = other))";
constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) { constructor (private route: ActivatedRoute, private _searchDataprovidersService: SearchDataprovidersService ) {
var errorCodes:ErrorCodes = new ErrorCodes(); var errorCodes:ErrorCodes = new ErrorCodes();

1
portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts
View File

@ -62,6 +62,7 @@ export class AdvancedSearchPageComponent {
@Input() selectedFields:AdvancedField[]; @Input() selectedFields:AdvancedField[];
@Input() simpleSearchUrl: string; @Input() simpleSearchUrl: string;
@ViewChild (ModalLoading) loading : ModalLoading ; @ViewChild (ModalLoading) loading : ModalLoading ;
@Input() resourcesQuery = "";
public baseURLWithParameters:string = ''; public baseURLWithParameters:string = '';

1
portal-2/src/app/searchPages/searchUtils/searchPage.component.ts
View File

@ -75,6 +75,7 @@ export class SearchPageComponent {
@Input() showResultCount:boolean = true; @Input() showResultCount:boolean = true;
@Input() showRefine:boolean = true; @Input() showRefine:boolean = true;
@Input() refineFields = []; @Input() refineFields = [];
@Input() resourcesQuery = "";
@ViewChild (ModalLoading) loading : ModalLoading ; @ViewChild (ModalLoading) loading : ModalLoading ;
public fieldIdsMap;//: { [key:string]:{ name:string, operator:string, type:string, indexField:string, equalityOperator:string }}; public fieldIdsMap;//: { [key:string]:{ name:string, operator:string, type:string, indexField:string, equalityOperator:string }};
private searchFieldsHelper:SearchFields = new SearchFields(); private searchFieldsHelper:SearchFields = new SearchFields();