diff --git a/portal-4cli-lib/src/app/app-routing.module.ts b/portal-4cli-lib/src/app/app-routing.module.ts index a0146885..66287bec 100644 --- a/portal-4cli-lib/src/app/app-routing.module.ts +++ b/portal-4cli-lib/src/app/app-routing.module.ts @@ -13,6 +13,7 @@ const routes: Routes = [ { path: 'search/publication', loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataset', loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/software', loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/other', loadChildren: './landingPages/orp/libOrp.module#LibOrpModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/project', loadChildren: './landingPages/project/libProject.module#LibProjectModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/dataprovider', loadChildren: '././landingPages/dataProvider/libDataProvider.module#LibDataProviderModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/organization', loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -25,6 +26,7 @@ const routes: Routes = [ { path: 'search/find/publications', loadChildren: './searchPages/simple/searchPublications.module#LibSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/datasets', loadChildren: './searchPages/simple/searchDatasets.module#LibSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/software', loadChildren: './searchPages/simple/searchSoftware.module#LibSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/find/other', loadChildren: './searchPages/simple/searchOrps.module#LibSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/projects', loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/dataproviders', loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/find/organizations', loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, @@ -37,6 +39,7 @@ const routes: Routes = [ { path: 'search/advanced/publications', loadChildren: './searchPages/advanced/advancedSearchPublications.module#LibAdvancedSearchPublicationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/datasets', loadChildren: './searchPages/advanced/advancedSearchDatasets.module#LibAdvancedSearchDatasetsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/software', loadChildren: './searchPages/advanced/advancedSearchSoftware.module#LibAdvancedSearchSoftwareModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/advanced/other', loadChildren: './searchPages/advanced/advancedSearchOrps.module#LibAdvancedSearchOrpsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/organizations', loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/dataproviders', loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, { path: 'search/advanced/projects', loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, diff --git a/portal-4cli-lib/src/app/app.component.ts b/portal-4cli-lib/src/app/app.component.ts index 32ce85f4..aeffa9d7 100644 --- a/portal-4cli-lib/src/app/app.component.ts +++ b/portal-4cli-lib/src/app/app.component.ts @@ -50,6 +50,7 @@ export class AppComponent { items: [new MenuItem("","Publications","","/search/find/publications",false,["publication"],["/search/find/publications"],{}), new MenuItem("","Research Data","","/search/find/datasets",false,["dataset"],["/search/find/datasets"],{}), new MenuItem("","Software","","/search/find/software",false,["software"],["/search/find/software"],{}), + new MenuItem("","Other Research Products","","/search/find/other",false,["orp"],["/search/find/other"],{}), new MenuItem("","Projects","","/search/find/projects/",false,["project"],["/search/find/projects"],{}), new MenuItem("","Content Providers","","/search/find/dataproviders",false,["datasource"],["/search/find/dataproviders"],{}), new MenuItem("","Organizations","","/search/find/organizations/",false,["organization"],["/search/find/organizations"],{}) diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index 5d661072..c95aa475 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -66,6 +66,7 @@ "searchLinkToProject" : "/search/project?projectId=", "searchLinkToDataProvider" : "/search/dataprovider?datasourceId=", "searchLinkToDataset" : "/search/dataset?datasetId=", + "searchLinkToOrp" : "/search/other?orpId=", "searchLinkToOrganization" : "/search/organization?organizationId=", "searchLinkToPublications" : "/search/find/publications", @@ -73,6 +74,7 @@ "searchLinkToProjects" : "/search/find/projects", "searchLinkToDatasets" : "/search/find/datasets", "searchLinkToSoftware" : "/search/find/software", + "searchLinkToOrps" : "/search/find/other", "searchLinkToOrganizations" : "/search/find/organizations", "searchLinkToCompatibleDataProviders" : "/search/content-providers", "searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table", @@ -85,6 +87,7 @@ "searchLinkToAdvancedProjects" : "/search/advanced/projects", "searchLinkToAdvancedDatasets" : "/search/advanced/datasets", "searchLinkToAdvancedSoftware" : "/search/advanced/software", + "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedPeople" : "/search/advanced/people"