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

[Trunk | Explore]: 

1. advancedSearchDatasets & advancedSearchOrps & advancedSearchPublications & advancedSearchSoftware: Use common advanced search page for research results (advancedSearchResearchResults).
2. searchDatasets & searchOrps & searchPublications & searchSoftware: Use common simple search page for research results (searchResearchResults).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@57032 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2019-09-11 11:11:46 +00:00
parent 4e2eb8f8ed
commit 00ebb40083
16 changed files with 56 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -2,20 +2,17 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import{ AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module'; import {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component'; import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchDatasetsModule, AdvancedSearchDatasetsRoutingModule, AdvancedSearchResearchResultsModule
AdvancedSearchDatasetsRoutingModule
], ],
declarations: [ declarations: [

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

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

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

@ -2,20 +2,18 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module'; import {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module';
import { OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component'; import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchOrpsModule, AdvancedSearchOrpsRoutingModule, SearchResearchResultsModule, AdvancedSearchResearchResultsModule
AdvancedSearchOrpsRoutingModule
], ],
declarations: [ declarations: [

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

@ -1,11 +1,10 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-publications', selector: 'openaire-advanced-search-publications',
template: ` template: `
<advanced-search-publications> <advanced-search-research-results resultType="publication"></advanced-search-research-results>
</advanced-search-publications>
` `
}) })

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

@ -2,20 +2,17 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import{ AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module'; import {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component'; import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchPublicationsModule, AdvancedSearchPublicationsRoutingModule, AdvancedSearchResearchResultsModule
AdvancedSearchPublicationsRoutingModule
], ],
declarations: [ declarations: [

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

@ -1,11 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-advanced-search-software', selector: 'openaire-advanced-search-software',
template: ` template: `
<advanced-search-software> <advanced-search-research-results resultType="software"></advanced-search-research-results>
</advanced-search-software>
` `
}) })

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

@ -2,27 +2,24 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import{ AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module'; import {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
import{OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component'; import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
AdvancedSearchSoftwareModule, AdvancedSearchSoftwareRoutingModule, AdvancedSearchResearchResultsModule
AdvancedSearchSoftwareRoutingModule
], ],
declarations: [ declarations: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
], ],
providers:[FreeGuard providers:[FreeGuard, IsRouteEnabled],
],
exports: [ exports: [
OpenaireAdvancedSearchSoftwareComponent OpenaireAdvancedSearchSoftwareComponent
] ]

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

@ -1,11 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-datasets', selector: 'openaire-search-datasets',
template: ` template: `
<search-research-results resultType="dataset"></search-research-results>
<search-datasets>
</search-datasets>
` `
}) })

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

@ -2,19 +2,19 @@ import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import{ SearchDatasetsRoutingModule} from './searchDatasets-routing.module'; import {SearchDatasetsRoutingModule} from './searchDatasets-routing.module';
import{OpenaireSearchDatasetsComponent} from './searchDatasets.component'; import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
SearchDatasetsModule , SearchDatasetsRoutingModule SearchDatasetsRoutingModule, SearchResearchResultsModule
], ],
declarations: [ declarations: [

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

@ -1,11 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-orps', selector: 'openaire-search-orps',
template: ` template: `
<search-research-results resultType="other"></search-research-results>
<search-orps>
</search-orps>
` `
}) })

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

@ -5,16 +5,16 @@ import { FormsModule } from '@angular/forms';
import{ SearchOrpsRoutingModule} from './searchOrps-routing.module'; import{ SearchOrpsRoutingModule} from './searchOrps-routing.module';
import{OpenaireSearchOrpsComponent} from './searchOrps.component'; import{OpenaireSearchOrpsComponent} from './searchOrps.component';
import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, CommonModule, FormsModule,
SearchOrpsModule , SearchOrpsRoutingModule SearchOrpsRoutingModule, SearchResearchResultsModule
], ],
declarations: [ declarations: [

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

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

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

@ -5,16 +5,15 @@ import { FormsModule } from '@angular/forms';
import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module'; import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module';
import{OpenaireSearchPublicationsComponent} from './searchPublications.component'; import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, SearchPublicationsModule, CommonModule, FormsModule,
SearchPublicationsRoutingModule, SearchResearchResultsModule
SearchPublicationsRoutingModule
], ],
declarations: [ declarations: [

6
explore/src/app/searchPages/simple/searchSoftware.component.ts
View File

@ -1,11 +1,9 @@
import {Component, Input, ViewChild} from '@angular/core'; import {Component} from '@angular/core';
@Component({ @Component({
selector: 'openaire-search-software', selector: 'openaire-search-software',
template: ` template: `
<search-research-results resultType="software"></search-research-results>
<search-software>
</search-software>
` `
}) })

5
explore/src/app/searchPages/simple/searchSoftware.module.ts
View File

@ -8,12 +8,11 @@ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard' import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, FormsModule, SearchSoftwareModule, SearchSoftwareRoutingModule CommonModule, FormsModule, SearchSoftwareRoutingModule, SearchResearchResultsModule
], ],
declarations: [ declarations: [
OpenaireSearchSoftwareComponent OpenaireSearchSoftwareComponent