From 7065cda22e3243ae575643798bf2282dc8dbdfe0 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Wed, 11 Sep 2019 11:45:35 +0000
Subject: [PATCH] [Trunk | Library]: app-routing.module & entities.module: Bug
 fixes in imports after merging research results.

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57034 d315682c-612b-4755-9ff5-7f18f6832af3
---
 app-routing.module.ts             | 26 ++++++++++----------------
 utils/entities/entities.module.ts |  3 +--
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app-routing.module.ts b/app-routing.module.ts
index c909bb53..7a9d130d 100644
--- a/app-routing.module.ts
+++ b/app-routing.module.ts
@@ -21,18 +21,12 @@ import {DepositBySubjectResultComponent} from './deposit/datasets/depositBySubje
 import {DepositPublicationsComponent} from './deposit/publications/depositPublications.component';
 import {DepositPublicationsResultComponent} from './deposit/publications/depositPublicationsResult.component';
 
-import {SearchDatasetsComponent} from './searchPages/simple/searchDatasets.component';
-import {SearchPublicationsComponent} from './searchPages/simple/searchPublications.component';
-import {SearchSoftwareComponent} from './searchPages/simple/searchSoftware.component';
-import {SearchOrpsComponent} from './searchPages/simple/searchOrps.component';
+import {SearchResearchResultsComponent} from './searchPages/simple/searchResearchResults.component';
 import {SearchDataprovidersComponent} from './searchPages/simple/searchDataproviders.component';
 import {SearchProjectsComponent} from './searchPages/simple/searchProjects.component';
 import {SearchOrganizationsComponent} from './searchPages/simple/searchOrganizations.component';
 
-import {AdvancedSearchPublicationsComponent} from './searchPages/advanced/advancedSearchPublications.component';
-import {AdvancedSearchDatasetsComponent} from './searchPages/advanced/advancedSearchDatasets.component';
-import {AdvancedSearchSoftwareComponent} from './searchPages/advanced/advancedSearchSoftware.component';
-import {AdvancedSearchOrpsComponent} from './searchPages/advanced/advancedSearchOrps.component';
+import {AdvancedSearchResearchResultsComponent} from './searchPages/advanced/advancedSearchResearchResults.component';
 import {AdvancedSearchDataProvidersComponent} from './searchPages/advanced/advancedSearchDataProviders.component';
 import {AdvancedSearchProjectsComponent} from './searchPages/advanced/advancedSearchProjects.component';
 import {AdvancedSearchOrganizationsComponent} from './searchPages/advanced/advancedSearchOrganizations.component';
@@ -70,10 +64,10 @@ const routes: Routes = [
   { path: 'participate/deposit-publications', component: DepositPublicationsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'participate/deposit-publications-result', component: DepositPublicationsResultComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/find', component:  SearchComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/find/publications', component: SearchPublicationsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  }, canActivate: [ ] },
-  { path: 'search/find/datasets', component:SearchDatasetsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/find/software', component:SearchSoftwareComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/find/other', component:SearchOrpsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/find/publications', component: SearchResearchResultsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  }, canActivate: [ ] },
+  { path: 'search/find/datasets', component:SearchResearchResultsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/find/software', component:SearchResearchResultsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/find/other', component:SearchResearchResultsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/find/projects', component:SearchProjectsComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/find/dataproviders', component:SearchDataprovidersComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/find/organizations', component:SearchOrganizationsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
@@ -83,10 +77,10 @@ const routes: Routes = [
   { path: 'search/entity-registries-table', component: SearchEntityRegistriesTableComponent, resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/journals', component: SearchJournalsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/journals-table', component: SearchJournalsTableComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/advanced/publications', component: AdvancedSearchPublicationsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/advanced/datasets', component: AdvancedSearchDatasetsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/advanced/software', component: AdvancedSearchSoftwareComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
-  { path: 'search/advanced/other', component: AdvancedSearchOrpsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/advanced/publications', component: AdvancedSearchResearchResultsComponent , resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/advanced/datasets', component: AdvancedSearchResearchResultsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/advanced/software', component: AdvancedSearchResearchResultsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
+  { path: 'search/advanced/other', component: AdvancedSearchResearchResultsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/advanced/organizations',component: AdvancedSearchOrganizationsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/advanced/dataproviders', component: AdvancedSearchDataProvidersComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
   { path: 'search/advanced/projects', component: AdvancedSearchProjectsComponent  , resolve: { envSpecific: EnvironmentSpecificResolver  } },
diff --git a/utils/entities/entities.module.ts b/utils/entities/entities.module.ts
index 9dc27455..76e06335 100644
--- a/utils/entities/entities.module.ts
+++ b/utils/entities/entities.module.ts
@@ -4,11 +4,10 @@ import { FormsModule }         from '@angular/forms';
 
 
 //Entities
-import {DatasetInfo} from './datasetInfo';
 import {OrganizationInfo} from './organizationInfo';
 import {ProjectInfo} from './projectInfo';
 import {Publication} from './publication';
-import {PublicationInfo} from './publicationInfo';
+import {ResultLandingInfo} from './resultLandingInfo';
 import {SearchResult} from './searchResult';
 import {DataProviderInfo} from './dataProviderInfo';
 import {Metrics} from './metrics';