Home:
		remove explore related parts
		leave only search form
		update with more numbers
	Remove Search for Content providers (Journals, registries, compatible)
	
	Search: use custom filter to filter results





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@55723 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-05-24 13:54:22 +00:00
parent 19bbb42785
commit f773e0ca7e
43 changed files with 437 additions and 868 deletions

View File

@ -1,7 +1,7 @@
{ {
"environment" : "beta", "environment" : "beta",
"enablePiwikTrack" : true, "enablePiwikTrack" : false,
"enableHelper" : true, "enableHelper" : false,
"useCache" : true, "useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",

View File

@ -16,7 +16,9 @@ const routes: Routes = [
{ path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: ':id/search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find', loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }},

View File

@ -17,14 +17,13 @@ import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
<navbar *ngIf="properties" portal="aggregator" [environment]=properties.environment [onlyTop]=false <navbar *ngIf="properties" portal="aggregator" [environment]=properties.environment [onlyTop]=false
[communityId]="properties.adminToolsCommunity" [menuItems]=menuItems [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
[APIUrl]="properties.adminToolsAPIURL" [logInUrl]="properties.loginUrl" [APIUrl]="properties.adminToolsAPIURL" [logInUrl]="properties.loginUrl"
[logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false"></navbar> [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
<div class="custom-main-content"> <div class="custom-main-content">
<main> <main>
<router-outlet></router-outlet> <router-outlet></router-outlet>
</main> </main>
</div> </div>
<feedback *ngIf="isClient && properties" portalName="Explore" [feedbackmail]=feedbackmail></feedback> <cookie-law *ngIf="isClient" position="bottom">
<cookie-law *ngIf="isClient" position="bottom">
OpenAIRE uses cookies in order to function properly.<br> OpenAIRE uses cookies in order to function properly.<br>
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
experience possible. experience possible.
@ -49,15 +48,15 @@ export class AppComponent {
new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}), new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}), new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}), new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}), // new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}), // new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {}) new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
] ]
} }
]; ];
community = {id: "CA", name: "Canada Aggregator", logoUrl:"assets/common-assets/logo-small-aggregator.png"};
feedbackmail: string
properties: EnvProperties; properties: EnvProperties;
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService, constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
@ -83,17 +82,6 @@ export class AppComponent {
.then(es => { .then(es => {
this.propertiesService.setEnvProperties(es); this.propertiesService.setEnvProperties(es);
this.properties = this.propertiesService.envSpecific; this.properties = this.propertiesService.envSpecific;
this.feedbackmail = this.properties.feedbackmail;
// if (Session.isPortalAdministrator()) {
// this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
// this.userMenuItems.push(new MenuItem("", "Manage helptexts",
// ((this.properties.environment == "beta") ? "https://beta.admin.connect.openaire.eu" : "https://admin.explore.openaire.eu") + "/dashboard?communityId=openaire", "", true, [], [], {}))
//
// } else if (Session.isClaimsCurator()) {
// this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
//
// }
//console.log(this.properties.loginUrl);
}, error => { }, error => {
console.log("App couldn't fetch properties"); console.log("App couldn't fetch properties");
console.log(error); console.log(error);

View File

@ -12,7 +12,7 @@
<div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid=""> <div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column"> <div class="uk-width-1-1@m uk-first-column">
<div data-id="page#4"> <div data-id="page#4">
<search-form placeholderText="Search in OpenAIRE for scholarly works" link="/search/find"></search-form> <search-form placeholderText="Search for scholarly works" link="/search/find"></search-form>
</div> </div>
</div> </div>
</div> </div>
@ -22,14 +22,22 @@
<div class="uk-width-1-1@m uk-first-column"> <div class="uk-width-1-1@m uk-first-column">
<div id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto uk-animation-fade" uk-scrollspy-class="" style=""> <div id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto uk-animation-fade" uk-scrollspy-class="" style="">
<h2> <h2>
<span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} </span> Search for more than
<span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}} {{datasetsSize.size}} research data </span> <span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}}
{{publicationsSize.size}} publications{{((showDatasets||showSoftware||showOrp)?",":"")}} </span>
<span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}}
{{datasetsSize.size}} research data{{((showSoftware ||showOrp)?",":"")}} </span>
<span *ngIf="showSoftware && softwareSize">{{softwareSize.number|number}}
{{softwareSize.size}} software{{(showOrp?",":"")}} </span>
<span *ngIf="showOrp && otherSize">{{otherSize.number|number}}
{{otherSize.size}} other research products </span>
<br> <br>
<span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span> <span *ngIf="showOrganizations && organizationsSize" > from {{organizationsSize.number |number}}
{{organizationsSize.size}} organizations</span>
<span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
<span *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span> <span *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span>
<span *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" >
linked together for an integrated research search
</span>
</h2> </h2>
</div> </div>
@ -46,7 +54,7 @@
name="OpenAIRE Explore"></schema2jsonld> name="OpenAIRE Explore"></schema2jsonld>
<div class=" uk-section uk-section-small"> <!--<div class=" uk-section uk-section-small">
<div class="uk-container uk-container-small"> <div class="uk-container uk-container-small">
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid=""> <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column"> <div class="uk-width-1-1@m uk-first-column">
@ -111,9 +119,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>-->
<div class="uk-section-muted uk-section uk-section-small"> <!--<div class="uk-section-muted uk-section uk-section-small">
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid=""> <div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column"> <div class="uk-width-1-1@m uk-first-column">
@ -155,14 +163,14 @@
<div class="uk-grid uk-margin-medium-top"> <div class="uk-grid uk-margin-medium-top">
<div class="uk-width-expand@m"> <div class="uk-width-expand@m">
<!-- <div class="uk-grid uk-child-width-1-2@m"> --> &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m"> &ndash;&gt;
<p *ngIf="showPublications && publicationsSize"> <p *ngIf="showPublications && publicationsSize">
<span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span> <span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span>
</p> </p>
<p *ngIf="showDatasets && datasetsSize"> <p *ngIf="showDatasets && datasetsSize">
<span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span> <span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span>
</p> </p>
<!-- </div> --> &lt;!&ndash; </div> &ndash;&gt;
@ -186,13 +194,13 @@
<span class="uk-text-uppercase">Projects</span> <span class="uk-text-uppercase">Projects</span>
</p> </p>
</div> </div>
<!-- <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top"> &lt;!&ndash; <div class="uk-grid uk-child-width-1-2@m uk-margin-small-top">
<p *ngIf="showProjects && projectsSize"> <p *ngIf="showProjects && projectsSize">
<span class=" emphasis ">{{projectsSize.count|number}} </span><br> <span class=" emphasis ">{{projectsSize.count|number}} </span><br>
<span class="uk-text-uppercase">Projects</span> <span class="uk-text-uppercase">Projects</span>
</p> </p>
</div> --> </div> &ndash;&gt;
@ -236,192 +244,12 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>-->
<!-- <div class="uk-section-default uk-section">
<div class="uk-container">
<div class="uk-grid-small uk-margin-medium uk-grid" uk-grid=""> -->
<!--<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<!--div class="uk-width-expand@m uk-first-column">
<h5 class="searchFilterTitle">
<span>New content providers</span>
</h5>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid=""-->
<!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
<ul [class]="'uk-list uk-list-divider uk-margin '+custom_class">
<li *ngFor="let result of fetchDataproviders.results" class="uk-animation-fade">
<h4 [title] = result.title.accessMode >
<a [queryParams]="routerHelper.createQueryParam(urlParam,result.id)" routerLinkActive="router-link-active" routerLink="/search/{{type}}">
<p *ngIf="result['title'].name || result.acronym"><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.acronym && result['title'].name">-</span><span *ngIf="result['title'].name" [innerHTML]="result['title'].name"></span><span *ngIf="result.code">({{result.code}})</span></p>
<p *ngIf="!result['title'].name && !result.acronym">[no title available]<span *ngIf="result.code">({{result.code}})</span></p>
</a>
</h4>
<span *ngIf="result.types && result.types.length > 0" [class]="'uk-label custom-label label-blue label-'+result.entityType" title="Type">{{result.types.join(", ")}}</span>
<span *ngIf="result.languages && result.languages.length > 0" class="uk-label custom-label label-language " title="Language">{{result.languages.join(", ")}}</span>
<span *ngIf="result.title && result.title.accessMode" [class]="'uk-label custom-label label-'+ result.title.accessMode " title="Access Mode">{{result.title.accessMode}}</span>
<span *ngIf="result['funderShortname']" class="uk-label custom-label label-funder " title="Funder">{{result['funderShortname']}}></span>
<span *ngIf="result.openAccessMandate != undefined && result.openAccessMandate " class="uk-label custom-label label-openaccessmandate " title="Open Access mandate">Open Access mandate</span>
<span *ngIf="result['type'] != undefined && result['type'] != ''" class="uk-label custom-label label-blue label-dataprovider" title="Type"> {{result['type']}}</span>
<span *ngIf="result['compatibility'] != undefined && result['compatibility'] != ''" class="uk-label custom-label label-compatibility" title="Compatibility">{{result.compatibility}}</span>
<div *ngIf="showOrganizations && result['organizations'] != undefined && result['organizations'].length > 0">
<span> Organization: </span>
<span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
<a *ngIf="organization.id" [queryParams]="{organizationId: organization.id}" routerLinkActive="router-link-active" routerLink="/search/organization">
{{organization.name}}</a><span
*ngIf="!organization.id">
{{organization.name}}</span><span
*ngIf="(i < result['organizations'].length-1) && (i < 9)">,</span>
</span>
<span *ngIf="result['organizations'].length > 10">...</span>
</div>
<div *ngIf="result['countries'] && result['countries'].length > 0">
Country: <span *ngFor="let country of result['countries'].slice(0,10) let i = index">{{country}}{{(i < ( result['countries'].slice(0,10).length-1))?", ":""}}{{(i == result['countries'].slice(0,10).length-1 && result['countries'].length > 10)?"...":""}}</span>
</div>
<div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''">
<span>Website URL: </span>
<span>
<a href="{{result['websiteURL']}}" target="_blank" class="custom-external custom-icon">
{{result['websiteURL']}}
</a>
</span>
</div>
<div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''">
<span>OAI-PMH URL: </span>
<span>
<a href="{{result['OAIPMHURL']}}" target="_blank" class="custom-external custom-icon">
{{result['OAIPMHURL']}}
</a>
</span>
</div>
</li>
</ul>
</div> -->
<!--div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Aaltodoc Publication Archive
</h6>
<div class="el-meta uk-margin uk-text-meta">Aalto University</div>
<div class="el-content uk-margin"><span class="uk-label label-grey">IR</span>&nbsp;<span class=" uk-label label-grey">Data</span>&nbsp;<span class="uk-label label-grey">OpenAIRE 3.0</span><br>
12469 datasets
</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Cambridge Server
</h6>
<div class="el-meta uk-margin uk-text-meta">Cambridge Uviversity</div>
<div class="el-content uk-margin"><span class="uk-label label-grey">IR</span>&nbsp;<span class=" uk-label label-grey">Literature</span>&nbsp;<span class="uk-label label-grey" >OpenAIRE 2.0</span><br>
4567 publications
</div>
</div>
</div>
</div>
<hr>
<div class="uk-margin">
<a class="" routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
View all
</a>
</div>
</div>
<div class="uk-width-expand@m">
<h5 class="searchFilterTitle">
<span>New funders</span>
</h5>
<div class="uk-margin uk-text-meta">
Latest funding database incorporated in OpenAIRE
</div>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Swiss National Science Foundation
</h6>
<div class="el-meta uk-margin uk-text-meta">Switzerland</div>
<div class="el-content uk-margin"><span class="uk-label label-grey">OA mandate</span><br> 47.509 publications</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Ministry of Education, Science and Technological Development of Republic of Serbia
</h6>
<div class="el-meta uk-margin uk-text-meta">Serbia</div>
<div class="el-content uk-margin">7.942 publicatios</div>
</div>
</div>
</div>
</div-->
<!-- <div class="uk-width-medium uk-grid-item-match">
<div class="uk-tile-secondary uk-tile uk-tile-xsmall portal-box" >
<h3 class="uk-margin-remove-top ">
Our data policies
</h3>
<ul class="uk-margin-small uk-list uk-list-large">
<li class="el-item">
<h6 class="el-title uk-margin-remove">Data acquisition</h6>
<h5 class="el-content">
<a target="_blank" href="www.openaire.eu/policies">How we retrieve data, how often, what processes it goes through (aggregating cleaning, trasnforming, inferring, de-duplicating), what are the quality checks&nbsp;along all&nbsp; data processing stages.</a>
</h5>
</li>
<li class="el-item">
<h6 class="el-title uk-margin-remove">Data usage</h6>
<h5 class="el-content">
<a target="_blank" href="www.openaire.eu/policies">Who is able to retrieve our data, what are the licences, what about specific SLAs.</a>
</h5>
</li>
</ul>
<div class="uk-margin uk-margin-remove-bottom uk-text-left">
<a class="el-content uk-link-text" target="_blank" href="www.openaire.eu/policies">
Learn more
</a>
</div>
</div>
</div>
</div>
</div>
</div> -->
<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<div class="uk-container uk-container-large"> <div class="uk-container uk-container-large">
<div uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom"> <div uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom">
<!--div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
<div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<h4 class="el-title uk-margin uk-h4">
Researcher?
</h4>
<div class="el-content uk-margin">
Explore all OA research results. Link all your research. Build your profile
</div>
<p>
<a [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'explore.openaire.eu'" class="el-link uk-button uk-button-default">
OpenAIRE.EXPLORE
</a>
</p>
</div>
</div-->
<div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column provide"> <div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column provide">
<div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style=""> <div class="uk-margin uk-panel uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" style="">
<h4 class="el-title uk-margin uk-h4"> <h4 class="el-title uk-margin uk-h4">
@ -484,68 +312,5 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>-->
<!--div class="image-front-topbar uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">
<div style="" class="mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom uk-flex uk-flex-middle" uk-height-viewport="offset-top: true;offset-bottom: ! +">
<div class="uk-position-cover"></div>
<div class="uk-width-1-1">
<div class="uk-position-relative">
<div class="uk-container uk-margin-medium">
<div class="tm-header-placeholder uk-margin-medium" style="height: 84px;"></div>
<div class="search_box_bg uk-grid-large uk-flex-middle uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div data-id="page#4">
<search-form placeholderText="Search in OpenAIRE information space" link=true></search-form>
</div>
</div>
</div>
</div>
<div class="uk-container uk-container-large uk-margin-medium">
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div class="search_box_bg uk-margin-large uk-margin-remove-bottom uk-text-center uk-grid-match uk-child-width-1-2 uk-child-width-1-2@s uk-child-width-1-4@m uk-child-width-1-4@l uk-child-width-1-4@xl uk-grid-collapse uk-grid-divider uk-grid uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" uk-grid="" data-id="page#7" style="">
<div *ngIf="showPublications && publicationsSize" class="uk-first-column">
<div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
<h2 class="el-title uk-margin uk-h2">
<span>{{publicationsSize.number}} {{publicationsSize.size}} publications</span>
</h2>
</div>
</div>
<div *ngIf="showDatasets && datasetsSize">
<div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
<h2 class="el-title uk-margin uk-h2">
<span>{{datasetsSize.number}} {{datasetsSize.size}} research data</span>
</h2>
</div>
</div>
<div *ngIf="showDataProviders && datasourcesSize" >
<div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
<h2 class="el-title uk-margin uk-h2">
<span>{{datasourcesSize.number}} {{datasourcesSize.size}} data sources</span>
</h2>
</div>
</div>
<div *ngIf="showProjects && fundersSize">
<div uk-scrollspy-class="" class="uk-width-medium uk-margin-auto el-item uk-panel uk-scrollspy-inview uk-animation-fade" style="">
<h2 class="el-title uk-margin uk-h2">
<span>{{fundersSize.number}} {{fundersSize.size}} funders</span>
</h2>
</div>
</div>
</div>
<div *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" class="uk-margin-large uk-margin-remove-bottom uk-text-center uk-text-meta uk-scrollspy-inview uk-animation-fade" uk-scrollspy-class="" data-id="page#8" style="">
<span style="color:#fff!important; font-size:30pt!important">all linked together</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="tm-main uk-container" style="min-height:200px">
<helper position="bottom"></helper>
</div-->

View File

@ -1,206 +1,279 @@
import {Component, Input, Output, EventEmitter, ViewChild, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core'; import {Component} from '@angular/core';
import {Observable} from 'rxjs';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common'; import {Location} from '@angular/common';
import "rxjs/add/observable/zip"; import "rxjs/add/observable/zip";
import {Title, Meta} from '@angular/platform-browser'; import {Meta, Title} from '@angular/platform-browser';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service'; import {SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
import { FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class'; import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service'; import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
import { SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service'; import {SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service'; import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
import { RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service'; import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
import { SearchFields} from '../openaireLibrary/utils/properties/searchFields'; import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
import { NumberUtils} from '../openaireLibrary/utils/number-utils.class'; import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';
import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class'; import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties'; import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes'; import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service'; import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service";
import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service";
@Component({ @Component({
selector: 'home', selector: 'home',
templateUrl: 'home.component.html', templateUrl: 'home.component.html',
}) })
export class HomeComponent { export class HomeComponent {
public piwiksub: any; public piwiksub: any;
public subfunders: any; public subfunders: any;
public pageTitle = "OpenAIRE" public pageTitle = "OpenAIRE"
public keyword:string = ""; public keyword: string = "";
public searchFields:SearchFields = new SearchFields(); public searchFields: SearchFields = new SearchFields();
public errorCodes:ErrorCodes = new ErrorCodes(); public errorCodes: ErrorCodes = new ErrorCodes();
public routerHelper:RouterHelper = new RouterHelper(); public routerHelper: RouterHelper = new RouterHelper();
public publicationsSize:any = null; public publicationsSize: any = null;
public datasetsSize:any = null; public datasetsSize: any = null;
public fundersSize:any = null; public softwareSize: any = null;
public projectsSize:any = null; public otherSize: any = null;
public datasourcesSize:any = null; public organizationsSize: any = null;
public fundersSize: any = null;
public projectsSize: any = null;
public datasourcesSize: any = null;
private numResults: number = 2; public fetchDataproviders: FetchDataproviders;
public fetchDataproviders : FetchDataproviders;
showPublications:boolean= false; showPublications: boolean = false;
showDatasets:boolean= false; showDatasets: boolean = false;
showProjects:boolean= false; showSoftware: boolean = false;
showDataProviders:boolean= false; showOrp: boolean = false;
showOrganizations: boolean = false;
showProjects: boolean = false;
showDataProviders: boolean = false;
properties: EnvProperties; properties: EnvProperties;
public subPub;public subData;public subProjects;public subOrg; public subDataPr; public subPub;
public subSoft;
public subOrp;
public subData;
public subProjects;
public subOrg;
public subDataPr;
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor ( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private _router: Router, private _router: Router,
private _searchPublicationsService: SearchPublicationsService, private _searchPublicationsService: SearchPublicationsService,
private _searchDataprovidersService: SearchDataprovidersService, private _searchDataprovidersService: SearchDataprovidersService,
private _searchProjectsService: SearchProjectsService, private _searchProjectsService: SearchProjectsService,
private _searchDatasetsService: SearchDatasetsService, private _searchDatasetsService: SearchDatasetsService,
private _searchOrganizationsService: SearchOrganizationsService, private _searchSoftwareService: SearchSoftwareService,
private _refineFieldResultsService:RefineFieldResultsService, private _searchOrpsService: SearchOrpsService,
private location: Location, private _piwikService:PiwikService, private _searchOrganizationsService: SearchOrganizationsService,
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService private _refineFieldResultsService: RefineFieldResultsService,
) { private location: Location, private _piwikService: PiwikService,
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService
) {
var description = "openAIRE explore, open access, publications, research results, European commission, search"; let description = "openAIRE explore, open access, publications, research results, European commission, search";
var title = "OpenAIRE | Explore"; let title = "OpenAIRE | Explore";
this._title.setTitle(title); this._title.setTitle(title);
this._meta.updateTag({content:description},"name='description'"); this._meta.updateTag({content: description}, "name='description'");
this._meta.updateTag({content:description},"property='og:description'"); this._meta.updateTag({content: description}, "property='og:description'");
this._meta.updateTag({content:title},"property='og:title'"); this._meta.updateTag({content: title}, "property='og:title'");
this.customFilter.set("Country", "country", "CA" , "Canada");
//this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
} }
public ngOnInit() { public ngOnInit() {
this.route.data this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => { .subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific; this.properties = data.envSpecific;
this.seoService.createLinkForCanonicalURL(this.properties.baseLink+this._router.url, false); this.seoService.createLinkForCanonicalURL(this.properties.baseLink + this._router.url, false);
if(this.properties!=null){ let url = this.properties.baseLink + this._router.url;
var url = this.properties.baseLink+this._router.url; this._meta.updateTag({content: url}, "property='og:url'");
this._meta.updateTag({content:url},"property='og:url'"); if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
} }
this.showPublications = true;
this.showOrp = true;
this.showOrganizations = true;
this.showDatasets = true;
this.showSoftware = true;
//this.showProjects = false;
// this.showDataProviders = true;
this.getNumbers();
this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity ).subscribe(data => { /* this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
var showEntity = {}; let showEntity = {};
for(var i=0; i< data['entities'].length; i++){ for (let i = 0; i < data['entities'].length; i++) {
showEntity[""+data['entities'][i]["pid"]+""] = data['entities'][i]["isEnabled"]; showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
} }
this.showPublications = showEntity["publication"]; this.showPublications = showEntity["publication"];
this.showDatasets = showEntity["dataset"]; this.showDatasets = showEntity["dataset"];
this.showProjects = showEntity["project"]; this.showProjects = showEntity["project"];
this.showDataProviders = showEntity["datasource"]; this.showDataProviders = showEntity["datasource"];
this.getNumbers(); this.getNumbers();
// if(this.showDataProviders) { // if(this.showDataProviders) {
// this.fetchDataproviders.getResultsForHome(this.numResults, this.properties); // this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
// } // }
}, },
error => { error => {
this.handleError("Error getting community information", error); this.handleError("Error getting community information", error);
} }
); );*/
}
}); });
} }
public ngOnDestroy() { public ngOnDestroy() {
if(this.piwiksub){ if (this.piwiksub) {
this.piwiksub.unsubscribe(); this.piwiksub.unsubscribe();
} }
if(this.subfunders){ if (this.subfunders) {
this.subfunders.unsubscribe(); this.subfunders.unsubscribe();
} }
if(this.subPub){ if (this.subPub) {
this.subPub.unsubscribe(); this.subPub.unsubscribe();
} }
if(this.subData){ if (this.subOrp) {
this.subData.unsubscribe(); this.subOrp.unsubscribe();
} }
// if(this.subProjects){ if (this.subSoft) {
// this.subProjects.unsubscribe(); this.subSoft.unsubscribe();
// } }
// if(this.subOrg){ if (this.subData) {
// this.subOrg.unsubscribe(); this.subData.unsubscribe();
// } }
if(this.subDataPr){ if (this.subProjects) {
this.subDataPr.unsubscribe(); this.subProjects.unsubscribe();
} }
if (this.subOrg) {
this.subOrg.unsubscribe();
}
if (this.subDataPr) {
this.subDataPr.unsubscribe();
}
} }
private getNumbers() { private getNumbers() {
if(this.showPublications){ let refineQuery = null
this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties).subscribe( if(this.customFilter){
data => { refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
if(data && data != null && data > 0 ){ }
this.publicationsSize = NumberUtils.roundNumber(data); if (this.showPublications) {
this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties,refineQuery).subscribe(
} data => {
}, if (data && data > 0) {
err => { this.publicationsSize = NumberUtils.roundNumber(data);
//console.log(err); }else{
this.handleError("Error getting number of publications", err); this.showPublications = false;
} }
); },
} err => {
if(this.showDatasets){ this.handleError("Error getting number of publications", err);
this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties).subscribe( }
data => { );
if(data && data != null && data > 0 ){ }
this.datasetsSize = NumberUtils.roundNumber(data); if (this.showDatasets) {
} this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties,refineQuery).subscribe(
}, data => {
err => { if (data && data > 0) {
//console.log(err); this.datasetsSize = NumberUtils.roundNumber(data);
this.handleError("Error getting number of research data", err); }else{
} this.showDatasets = false;
); }
} },
if(this.showProjects){ err => {
this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe( this.handleError("Error getting number of research data", err);
data => { }
);
}
if(data[0] && data[0] > 0 ){ if (this.showSoftware) {
this.projectsSize = NumberUtils.roundNumber(data[0]); this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties,refineQuery).subscribe(
} data => {
if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){ if (data && data > 0) {
this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length); this.softwareSize = NumberUtils.roundNumber(data);
} }else{
this.showSoftware = false;
}, }
err => { },
//console.log(err); err => {
this.handleError("Error getting 'funder' field results of projects", err); this.handleError("Error getting number of software data", err);
}
);
}
if (this.showOrp) {
this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties,refineQuery).subscribe(
data => {
if (data && data > 0) {
this.otherSize = NumberUtils.roundNumber(data);
}else{
this.showOrp = false;
}
},
err => {
this.handleError("Error getting number of software data", err);
}
);
}
if (this.showProjects) {
this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties).subscribe(
data => {
if (data[0] && data[0] > 0) {
this.projectsSize = NumberUtils.roundNumber(data[0]);
}
else{
this.showProjects = false;
}
if (data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values) {
this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
}
},
err => {
this.handleError("Error getting 'funder' field results of projects", err);
}); });
} }
if(this.showDataProviders){ if (this.showDataProviders) {
this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe( this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
data => { data => {
if(data && data != null && data > 0 ){ if (data && data > 0) {
this.datasourcesSize = NumberUtils.roundNumber(data); this.datasourcesSize = NumberUtils.roundNumber(data);
} }else{
this.showDataProviders = false;
}
},
err => {
this.handleError("Error getting number of content providers", err);
}
);
}
if (this.showOrganizations) {
this.subOrg = this._searchOrganizationsService.numOfSearchOrganizations("", this.properties, refineQuery).subscribe(
data => {
if (data && data > 0) {
this.organizationsSize = NumberUtils.roundNumber(data);
}
},
err => {
this.handleError("Error getting number of Organizations", err);
}
);
}
}
}, private handleError(message: string, error) {
err => { console.error("Home Page: " + message, error);
//console.log(err); }
this.handleError("Error getting number of content providers", err);
}
);
}
}
private handleError(message: string, error) {
console.error("Home Page: "+message, error);
}
} }

View File

@ -24,6 +24,8 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module'; import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module'; import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
@NgModule({ @NgModule({
imports: [ imports: [
@ -31,7 +33,7 @@ import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module
RefineFieldResultsServiceModule, RefineFieldResultsServiceModule,
DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule, DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
PublicationsServiceModule, PublicationsServiceModule,
OrganizationsServiceModule, OrganizationsServiceModule, SoftwareServiceModule, OrpsServiceModule,
SearchFormModule, SearchFormModule,
PiwikServiceModule, PiwikServiceModule,
HomeRoutingModule, HomeRoutingModule,

View File

@ -1,4 +1,4 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-dataset', selector: 'openaire-dataset',

View File

@ -1,4 +1,4 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-organization', selector: 'openaire-organization',

View File

@ -1,4 +1,4 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-orp', selector: 'openaire-orp',

View File

@ -1,4 +1,4 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-project', selector: 'openaire-project',

View File

@ -1,17 +1,17 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-publication', selector: 'openaire-publication',
template: `<publication></publication>`, template: `
}) <publication></publication>`,
export class OpenairePublicationComponent{ })
constructor ( ) { export class OpenairePublicationComponent {
constructor() {
} }
ngOnInit() { ngOnInit() {
} }
} }

View File

@ -1,4 +1,4 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-software', selector: 'openaire-software',

View File

@ -1,16 +1,23 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-advanced-search-datasets', selector: 'openaire-advanced-search-datasets',
template: ` template: `
<advanced-search-datasets> <advanced-search-datasets [customFilter]="customFilter">
</advanced-search-datasets> </advanced-search-datasets>
` `
}) })
export class OpenaireAdvancedSearchDatasetsComponent { export class OpenaireAdvancedSearchDatasetsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,16 +1,23 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-advanced-search-organizations', selector: 'openaire-advanced-search-organizations',
template: ` template: `
<advanced-search-organizations> <advanced-search-organizations [customFilter]="customFilter">
</advanced-search-organizations> </advanced-search-organizations>
` `
}) })
export class OpenaireAdvancedSearchOrganizationsComponent { export class OpenaireAdvancedSearchOrganizationsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,16 +1,23 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-advanced-search-orps', selector: 'openaire-advanced-search-orps',
template: ` template: `
<advanced-search-orps> <advanced-search-orps [customFilter]="customFilter">
</advanced-search-orps> </advanced-search-orps>
` `
}) })
export class OpenaireAdvancedSearchOrpsComponent { export class OpenaireAdvancedSearchOrpsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,4 +1,5 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-projects', selector: 'openaire-advanced-search-projects',
template: ` template: `

View File

@ -1,13 +1,21 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-advanced-search-publications', selector: 'openaire-advanced-search-publications',
template: ` template: `
<advanced-search-publications> <advanced-search-publications [customFilter]="customFilter">
</advanced-search-publications> </advanced-search-publications>
` `
}) })
export class OpenaireAdvancedSearchPublicationsComponent { export class OpenaireAdvancedSearchPublicationsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,15 +1,22 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-advanced-search-software', selector: 'openaire-advanced-search-software',
template: ` template: `
<advanced-search-software> <advanced-search-software [customFilter]="customFilter">
</advanced-search-software> </advanced-search-software>
` `
}) })
export class OpenaireAdvancedSearchSoftwareComponent { export class OpenaireAdvancedSearchSoftwareComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class CompatibleDataProvidersRoutingModule { }

View File

@ -1,16 +0,0 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
@Component({
selector: 'openaire-search-content-providers',
template: `
<search-content-providers>
</search-content-providers>
`
})
export class OpenaireSearchCompatibleDataprovidersComponent {
}

View File

@ -1,29 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
@NgModule({
imports: [
CommonModule, FormsModule,
CompatibleDataProvidersModule,
CompatibleDataProvidersRoutingModule
],
declarations: [
OpenaireSearchCompatibleDataprovidersComponent
],
providers:[FreeGuard, IsRouteEnabled],
exports: [
OpenaireSearchCompatibleDataprovidersComponent
]
})
export class LibCompatibleDataProvidersModule { }

View File

@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class CompatibleDataProvidersTableRoutingModule { }

View File

@ -1,14 +0,0 @@
import {Component, Input, ViewChild} from '@angular/core';
@Component({
selector: 'openaire-search-content-providers-table',
template: `
<search-content-providers-table>
</search-content-providers-table>
`
})
export class OpenaireSearchCompatibleDataprovidersTableComponent {
}

View File

@ -1,26 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDataProvidersTable.component';
import {CompatibleDataProvidersTableRoutingModule} from './compatibleDataProvidersTable-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module';
@NgModule({
imports: [
CommonModule, FormsModule,
CompatibleDataProvidersTableModule,
CompatibleDataProvidersTableRoutingModule
], providers:[FreeGuard, IsRouteEnabled],
declarations: [
OpenaireSearchCompatibleDataprovidersTableComponent
],
exports: [
OpenaireSearchCompatibleDataprovidersTableComponent
]
})
export class LibCompatibleDataProvidersTableModule { }

View File

@ -1,19 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class EntityRegistriesRoutingModule { }

View File

@ -1,16 +0,0 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
@Component({
selector: 'openaire-search-entity-registries',
template: `
<search-entity-registries>
</search-entity-registries>
`
})
export class OpenaireSearchEntityRegistriesComponent {
}

View File

@ -1,27 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module';
@NgModule({
imports: [
CommonModule, FormsModule,
EntityRegistriesModule, EntityRegistriesRoutingModule
],
declarations: [
OpenaireSearchEntityRegistriesComponent
],
providers:[FreeGuard, IsRouteEnabled],
exports: [
OpenaireSearchEntityRegistriesComponent
]
})
export class LibEntityRegistriesModule { }

View File

@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class EntityRegistriesTableRoutingModule { }

View File

@ -1,16 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-entity-registries-table',
template: `
<search-entity-registries-table>
</search-entity-registries-table>
`
})
export class OpenaireSearchEntityRegistriesTableComponent {
}

View File

@ -1,27 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTable.component';
import {EntityRegistriesTableRoutingModule} from './entityRegistriesTable-routing.module';
import { EntityRegistriesTableModule} from '../../openaireLibrary/searchPages/dataProviders/entityRegistriesTable.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
CommonModule, FormsModule,
EntityRegistriesTableRoutingModule,
EntityRegistriesTableModule
], providers:[FreeGuard, IsRouteEnabled],
declarations: [
OpenaireSearchEntityRegistriesTableComponent
],
exports: [
OpenaireSearchEntityRegistriesTableComponent
]
})
export class LibEntityRegistriesTableModule { }

View File

@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchJournalsComponent} from './journals.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class JournalsRoutingModule { }

View File

@ -1,14 +0,0 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
@Component({
selector: 'openaire-search-journals',
template: `
<search-journals>
</search-journals>
`
})
export class OpenaireSearchJournalsComponent {
}

View File

@ -1,24 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{ JournalsRoutingModule} from './journals-routing.module';
import{OpenaireSearchJournalsComponent} from './journals.component';
import { JournalsModule} from '../../openaireLibrary/searchPages/dataProviders/journals.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
CommonModule, FormsModule, JournalsRoutingModule, JournalsModule
],
declarations: [
OpenaireSearchJournalsComponent
],
providers:[FreeGuard, IsRouteEnabled],
exports: [
OpenaireSearchJournalsComponent
]
})
export class LibJournalsModule { }

View File

@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', community : 'openaire'
} , canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class JournalsTableRoutingModule { }

View File

@ -1,15 +0,0 @@
import {Component } from '@angular/core';
@Component({
selector: 'openaire-search-journals-table',
template: `
<search-journals-table>
</search-journals-table>
`
})
export class OpenaireSearchJournalsTableComponent {
}

View File

@ -1,27 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
import {JournalsTableRoutingModule} from './journalsTable-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module';
@NgModule({
imports: [
CommonModule, FormsModule,
JournalsTableModule, JournalsTableRoutingModule
], providers:[FreeGuard, IsRouteEnabled],
declarations: [
OpenaireSearchJournalsTableComponent
],
exports: [
OpenaireSearchJournalsTableComponent
]
})
export class LibJournalsTableModule { }

View File

@ -1,18 +1,44 @@
import {Component, ViewChild, ElementRef} from '@angular/core'; import {Component, ViewChild, ElementRef} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute} from "@angular/router";
@Component({ @Component({
selector: 'openaire-search-find', selector: 'openaire-search-find',
template: ` template: `
<search-find logoURL = "/assets/common-assets/logo-small-explore.png" name="OpenAIRE Explore"></search-find> <search-find logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter"></search-find>
`, `,
}) })
export class OpenaireSearchComponent{ export class OpenaireSearchComponent{
constructor ( ) { customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor ( private route: ActivatedRoute ) {
} }
ngOnInit() { ngOnInit() {
let id = this.route.snapshot.paramMap.get('id');
if(id && id.length > 0){
this.customFilter.set("Country", "country", id , "");
}else{
this.customFilter.set("Country", "country", "CA" , "Canada");
}
this.route.data
.subscribe((data: { envSpecific: any }) => {
// this.piwikSiteId = PiwikHelper.siteIDs[communityId];
// if(communityId){
// this.connectCommunityId = communityId
// }else{
// this.route.queryParams.subscribe(data => {
//
// if(data['communityId'] && data['communityId']!=""){
// this.connectCommunityId = data['communityId'];
// this.piwikSiteId = PiwikHelper.siteIDs[this.connectCommunityId];
// }
// });
// }
});
} }

View File

@ -1,14 +1,23 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({
selector: 'openaire-search-datasets',
template: `
<search-datasets> @Component({
selector: 'openaire-search-datasets',
template: `
<search-datasets [customFilter]="customFilter">
</search-datasets> </search-datasets>
` `
}) })
export class OpenaireSearchDatasetsComponent { export class OpenaireSearchDatasetsComponent {
customFilter: SearchCustomFilter = new SearchCustomFilter();
constructor() {
this.customFilter.set("Country", "country", "CA", "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,15 +1,22 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component, Input, ViewChild} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-search-organizations', selector: 'openaire-search-organizations',
template: ` template: `
<search-organizations> <search-organizations [customFilter]="customFilter">
</search-organizations> </search-organizations>
` `
}) })
export class OpenaireSearchOrganizationsComponent { export class OpenaireSearchOrganizationsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,14 +1,21 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component, Input, ViewChild} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-search-orps', selector: 'openaire-search-orps',
template: ` template: `
<search-orps> <search-orps [customFilter]="customFilter">
</search-orps> </search-orps>
` `
}) })
export class OpenaireSearchOrpsComponent { export class OpenaireSearchOrpsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -1,10 +1,12 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component, Input, ViewChild} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute} from "@angular/router";
@Component({ @Component({
selector: 'openaire-search-publications', selector: 'openaire-search-publications',
template: ` template: `
<search-publications> <search-publications [customFilter]="customFilter">
</search-publications> </search-publications>
` `
@ -12,5 +14,18 @@ import {Component, Input, ViewChild} from '@angular/core';
}) })
export class OpenaireSearchPublicationsComponent { export class OpenaireSearchPublicationsComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor ( private route: ActivatedRoute ) {
}
ngOnInit() {
let id = this.route.snapshot.paramMap.get('id');
if(id && id.length > 0){
this.customFilter.set("Country", "country", id , "");
}else{
this.customFilter.set("Country", "country", "CA" , "Canada");
}
}
} }

View File

@ -1,14 +1,22 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({ @Component({
selector: 'openaire-search-software', selector: 'openaire-search-software',
template: ` template: `
<search-software> <search-software [customFilter]="customFilter">
</search-software> </search-software>
` `
}) })
export class OpenaireSearchSoftwareComponent { export class OpenaireSearchSoftwareComponent {
customFilter:SearchCustomFilter= new SearchCustomFilter();
constructor () {
this.customFilter.set("Country", "country", "CA" , "Canada");
}
ngOnInit() {
}
} }

View File

@ -33,7 +33,7 @@
"helpdesk" : "https://www.openaire.eu/support/helpdesk", "helpdesk" : "https://www.openaire.eu/support/helpdesk",
"uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload", "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload",
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "vocabulariesAPI" :"https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
"piwikSiteId" : "6", "piwikSiteId" : "6",
@ -93,7 +93,7 @@
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows", "lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
"showLastIndexInformationLink" : true, "showLastIndexInformationLink" : false,
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://www.openaire.eu/linking-beta" "claimsInformationLink": "https://www.openaire.eu/linking-beta"
} }