MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

Remove src/app/utils/openaireProperties.ts | remove admincommunity API from routing module let only community 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@51350 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-03-20 14:07:14 +00:00
parent 92c8457062
commit c582a37760
34 changed files with 159 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
portal-4cli-lib/explore-production-properties.json Normal file
View File

@ -0,0 +1,85 @@
{
"enablePiwikTrack" : true,
"enableHelper" : true,
"useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
"claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources",
"csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports",
"searchCrossrefAPIURL" : "https://api.crossref.org/works",
"searchDataciteAPIURL" : "https://api.datacite.org/works",
"searchOrcidURL" : "https://pub.orcid.org/",
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
"doiURL" : "https://dx.doi.org/",
"cordisURL" : "http://cordis.europa.eu/projects/",
"pmcURL" : "http://europepmc.org/articles/",
"handleURL" : "http://hdl.handle.net/",
"zenodo" : "https://zenodo.org/",
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
"h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
"ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
"helpdesk" : "https://www.openaire.eu/support/helpdesk",
"uploadService" : "https://demo.openaire.eu/upload",
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
"piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
"loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login",
"logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo:",
"logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
"cookieDomain" :".openaire.eu",
"feedbackmail" :"openaire.test@gmail.com",
"helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route",
"cacheUrl" :"https://demo.openaire.eu/cache/get?url=",
"adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
"adminToolsCommunity" :"openaire",
"communityAPI": "https://dev-openaire.d4science.org/openaire/community/",
"csvLimit": 2000,
"pagingLimit": 20,
"resultsPerPage": 10,
"baseLink" : "https://beta.explore.openaire.eu",
"searchLinkToPublication" : "/search/publication?articleId=",
"searchLinkToProject" : "/search/project?projectId=",
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
"searchLinkToDataset" : "/search/dataset?datasetId=",
"searchLinkToOrganization" : "/search/organization?organizationId=",
"searchLinkToPublications" : "/search/find/publications",
"searchLinkToDataProviders" : "/search/find/dataproviders",
"searchLinkToProjects" : "/search/find/projects",
"searchLinkToDatasets" : "/search/find/datasets",
"searchLinkToSoftware" : "/search/find/software",
"searchLinkToOrganizations" : "/search/find/organizations",
"searchLinkToCompatibleDataProviders" : "/search/content-providers",
"searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
"searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
"searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
"searchLinkToJournals" : "/search/journals",
"searchLinkToJournalsTable" : "/search/journals-table",
"searchLinkToAdvancedPublications" : "/search/advanced/publications",
"searchLinkToAdvancedProjects" : "/search/advanced/projects",
"searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
"searchLinkToAdvancedSoftware" : "/search/advanced/software",
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
"searchLinkToAdvancedPeople" : "/search/advanced/people"
}

4
portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts
View File

@ -4,13 +4,13 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
import{ AdminLoginGuard} from '../../openaireLibrary/login/adminLoginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, AdminLoginGuard],
data: {redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
]
})
export class ClaimsAdminRoutingModule { }

4
portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts
View File

@ -5,13 +5,13 @@ import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireClaimsByTokenComponent, canActivate: [IsRouteEnabled, LoginGuard],
data: {redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
]
})
export class ClaimsByTokenRoutingModule { }

4
portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts
View File

@ -5,13 +5,13 @@ import { OpenaireDirectLinkingComponent } from './directLinking.component';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder]},
])

4
portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts
View File

@ -4,13 +4,13 @@ import { OpenaireLinkingComponent } from './linkingGeneric.component';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder]},
])

4
portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts
View File

@ -5,13 +5,13 @@ import {OpenaireMyClaimsComponent } from './myClaims.component';
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard],
data: {redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity}, canDeactivate: [PreviousRouteRecorder]}])
data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
]
})
export class MyClaimsRoutingModule { }

4
portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts
View File

@ -5,13 +5,13 @@ import { OpenaireDepositBySubjectResultComponent } from './depositBySubjectResul
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDepositBySubjectResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts
View File

@ -6,13 +6,13 @@ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDepositDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts
View File

@ -3,13 +3,13 @@ import { RouterModule } from '@angular/router';
import { OpenaireDepositDatasetsResultComponent } from './depositDatasetsResult.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';import {OpenaireProperties} from '../../utils/openaireProperties';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDepositDatasetsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts
View File

@ -4,13 +4,13 @@ import { OpenaireDepositPublicationsComponent } from './depositPublications.comp
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDepositPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts
View File

@ -4,13 +4,13 @@ import { OpenaireDepositPublicationsResultComponent } from './depositPublication
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDepositPublicationsResultComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
View File

@ -5,13 +5,13 @@ 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'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
]

4
portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts
View File

@ -5,13 +5,13 @@ 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 {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
]

4
portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts
View File

@ -5,14 +5,14 @@ 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'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
]

4
portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts
View File

@ -5,13 +5,13 @@ 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'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
]

4
portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts
View File

@ -5,13 +5,13 @@ 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'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder] }
])
]

4
portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
View File

@ -4,14 +4,14 @@ import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataP
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireAdvancedSearchDatasetsComponent} from './advancedSearchDatasets.c
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrgan
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent , canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
},canDeactivate: [PreviousRouteRecorder]}
])

4
portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.c
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireAdvancedSearchPublicationsComponent} from './advancedSearchPublic
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireAdvancedSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataPro
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchCompatibleDataprovidersTableComponent} from './compatibleDa
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchCompatibleDataprovidersTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts
View File

@ -4,13 +4,13 @@ import { RouterModule } from '@angular/router';
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';import {OpenaireProperties} from '../../utils/openaireProperties';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchEntityRegistriesTableComponent} from './entityRegistriesTab
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchEntityRegistriesTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchJournalsComponent} from './journals.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchJournalsTableComponent} from './journalsTable.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchJournalsTableComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
} , canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts
View File

@ -5,13 +5,13 @@ import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.compone
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchDataprovidersComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts
View File

@ -8,13 +8,13 @@ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchDatasetsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] , resolve: { envSpecific: EnvironmentSpecificResolver }},
])

4
portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts
View File

@ -7,13 +7,13 @@ import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchOrganizationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts
View File

@ -5,13 +5,13 @@ 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 {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchProjectsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

4
portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts
View File

@ -5,13 +5,13 @@ 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'
import {OpenaireProperties} from '../../utils/openaireProperties';
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: OpenaireSearchPublicationsComponent, canActivate: [FreeGuard, IsRouteEnabled], data: {
redirect: '/error', api: OpenaireProperties.adminToolsAPIURL, community :OpenaireProperties.adminToolsCommunity
redirect: '/error', community : 'openaire'
}, canDeactivate: [PreviousRouteRecorder] }
])

21
portal-4cli-lib/src/app/utils/openaireProperties.ts
View File

@ -1,21 +0,0 @@
export class OpenaireProperties {
private static productionMode:boolean = false;
public static adminToolsAPIURL = "http://duffy.di.uoa.gr:8080/uoa-admin-tools";
public static adminToolsAPIURL_pm = "http://duffy.di.uoa.gr:8080/uoa-admin-tools";
public static adminToolsCommunity = "openaire";
public static getAdminToolsAPIURL():string{
if(this.productionMode){
return this.adminToolsAPIURL_pm;
}else{
return this.adminToolsAPIURL;
}
}
public static getAdminToolsCommunity():string{
return this.adminToolsCommunity;
}
}

20
portal-4cli-lib/src/assets/env-properties.json
View File

@ -4,6 +4,8 @@
"useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
"claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
@ -37,12 +39,12 @@
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
"piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite:6",
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=6",
"loginUrl" :"http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
"logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo:",
"logoutUrl" :"https://aai.openminted.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
"logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout",
@ -54,21 +56,23 @@
"cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools",
"adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools/",
"adminToolsCommunity" :"openaire",
"communityAPI": "https://dev-openaire.d4science.org/openaire/community/",
"csvLimit": 2000,
"pagingLimit": 20,
"resultsPerPage": 10,
"baseLink" : "https://demo.openaire.eu",
"searchLinkToPublication" : "/search/publication?articleId:",
"searchLinkToProject" : "/search/project?projectId:",
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId:",
"searchLinkToDataset" : "/search/dataset?datasetId:",
"searchLinkToOrganization" : "/search/organization?organizationId:",
"searchLinkToPublication" : "/search/publication?articleId=",
"searchLinkToProject" : "/search/project?projectId=",
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
"searchLinkToDataset" : "/search/dataset?datasetId=",
"searchLinkToOrganization" : "/search/organization?organizationId=",
"searchLinkToPublications" : "/search/find/publications",
"searchLinkToDataProviders" : "/search/find/dataproviders",