From c582a37760a2136804fd8389a3e7ca9be67795f2 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 20 Mar 2018 14:07:14 +0000 Subject: [PATCH] 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 --- .../explore-production-properties.json | 85 +++++++++++++++++++ .../claimsAdmin/claimsAdmin-routing.module.ts | 4 +- .../claimsByToken-routing.module.ts | 4 +- .../directLinking-routing.module.ts | 4 +- .../claims/linking/linking-routing.module.ts | 4 +- .../myClaims/myClaims-routing.module.ts | 4 +- .../depositBySubjectResult-routing.module.ts | 4 +- .../depositDatasets-routing.module.ts | 4 +- .../depositDatasetsResults-routing.module.ts | 4 +- .../depositPublications-routing.module.ts | 4 +- ...epositPublicationsResult-routing.module.ts | 4 +- .../dataProvider-routing.module.ts | 4 +- .../dataset/dataset-routing.module.ts | 4 +- .../organization-routing.module.ts | 4 +- .../project/project-routing.module.ts | 4 +- .../publication/publication-routing.module.ts | 4 +- ...ancedSearchDataProviders-routing.module.ts | 4 +- .../advancedSearchDatasets-routing.module.ts | 4 +- ...ancedSearchOrganizations-routing.module.ts | 4 +- .../advancedSearchProjects-routing.module.ts | 4 +- ...vancedSearchPublications-routing.module.ts | 4 +- .../compatibleDataProviders-routing.module.ts | 4 +- ...atibleDataProvidersTable-routing.module.ts | 4 +- .../entityRegistries-routing.module.ts | 4 +- .../entityRegistriesTable-routing.module.ts | 4 +- .../dataProviders/journals-routing.module.ts | 4 +- .../journalsTable-routing.module.ts | 4 +- .../searchDataProviders-routing.module.ts | 4 +- .../simple/searchDatasets-routing.module.ts | 4 +- .../searchOrganizations-routing.module.ts | 4 +- .../simple/searchProjects-routing.module.ts | 4 +- .../searchPublications-routing.module.ts | 4 +- .../src/app/utils/openaireProperties.ts | 21 ----- .../src/assets/env-properties.json | 20 +++-- 34 files changed, 159 insertions(+), 91 deletions(-) create mode 100644 portal-4cli-lib/explore-production-properties.json delete mode 100644 portal-4cli-lib/src/app/utils/openaireProperties.ts diff --git a/portal-4cli-lib/explore-production-properties.json b/portal-4cli-lib/explore-production-properties.json new file mode 100644 index 00000000..47bbde53 --- /dev/null +++ b/portal-4cli-lib/explore-production-properties.json @@ -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" +} diff --git a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts index 2f23dd9b..c7895353 100644 --- a/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts +++ b/portal-4cli-lib/src/app/claims/claimsAdmin/claimsAdmin-routing.module.ts @@ -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 { } diff --git a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts index eef611eb..c4835ae3 100644 --- a/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts +++ b/portal-4cli-lib/src/app/claims/claimsByToken/claimsByToken-routing.module.ts @@ -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 { } diff --git a/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts b/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts index 69467758..fa63dd33 100644 --- a/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts +++ b/portal-4cli-lib/src/app/claims/directLinking/directLinking-routing.module.ts @@ -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]}, ]) diff --git a/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts b/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts index 091218ae..cb1438d0 100644 --- a/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts +++ b/portal-4cli-lib/src/app/claims/linking/linking-routing.module.ts @@ -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]}, ]) diff --git a/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts b/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts index c75a9949..44adf9cb 100644 --- a/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts +++ b/portal-4cli-lib/src/app/claims/myClaims/myClaims-routing.module.ts @@ -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 { } diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts index cc4ce15a..6045594f 100644 --- a/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts +++ b/portal-4cli-lib/src/app/deposit/datasets/depositBySubjectResult-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts index dfd4af8b..edf71a77 100644 --- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts +++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasets-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts index 6867cc02..1d1a3bf8 100644 --- a/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts +++ b/portal-4cli-lib/src/app/deposit/datasets/depositDatasetsResults-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts index 729a8521..3b3df71c 100644 --- a/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts +++ b/portal-4cli-lib/src/app/deposit/publications/depositPublications-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts index b9ab7ee2..abd07d5b 100644 --- a/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts +++ b/portal-4cli-lib/src/app/deposit/publications/depositPublicationsResult-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts index ace5723c..c9e1d332 100644 --- a/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts +++ b/portal-4cli-lib/src/app/landingPages/dataProvider/dataProvider-routing.module.ts @@ -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] } ]) ] diff --git a/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts b/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts index 45e3eba1..e5a53a5c 100644 --- a/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts +++ b/portal-4cli-lib/src/app/landingPages/dataset/dataset-routing.module.ts @@ -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] } ]) ] diff --git a/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts b/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts index ab650020..a8d3e704 100644 --- a/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts +++ b/portal-4cli-lib/src/app/landingPages/organization/organization-routing.module.ts @@ -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] } ]) ] diff --git a/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts b/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts index ff1c8c3f..23d2efac 100644 --- a/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts +++ b/portal-4cli-lib/src/app/landingPages/project/project-routing.module.ts @@ -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] } ]) ] diff --git a/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts b/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts index 78b0202e..629d8467 100644 --- a/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts +++ b/portal-4cli-lib/src/app/landingPages/publication/publication-routing.module.ts @@ -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] } ]) ] diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts index 6102cd11..febdaa83 100644 --- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts index 02434539..9d6ac540 100644 --- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchDatasets-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts index c2ed9f0b..13ecad75 100644 --- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts @@ -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]} ]) diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts index df772948..d1796128 100644 --- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts index 936ae995..b755d0a9 100644 --- a/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/advanced/advancedSearchPublications-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts index d9bcecc1..6221c85d 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProviders-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts index 2e230003..d3d7b170 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/compatibleDataProvidersTable-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts index dccd161b..b1baff2a 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistries-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts index 8f4d411b..d0f2250a 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/entityRegistriesTable-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts index a2ed125f..5c433252 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journals-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts index 0222983e..6f3aaf79 100644 --- a/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/dataProviders/journalsTable-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts index 078eb0ed..1da07378 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDataProviders-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts index 05b5d6fc..8edc0a76 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchDatasets-routing.module.ts @@ -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 }}, ]) diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts index 788e1117..7e3a7096 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchOrganizations-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts index d7a63e1d..1855ae07 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchProjects-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts b/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts index 04f8284e..93ee9d16 100644 --- a/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts +++ b/portal-4cli-lib/src/app/searchPages/simple/searchPublications-routing.module.ts @@ -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] } ]) diff --git a/portal-4cli-lib/src/app/utils/openaireProperties.ts b/portal-4cli-lib/src/app/utils/openaireProperties.ts deleted file mode 100644 index 0f733c58..00000000 --- a/portal-4cli-lib/src/app/utils/openaireProperties.ts +++ /dev/null @@ -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; - - } - -} diff --git a/portal-4cli-lib/src/assets/env-properties.json b/portal-4cli-lib/src/assets/env-properties.json index de725dac..c85f68f0 100644 --- a/portal-4cli-lib/src/assets/env-properties.json +++ b/portal-4cli-lib/src/assets/env-properties.json @@ -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",