[Aggregator|Trunk]
Add more numbers in home page Add pages for projects and content providers Remove checks for admin tool community Id Set community in properties as null git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@56093 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
f9f4df43c3
commit
c30611f3a7
|
@ -43,14 +43,14 @@ export class AppComponent {
|
||||||
menuItems: RootMenuItem [] = [
|
menuItems: RootMenuItem [] = [
|
||||||
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
||||||
{
|
{
|
||||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], [], {}),
|
||||||
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
|
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}),
|
||||||
new MenuItem("", "Research Data", "", "/search/find/datasets", false, ["dataset"], ["/search/find/datasets"], {}),
|
new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}),
|
||||||
new MenuItem("", "Software", "", "/search/find/software", false, ["software"], ["/search/find/software"], {}),
|
new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}),
|
||||||
new MenuItem("", "Other Research Products", "", "/search/find/other", false, ["orp"], ["/search/find/other"], {}),
|
new MenuItem("", "Other Research Products", "", "/search/find/other", false, [], [], {}),
|
||||||
// new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
new MenuItem("", "Projects", "", "/search/find/projects/", false, [], [], {}),
|
||||||
// new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, [], [], {}),
|
||||||
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, [], [], {})
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -17,7 +17,7 @@ import {ErrorModule} from './openaireLibrary/error/error.module';
|
||||||
|
|
||||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||||
import {AppRoutingModule} from './app-routing.module';
|
import {AppRoutingModule} from './app-routing.module';
|
||||||
import {AggregatorNavBarComponent} from "./utils/aggregatorNavBar.component";
|
// import {AggregatorNavBarComponent} from "./utils/aggregatorNavBar.component";
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
|
|
||||||
<!--<aggNavbar></aggNavbar>-->
|
<!--<aggNavbar></aggNavbar>-->
|
||||||
|
|
||||||
<div class="image-front-topbar uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color" uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}" tm-header-transparent="light" tm-header-transparent-placeholder="">
|
<div class="image-front-topbar uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color"
|
||||||
|
uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}"
|
||||||
|
tm-header-transparent="light" tm-header-transparent-placeholder="">
|
||||||
<div style=" min-height: calc(7.89999px + 60vh);"
|
<div style=" min-height: calc(7.89999px + 60vh);"
|
||||||
class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom">
|
class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom">
|
||||||
<!-- uk-height-viewport="offset-top: true;offset-bottom: 20"> -->
|
<!-- uk-height-viewport="offset-top: true;offset-bottom: 20"> -->
|
||||||
|
@ -20,8 +21,10 @@
|
||||||
<div class="uk-container uk-container-large uk-margin-medium explore-numbers">
|
<div class="uk-container uk-container-large uk-margin-medium explore-numbers">
|
||||||
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
|
<div class="search_box_bg 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 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"
|
||||||
<h2>
|
class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto uk-animation-fade"
|
||||||
|
uk-scrollspy-class="" style="">
|
||||||
|
<!--<h2>
|
||||||
Search for more than
|
Search for more than
|
||||||
<span *ngIf="showPublications && publicationsSize">{{publicationsSize.number|number}}
|
<span *ngIf="showPublications && publicationsSize">{{publicationsSize.number|number}}
|
||||||
{{publicationsSize.size}} publications{{((showDatasets || showSoftware || showOrp) ? "," : "")}} </span>
|
{{publicationsSize.size}} publications{{((showDatasets || showSoftware || showOrp) ? "," : "")}} </span>
|
||||||
|
@ -35,10 +38,57 @@
|
||||||
<span *ngIf="showOrganizations && organizationsSize"> from {{organizationsSize.number |number}}
|
<span *ngIf="showOrganizations && organizationsSize"> from {{organizationsSize.number |number}}
|
||||||
{{organizationsSize.size}} organizations</span>
|
{{organizationsSize.size}} organizations</span>
|
||||||
|
|
||||||
<span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
|
<span
|
||||||
<span *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</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>
|
||||||
|
|
||||||
</h2>
|
</h2>-->
|
||||||
|
<div class="uk-margin-bottom">
|
||||||
|
<span class="uk-text-large"> Search for more than </span>
|
||||||
|
|
||||||
|
<span *ngIf="showPublications && publicationsSize">
|
||||||
|
<span class="uk-h2">{{publicationsSize.number|number}}{{publicationsSize.size}}</span>
|
||||||
|
<span class="uk-text-large"> {{((showDatasets || showSoftware || showOrp) ? " publications, "
|
||||||
|
: " publications ")}}</span>
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showDatasets && datasetsSize">
|
||||||
|
<span class="uk-h2">{{datasetsSize.number|number}}{{datasetsSize.size}}</span>
|
||||||
|
<span
|
||||||
|
class="uk-text-large">{{((showSoftware || showOrp) ? " research data, " : " research data ")}}</span>
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showOrp && otherSize">
|
||||||
|
<span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>
|
||||||
|
<span
|
||||||
|
class="uk-text-large"> {{((showSoftware) ? " other research products, " : " other research products ")}}</span>
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showSoftware && softwareSize">
|
||||||
|
<span class="uk-h2">{{softwareSize.number|number}}{{softwareSize.size}}</span>
|
||||||
|
<span class="uk-text-large"> software </span>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<br>
|
||||||
|
<span *ngIf="showOrganizations && organizationsSize">
|
||||||
|
<span class="uk-text-large"> from </span>
|
||||||
|
<span class="uk-h2">{{organizationsSize.number|number}}{{organizationsSize.size}}</span>
|
||||||
|
<span class="uk-text-large"> organizations </span>
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showDataProviders && datasourcesSize">
|
||||||
|
<span class="uk-text-large"> {{((showOrganizations && showOrganizations) ? " and " : " from ")}} </span>
|
||||||
|
<span class="uk-h2">{{datasourcesSize.number|number}}{{datasourcesSize.size}}</span>
|
||||||
|
<span class="uk-text-large"> content providers </span>
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showProjects && fundersSize">
|
||||||
|
<span class="uk-text-large"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} </span>
|
||||||
|
<span class="uk-h2">{{fundersSize.number|number}}{{fundersSize.size}} </span>
|
||||||
|
<span class="uk-text-large"> funders </span>
|
||||||
|
|
||||||
|
</span>
|
||||||
|
<span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
|
||||||
|
showDataProviders"
|
||||||
|
class="uk-text-large"> linked together for an integrated research search </span>
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -114,8 +114,8 @@ export class HomeComponent {
|
||||||
this.showOrganizations = true;
|
this.showOrganizations = true;
|
||||||
this.showDatasets = true;
|
this.showDatasets = true;
|
||||||
this.showSoftware = true;
|
this.showSoftware = true;
|
||||||
//this.showProjects = false;
|
this.showProjects = true;
|
||||||
// this.showDataProviders = true;
|
this.showDataProviders = true;
|
||||||
this.getNumbers();
|
this.getNumbers();
|
||||||
|
|
||||||
/* this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
|
/* this.config.getCommunityInformation(this.properties.adminToolsAPIURL, this.properties.adminToolsCommunity).subscribe(data => {
|
||||||
|
@ -235,7 +235,7 @@ export class HomeComponent {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (this.showProjects) {
|
if (this.showProjects) {
|
||||||
this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties).subscribe(
|
this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties, refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data[0] && data[0] > 0) {
|
if (data[0] && data[0] > 0) {
|
||||||
this.projectsSize = NumberUtils.roundNumber(data[0]);
|
this.projectsSize = NumberUtils.roundNumber(data[0]);
|
||||||
|
@ -252,7 +252,7 @@ export class HomeComponent {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (this.showDataProviders) {
|
if (this.showDataProviders) {
|
||||||
this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
|
this.subDataPr = this._searchDataprovidersService.numOfSearchDataproviders("", this.properties, refineQuery).subscribe(
|
||||||
data => {
|
data => {
|
||||||
if (data && data > 0) {
|
if (data && data > 0) {
|
||||||
this.datasourcesSize = NumberUtils.roundNumber(data);
|
this.datasourcesSize = NumberUtils.roundNumber(data);
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -12,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
},canDeactivate: [PreviousRouteRecorder] }
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,14 +1,29 @@
|
||||||
import {Component, Input, ViewChild} from '@angular/core';
|
import {Component} from '@angular/core';
|
||||||
|
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
|
||||||
|
import {ActivatedRoute} from "@angular/router";
|
||||||
|
import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-dataprovider',
|
selector: 'openaire-advanced-search-dataprovider',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-dataprovider>
|
<advanced-search-dataprovider [customFilter]="customFilter">
|
||||||
</advanced-search-dataprovider>
|
</advanced-search-dataprovider>
|
||||||
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
||||||
export class OpenaireAdvancedSearchDataProvidersComponent {
|
export class OpenaireAdvancedSearchDataProvidersComponent {
|
||||||
|
|
||||||
|
customFilter: SearchCustomFilter = null;
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
let id = this.route.snapshot.paramMap.get('id');
|
||||||
|
let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
||||||
|
this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
},canDeactivate: [PreviousRouteRecorder]}
|
},canDeactivate: [PreviousRouteRecorder]}
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
import {Component} from '@angular/core';
|
import {Component} from '@angular/core';
|
||||||
|
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
|
||||||
|
import {ActivatedRoute} from "@angular/router";
|
||||||
|
import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-advanced-search-projects',
|
selector: 'openaire-advanced-search-projects',
|
||||||
template: `
|
template: `
|
||||||
<advanced-search-projects>
|
<advanced-search-projects [customFilter]="customFilter">
|
||||||
</advanced-search-projects>
|
</advanced-search-projects>
|
||||||
|
|
||||||
`
|
`
|
||||||
|
@ -11,4 +14,14 @@ import {Component} from '@angular/core';
|
||||||
|
|
||||||
export class OpenaireAdvancedSearchProjectsComponent {
|
export class OpenaireAdvancedSearchProjectsComponent {
|
||||||
|
|
||||||
|
customFilter:SearchCustomFilter= null;
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
let id = this.route.snapshot.paramMap.get('id');
|
||||||
|
let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
||||||
|
this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
|
||||||
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
|
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
|
||||||
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,14 +1,27 @@
|
||||||
import {Component, Input, ViewChild} from '@angular/core';
|
import {Component} from '@angular/core';
|
||||||
|
import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
|
||||||
|
import {ActivatedRoute} from "@angular/router";
|
||||||
|
import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-dataproviders',
|
selector: 'openaire-search-dataproviders',
|
||||||
template: `
|
template: `
|
||||||
|
|
||||||
<search-dataproviders>
|
<search-dataproviders [customFilter]="customFilter">
|
||||||
</search-dataproviders>
|
</search-dataproviders>
|
||||||
|
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
export class OpenaireSearchDataprovidersComponent {
|
export class OpenaireSearchDataprovidersComponent {
|
||||||
|
customFilter: SearchCustomFilter = null;
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
let id = this.route.snapshot.paramMap.get('id');
|
||||||
|
let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
||||||
|
this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -13,7 +13,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -14,7 +14,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,14 +1,27 @@
|
||||||
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";
|
||||||
|
import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'openaire-search-projects',
|
selector: 'openaire-search-projects',
|
||||||
template: `
|
template: `
|
||||||
|
|
||||||
<search-projects>
|
<search-projects [customFilter]="customFilter">
|
||||||
</search-projects>
|
</search-projects>
|
||||||
`
|
`
|
||||||
|
|
||||||
})
|
})
|
||||||
export class OpenaireSearchProjectsComponent {
|
export class OpenaireSearchProjectsComponent {
|
||||||
|
customFilter: SearchCustomFilter = null;
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
let id = this.route.snapshot.paramMap.get('id');
|
||||||
|
let agg: FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
||||||
|
this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
|
||||||
redirect: '/error', community : 'openaire'
|
redirect: '/error'
|
||||||
}, canDeactivate: [PreviousRouteRecorder] }
|
}, canDeactivate: [PreviousRouteRecorder] }
|
||||||
|
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,63 +1,63 @@
|
||||||
import {Component} from '@angular/core';
|
// import {Component} from '@angular/core';
|
||||||
import {ActivatedRoute} from '@angular/router';
|
// import {ActivatedRoute} from '@angular/router';
|
||||||
import "rxjs/add/observable/zip";
|
// import "rxjs/add/observable/zip";
|
||||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
// import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||||
import {FilterInfo, PortalAggregators} from "../utils/aggregators";
|
// import {FilterInfo, PortalAggregators} from "../utils/aggregators";
|
||||||
import {MenuItem, RootMenuItem} from "../openaireLibrary/sharedComponents/menu";
|
// import {MenuItem, RootMenuItem} from "../openaireLibrary/sharedComponents/menu";
|
||||||
|
//
|
||||||
@Component({
|
// @Component({
|
||||||
selector: 'aggNavbar',
|
// selector: 'aggNavbar',
|
||||||
templateUrl: `
|
// templateUrl: `
|
||||||
<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" [community]="community" [showCommunityName]="true"></navbar>
|
// [logOutUrl]="properties.logoutUrl" [cookieDomain]="properties.cookieDomain" [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
|
||||||
`,
|
// `,
|
||||||
})
|
// })
|
||||||
export class AggregatorNavBarComponent {
|
// export class AggregatorNavBarComponent {
|
||||||
|
//
|
||||||
properties: EnvProperties;
|
// properties: EnvProperties;
|
||||||
menuItems: RootMenuItem [] = [
|
// menuItems: RootMenuItem [] = [
|
||||||
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
// {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
||||||
{
|
// {
|
||||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
// rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {}),
|
||||||
items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
|
// items: [new MenuItem("", "Publications", "", "/search/find/publications", false, ["publication"], ["/search/find/publications"], {}),
|
||||||
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"};
|
// community = {id: "CA", name: "Canada Aggregator", logoUrl:"assets/common-assets/logo-small-aggregator.png"};
|
||||||
|
//
|
||||||
|
//
|
||||||
constructor(
|
// constructor(
|
||||||
private route: ActivatedRoute,
|
// private route: ActivatedRoute,
|
||||||
|
//
|
||||||
) {
|
// ) {
|
||||||
let id = this.route.snapshot.paramMap.get('id');
|
// let id = this.route.snapshot.paramMap.get('id');
|
||||||
console.log(id);
|
// console.log(id);
|
||||||
let agg:FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
// let agg:FilterInfo = PortalAggregators.getFilterInfoByMenuId(id);
|
||||||
// this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
// // this.customFilter = PortalAggregators.getSearchCustomFilterByAggregator(agg);
|
||||||
// console.log(this.customFilter);
|
// // console.log(this.customFilter);
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
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;
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
});
|
// });
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
|
|
@ -50,9 +50,9 @@
|
||||||
|
|
||||||
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
|
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
|
||||||
|
|
||||||
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
|
"adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",
|
||||||
|
|
||||||
"adminToolsCommunity" :"openaire",
|
"adminToolsCommunity" :null,
|
||||||
|
|
||||||
"datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
|
"datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
|
||||||
"contextsAPI":"https://dev-openaire.d4science.org/openaire/context",
|
"contextsAPI":"https://dev-openaire.d4science.org/openaire/context",
|
||||||
|
|
Loading…
Reference in New Issue