[Aggregator| Trunk]

update the aggregator according to the changes made in library components:
		result landing component
		result search & advance search page
		user info from API - not cookie

	remove isRouteenabled
	clean up modules





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@57127 d315682c-612b-4755-9ff5-7f18f6832af3

angular.json

@@ -19,50 +19,11 @@
             "assets": [
               "src/assets",
               "src/robots.txt",
+              "src/sitemap.xml",
               {
-                "glob": "sitemap.xml",
+                "glob": "**/*",
                 "input": "src/sitemaps",
                 "output": "/"
-              },
-              {
-                "glob": "sitemap.xml",
-                "input": "src/sitemaps",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/publication",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/dataset",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/software",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/other",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/project",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/organization",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/dataprovider",
-                "output": "/"
               }
             ],
             "styles": [
@@ -129,50 +90,11 @@
             "assets": [
               "src/assets",
               "src/robots.txt",
+              "src/sitemap.xml",
               {
-                "glob": "sitemap.xml",
+                "glob": "**/*",
                 "input": "src/sitemaps",
                 "output": "/"
-              },
-              {
-                "glob": "sitemap.xml",
-                "input": "src/sitemaps",
-                "output": "/assets"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/publication",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/dataset",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/software",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/other",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/project",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/organization",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/sitemaps/dataprovider",
-                "output": "/"
               }
             ]
           }

src/app/app.component.ts

@@ -6,6 +6,8 @@ import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
 import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
 import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
 import {FilterInfo, PortalAggregators} from "./utils/aggregators";
+import {UserManagementService} from "./openaireLibrary/services/user-management.service";
+import {User} from "./openaireLibrary/login/utils/helper.class";
 
 @Component({
   //changeDetection: ChangeDetectionStrategy.Default,
@@ -15,8 +17,8 @@ import {FilterInfo, PortalAggregators} from "./utils/aggregators";
   `],
   template: `
 
-    <navbar *ngIf="properties" portal="aggregator" [properties]=properties [onlyTop]=false
-            [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
+    <navbar *ngIf="properties && loginCheck" portal="aggregator" [properties]=properties [onlyTop]=false [user]="user"
+            [communityId]="properties.adminToolsCommunity" [menuItems]=menuItems  
             [userMenu]="false" [community]="community" [showCommunityName]="true"></navbar>
     <div class="custom-main-content">
       <main>
@@ -43,7 +45,7 @@ export class AppComponent {
   menuItems: RootMenuItem [] = [
     {rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
     {
-      rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], [], {}),
+      rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], null, {}),
       items: [new MenuItem("", "Publications", "", "/search/find/publications", false, [], [], {}),
         new MenuItem("", "Research Data", "", "/search/find/datasets", false, [], [], {}),
         new MenuItem("", "Software", "", "/search/find/software", false, [], [], {}),
@@ -58,9 +60,10 @@ export class AppComponent {
 
 
   properties: EnvProperties;
-
+  user: User;
+  loginCheck: boolean = false;
   constructor(private  route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
-              private router: Router) {
+              private router: Router, private userManagementService: UserManagementService) {
 
     router.events.forEach((event) => {
 
@@ -91,6 +94,11 @@ export class AppComponent {
       .then(es => {
         this.propertiesService.setEnvProperties(es);
         this.properties = this.propertiesService.envSpecific;
+        this.userManagementService.getUserInfo(this.properties.userInfoUrl).subscribe(user => {
+          this.user = user;
+          this.loginCheck = true;
+          console.log(this.user)
+        });
       }, error => {
         console.log("App couldn't fetch properties");
         console.log(error);

src/app/home/home.component.html

@@ -86,7 +86,7 @@
                 </span>
                 <span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
                    showDataProviders"
-                      class="uk-text-large"> linked together for an integrated research search </span>
+                      class="uk-text-large"> linked together for an integrated discovery of scientific output </span>
 
               </div>
             </div>

src/app/home/home.component.ts

@@ -4,11 +4,9 @@ import {Location} from '@angular/common';
 import "rxjs/add/observable/zip";
 import {Meta, Title} from '@angular/platform-browser';
 import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import {SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
 import {FetchDataproviders} from '../openaireLibrary/utils/fetchEntitiesClasses/fetchDataproviders.class';
 import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
 import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-import {SearchDatasetsService} from '../openaireLibrary/services/searchDatasets.service';
 import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
 import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
 import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
@@ -21,8 +19,8 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
 import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
 import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class";
 import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
-import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service";
-import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service";
+import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
+
 import {FilterInfo, PortalAggregators} from "../utils/aggregators";
 
 @Component({
@@ -71,12 +69,9 @@ export class HomeComponent {
   constructor(
     private route: ActivatedRoute,
     private _router: Router,
-    private _searchPublicationsService: SearchPublicationsService,
+    private _searchResearchResultsService: SearchResearchResultsService,
     private _searchDataprovidersService: SearchDataprovidersService,
     private _searchProjectsService: SearchProjectsService,
-    private _searchDatasetsService: SearchDatasetsService,
-    private _searchSoftwareService: SearchSoftwareService,
-    private _searchOrpsService: SearchOrpsService,
     private _searchOrganizationsService: SearchOrganizationsService,
     private _refineFieldResultsService: RefineFieldResultsService,
     private location: Location, private _piwikService: PiwikService,
@@ -179,7 +174,7 @@ export class HomeComponent {
       refineQuery= "&fq="+StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId )));
     }
     if (this.showPublications) {
-      this.subPub = this._searchPublicationsService.numOfSearchPublications("", this.properties,refineQuery).subscribe(
+      this.subPub = this._searchResearchResultsService.numOfSearchResults("publication","", this.properties,refineQuery).subscribe(
         data => {
           if (data  && data > 0) {
             this.publicationsSize = NumberUtils.roundNumber(data);
@@ -193,7 +188,7 @@ export class HomeComponent {
       );
     }
     if (this.showDatasets) {
-      this.subData = this._searchDatasetsService.numOfSearchDatasets("", this.properties,refineQuery).subscribe(
+      this.subData = this._searchResearchResultsService.numOfSearchResults("dataset","", this.properties,refineQuery).subscribe(
         data => {
           if (data && data > 0) {
             this.datasetsSize = NumberUtils.roundNumber(data);
@@ -207,7 +202,7 @@ export class HomeComponent {
       );
     }
     if (this.showSoftware) {
-      this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties,refineQuery).subscribe(
+      this.subSoft = this._searchResearchResultsService.numOfSearchResults("software","", this.properties,refineQuery).subscribe(
         data => {
           if (data && data > 0) {
             this.softwareSize = NumberUtils.roundNumber(data);
@@ -221,7 +216,7 @@ export class HomeComponent {
       );
     }
     if (this.showOrp) {
-      this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties,refineQuery).subscribe(
+      this.subOrp = this._searchResearchResultsService.numOfSearchResults("other","", this.properties,refineQuery).subscribe(
         data => {
           if (data && data > 0) {
             this.otherSize = NumberUtils.roundNumber(data);

src/app/home/home.module.ts

@@ -7,9 +7,9 @@ import{HomeRoutingModule} from './home-routing.module';
 import{HomeComponent} from './home.component';
 
 import {  DataProvidersServiceModule} from '../openaireLibrary/services/dataProvidersService.module';
-import {  DatasetsServiceModule} from '../openaireLibrary/services/datasetsService.module';
+import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module';
 import {  ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
-import {  PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
+// import {  PublicationsServiceModule} from '../openaireLibrary/services/publicationsService.module';
 import {  OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
 import { SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
 import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
@@ -24,17 +24,16 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js
 import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
 
 import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
-import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
-import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
+// import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
+// import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
 // import {AggregatorNavBarComponent} from "../utils/aggregatorNavBar.component";
 
  @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule,
      RefineFieldResultsServiceModule,
-    DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
-     PublicationsServiceModule,
-    OrganizationsServiceModule, SoftwareServiceModule, OrpsServiceModule,
+    DataProvidersServiceModule, SearchResearchResultsServiceModule, ProjectsServiceModule,
+    OrganizationsServiceModule,
      SearchFormModule,
       PiwikServiceModule,
       HomeRoutingModule,

src/app/landingPages/dataProvider/dataProvider-routing.module.ts

@@ -4,13 +4,12 @@ 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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
-    { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+    { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
         redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])

src/app/landingPages/dataProvider/libDataProvider.module.ts

@@ -1,18 +1,14 @@
-//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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 @NgModule({
   imports: [DataProviderModule, DataProviderRoutingModule],
   declarations:[OpenaireDataProviderComponent],
-  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard, PreviousRouteRecorder],
   exports:[OpenaireDataProviderComponent]
 })
 export class LibDataProviderModule { }

src/app/landingPages/dataset/dataset-routing.module.ts

@@ -4,13 +4,12 @@ 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 {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
-    { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+    { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
         redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])

src/app/landingPages/dataset/dataset.component.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 
 @Component({
     selector: 'openaire-dataset',
-    template: `<dataset></dataset>`,
+    template: `<result-landing type="dataset" [activeTab]="'References'"></result-landing>`,
  })
 export class OpenaireDatasetComponent{
   constructor (  ) {

src/app/landingPages/dataset/libDataset.module.ts

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

src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts

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

src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts

@@ -1,20 +1,14 @@
-//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 {NgModule} from '@angular/core';
+import {HtmlProjectReportModule} from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
+import {OpenaireHtmlProjectReportComponent} from './htmlProjectReport.component';
 import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
 
 @NgModule({
   imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
   declarations:[OpenaireHtmlProjectReportComponent],
-  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard, PreviousRouteRecorder],
   exports:[OpenaireHtmlProjectReportComponent]
 })
 export class LibHtmlProjectReportModule { }

src/app/landingPages/organization/libOrganization.module.ts

@@ -1,20 +1,14 @@
-//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 {NgModule} from '@angular/core';
+import {OrganizationModule} from '../../openaireLibrary/landingPages/organization/organization.module';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import { OpenaireOrganizationComponent } from './organization.component';
+import {OpenaireOrganizationComponent} from './organization.component';
 import {OrganizationRoutingModule} from './organization-routing.module';
 
 @NgModule({
   imports: [OrganizationModule, OrganizationRoutingModule],
   declarations:[OpenaireOrganizationComponent],
-  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard, PreviousRouteRecorder],
   exports:[OpenaireOrganizationComponent]
 })
 export class LibOrganizationModule { }

src/app/landingPages/organization/organization-routing.module.ts

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

src/app/landingPages/orp/libOrp.module.ts

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

src/app/landingPages/orp/orp-routing.module.ts

@@ -1,16 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import { OpenaireOrpComponent } from './orp.component';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
-    { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+    { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
         redirect: '/error'
       },canDeactivate: [PreviousRouteRecorder] }
   ])

src/app/landingPages/orp/orp.component.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 
 @Component({
     selector: 'openaire-orp',
-    template: `<orp></orp>`,
+    template: `<result-landing type="orp" [activeTab]="'References'"></result-landing>`,
  })
 export class OpenaireOrpComponent{
   constructor (  ) {

src/app/landingPages/project/libProject.module.ts

@@ -1,20 +1,14 @@
-//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 {NgModule} from '@angular/core';
+import {ProjectModule} from '../../openaireLibrary/landingPages/project/project.module';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-import { OpenaireProjectComponent } from './project.component';
+import {OpenaireProjectComponent} from './project.component';
 import {ProjectRoutingModule} from './project-routing.module';
 
 @NgModule({
   imports: [ProjectModule, ProjectRoutingModule],
   declarations:[OpenaireProjectComponent],
-  providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard, PreviousRouteRecorder],
   exports:[OpenaireProjectComponent]
 })
 export class LibProjectModule { }

src/app/landingPages/project/project-routing.module.ts

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

src/app/landingPages/publication/libPublication.module.ts

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

src/app/landingPages/publication/publication-routing.module.ts

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

src/app/landingPages/publication/publication.component.ts

@@ -3,7 +3,7 @@ import {Component} from '@angular/core';
 @Component({
   selector: 'openaire-publication',
   template: `
-    <publication></publication>`,
+    <result-landing type="publication" [activeTab]="'References'"></result-landing>`,
 })
 export class OpenairePublicationComponent {
   constructor() {

src/app/landingPages/software/libSoftware.module.ts

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

src/app/landingPages/software/software-routing.module.ts

@@ -1,15 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
-import {OpenaireSoftwareComponent } from './software.component';
+import {OpenaireSoftwareComponent} from './software.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: OpenaireSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled],canDeactivate: [PreviousRouteRecorder]  }
+    { path: '', component: OpenaireSoftwareComponent, canActivate: [FreeGuard],canDeactivate: [PreviousRouteRecorder]  }
   ])
 ]
 })

src/app/landingPages/software/software.component.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 
 @Component({
     selector: 'openaire-software',
-    template: `<software></software>`,
+    template: `<result-landing type="software" [activeTab]="'Related Research Results'"></result-landing>`,
  })
 export class OpenaireSoftwareComponent{
   constructor (  ) {

src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts

@@ -1,16 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 

src/app/searchPages/advanced/advancedSearchDataProviders.module.ts

@@ -1,14 +1,12 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
 
-import{ AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
-import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
-import {AdvancedSearchDataProvidersModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
+import {AdvancedSearchDataProvidersRoutingModule} from './advancedSearchDataProviders-routing.module';
+import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
+import {AdvancedSearchDataProvidersModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchDataProviders.module';
 
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
 
 @NgModule({
   imports: [
@@ -20,7 +18,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
   declarations: [
     OpenaireAdvancedSearchDataProvidersComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchDataProvidersComponent
      ]

src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts

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

src/app/searchPages/advanced/advancedSearchDatasets.component.ts

@@ -6,9 +6,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 @Component({
   selector: 'openaire-advanced-search-datasets',
-  template: `
-    <advanced-search-datasets  [customFilter]="customFilter">
-    </advanced-search-datasets>
+  template: `    
+    <advanced-search-research-results  [customFilter]="customFilter" resultType="dataset"></advanced-search-research-results>
 
   `
 })

src/app/searchPages/advanced/advancedSearchDatasets.module.ts

@@ -1,27 +1,22 @@
-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 {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 {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 {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-    AdvancedSearchDatasetsModule,
+    AdvancedSearchResearchResultsModule,
    AdvancedSearchDatasetsRoutingModule
 
   ],
   declarations: [
     OpenaireAdvancedSearchDatasetsComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchDatasetsComponent
      ]

src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts

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

src/app/searchPages/advanced/advancedSearchOrganizations.module.ts

@@ -1,15 +1,10 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
-import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
-
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {AdvancedSearchOrganizationsRoutingModule} from './advancedSearchOrganizations-routing.module';
+import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
- import { AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
+import {AdvancedSearchOrganizationsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchOrganizations.module';
 
 @NgModule({
   imports: [
@@ -21,7 +16,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
   declarations: [
     OpenaireAdvancedSearchOrganizationsComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchOrganizationsComponent
      ]

src/app/searchPages/advanced/advancedSearchOrps-routing.module.ts

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

src/app/searchPages/advanced/advancedSearchOrps.component.ts

@@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 @Component({
     selector: 'openaire-advanced-search-orps',
     template: `
-    <advanced-search-orps [customFilter]="customFilter">
-    </advanced-search-orps>
+      <advanced-search-research-results  [customFilter]="customFilter" resultType="other"></advanced-search-research-results>
 
     `
  })

src/app/searchPages/advanced/advancedSearchOrps.module.ts

@@ -1,27 +1,22 @@
-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 {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 {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 {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-    AdvancedSearchOrpsModule,
+    AdvancedSearchResearchResultsModule,
     AdvancedSearchOrpsRoutingModule
 
   ],
   declarations: [
     OpenaireAdvancedSearchOrpsComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchOrpsComponent
      ]

src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts

@@ -4,13 +4,11 @@ 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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
-
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 

src/app/searchPages/advanced/advancedSearchProjects.module.ts

@@ -1,15 +1,10 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
-
-import{ AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
-import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
-
-
- import {AdvancedSearchProjectsModule } from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
- import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
- import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
- import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {AdvancedSearchProjectsRoutingModule} from './advancedSearchProjects-routing.module';
+import {OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
+import {AdvancedSearchProjectsModule} from '../../openaireLibrary/searchPages/advanced/advancedSearchProjects.module';
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 
 @NgModule({
   imports: [
@@ -21,7 +16,7 @@ import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.c
   declarations: [
     OpenaireAdvancedSearchProjectsComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchProjectsComponent
      ]

src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts

@@ -1,16 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublications.component';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 

src/app/searchPages/advanced/advancedSearchPublications.component.ts

@@ -7,8 +7,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 @Component({
     selector: 'openaire-advanced-search-publications',
     template: `
-    <advanced-search-publications [customFilter]="customFilter">
-    </advanced-search-publications>
+      <advanced-search-research-results  [customFilter]="customFilter" resultType="publication"></advanced-search-research-results>
     `
  })
 

src/app/searchPages/advanced/advancedSearchPublications.module.ts

@@ -1,27 +1,25 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+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 {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-    AdvancedSearchPublicationsModule,
+    AdvancedSearchResearchResultsModule,
    AdvancedSearchPublicationsRoutingModule
 
   ],
   declarations: [
     OpenaireAdvancedSearchPublicationsComponent
    ],
-  providers:[FreeGuard, IsRouteEnabled],
+  providers:[FreeGuard],
   exports: [
     OpenaireAdvancedSearchPublicationsComponent
      ]

src/app/searchPages/advanced/advancedSearchSoftware.component.ts

@@ -6,8 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 @Component({
   selector: 'openaire-advanced-search-software',
   template: `
-    <advanced-search-software [customFilter]="customFilter">
-    </advanced-search-software>
+    <advanced-search-research-results  [customFilter]="customFilter" resultType="software"></advanced-search-research-results>
 
   `
 })

src/app/searchPages/advanced/advancedSearchSoftware.module.ts

@@ -1,20 +1,17 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+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 {AdvancedSearchResearchResultsModule} from "../../openaireLibrary/searchPages/advanced/advancedSearchResearchResults.module";
+import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 
 
- 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'
-
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-    AdvancedSearchSoftwareModule,
+    AdvancedSearchResearchResultsModule,
     AdvancedSearchSoftwareRoutingModule
 
   ],

src/app/searchPages/find/libSearch.module.ts

@@ -1,17 +1,15 @@
-//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 {NgModule} from '@angular/core';
 import {MainSearchModule} from '../../openaireLibrary/searchPages/find/mainSearch.module';
 
-import { OpenaireSearchComponent } from './search.component';
-import { MainSearchRoutingModule } from './mainSearch-routing.module';
+import {OpenaireSearchComponent} from './search.component';
+import {MainSearchRoutingModule} from './mainSearch-routing.module';
+import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
+import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
 
 @NgModule({
   imports: [ MainSearchRoutingModule, MainSearchModule],
   declarations:[OpenaireSearchComponent],
-  exports:[OpenaireSearchComponent]
+  exports:[OpenaireSearchComponent],
+  providers: [FreeGuard, PreviousRouteRecorder]
 })
 export class LibMainSearchModule { }

src/app/searchPages/find/mainSearch-routing.module.ts

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

src/app/searchPages/simple/searchDataProviders-routing.module.ts

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

src/app/searchPages/simple/searchDataProviders.module.ts

@@ -1,12 +1,12 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
 import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
-import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
+import {SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/simple/searchDataProviders.module';
+
 @NgModule({
   imports: [
     CommonModule, FormsModule,
@@ -16,7 +16,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
   declarations: [
     OpenaireSearchDataprovidersComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchDataprovidersComponent
      ]

src/app/searchPages/simple/searchDatasets-routing.module.ts

@@ -1,19 +1,17 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
-import{OpenaireSearchDatasetsComponent} from './searchDatasets.component';
-import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
-
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver  }},
 

src/app/searchPages/simple/searchDatasets.component.ts

@@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 @Component({
   selector: 'openaire-search-datasets',
   template: `
-
-    <search-datasets [customFilter]="customFilter">
-    </search-datasets>
+    <search-research-results resultType="dataset" [customFilter]="customFilter"></search-research-results>
   `
 })
 

src/app/searchPages/simple/searchDatasets.module.ts

@@ -1,26 +1,25 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+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 {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-  SearchDatasetsModule , SearchDatasetsRoutingModule
+    SearchResearchResultsModule , SearchDatasetsRoutingModule
 
   ],
   declarations: [
     OpenaireSearchDatasetsComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchDatasetsComponent
      ]

src/app/searchPages/simple/searchOrganizations-routing.module.ts

@@ -1,18 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
-
+import {NgModule} from '@angular/core';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
-
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] }
 

src/app/searchPages/simple/searchOrganizations.module.ts

@@ -1,15 +1,14 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
 
-import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
-import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
+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 {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
-import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
+import {SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simple/searchOrganizations.module';
 
 @NgModule({
   imports: [
@@ -20,7 +19,7 @@ import { SearchOrganizationsModule} from '../../openaireLibrary/searchPages/simp
   declarations: [
     OpenaireSearchOrganizationsComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchOrganizationsComponent
      ]

src/app/searchPages/simple/searchOrps-routing.module.ts

@@ -1,19 +1,17 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
-import{OpenaireSearchOrpsComponent} from './searchOrps.component';
-import { EnvironmentSpecificResolver} from '../../openaireLibrary/utils/properties/environmentSpecificResolver';
+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';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
-
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
+     	{ path: '', component: OpenaireSearchOrpsComponent, canActivate: [FreeGuard], data: {
           redirect: '/error'
         }, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver  }},
 

src/app/searchPages/simple/searchOrps.component.ts

@@ -6,9 +6,7 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 @Component({
     selector: 'openaire-search-orps',
     template: `
-
-    <search-orps [customFilter]="customFilter">
-    </search-orps>
+        <search-research-results resultType="other" [customFilter]="customFilter"></search-research-results>
     `
 })
 

src/app/searchPages/simple/searchOrps.module.ts

@@ -1,26 +1,23 @@
-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 {SearchOrpsModule} from '../../openaireLibrary/searchPages/simple/searchOrps.module';
+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 {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
-  SearchOrpsModule , SearchOrpsRoutingModule
+    SearchResearchResultsModule , SearchOrpsRoutingModule
 
   ],
   declarations: [
     OpenaireSearchOrpsComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchOrpsComponent
      ]

src/app/searchPages/simple/searchProjects-routing.module.ts

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

src/app/searchPages/simple/searchProjects.module.ts

@@ -1,14 +1,14 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
 
-import{ SearchProjectsRoutingModule} from './searchProjects-routing.module';
-import{OpenaireSearchProjectsComponent} from './searchProjects.component';
+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 {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
-import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
+import {SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/searchProjects.module';
+
 @NgModule({
   imports: [
     CommonModule, FormsModule, SearchProjectsRoutingModule, SearchProjectsModule
@@ -17,7 +17,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/simple/se
   declarations: [
     OpenaireSearchProjectsComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchProjectsComponent
      ]

src/app/searchPages/simple/searchPublications-routing.module.ts

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

src/app/searchPages/simple/searchPublications.component.ts

@@ -5,10 +5,8 @@ import {FilterInfo, PortalAggregators} from "../../utils/aggregators";
 
 @Component({
     selector: 'openaire-search-publications',
-    template: `      
-    <search-publications [customFilter]="customFilter">
-    </search-publications>
-
+    template: `
+        <search-research-results resultType="publication" [customFilter]="customFilter"></search-research-results>
     `
 
 })

src/app/searchPages/simple/searchPublications.module.ts

@@ -1,18 +1,17 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+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 {SearchPublicationsRoutingModule} from './searchPublications-routing.module';
+import {OpenaireSearchPublicationsComponent} from './searchPublications.component';
 
-import { SearchPublicationsModule} from '../../openaireLibrary/searchPages/simple/searchPublications.module';
+import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/simple/searchResearchResults.module";
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule, SearchPublicationsModule,
+    CommonModule, FormsModule, SearchResearchResultsModule,
 
       SearchPublicationsRoutingModule
 
@@ -20,7 +19,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
   declarations: [
     OpenaireSearchPublicationsComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled],
+  providers:[FreeGuard,PreviousRouteRecorder],
   exports: [
     OpenaireSearchPublicationsComponent
      ]

src/app/searchPages/simple/searchSoftware-routing.module.ts

@@ -1,15 +1,14 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
 
 import {OpenaireSearchSoftwareComponent} from './searchSoftware.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: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]  }
+     	{ path: '', component: OpenaireSearchSoftwareComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder]  }
 
     ])
   ]

src/app/searchPages/simple/searchSoftware.component.ts

@@ -6,9 +6,7 @@ import {ActivatedRoute} from "@angular/router";
 @Component({
     selector: 'openaire-search-software',
     template: `
-
-    <search-software [customFilter]="customFilter">
-    </search-software>
+        <search-research-results resultType="software" [customFilter]="customFilter"></search-research-results>
     `
 })
 

src/app/searchPages/simple/searchSoftware.module.ts

@@ -1,24 +1,21 @@
-import { NgModule}            from '@angular/core';
-import { CommonModule }        from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
 
-import{ SearchSoftwareRoutingModule} from './searchSoftware-routing.module';
-import{OpenaireSearchSoftwareComponent} from './searchSoftware.component';
+import {SearchSoftwareRoutingModule} from './searchSoftware-routing.module';
+import {OpenaireSearchSoftwareComponent} from './searchSoftware.component';
 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, SearchResearchResultsModule, SearchSoftwareRoutingModule
   ],
   declarations: [
     OpenaireSearchSoftwareComponent
    ],
-  providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled
+  providers:[FreeGuard,PreviousRouteRecorder
     ],
   exports: [
     OpenaireSearchSoftwareComponent

src/assets/env-properties.json

@@ -16,7 +16,7 @@
   "searchDataciteAPIURL" : "https://api.datacite.org/works",
 
   "searchOrcidURL"    :  "https://pub.orcid.org/v2.1/",
-
+  "orcidURL"   : "https://orcid.org/",
   "pmidURL"    : "http://www.ncbi.nlm.nih.gov/pubmed/",
   "doiURL"     : "https://dx.doi.org/",
   "cordisURL"  : "http://cordis.europa.eu/projects/",
@@ -39,7 +39,7 @@
   "piwikSiteId" : "6",
 
   "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
-
+  "userInfoUrl" : "http://rudie.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
   "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
 
   "cookieDomain" :".di.uoa.gr",