search page: remove all various search pages and keep only 'search all' - TODO: redirect old ?active=<entity> to the new path, update submodules

This commit is contained in:
Alex Martzios 2023-05-10 15:10:40 +03:00
parent 2da6b5f360
commit fae5a4bc5b
3 changed files with 8 additions and 14 deletions

View File

@ -35,25 +35,19 @@ const routes: Routes = [
path: 'project-report', path: 'project-report',
loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule) loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
}, },
// Search Pages // Search Pages
{path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)},
{ {
path: 'search/find/research-outcomes', path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule) },
{
path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
}, },
{path: 'search/find/publications', component: PageURLResolverComponent}, {path: 'search/find/publications', component: PageURLResolverComponent},
{path: 'search/find/datasets', component: PageURLResolverComponent}, {path: 'search/find/datasets', component: PageURLResolverComponent},
{path: 'search/find/software', component: PageURLResolverComponent}, {path: 'search/find/software', component: PageURLResolverComponent},
{path: 'search/find/other', component: PageURLResolverComponent}, {path: 'search/find/other', component: PageURLResolverComponent},
{path: 'search/find/projects', loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)},
{
path: 'search/find/dataproviders',
loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
},
{
path: 'search/find/organizations',
loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
},
// Advanced Search Pages // Advanced Search Pages
{ {
path: 'search/advanced/research-outcomes', path: 'search/advanced/research-outcomes',

View File

@ -168,7 +168,7 @@ export class AppComponent {
new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})]; new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})];
//TODO add check for research results route //TODO add check for research results route
this.menuItems = [ this.menuItems = [
new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true}, new MenuItem("search", "Search", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'},
null, null, null, null, "_blank", "internal", false, null, null, null, null, "_blank", "internal", false,
[ [
researchOutcomesMenu, researchOutcomesMenu,

@ -1 +1 @@
Subproject commit ef742be1b236e84d7fc7819acbbf5679f9726db5 Subproject commit 619dd3c9fa7bcdd6ca8ab2d67e4166e04b0f9fda