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

[Explore |Trunk] 

code clean up:
-add timeout interceptor
-remove unused imports, code, files (Old search pages for results, dataproviders, map search page, etc)
-remove Freeguard from modules                          
-unsubscribe all subscriptions
-Services: configuration, isvocabularies, user management: unsubscribe from app component or the component that uses them (clearSubscriptions())
-Fetchers: unsubscribe from  the component that uses them (clearSubscriptions())



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@59817 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-11-11 14:44:21 +00:00
parent 097d63950a
commit b916f19f57
106 changed files with 110 additions and 913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
explore/src/app/app.component.ts
View File

@ -10,6 +10,7 @@ import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
import {UserManagementService} from "./openaireLibrary/services/user-management.service";
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
import {Subscriber} from "rxjs";
@Component({
//changeDetection: ChangeDetectionStrategy.Default,
@ -56,20 +57,20 @@ export class AppComponent {
user: User;
header: Header;
logoPath: string = 'assets/common-assets/';
subscriptions = [];
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
private router: Router, private userManagementService: UserManagementService,
private configurationService: ConfigurationService) {
router.events.forEach((event) => {
this.subscriptions.push(router.events.forEach((event) => {
if (event instanceof NavigationStart) {
// console.log(event.url);
HelperFunctions.scroll();
}
});
}));
}
ngOnInit() {
if (typeof document !== 'undefined') {
try {
this.isClient = true;
@ -78,13 +79,13 @@ export class AppComponent {
}
}
this.propertiesService.loadEnvironment()
this.subscriptions.push(this.propertiesService.loadEnvironment()
.then(es => {
this.propertiesService.setEnvProperties(es);
this.properties = this.propertiesService.envSpecific;
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
this.feedbackmail = this.properties.feedbackmail;
this.userManagementService.getUserInfo().subscribe(user => {
this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
this.user = user;
this.buildMenu();
this.header = {
@ -96,15 +97,23 @@ export class AppComponent {
position:'left',
badge:true
};
});
}));
//console.log(this.properties.loginUrl);
}, error => {
console.log("App couldn't fetch properties");
console.log(error);
});
}));
}
ngOnDestroy() {
this.subscriptions.forEach(subscription => {
if (subscription instanceof Subscriber) {
subscription.unsubscribe();
}
});
this.configurationService.clearSubscriptions();
this.userManagementService.clearSubscriptions();
}
buildMenu() {
//TODO add check for research results route
this.menuItems = [

1
explore/src/app/app.module.ts
View File

@ -22,7 +22,6 @@ import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jso
import {CacheInterceptorService} from "./openaireLibrary/cache-interceptor.service";
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
//import { EnvironmentSpecificService, REQUEST_TOKEN} from './openaireLibrary/utils/properties/environment-specific.service';
@NgModule({

68
explore/src/app/claims/claim.module.ts
View File

@ -1,68 +0,0 @@
// import { NgModule} from '@angular/core';
// import { CommonModule } from '@angular/common';
// import { FormsModule } from '@angular/forms';
// //
// import {UtilsModule} from '../utils/utils.module';
// import {ServicesModule} from '../services/services.module';
//
// import { ClaimsService} from '../services/claims.service';
// //main
// import {ClaimComponent} from './claim/claim.component';
// import {ClaimsAdminComponent} from './claims/claimsAdmin.component';
// import {MyClaimsComponent} from './myClaims/myClaims.component';
// import {LinkingHomeComponent} from './linking/linkingHome.component';
// import {LinkingComponent} from './linking/linking.component';
// import { BulkLinkingComponent } from './linking/bulkLinking.component';
//
// import {BulkClaimComponent} from './linking/bulkClaim/bulkClaim.component';
// import {ClaimsComponent} from './claim-utils/claims.component';
//
// import {ClaimContextComponent} from './claim-utils/claimContext.component';
// import {ClaimProjectsComponent} from './claim-utils/claimProject.component';
// import {ClaimResultComponent} from './claim-utils/claimResult.component';
// import {ClaimPublicationComponent} from './claim-utils/claimPublication.component';
// import {ClaimDatasetComponent} from './claim-utils/claimDataset.component';
//
// import {ClaimInsertComponent} from './linking/insertClaim/insertClaim.component';
//
// import {ClaimSelectedContextsComponent} from './linking/selected/selectedContexts.component';
// import {ClaimSelectedComponent} from './linking/selected/selected.component';
// import {ClaimSelectedDatasetsComponent} from './linking/selected/selectedDatasets.component';
// import {ClaimSelectedResultsComponent} from './linking/selected/selectedResults.component';
// import {ClaimSelectedProjectsComponent} from './linking/selected/selectedProjects.component';
// import {ClaimSelectedPublicationsComponent} from './linking/selected/selectedPublications.component';
//
// import {LinkingGenericComponent} from './linking/linkingGeneric.component';
//
// import {InlineClaimContextComponent} from './inlineClaims/inlineClaimContext.component';
// import {InlineClaimProjectComponent} from './inlineClaims/inlineClaimProject.component';
// import {InlineClaimResultComponent} from './inlineClaims/inlineClaimResult.component';
// import {ClaimEntityFormatter} from '../utils/claimEntityFormatter.component';
//
// import { Claim } from '../utils/entities/claim';
// //helpers
//
// import { ClaimRoutingModule } from './claim-routing.module';
// @NgModule({
// imports: [
// CommonModule, FormsModule,
// UtilsModule,
// ServicesModule,
// ClaimRoutingModule
//
// ],
// declarations: [
// ClaimsAdminComponent, MyClaimsComponent, ClaimComponent, ClaimsComponent,
// BulkLinkingComponent, LinkingComponent, LinkingHomeComponent, LinkingGenericComponent,
// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent, ClaimSelectedComponent,
// ClaimContextComponent, ClaimSelectedContextsComponent, ClaimInsertComponent, ClaimProjectsComponent, ClaimSelectedProjectsComponent,
// ClaimResultComponent, ClaimSelectedPublicationsComponent, ClaimSelectedDatasetsComponent, ClaimSelectedResultsComponent, ClaimPublicationComponent,
// ClaimDatasetComponent, BulkClaimComponent,
// ClaimEntityFormatter
// ],
// providers: [ ClaimsService ],
// exports: [
// InlineClaimContextComponent, InlineClaimProjectComponent, InlineClaimResultComponent
// ]
// })
// export class ClaimModule { }

16
explore/src/app/claims/claimsAdmin/claimsAdmin.component.ts
View File

@ -1,8 +1,7 @@
import {Component, ViewChild, Input} from '@angular/core';
import {Location} from '@angular/common';
import {Observable} from 'rxjs';
import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
import {Subscriber} from "rxjs";
@Component({
selector: 'openaire-claims-admin',
@ -17,12 +16,17 @@ export class OpenaireClaimsAdminComponent {
claimsInfoURL:string;
userInfoURL: string;
sub;
constructor (private route: ActivatedRoute) {
}
ngOnDestroy() {
if (this.sub instanceof Subscriber) {
this.sub.unsubscribe();
}
}
public ngOnInit() {
this.route.data
this.sub = this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.claimsInfoURL = data.envSpecific.claimsInformationLink;
this.userInfoURL = data.envSpecific.userInfoUrl;

4
explore/src/app/claims/linking/linkingGeneric.component.ts
View File

@ -1,6 +1,4 @@
import {Component, Input} from '@angular/core';
import {Observable} from 'rxjs';
import {ActivatedRoute, Router} from '@angular/router';
import {Component} from '@angular/core';
@Component({
selector: 'openaire-linking-generic',

14
explore/src/app/claims/myClaims/myClaims.component.ts
View File

@ -1,7 +1,7 @@
import {Component, Input} from '@angular/core';
import {Observable} from 'rxjs';
import {Component} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties';
import {Subscriber} from "rxjs";
@ -16,12 +16,16 @@ import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properti
export class OpenaireMyClaimsComponent {
claimsInfoURL:string;
userInfoURL: string;
sub;
constructor (private route: ActivatedRoute) {
}
ngOnDestroy() {
if (this.sub instanceof Subscriber) {
this.sub.unsubscribe();
}
}
public ngOnInit() {
this.route.data
this.sub = this.route.data
.subscribe((data: { envSpecific: EnvProperties }) => {
this.claimsInfoURL = data.envSpecific.claimsInformationLink;
this.userInfoURL = data.envSpecific.userInfoUrl;

3
explore/src/app/deposit/deposit-routing.module.ts
View File

@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDepositComponent } from './deposit.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: OpenaireDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
{ path: '', component: OpenaireDepositComponent, canActivate: [IsRouteEnabled], data: {
redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/deposit/deposit.component.ts
View File

@ -1,5 +1,4 @@
import {Component} from '@angular/core';
//import {ZenodoInformationClass} from "../openaireLibrary/deposit/utils/zenodoInformation.class";
@Component({
selector: 'openaire-deposit',
@ -9,7 +8,6 @@ import {Component} from '@angular/core';
})
export class OpenaireDepositComponent {
//public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass();
constructor() {
}

3
explore/src/app/deposit/deposit.module.ts
View File

@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
@ -26,7 +25,7 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC
exports: [
OpenaireDepositComponent,
],
providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled,
providers: [PreviousRouteRecorder, IsRouteEnabled,
ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService]
})
export class LibDepositModule { }

3
explore/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
View File

@ -1,14 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovidersToDeposit.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: OpenaireSearchDataprovidersToDepositComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
{ path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [IsRouteEnabled], data: {
redirect: '/error'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/deposit/searchDataprovidersToDeposit.component.ts
View File

@ -1,5 +1,4 @@
import {Component} from '@angular/core';
//import {ZenodoInformationClass} from '../openaireLibrary/deposit/utils/zenodoInformation.class';
@Component({
selector: 'openaire-search-deposit',
@ -9,7 +8,6 @@ import {Component} from '@angular/core';
})
export class OpenaireSearchDataprovidersToDepositComponent {
//public zenodoInformation: ZenodoInformationClass = new ZenodoInformationClass();
constructor() {}

3
explore/src/app/deposit/searchDataprovidersToDeposit.module.ts
View File

@ -6,7 +6,6 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi
import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module';
import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module';
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
@ -27,6 +26,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
exports: [
OpenaireSearchDataprovidersToDepositComponent,
],
providers: [FreeGuard,PreviousRouteRecorder, IsRouteEnabled, CommunityService]
providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService]
})
export class LibSearchDataprovidersToDepositModule { }

3
explore/src/app/error/errorPage.component.ts
View File

@ -1,5 +1,4 @@
import { Component, Input } from '@angular/core';
import { Location } from '@angular/common';
import { Component } from '@angular/core';
@Component({
selector: 'openaire-error',

3
explore/src/app/home/home-routing.module.ts
View File

@ -2,12 +2,11 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{HomeComponent} from './home.component';
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: HomeComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] }
{ path: '', component: HomeComponent, canDeactivate: [PreviousRouteRecorder] }
])
]

8
explore/src/app/home/home.component.ts
View File

@ -1,11 +1,10 @@
import {Component, Input} from '@angular/core';
import {Component} from '@angular/core';
import {Subscription} from 'rxjs';
import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common';
import "rxjs/add/observable/zip";
import {Title, Meta} from '@angular/platform-browser';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
import { FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
@ -126,7 +125,6 @@ export class HomeComponent {
public datasourcesSize:any = null;
private numResults: number = 2;
public fetchDataproviders : FetchDataproviders;
showPublications:boolean= false;
showDatasets:boolean= false;
@ -174,7 +172,6 @@ export class HomeComponent {
this._meta.updateTag({content:title},"property='og:title'");
//this.fetchDataproviders = new FetchDataproviders(this._searchDataprovidersService);
}
private getPageContents() {
@ -241,9 +238,6 @@ export class HomeComponent {
this.resultTypes.values.push({name: "Other research products" , id:"other",selected:true, number:0});
}
this.getNumbers();
// if(this.showDataProviders) {
// this.fetchDataproviders.getResultsForHome(this.numResults, this.properties);
// }
}
},
error => {

3
explore/src/app/home/home.module.ts
View File

@ -16,7 +16,6 @@ import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.m
import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
@ -45,7 +44,7 @@ import {arrow_right} from "../openaireLibrary/utils/icons/icons";
HomeComponent
],
providers:[
FreeGuard, PreviousRouteRecorder
PreviousRouteRecorder
],
exports: [
HomeComponent

3
explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDataProviderComponent } from './dataProvider.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireDataProviderComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

2
explore/src/app/landingPages/dataProvider/dataProvider.component.ts
View File

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

6
explore/src/app/landingPages/dataProvider/libDataProvider.module.ts
View File

@ -1,17 +1,13 @@
//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 { OpenaireDataProviderComponent } from './dataProvider.component';
import {DataProviderRoutingModule} from './dataProvider-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [DataProviderModule, DataProviderRoutingModule],
declarations:[OpenaireDataProviderComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenaireDataProviderComponent]
})
export class LibDataProviderModule { }

4
explore/src/app/landingPages/dataset/dataset-routing.module.ts
View File

@ -1,15 +1,13 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireDatasetComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

8
explore/src/app/landingPages/dataset/libDataset.module.ts
View File

@ -1,18 +1,12 @@
//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 { OpenaireDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {DatasetRoutingModule} from './dataset-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [DatasetRoutingModule, ResultLandingModule],
declarations:[OpenaireDatasetComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports:[OpenaireDatasetComponent]
})
export class LibDatasetModule { }

4
explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts
View File

@ -1,13 +1,11 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireHtmlProjectReportComponent , canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]}
{ path: '', component: OpenaireHtmlProjectReportComponent ,canDeactivate: [PreviousRouteRecorder]}
])
]
})

2
explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts
View File

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

8
explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts
View File

@ -1,11 +1,5 @@
//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 { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
@ -13,7 +7,7 @@ import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module
@NgModule({
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
declarations:[OpenaireHtmlProjectReportComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenaireHtmlProjectReportComponent]
})
export class LibHtmlProjectReportModule { }

8
explore/src/app/landingPages/organization/libOrganization.module.ts
View File

@ -1,11 +1,5 @@
//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 { OpenaireOrganizationComponent } from './organization.component';
import {OrganizationRoutingModule} from './organization-routing.module';
@ -13,7 +7,7 @@ import {OrganizationRoutingModule} from './organization-routing.module';
@NgModule({
imports: [OrganizationModule, OrganizationRoutingModule],
declarations:[OpenaireOrganizationComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenaireOrganizationComponent]
})
export class LibOrganizationModule { }

3
explore/src/app/landingPages/organization/organization-routing.module.ts
View File

@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireOrganizationComponent } from './organization.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@ -10,7 +9,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireOrganizationComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

2
explore/src/app/landingPages/organization/organization.component.ts
View File

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

8
explore/src/app/landingPages/orp/libOrp.module.ts
View File

@ -1,18 +1,12 @@
//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 { OpenaireOrpComponent } from './orp.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {OrpRoutingModule} from './orp-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({
imports: [OrpRoutingModule, ResultLandingModule],
declarations:[OpenaireOrpComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenaireOrpComponent]
})
export class LibOrpModule { }

3
explore/src/app/landingPages/orp/orp-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireOrpComponent } from './orp.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireOrpComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

8
explore/src/app/landingPages/project/libProject.module.ts
View File

@ -1,11 +1,5 @@
//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 { OpenaireProjectComponent } from './project.component';
import {ProjectRoutingModule} from './project-routing.module';
@ -13,7 +7,7 @@ import {ProjectRoutingModule} from './project-routing.module';
@NgModule({
imports: [ProjectModule, ProjectRoutingModule],
declarations:[OpenaireProjectComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenaireProjectComponent]
})
export class LibProjectModule { }

3
explore/src/app/landingPages/project/project-routing.module.ts
View File

@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { OpenaireProjectComponent } from './project.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireProjectComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

2
explore/src/app/landingPages/project/project.component.ts
View File

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

8
explore/src/app/landingPages/publication/libPublication.module.ts
View File

@ -1,10 +1,4 @@
//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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenairePublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module';
@ -13,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({
imports: [PublicationRoutingModule, ResultLandingModule],
declarations:[OpenairePublicationComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[ PreviousRouteRecorder],
exports:[OpenairePublicationComponent]
})
export class LibPublicationModule { }

3
explore/src/app/landingPages/publication/publication-routing.module.ts
View File

@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenairePublicationComponent } from './publication.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenairePublicationComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

3
explore/src/app/landingPages/result/libResult.module.ts
View File

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

3
explore/src/app/landingPages/result/result-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireResultComponent } from './result.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireResultComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireResultComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

7
explore/src/app/landingPages/software/libSoftware.module.ts
View File

@ -1,10 +1,5 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { OpenaireSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module';
@ -12,7 +7,7 @@ import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/res
@NgModule({
imports: [SoftwareRoutingModule, ResultLandingModule],
declarations:[OpenaireSoftwareComponent],
providers:[FreeGuard, PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports:[OpenaireSoftwareComponent]
})
export class LibSoftwareModule { }

3
explore/src/app/landingPages/software/software-routing.module.ts
View File

@ -2,13 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import {OpenaireSoftwareComponent } from './software.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
{ path: '', component: OpenaireSoftwareComponent, canDeactivate: [PreviousRouteRecorder] }
])
]
})

3
explore/src/app/login/user.component.ts
View File

@ -1,5 +1,4 @@
import {Component, ElementRef} from '@angular/core';
import {Observable} from 'rxjs';
import {Component} from '@angular/core';
@Component({
selector: 'openaire-user',

3
explore/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
View File

@ -1,7 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@ -9,7 +8,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -1,4 +1,4 @@
import {Component, Input, ViewChild} from '@angular/core';
import {Component} from '@angular/core';
@Component({

3
explore/src/app/searchPages/advanced/advancedSearchDataProviders.module.ts
View File

@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms';
import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({
@ -18,7 +17,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
declarations: [
OpenaireAdvancedSearchDataProvidersComponent
],
providers:[FreeGuard],
providers:[],
exports: [
OpenaireAdvancedSearchDataProvidersComponent
]

19
explore/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
View File

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

14
explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
View File

@ -1,14 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-datasets',
template: `
<advanced-search-research-results resultType="dataset"></advanced-search-research-results>
`
})
export class OpenaireAdvancedSearchDatasetsComponent {
}

25
explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
View File

@ -1,25 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
AdvancedSearchDatasetsRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
OpenaireAdvancedSearchDatasetsComponent
],
providers:[FreeGuard],
exports: [
OpenaireAdvancedSearchDatasetsComponent
]
})
export class LibAdvancedSearchDatasetsModule { }

3
explore/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent, data: {
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder]}

2
explore/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -1,4 +1,4 @@
import {Component, Input, ViewChild} from '@angular/core';
import {Component} from '@angular/core';
@Component({

3
explore/src/app/searchPages/advanced/advancedSearchOrganizations.module.ts
View File

@ -5,7 +5,6 @@ import {FormsModule} from '@angular/forms';
import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@NgModule({
@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
declarations: [
OpenaireAdvancedSearchOrganizationsComponent
],
providers:[FreeGuard],
providers:[],
exports: [
OpenaireAdvancedSearchOrganizationsComponent
]

19
explore/src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts
View File

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

14
explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts
View File

@ -1,14 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-orps',
template: `
<advanced-search-research-results resultType="other"></advanced-search-research-results>
`
})
export class OpenaireAdvancedSearchOrpsComponent {
}

26
explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts
View File

@ -1,26 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module';
import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
AdvancedSearchOrpsRoutingModule, SearchResearchResultsModule, AdvancedSearchResearchResultsModule
],
declarations: [
OpenaireAdvancedSearchOrpsComponent
],
providers:[FreeGuard],
exports: [
OpenaireAdvancedSearchOrpsComponent
]
})
export class LibAdvancedSearchOrpsModule { }

3
explore/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

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

3
explore/src/app/searchPages/advanced/advancedSearchProjects.module.ts
View File

@ -4,7 +4,6 @@ import {FormsModule} from '@angular/forms';
import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProjects.module";
@NgModule({
@ -17,7 +16,7 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj
declarations: [
OpenaireAdvancedSearchProjectsComponent
],
providers: [FreeGuard],
providers: [],
exports: [
OpenaireAdvancedSearchProjectsComponent
]

19
explore/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
View File

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

12
explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts
View File

@ -1,12 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-publications',
template: `
<advanced-search-research-results resultType="publication"></advanced-search-research-results>
`
})
export class OpenaireAdvancedSearchPublicationsComponent {
}

25
explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts
View File

@ -1,25 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
AdvancedSearchPublicationsRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
OpenaireAdvancedSearchPublicationsComponent
],
providers:[FreeGuard],
exports: [
OpenaireAdvancedSearchPublicationsComponent
]
})
export class LibAdvancedSearchPublicationsModule { }

16
explore/src/app/searchPages/advanced/advancedSearchSoftware-routing.module.ts
View File

@ -1,16 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class AdvancedSearchSoftwareRoutingModule { }

13
explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
View File

@ -1,13 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-software',
template: `
<advanced-search-research-results resultType="software"></advanced-search-research-results>
`
})
export class OpenaireAdvancedSearchSoftwareComponent {
}

26
explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
View File

@ -1,26 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
AdvancedSearchSoftwareRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
OpenaireAdvancedSearchSoftwareComponent
],
providers:[FreeGuard],
exports: [
OpenaireAdvancedSearchSoftwareComponent
]
})
export class LibAdvancedSearchSoftwareModule { }

3
explore/src/app/searchPages/advanced/searchResearchResults-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchResearchResultsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchResearchResultsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/advanced/searchResearchResults.module.ts
View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@ -18,7 +17,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [
OpenaireSearchResearchResultsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchResearchResultsComponent
]

3
explore/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
View File

@ -2,14 +2,13 @@ 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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

5
explore/src/app/searchPages/dataProviders/compatibleDataProviders.component.ts
View File

@ -1,12 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-content-providers',
template: `
<!-- <search-content-providers>-->
<!-- </search-content-providers>-->
<search-dataproviders [simpleView]="true" type="compatible" simpleSearchLink="/search/content-providers" tableViewLink="/search/content-providers-table">
</search-dataproviders>

5
explore/src/app/searchPages/dataProviders/compatibleDataProviders.module.ts
View File

@ -5,23 +5,20 @@ 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 { CompatibleDataProvidersModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProviders.module';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({
imports: [
CommonModule, FormsModule,
CompatibleDataProvidersModule,
CompatibleDataProvidersRoutingModule, SearchDataProvidersModule
],
declarations: [
OpenaireSearchCompatibleDataprovidersComponent
],
providers:[FreeGuard],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchCompatibleDataprovidersComponent
]

19
explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
View File

@ -1,19 +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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class CompatibleDataProvidersTableRoutingModule { }

14
explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.component.ts
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 {
}

25
explore/src/app/searchPages/dataProviders/compatibleDataProvidersTable.module.ts
View File

@ -1,25 +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 { CompatibleDataProvidersTableModule} from '../../openaireLibrary/searchPages/dataProviders/compatibleDataProvidersTable.module';
@NgModule({
imports: [
CommonModule, FormsModule,
CompatibleDataProvidersTableModule,
CompatibleDataProvidersTableRoutingModule
], providers:[FreeGuard],
declarations: [
OpenaireSearchCompatibleDataprovidersTableComponent
],
exports: [
OpenaireSearchCompatibleDataprovidersTableComponent
]
})
export class LibCompatibleDataProvidersTableModule { }

3
explore/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
View File

@ -2,13 +2,12 @@ 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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchEntityRegistriesComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

5
explore/src/app/searchPages/dataProviders/entityRegistries.component.ts
View File

@ -1,12 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-entity-registries',
template: `
<!-- <search-entity-registries>
</search-entity-registries>-->
<search-dataproviders [simpleView]="true" type="registries" simpleSearchLink="/search/entity-registries" tableViewLink="/search/entity-registries-table">
</search-dataproviders>
`

6
explore/src/app/searchPages/dataProviders/entityRegistries.module.ts
View File

@ -4,22 +4,20 @@ 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 {EntityRegistriesModule } from '../../openaireLibrary/searchPages/dataProviders/entityRegistries.module';
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({
imports: [
CommonModule, FormsModule,
EntityRegistriesModule, EntityRegistriesRoutingModule, SearchDataProvidersModule
EntityRegistriesRoutingModule, SearchDataProvidersModule
],
declarations: [
OpenaireSearchEntityRegistriesComponent
],
providers:[FreeGuard],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchEntityRegistriesComponent
]

19
explore/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
View File

@ -1,19 +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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class EntityRegistriesTableRoutingModule { }

16
explore/src/app/searchPages/dataProviders/entityRegistriesTable.component.ts
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 {
}

26
explore/src/app/searchPages/dataProviders/entityRegistriesTable.module.ts
View File

@ -1,26 +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';
@NgModule({
imports: [
CommonModule, FormsModule,
EntityRegistriesTableRoutingModule,
EntityRegistriesTableModule
], providers:[FreeGuard],
declarations: [
OpenaireSearchEntityRegistriesTableComponent
],
exports: [
OpenaireSearchEntityRegistriesTableComponent
]
})
export class LibEntityRegistriesTableModule { }

3
explore/src/app/searchPages/dataProviders/journals-routing.module.ts
View File

@ -2,14 +2,13 @@ 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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchJournalsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

7
explore/src/app/searchPages/dataProviders/journals.component.ts
View File

@ -1,12 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core';
import { ActivatedRoute} from '@angular/router';
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-journals',
template: `
<!--<search-journals>
</search-journals>-->
<search-dataproviders [simpleView]="true" type="journals" simpleSearchLink="/search/journals" >
</search-dataproviders>
`

6
explore/src/app/searchPages/dataProviders/journals.module.ts
View File

@ -4,19 +4,17 @@ 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 {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
@NgModule({
imports: [
CommonModule, FormsModule, JournalsRoutingModule, JournalsModule, SearchDataProvidersModule
CommonModule, FormsModule, JournalsRoutingModule, SearchDataProvidersModule
],
declarations: [
OpenaireSearchJournalsComponent
],
providers:[FreeGuard],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchJournalsComponent
]

18
explore/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
View File

@ -1,18 +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';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire'
} , canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class JournalsTableRoutingModule { }

15
explore/src/app/searchPages/dataProviders/journalsTable.component.ts
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 {
}

26
explore/src/app/searchPages/dataProviders/journalsTable.module.ts
View File

@ -1,26 +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 { JournalsTableModule} from '../../openaireLibrary/searchPages/dataProviders/journalsTable.module';
@NgModule({
imports: [
CommonModule, FormsModule,
JournalsTableModule, JournalsTableRoutingModule
], providers:[FreeGuard],
declarations: [
OpenaireSearchJournalsTableComponent
],
exports: [
OpenaireSearchJournalsTableComponent
]
})
export class LibJournalsTableModule { }

2
explore/src/app/searchPages/find/search.component.ts
View File

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

3
explore/src/app/searchPages/simple/searchDataProviders-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchDataprovidersComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/simple/searchDataProviders.module.ts
View File

@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
@NgModule({
@ -15,7 +14,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
declarations: [
OpenaireSearchDataprovidersComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchDataprovidersComponent
]

22
explore/src/app/searchPages/simple/searchDatasets-routing.module.ts
View File

@ -1,22 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchDatasetsComponent} from './searchDatasets.component';
import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
])
]
})
export class SearchDatasetsRoutingModule { }

12
explore/src/app/searchPages/simple/searchDatasets.component.ts
View File

@ -1,12 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-datasets',
template: `
<search-research-results resultType="dataset"></search-research-results>
`
})
export class OpenaireSearchDatasetsComponent {
}

27
explore/src/app/searchPages/simple/searchDatasets.module.ts
View File

@ -1,27 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {SearchDatasetsRoutingModule} from './searchDatasets-routing.module';
import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchDatasetsRoutingModule, SearchResearchResultsModule
],
declarations: [
OpenaireSearchDatasetsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
exports: [
OpenaireSearchDatasetsComponent
]
})
export class LibSearchDatasetsModule { }

3
explore/src/app/searchPages/simple/searchOrganizations-routing.module.ts
View File

@ -3,7 +3,6 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@ -11,7 +10,7 @@ import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousR
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchOrganizationsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/searchPages/simple/searchOrganizations.component.ts
View File

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

3
explore/src/app/searchPages/simple/searchOrganizations.module.ts
View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
@ -19,7 +18,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
declarations: [
OpenaireSearchOrganizationsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchOrganizationsComponent
]

22
explore/src/app/searchPages/simple/searchOrps-routing.module.ts
View File

@ -1,22 +0,0 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchOrpsComponent} from './searchOrps.component';
import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
])
]
})
export class SearchOrpsRoutingModule { }

12
explore/src/app/searchPages/simple/searchOrps.component.ts
View File

@ -1,12 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-orps',
template: `
<search-research-results resultType="other"></search-research-results>
`
})
export class OpenaireSearchOrpsComponent {
}

27
explore/src/app/searchPages/simple/searchOrps.module.ts
View File

@ -1,27 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{ SearchOrpsRoutingModule} from './searchOrps-routing.module';
import{OpenaireSearchOrpsComponent} from './searchOrps.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchOrpsRoutingModule, SearchResearchResultsModule
],
declarations: [
OpenaireSearchOrpsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
exports: [
OpenaireSearchOrpsComponent
]
})
export class LibSearchOrpsModule { }

3
explore/src/app/searchPages/simple/searchProjects-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchProjectsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

2
explore/src/app/searchPages/simple/searchProjects.component.ts
View File

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

3
explore/src/app/searchPages/simple/searchProjects.module.ts
View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchProjectsRoutingModule} from './searchProjects-routing.module';
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
@NgModule({
@ -16,7 +15,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro
declarations: [
OpenaireSearchProjectsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchProjectsComponent
]

19
explore/src/app/searchPages/simple/searchPublications-routing.module.ts
View File

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

13
explore/src/app/searchPages/simple/searchPublications.component.ts
View File

@ -1,13 +0,0 @@
import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-publications',
template: `
<search-research-results resultType="publication"></search-research-results>
`
})
export class OpenaireSearchPublicationsComponent {
}

26
explore/src/app/searchPages/simple/searchPublications.module.ts
View File

@ -1,26 +0,0 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module';
import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
SearchPublicationsRoutingModule, SearchResearchResultsModule
],
declarations: [
OpenaireSearchPublicationsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
exports: [
OpenaireSearchPublicationsComponent
]
})
export class LibSearchPublicationsModule { }

3
explore/src/app/searchPages/simple/searchResearchResults-routing.module.ts
View File

@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchResearchResultsComponent, canActivate: [FreeGuard], data: {
{ path: '', component: OpenaireSearchResearchResultsComponent, data: {
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }

3
explore/src/app/searchPages/simple/searchResearchResults.module.ts
View File

@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
@ -18,7 +17,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
declarations: [
OpenaireSearchResearchResultsComponent
],
providers:[FreeGuard,PreviousRouteRecorder],
providers:[PreviousRouteRecorder],
exports: [
OpenaireSearchResearchResultsComponent
]

Some files were not shown because too many files have changed in this diff Show More