From 92cf0265e2b8a7b4a8b2cb0ecdaa69cf7e4ab1c7 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 11 Jun 2020 15:36:38 +0000 Subject: [PATCH] [Admin | Trunk]: Add properties on enviroment git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@58885 d315682c-612b-4755-9ff5-7f18f6832af3 --- angular.json | 20 ++++++ package.json | 1 + src/environments/environment.beta.ts | 85 ++++++++++++++++++++++ src/environments/environment.prod.ts | 102 ++++++++++++++++++++++++++- src/environments/environment.ts | 100 +++++++++++++++++++++++++- src/main.ts | 4 +- 6 files changed, 306 insertions(+), 6 deletions(-) create mode 100644 src/environments/environment.beta.ts diff --git a/angular.json b/angular.json index a9148cb..c84184d 100644 --- a/angular.json +++ b/angular.json @@ -51,6 +51,23 @@ "with": "src/environments/environment.prod.ts" } ] + }, + "beta": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.beta.ts" + } + ] } } }, @@ -62,6 +79,9 @@ "configurations": { "production": { "browserTarget": "admin-portal:build:production" + }, + "beta": { + "browserTarget": "admin-portal:build:beta" } } }, diff --git a/package.json b/package.json index 6ad0cbe..d838325 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "ng": "ng", "start": "ng serve --host 0.0.0.0 --disable-host-check --port=5000", "build": "ng build --prod", + "build-beta": "ng build --configuration=beta", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts new file mode 100644 index 0000000..4dfc853 --- /dev/null +++ b/src/environments/environment.beta.ts @@ -0,0 +1,85 @@ +import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; + +export let properties: EnvProperties = { + environment: "beta", + enablePiwikTrack: false, + useCache: false, + metricsAPIURL: "https://beta.services.openaire.eu/usagestats/", + framesAPIURL: "https://beta.openaire.eu/stats3/", + claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", + statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", + statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", + statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/", + useNewStatistisTool: false, + searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", + searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", + openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", + 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/", + orcidURL: "https://orcid.org/", + doiURL: "https://dx.doi.org/", + cordisURL: "http://cordis.europa.eu/projects/", + openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", + r3DataURL: "http://service.re3data.org/repository/", + sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", + zenodo: "https://zenodo.org/", + zenodoCommunities: "https://zenodo.org/api/communities/", + 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", + helpdeskEmail: "helpdesk@openaire.eu", + utilsService: "https://demo.openaire.eu/utils-service", + vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", + piwikBaseUrl: " https://analytics.openaire.eu/piwik.php?idsite=6", + loginUrl: "https://beta.services.openaire.eu/admin-user-management/openid_connect_login", + userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", + logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + cookieDomain: ".openaire.eu", + feedbackmail: "openaire.test@gmail.com", + feedbackmailForMissingEntities: "feedback@openaire.eu", + cacheUrl: "https://demo.openaire.eu/cache/get?url=", + adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", + adminToolsCommunity: "openaire", + communityAPI: "https://beta.services.openaire.eu/openaire/community/", + miningBackendURL: "https://beta.services.openaire.eu/interactive-mining", + csvLimit: 2000, + pagingLimit: 20, + resultsPerPage: 10, + baseLink: "https://beta.admin.connect.openaire.eu/", + baseOpenaireLink: "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", + 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", + lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", + showLastIndexInformationLink: false, + widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://beta.openaire.eu/linking", + lastIndexUpdate: "2019-11-01", + indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", + adminPortalURL: "https://beta.admin.connect.openaire.eu", + admins: ["rcd-helpdesk@openaire.eu"] +}; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073..4bc64f5 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,101 @@ -export const environment = { - production: true +import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; + +export let properties: EnvProperties = { + environment:"production", + enablePiwikTrack: false, + useCache: false, + metricsAPIURL: "https://services.openaire.eu/usagestats/", + framesAPIURL: "https://www.openaire.eu/stats3/", + claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", + statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", + statisticsFrameAPIURL:"https://www.openaire.eu/stats/", + statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/", + useNewStatistisTool:false, + searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", + searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", + openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", + csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", + searchCrossrefAPIURL: "https://api.crossref.org/works", + searchDataciteAPIURL: "https://api.datacite.org/works", + searchOrcidURL: "https://pub.orcid.org/", + orcidURL: "https://orcid.org/", + doiURL: "https://dx.doi.org/", + cordisURL: "http://cordis.europa.eu/projects/", + openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", + r3DataURL: "http://service.re3data.org/repository/", + sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", + zenodo: "https://zenodo.org/", + zenodoCommunities: "https://zenodo.org/api/communities/", + 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", + helpdeskEmail: "helpdesk@openaire.eu", + utilsService: "https://explore.openaire.eu/utils-service", + + vocabulariesAPI:"https://services.openaire.eu/provision/mvc/vocabularies/", + + piwikBaseUrl:" https://analytics.openaire.eu/piwik.php?idsite=6", + loginUrl:"https://services.openaire.eu/admin-user-management/openid_connect_login", + + userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", + + logoutUrl:"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + + cookieDomain:".openaire.eu", + + feedbackmail:"openaire.test@gmail.com", + feedbackmailForMissingEntities: "feedback@openaire.eu", + + cacheUrl:"https://explore.openaire.eu/cache/get?url=", + + adminToolsAPIURL:"https://services.openaire.eu/uoa-admin-tools/", + + adminToolsCommunity:"openaire", + communityAPI: "https://services.openaire.eu/openaire/community/", + + miningBackendURL: "https://beta.services.openaire.eu/interactive-mining", + + csvLimit: 2000, + pagingLimit: 20, + resultsPerPage: 10, + + baseLink: "https://admin.explore.openaire.eu/", + baseOpenaireLink: "https://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", + 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", + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", + showLastIndexInformationLink: false, + + widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", + claimsInformationLink: "https://www.openaire.eu/linking", + lastIndexUpdate: "2019-07-24", + indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", + adminPortalURL: "https://admin.connect.openaire.eu", + admins: ["rcd-helpdesk@openaire.eu"] }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b7f639a..0a79897 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,6 +3,102 @@ // `ng build --env=prod` then `environment.prod.ts` will be used instead. // The list of which env maps to which file can be found in `.angular-cli.json`. -export const environment = { - production: false +import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; + +export let properties: EnvProperties = { + environment: 'development', + enablePiwikTrack: false, + useCache: false, + metricsAPIURL: 'https://beta.services.openaire.eu/usagestats/', + framesAPIURL: 'https://beta.openaire.eu/stats3/', + claimsAPIURL: 'http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/', + statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', + statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', + statisticsFrameNewAPIURL: 'http://marilyn.athenarc.gr:8080/stats-api/', + useNewStatistisTool: false, + searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/', + searchResourcesAPIURL: 'https://beta.services.openaire.eu/search/v2/api/resources', + openCitationsAPIURL: 'https://services.openaire.eu/opencitations/getCitations?id=', + csvAPIURL: 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports', + searchCrossrefAPIURL: 'https://api.crossref.org/works', + searchDataciteAPIURL: 'https://api.datacite.org/works', + searchOrcidURL: 'https://pub.orcid.org/', + orcidURL: 'https://orcid.org/', + doiURL: 'https://dx.doi.org/', + cordisURL: 'http://cordis.europa.eu/projects/', + openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/', + r3DataURL: 'http://service.re3data.org/repository/', + sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=', + zenodo: 'https://zenodo.org/', + zenodoCommunities: 'https://zenodo.org/api/communities/', + 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', + helpdeskEmail: 'helpdesk@openaire.eu', + utilsService: 'http://mpagasas.di.uoa.gr:8000', + + vocabulariesAPI: 'https://beta.services.openaire.eu/provision/mvc/vocabularies/', + + piwikBaseUrl: ' https://analytics.openaire.eu/piwik.php?idsite=6', + loginUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login', + + userInfoUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=', + logoutUrl: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=', + + cookieDomain: '.di.uoa.gr', + + feedbackmail: 'openaire.test@gmail.com', + feedbackmailForMissingEntities: 'feedback@openaire.eu', + cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=', + + adminToolsAPIURL: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/', + + adminToolsCommunity: 'openaire', + communityAPI: 'https://dev-openaire.d4science.org/openaire/community/', + + miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining', + + csvLimit: 2000, + pagingLimit: 20, + resultsPerPage: 10, + + baseLink: 'https://demo.openaire.eu', + baseOpenaireLink: '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', + 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', + lastIndexInformationLink: 'https://www.openaire.eu/aggregation-and-content-provision-workflows', + showLastIndexInformationLink: false, + + widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=', + claimsInformationLink: 'https://www.openaire.eu/linking-beta', + lastIndexUpdate: '2019-05-16', + indexInfoAPI: 'http://beta.services.openaire.eu/openaire/info/', + admins: ['kostis30fylloy@gmail.com'], + adminPortalURL: 'https://beta.admin.connect.openaire.eu' }; diff --git a/src/main.ts b/src/main.ts index a9ca1ca..9be6714 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,9 +2,9 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; +import { properties } from './environments/environment'; -if (environment.production) { +if (properties.environment !== "development") { enableProdMode(); }