diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
index 86e57d05..0572122c 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchDatasets.component.ts
@@ -1,12 +1,10 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-datasets',
template: `
-
-
-
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
index 3df2c856..d9a2d34f 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchDatasets.module.ts
@@ -2,20 +2,17 @@ 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 {AdvancedSearchDatasetsRoutingModule} from './advancedSearchDatasets-routing.module';
+import {OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.component';
-
- import {AdvancedSearchDatasetsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDatasets.module';
- import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
- import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
- import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchDatasetsModule,
- AdvancedSearchDatasetsRoutingModule
+ AdvancedSearchDatasetsRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts
index 262ab1b1..c4b53c93 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchOrps.component.ts
@@ -1,12 +1,10 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-orps',
template: `
-
-
-
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts
index 8d8d3137..d7b94ae3 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchOrps.module.ts
@@ -2,20 +2,18 @@ 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 {AdvancedSearchOrpsRoutingModule} from './advancedSearchOrps-routing.module';
+import {OpenaireAdvancedSearchOrpsComponent} from './advancedSearchOrps.component';
-
- import {AdvancedSearchOrpsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchOrps.module';
- import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
- import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
- import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
+import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchOrpsModule,
- AdvancedSearchOrpsRoutingModule
+ AdvancedSearchOrpsRoutingModule, SearchResearchResultsModule, AdvancedSearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts
index 26e393d9..23e43a86 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchPublications.component.ts
@@ -1,11 +1,10 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-publications',
template: `
-
-
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts
index 3b92f3dc..09ea81b8 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchPublications.module.ts
@@ -2,20 +2,17 @@ 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 {AdvancedSearchPublicationsRoutingModule} from './advancedSearchPublications-routing.module';
+import {OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
-
- import {AdvancedSearchPublicationsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchPublications.module';
- import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
- import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
- import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchPublicationsModule,
- AdvancedSearchPublicationsRoutingModule
+ AdvancedSearchPublicationsRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
index 4bc30c7a..1667bed7 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchSoftware.component.ts
@@ -1,11 +1,9 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-advanced-search-software',
template: `
-
-
-
+
`
})
diff --git a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
index f379f3da..d49fec84 100644
--- a/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
+++ b/explore/src/app/searchPages/advanced/advancedSearchSoftware.module.ts
@@ -2,27 +2,24 @@ 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 {AdvancedSearchSoftwareRoutingModule} from './advancedSearchSoftware-routing.module';
+import {OpenaireAdvancedSearchSoftwareComponent} from './advancedSearchSoftware.component';
-
- import {AdvancedSearchSoftwareModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchSoftware.module';
- import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
- import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
- import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
+import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- AdvancedSearchSoftwareModule,
- AdvancedSearchSoftwareRoutingModule
+ AdvancedSearchSoftwareRoutingModule, AdvancedSearchResearchResultsModule
],
declarations: [
OpenaireAdvancedSearchSoftwareComponent
],
- providers:[FreeGuard
- ],
+ providers:[FreeGuard, IsRouteEnabled],
exports: [
OpenaireAdvancedSearchSoftwareComponent
]
diff --git a/explore/src/app/searchPages/simple/searchDatasets.component.ts b/explore/src/app/searchPages/simple/searchDatasets.component.ts
index 8a0231f2..0180d0e6 100644
--- a/explore/src/app/searchPages/simple/searchDatasets.component.ts
+++ b/explore/src/app/searchPages/simple/searchDatasets.component.ts
@@ -1,11 +1,9 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-datasets',
- template: `
-
-
-
+ template: `
+
`
})
diff --git a/explore/src/app/searchPages/simple/searchDatasets.module.ts b/explore/src/app/searchPages/simple/searchDatasets.module.ts
index 3116a599..72ab159a 100644
--- a/explore/src/app/searchPages/simple/searchDatasets.module.ts
+++ b/explore/src/app/searchPages/simple/searchDatasets.module.ts
@@ -2,19 +2,19 @@ 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 {SearchDatasetsRoutingModule} from './searchDatasets-routing.module';
+import {OpenaireSearchDatasetsComponent} from './searchDatasets.component';
-import {SearchDatasetsModule} from '../../openaireLibrary/searchPages/simple/searchDatasets.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- SearchDatasetsModule , SearchDatasetsRoutingModule
+ SearchDatasetsRoutingModule, SearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/simple/searchOrps.component.ts b/explore/src/app/searchPages/simple/searchOrps.component.ts
index f9a21119..d5201e69 100644
--- a/explore/src/app/searchPages/simple/searchOrps.component.ts
+++ b/explore/src/app/searchPages/simple/searchOrps.component.ts
@@ -1,11 +1,9 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-orps',
- template: `
-
-
-
+ template: `
+
`
})
diff --git a/explore/src/app/searchPages/simple/searchOrps.module.ts b/explore/src/app/searchPages/simple/searchOrps.module.ts
index dcbdf007..486eb077 100644
--- a/explore/src/app/searchPages/simple/searchOrps.module.ts
+++ b/explore/src/app/searchPages/simple/searchOrps.module.ts
@@ -5,16 +5,16 @@ import { FormsModule } from '@angular/forms';
import{ SearchOrpsRoutingModule} from './searchOrps-routing.module';
import{OpenaireSearchOrpsComponent} from './searchOrps.component';
-import {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- SearchOrpsModule , SearchOrpsRoutingModule
+ SearchOrpsRoutingModule, SearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/simple/searchPublications.component.ts b/explore/src/app/searchPages/simple/searchPublications.component.ts
index d5051da5..6331b2d5 100644
--- a/explore/src/app/searchPages/simple/searchPublications.component.ts
+++ b/explore/src/app/searchPages/simple/searchPublications.component.ts
@@ -1,12 +1,9 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-publications',
template: `
-
-
-
-
+
`
})
diff --git a/explore/src/app/searchPages/simple/searchPublications.module.ts b/explore/src/app/searchPages/simple/searchPublications.module.ts
index 0209c7ca..87222d53 100644
--- a/explore/src/app/searchPages/simple/searchPublications.module.ts
+++ b/explore/src/app/searchPages/simple/searchPublications.module.ts
@@ -5,16 +5,15 @@ import { FormsModule } from '@angular/forms';
import{ SearchPublicationsRoutingModule} from './searchPublications-routing.module';
import{OpenaireSearchPublicationsComponent} from './searchPublications.component';
-import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
- CommonModule, FormsModule, SearchPublicationsModule,
-
- SearchPublicationsRoutingModule
+ CommonModule, FormsModule,
+ SearchPublicationsRoutingModule, SearchResearchResultsModule
],
declarations: [
diff --git a/explore/src/app/searchPages/simple/searchSoftware.component.ts b/explore/src/app/searchPages/simple/searchSoftware.component.ts
index da673ffd..a33cb66b 100644
--- a/explore/src/app/searchPages/simple/searchSoftware.component.ts
+++ b/explore/src/app/searchPages/simple/searchSoftware.component.ts
@@ -1,11 +1,9 @@
-import {Component, Input, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
@Component({
selector: 'openaire-search-software',
template: `
-
-
-
+
`
})
diff --git a/explore/src/app/searchPages/simple/searchSoftware.module.ts b/explore/src/app/searchPages/simple/searchSoftware.module.ts
index aef096f5..629e811e 100644
--- a/explore/src/app/searchPages/simple/searchSoftware.module.ts
+++ b/explore/src/app/searchPages/simple/searchSoftware.module.ts
@@ -8,12 +8,11 @@ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
-
-import { SearchSoftwareModule} from '../../openaireLibrary/searchPages/simple/searchSoftware.module';
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
@NgModule({
imports: [
- CommonModule, FormsModule, SearchSoftwareModule, SearchSoftwareRoutingModule
+ CommonModule, FormsModule, SearchSoftwareRoutingModule, SearchResearchResultsModule
],
declarations: [
OpenaireSearchSoftwareComponent