MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[Monitor | Trunk]: Remove search 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@59230 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Konstantinos Triantafyllou 2020-08-06 13:44:09 +00:00
parent 5a2646766a
commit 6b23d46c27
58 changed files with 0 additions and 1229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/app-routing.module.ts
View File

@ -13,21 +13,6 @@ const routes: Routes = [
loadChildren: './search-stakeholders/search-stakeholders.module#SearchStakeholdersModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
},
/* // Landing Pages
{ path: 'search/result', loadChildren: './search/landingPages/result/libResult.module#LibResultModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/publication', loadChildren: './search/landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/dataset', loadChildren: './search/landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/software', loadChildren: './search/landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/other', loadChildren: './search/landingPages/orp/libOrp.module#LibOrpModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/project', loadChildren: './search/landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/dataprovider', loadChildren: './search/landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'search/organization', loadChildren: './search/landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'project-report', loadChildren: './search/landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{
path: 'search',
loadChildren: './search/search.module#SearchModule',
resolve: {envSpecific: EnvironmentSpecificResolver}
},*/
{path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'},
{
path: 'about/learn-how',

35
src/app/app.component.ts
View File

@ -8,7 +8,6 @@ import {Session, User} from './openaireLibrary/login/utils/helper.class';
import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
import {UserManagementService} from "./openaireLibrary/services/user-management.service";
import {properties} from "../environments/environment";
import {LinksResolver} from "./search/links-resolver";
import {BehaviorSubject, Subscriber} from "rxjs";
import {StakeholderService} from "./openaireLibrary/monitor/services/stakeholder.service";
import {Stakeholder} from "./openaireLibrary/monitor/entities/stakeholder";
@ -74,36 +73,6 @@ export class AppComponent {
}
ngOnInit() {
/*this.subscriptions.push(this.params.subscribe( params => {
if (params && params['stakeholder']) {
if (!this.stakeholderService.stakeholder ||
this.stakeholderService.stakeholder.alias !== params['stakeholder']) {
this.stakeholderService.getStakeholder(this.properties.monitorServiceAPIURL, params['stakeholder']).subscribe(stakeholder => {
this.stakeholderService.setStakeholder(stakeholder);
this.stakeholder = stakeholder;
LinksResolver.setProperties(this.stakeholder.alias);
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.setUserMenu();
this.buildStakeholderMenu();
}));
}, error => {
this.navigateToError();
});
}
} else {
LinksResolver.resetProperties();
this.stakeholderService.setStakeholder(null);
if(this.url && !this.url.includes('search')) {
this.stakeholder = null;
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.setUserMenu();
this.buildMenu();
}));
}
}
}));*/
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.setUserMenu();
@ -119,10 +88,6 @@ export class AppComponent {
});
}
navigateToError() {
this.router.navigate(['/error'], {queryParams: {'page': this.router.url}});
}
public buildMenu() {
this.menuItems = [];
this.menuItems.push({

15
src/app/search/landingPages/dataProvider/dataProvider-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorDataProviderComponent} from './dataProvider.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{path: '', component: MonitorDataProviderComponent, canDeactivate: [PreviousRouteRecorder]}
])
]
})
export class DataProviderRoutingModule {
}

8
src/app/search/landingPages/dataProvider/dataProvider.component.ts
View File

@ -1,8 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-dataprovider',
template: `
<dataprovider></dataprovider>`,
})
export class MonitorDataProviderComponent {}

18
src/app/search/landingPages/dataProvider/libDataProvider.module.ts
View File

@ -1,18 +0,0 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { DataProviderModule } from '../../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
import { MonitorDataProviderComponent } from './dataProvider.component';
import {DataProviderRoutingModule} from './dataProvider-routing.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: [DataProviderModule, DataProviderRoutingModule],
declarations:[MonitorDataProviderComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorDataProviderComponent]
})
export class LibDataProviderModule { }

15
src/app/search/landingPages/dataset/dataset-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorDatasetComponent} from './dataset.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{path: '', component: MonitorDatasetComponent, canDeactivate: [PreviousRouteRecorder]}
])
]
})
export class DatasetRoutingModule {
}

9
src/app/search/landingPages/dataset/dataset.component.ts
View File

@ -1,9 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-dataset',
template: `
<result-landing type="dataset"></result-landing>
`,
})
export class MonitorDatasetComponent {}

14
src/app/search/landingPages/dataset/libDataset.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule} from '@angular/core';
import { MonitorDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import {DatasetRoutingModule} from './dataset-routing.module';
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [DatasetRoutingModule, ResultLandingModule],
declarations:[MonitorDatasetComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorDatasetComponent]
})
export class LibDatasetModule { }

16
src/app/search/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
View File

@ -1,16 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorHtmlProjectReportComponent} from './htmlProjectReport.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{path: '', component: MonitorHtmlProjectReportComponent, canDeactivate: [PreviousRouteRecorder]}
])
]
})
export class HtmlProjectReportRoutingModule {
}

7
src/app/search/landingPages/htmlProjectReport/htmlProjectReport.component.ts
View File

@ -1,7 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-htmlProjectReport',
template: `<htmlProjectReport></htmlProjectReport>`,
})
export class MonitorHtmlProjectReportComponent{}

20
src/app/search/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
View File

@ -1,20 +0,0 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../shared/shared.module';
import { RouterModule } from '@angular/router';
import { HtmlProjectReportModule } from '../../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import { MonitorHtmlProjectReportComponent } from './htmlProjectReport.component';
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
@NgModule({
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
declarations:[MonitorHtmlProjectReportComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorHtmlProjectReportComponent]
})
export class LibHtmlProjectReportModule { }

20
src/app/search/landingPages/organization/libOrganization.module.ts
View File

@ -1,20 +0,0 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../shared/shared.module';
import { RouterModule } from '@angular/router';
import { OrganizationModule } from '../../../openaireLibrary/landingPages/organization/organization.module';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import { MonitorOrganizationComponent } from './organization.component';
import {OrganizationRoutingModule} from './organization-routing.module';
@NgModule({
imports: [OrganizationModule, OrganizationRoutingModule],
declarations:[MonitorOrganizationComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorOrganizationComponent]
})
export class LibOrganizationModule { }

16
src/app/search/landingPages/organization/organization-routing.module.ts
View File

@ -1,16 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorOrganizationComponent} from './organization.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{path: '', component: MonitorOrganizationComponent, canDeactivate: [PreviousRouteRecorder]}
])
]
})
export class OrganizationRoutingModule {
}

8
src/app/search/landingPages/organization/organization.component.ts
View File

@ -1,8 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-organization',
template: `
<organization></organization>`,
})
export class MonitorOrganizationComponent {}

23
src/app/search/landingPages/orp/libOrp.module.ts
View File

@ -1,23 +0,0 @@
import {NgModule} from '@angular/core';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import {MonitorOrpComponent} from './orp.component';
import {OrpRoutingModule} from './orp-routing.module';
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [
OrpRoutingModule, ResultLandingModule
],
declarations: [
MonitorOrpComponent
],
providers: [
FreeGuard, PreviousRouteRecorder, IsRouteEnabled
],
exports: [
MonitorOrpComponent
]
})
export class LibOrpModule { }

15
src/app/search/landingPages/orp/orp-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorOrpComponent} from './orp.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([{
path: '', component: MonitorOrpComponent, canDeactivate: [PreviousRouteRecorder]
}])
]
})
export class OrpRoutingModule { }

10
src/app/search/landingPages/orp/orp.component.ts
View File

@ -1,10 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-orp',
template: `
<result-landing type="orp"></result-landing>
`,
})
export class MonitorOrpComponent {}

20
src/app/search/landingPages/project/libProject.module.ts
View File

@ -1,20 +0,0 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../shared/shared.module';
import { RouterModule } from '@angular/router';
import { ProjectModule } from '../../../openaireLibrary/landingPages/project/project.module';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import { MonitorProjectComponent } from './project.component';
import {ProjectRoutingModule} from './project-routing.module';
@NgModule({
imports: [ProjectModule, ProjectRoutingModule],
declarations:[MonitorProjectComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorProjectComponent]
})
export class LibProjectModule { }

14
src/app/search/landingPages/project/project-routing.module.ts
View File

@ -1,14 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorProjectComponent} from './project.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorProjectComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class ProjectRoutingModule { }

8
src/app/search/landingPages/project/project.component.ts
View File

@ -1,8 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-project',
template: `
<project></project>`,
})
export class MonitorProjectComponent {}

15
src/app/search/landingPages/publication/libPublication.module.ts
View File

@ -1,15 +0,0 @@
import { NgModule} from '@angular/core';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import { MonitorPublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module';
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [PublicationRoutingModule, ResultLandingModule],
declarations:[MonitorPublicationComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorPublicationComponent]
})
export class LibPublicationModule { }

14
src/app/search/landingPages/publication/publication-routing.module.ts
View File

@ -1,14 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorPublicationComponent} from './publication.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorPublicationComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class PublicationRoutingModule { }

9
src/app/search/landingPages/publication/publication.component.ts
View File

@ -1,9 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-publication',
template: `
<result-landing type="publication"></result-landing>
`,
})
export class MonitorPublicationComponent {}

14
src/app/search/landingPages/result/libResult.module.ts
View File

@ -1,14 +0,0 @@
import {NgModule} from '@angular/core';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {MonitorResultComponent} from './result.component';
import {ResultRoutingModule} from './result-routing.module';
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [ResultRoutingModule, ResultLandingModule],
declarations:[MonitorResultComponent],
providers:[FreeGuard, PreviousRouteRecorder],
exports:[MonitorResultComponent]
})
export class LibResultModule { }

15
src/app/search/landingPages/result/result-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorResultComponent} from './result.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorResultComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class ResultRoutingModule { }

9
src/app/search/landingPages/result/result.component.ts
View File

@ -1,9 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-result',
template: `
<result-landing type="result"></result-landing>`,
})
export class MonitorResultComponent {
}

14
src/app/search/landingPages/software/libSoftware.module.ts
View File

@ -1,14 +0,0 @@
import { NgModule} from '@angular/core';
import {FreeGuard} from '../../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../../openaireLibrary/error/isRouteEnabled.guard';
import { MonitorSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module';
import {ResultLandingModule} from "../../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [SoftwareRoutingModule, ResultLandingModule],
declarations:[MonitorSoftwareComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[MonitorSoftwareComponent]
})
export class LibSoftwareModule { }

15
src/app/search/landingPages/software/software-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorSoftwareComponent} from './software.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorSoftwareComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SoftwareRoutingModule { }

9
src/app/search/landingPages/software/software.component.ts
View File

@ -1,9 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-software',
template: `
<result-landing type="software"></result-landing>
`,
})
export class MonitorSoftwareComponent {}

36
src/app/search/links-resolver.ts
View File

@ -1,36 +0,0 @@
import {properties} from "../../environments/environment";
interface Links {
searchLinkToResults,
searchLinkToProjects,
searchLinkToDataProviders,
searchLinkToAdvancedResults,
searchLinkToAdvancedProjects,
searchLinkToAdvancedDataProviders,
searchLinkToAdvancedOrganizations,
}
export class LinksResolver {
private static default: Links = {
searchLinkToResults: properties.searchLinkToResults,
searchLinkToDataProviders: properties.searchLinkToDataProviders,
searchLinkToProjects: properties.searchLinkToProjects,
searchLinkToAdvancedResults: properties.searchLinkToAdvancedResults,
searchLinkToAdvancedProjects: properties.searchLinkToAdvancedProjects,
searchLinkToAdvancedDataProviders: properties.searchLinkToAdvancedDataProviders,
searchLinkToAdvancedOrganizations: properties.searchLinkToAdvancedOrganizations,
};
public static setProperties( alias: string) {
Object.keys(this.default).forEach(field => {
properties[field] = "/search/" + alias + "/" + (<string>this.default[field]).replace('search/', '');
});
}
public static resetProperties() {
Object.keys(this.default).forEach(field => {
properties[field] = this.default[field];
});
}
}

32
src/app/search/search.module.ts
View File

@ -1,32 +0,0 @@
import {NgModule} from "@angular/core";
import {CommonModule} from "@angular/common";
import {RouterModule} from "@angular/router";
import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
@NgModule({
imports: [CommonModule, RouterModule.forChild([
// Search Pages
{ path: 'find/research-outcomes', loadChildren: './searchPages/simple/searchResearchResults.module#MonitorSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'find/projects', loadChildren: './searchPages/simple/searchProjects.module#MonitorSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#MonitorSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#MonitorSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
// Advanced Search Pages
{ path: 'advanced/research-outcomes', loadChildren: './searchPages/advanced/searchResearchResults.module#MonitorAdvancedSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'advanced/projects', loadChildren: './searchPages/advanced/searchProjects.module#MonitorAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'advanced/dataproviders', loadChildren: './searchPages/advanced/searchDataProviders.module#MonitorAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'advanced/organizations', loadChildren: './searchPages/advanced/searchOrganizations.module#MonitorAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
// Stakeholder Search Pages
{ path: ':stakeholder/find/research-outcomes', loadChildren: './searchPages/simple/searchResearchResults.module#MonitorSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: ':stakeholder/find/projects', loadChildren: './searchPages/simple/searchProjects.module#MonitorSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: ':stakeholder/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#MonitorSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
// Stakeholder Advanced Search Pages
{ path: ':stakeholder/advanced/research-outcomes', loadChildren: './searchPages/advanced/searchResearchResults.module#MonitorAdvancedSearchResearchResultsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: ':stakeholder/advanced/projects', loadChildren: './searchPages/advanced/searchProjects.module#MonitorAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: ':stakeholder/advanced/dataproviders', loadChildren: './searchPages/advanced/searchDataProviders.module#MonitorAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
])],
providers:[EnvironmentSpecificResolver]
})
export class SearchModule {}

16
src/app/search/searchPages/advanced/searchDataProviders-routing.module.ts
View File

@ -1,16 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{MonitorAdvancedSearchDataprovidersComponent} from './searchDataproviders.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorAdvancedSearchDataprovidersComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchDataProvidersRoutingModule { }

24
src/app/search/searchPages/advanced/searchDataProviders.module.ts
View File

@ -1,24 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {MonitorAdvancedSearchDataprovidersComponent} from './searchDataproviders.component';
import {SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from '../../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({
imports: [
CommonModule, FormsModule,
SearchDataProvidersModule, SearchDataProvidersRoutingModule
],
declarations: [
MonitorAdvancedSearchDataprovidersComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorAdvancedSearchDataprovidersComponent
]
})
export class MonitorAdvancedSearchDataProvidersModule {
}

52
src/app/search/searchPages/advanced/searchDataproviders.component.ts
View File

@ -1,52 +0,0 @@
import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-advanced-search-dataproviders',
template: `
<search-dataproviders *ngIf="initialized" [simpleView]="false"
openaireLink="https://beta.explore.openaire.eu/search/find/dataproviders"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false">
</search-dataproviders>
`
})
export class MonitorAdvancedSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if(stakeholder) {
if (stakeholder.type === "funder") {
this.navigateToError();
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
navigateToError() {
this.router.navigate(['/error'], {queryParams: {'page': this.router.url}});
}
}

17
src/app/search/searchPages/advanced/searchOrganizations-routing.module.ts
View File

@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{MonitorAdvancedSearchOrganizationsComponent} from './searchOrganizations.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorAdvancedSearchOrganizationsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchOrganizationsRoutingModule { }

10
src/app/search/searchPages/advanced/searchOrganizations.component.ts
View File

@ -1,10 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-advanced-search-organizations',
template: `
<search-organizations [simpleView]="false">
</search-organizations>
`
})
export class MonitorAdvancedSearchOrganizationsComponent {}

26
src/app/search/searchPages/advanced/searchOrganizations.module.ts
View File

@ -1,26 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
import {MonitorAdvancedSearchOrganizationsComponent} from './searchOrganizations.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchOrganizationsModule} from "../../../openaireLibrary/searchPages/searchOrganizations.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchOrganizationsRoutingModule, SearchOrganizationsModule
],
declarations: [
MonitorAdvancedSearchOrganizationsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorAdvancedSearchOrganizationsComponent
]
})
export class MonitorAdvancedSearchOrganizationsModule {
}

16
src/app/search/searchPages/advanced/searchProjects-routing.module.ts
View File

@ -1,16 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorAdvancedSearchProjectsComponent} from './searchProjects.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorAdvancedSearchProjectsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchProjectsRoutingModule { }

54
src/app/search/searchPages/advanced/searchProjects.component.ts
View File

@ -1,54 +0,0 @@
import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-advanced-search-projects',
template: `
<search-projects *ngIf="initialized" [simpleView]="false"
openaireLink="https://beta.explore.openaire.eu/search/find/projects"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false">
</search-projects>
`
})
export class MonitorAdvancedSearchProjectsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if(stakeholder) {
if (stakeholder.type === "funder") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Funder", "funderid", value, "");
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
navigateToError() {
this.router.navigate(['/error'], {queryParams: {'page': this.router.url}});
}
}

24
src/app/search/searchPages/advanced/searchProjects.module.ts
View File

@ -1,24 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchProjectsRoutingModule} from './searchProjects-routing.module';
import {MonitorAdvancedSearchProjectsComponent} from './searchProjects.component';
import {SearchProjectsModule} from "../../../openaireLibrary/searchPages/searchProjects.module";
import {PreviousRouteRecorder} from "../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
@NgModule({
imports: [
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
],
declarations: [
MonitorAdvancedSearchProjectsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorAdvancedSearchProjectsComponent
]
})
export class MonitorAdvancedSearchProjectsModule {
}

16
src/app/search/searchPages/advanced/searchResearchResults-routing.module.ts
View File

@ -1,16 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorAdvancedSearchResearchResultsComponent,} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorAdvancedSearchResearchResultsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchResearchResultsRoutingModule { }

49
src/app/search/searchPages/advanced/searchResearchResults.component.ts
View File

@ -1,49 +0,0 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-advanced-search-results',
template: `
<search-research-results *ngIf="initialized" resultType="result" [simpleView]="false"
openaireLink="https://beta.explore.openaire.eu/search/find/publications"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"
[showAdvancedSearchLink]="true"></search-research-results>
`
})
export class MonitorAdvancedSearchResearchResultsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if(stakeholder) {
if (stakeholder.type === "funder") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
}

25
src/app/search/searchPages/advanced/searchResearchResults.module.ts
View File

@ -1,25 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import {MonitorAdvancedSearchResearchResultsComponent} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchResearchResultsRoutingModule, SearchResearchResultsModule
],
declarations: [
MonitorAdvancedSearchResearchResultsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorAdvancedSearchResearchResultsComponent
]
})
export class MonitorAdvancedSearchResearchResultsModule {
}

22
src/app/search/searchPages/find/libSearch.module.ts
View File

@ -1,22 +0,0 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { SharedModule } from '../../../shared/shared.module';
import { RouterModule } from '@angular/router';
import {MainSearchModule} from '../../../openaireLibrary/searchPages/find/mainSearch.module';
import { OpenaireSearchComponent } from './search.component';
import { MainSearchRoutingModule } from './mainSearch-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 {SearchAllModule} from "../../../openaireLibrary/searchPages/find/searchAll.module";
@NgModule({
imports: [MainSearchRoutingModule, MainSearchModule, SearchAllModule],
declarations:[OpenaireSearchComponent],
exports:[OpenaireSearchComponent],
providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
})
export class LibMainSearchModule { }

19
src/app/search/searchPages/find/mainSearch-routing.module.ts
View File

@ -1,19 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchComponent} from './search.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: OpenaireSearchComponent }
{ path: '', component: OpenaireSearchComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class MainSearchRoutingModule { }

42
src/app/search/searchPages/find/search.component.ts
View File

@ -1,42 +0,0 @@
import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {PiwikHelper} from '../../../utils/piwikHelper';
import {ConnectHelper} from '../../../openaireLibrary/connect/connectHelper';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
@Component({
selector: 'openaire-search-find',
template: `
<search-all logoURL = "/assets/common-assets/logo-small-explore.png" name="OpenAIRE Connect" [customFilter]=customFilter [piwikSiteId]="piwikSiteId" ></search-all>
<!-- <search-find [customFilter]=customFilter [piwikSiteId]="piwikSiteId" formPlaceholderText="Search for research results"></search-find>-->
`,
})
export class OpenaireSearchComponent{
connectCommunityId:string;
customFilter: SearchCustomFilter = null;
piwikSiteId = null;
constructor ( private route: ActivatedRoute) {
}
ngOnInit() {
this.route.data
.subscribe((data: { envSpecific: any }) => {
var communityId = ConnectHelper.getCommunityFromDomain(data.envSpecific.domain);
this.piwikSiteId = PiwikHelper.getSiteId(communityId,data.envSpecific.environment);
if(communityId){
this.connectCommunityId = communityId;
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
}else{
this.route.queryParams.subscribe(params => {
if(params['communityId'] && params['communityId']!=""){
this.connectCommunityId = params['communityId'];
this.piwikSiteId = PiwikHelper.getSiteId(this.connectCommunityId,data.envSpecific.environment);
this.customFilter = new SearchCustomFilter("Community", "communityId", this.connectCommunityId, "");
}
});
}
});
}
}

16
src/app/search/searchPages/simple/searchDataProviders-routing.module.ts
View File

@ -1,16 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{MonitorSearchDataprovidersComponent} from './searchDataproviders.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorSearchDataprovidersComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchDataProvidersRoutingModule { }

24
src/app/search/searchPages/simple/searchDataProviders.module.ts
View File

@ -1,24 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {MonitorSearchDataprovidersComponent} from './searchDataproviders.component';
import {SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from '../../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({
imports: [
CommonModule, FormsModule,
SearchDataProvidersModule, SearchDataProvidersRoutingModule
],
declarations: [
MonitorSearchDataprovidersComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorSearchDataprovidersComponent
]
})
export class MonitorSearchDataProvidersModule {
}

52
src/app/search/searchPages/simple/searchDataproviders.component.ts
View File

@ -1,52 +0,0 @@
import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-search-dataproviders',
template: `
<search-dataproviders *ngIf="initialized"
openaireLink="https://beta.explore.openaire.eu/search/find/dataproviders"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false">
</search-dataproviders>
`
})
export class MonitorSearchDataprovidersComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if (stakeholder) {
if (stakeholder.type === "funder") {
this.navigateToError();
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
navigateToError() {
this.router.navigate(['/error'], {queryParams: {'page': this.router.url}});
}
}

17
src/app/search/searchPages/simple/searchOrganizations-routing.module.ts
View File

@ -1,17 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{MonitorSearchOrganizationsComponent} from './searchOrganizations.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorSearchOrganizationsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchOrganizationsRoutingModule { }

10
src/app/search/searchPages/simple/searchOrganizations.component.ts
View File

@ -1,10 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'monitor-search-organizations',
template: `
<search-organizations>
</search-organizations>
`
})
export class MonitorSearchOrganizationsComponent {}

26
src/app/search/searchPages/simple/searchOrganizations.module.ts
View File

@ -1,26 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
import {MonitorSearchOrganizationsComponent} from './searchOrganizations.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchOrganizationsModule} from "../../../openaireLibrary/searchPages/searchOrganizations.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchOrganizationsRoutingModule, SearchOrganizationsModule
],
declarations: [
MonitorSearchOrganizationsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorSearchOrganizationsComponent
]
})
export class MonitorSearchOrganizationsModule {
}

16
src/app/search/searchPages/simple/searchProjects-routing.module.ts
View File

@ -1,16 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorSearchProjectsComponent} from './searchProjects.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorSearchProjectsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchProjectsRoutingModule { }

54
src/app/search/searchPages/simple/searchProjects.component.ts
View File

@ -1,54 +0,0 @@
import {Component} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-search-projects',
template: `
<search-projects *ngIf="initialized"
openaireLink="https://beta.explore.openaire.eu/search/find/projects"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false">
</search-projects>
`
})
export class MonitorSearchProjectsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if(stakeholder) {
if (stakeholder.type === "funder") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Funder", "funderid", value, "");
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.navigateToError();
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
navigateToError() {
this.router.navigate(['/error'], {queryParams: {'page': this.router.url}});
}
}

24
src/app/search/searchPages/simple/searchProjects.module.ts
View File

@ -1,24 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchProjectsRoutingModule} from './searchProjects-routing.module';
import {MonitorSearchProjectsComponent} from './searchProjects.component';
import {SearchProjectsModule} from "../../../openaireLibrary/searchPages/searchProjects.module";
import {PreviousRouteRecorder} from "../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
@NgModule({
imports: [
CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
],
declarations: [
MonitorSearchProjectsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorSearchProjectsComponent
]
})
export class MonitorSearchProjectsModule {
}

15
src/app/search/searchPages/simple/searchResearchResults-routing.module.ts
View File

@ -1,15 +0,0 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {MonitorSearchResearchResultsComponent} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: MonitorSearchResearchResultsComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class SearchResearchResultsRoutingModule { }

50
src/app/search/searchPages/simple/searchResearchResults.component.ts
View File

@ -1,50 +0,0 @@
import {Component, OnDestroy, OnInit} from '@angular/core';
import {SearchCustomFilter} from "../../../openaireLibrary/searchPages/searchUtils/searchUtils.class";
import {EnvProperties} from "../../../openaireLibrary/utils/properties/env-properties";
import {ActivatedRoute, Router} from "@angular/router";
import {StakeholderService} from "../../../openaireLibrary/monitor/services/stakeholder.service";
import {properties} from "../../../../environments/environment";
import {LinksResolver} from "../../links-resolver";
@Component({
selector: 'monitor-search-results',
template: `
<search-research-results *ngIf="initialized" resultType="result"
openaireLink="https://beta.explore.openaire.eu/search/find/publications"
[customFilter]=customFilter [hasPrefix]="false"
[includeOnlyResultsAndFilter]="false"
[showAdvancedSearchLink]="true"></search-research-results>
`
})
export class MonitorSearchResearchResultsComponent {
customFilter: SearchCustomFilter = null;
initialized: boolean = false;
constructor(private route: ActivatedRoute,
private router: Router,
private stakeholderService: StakeholderService) {
}
ngOnInit() {
this.route.params.subscribe(params => {
if (params['stakeholder']) {
this.stakeholderService.getStakeholderAsObservable().subscribe(stakeholder => {
if(stakeholder) {
if (stakeholder.type === "funder") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Funder", "relfunderid", value, "");
} else if (stakeholder.type === "organization") {
let value = stakeholder.index_id;
this.customFilter = new SearchCustomFilter("Organization", "relorganizationid", value, "");
} else if (stakeholder.type === "ri") {
this.customFilter = new SearchCustomFilter("Community", "communityId", stakeholder.index_id, "");
}
this.initialized = true;
}
});
} else {
this.initialized = true;
}
});
}
}

25
src/app/search/searchPages/simple/searchResearchResults.module.ts
View File

@ -1,25 +0,0 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import {MonitorSearchResearchResultsComponent} from './searchResearchResults.component';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../../openaireLibrary/searchPages/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchResearchResultsRoutingModule, SearchResearchResultsModule
],
declarations: [
MonitorSearchResearchResultsComponent
],
providers: [PreviousRouteRecorder],
exports: [
MonitorSearchResearchResultsComponent
]
})
export class MonitorSearchResearchResultsModule {
}