From 2d6b144441db6060f8c182b6ee4867adb12195df Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 2 Nov 2023 09:48:18 +0200 Subject: [PATCH] [develop | DONE | UPDATED] properties: use library properties --- src/environments/environment.beta.ts | 94 +++------------------------ src/environments/environment.prod.ts | 95 +++------------------------- src/environments/environment.ts | 95 +++------------------------- 3 files changed, 27 insertions(+), 257 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index a10968d..a4f0b30 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,92 +1,14 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonBeta, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "beta", - dashboard: 'connect', +let props: EnvProperties = { isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - 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: "https://stats.madgik.di.uoa.gr/stats-api/", - useNewStatistisTool: true, - 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/", - swhURL: "https://archive.softwareheritage.org/", - 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", - registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - feedbackmailForMissingEntities: "feedback@openaire.eu", - cacheUrl: "https://demo.openaire.eu/cache/get?url=", - deleteCacheUrl: 'https://demo.openaire.eu/cache/clear', - deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache', - 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: "", - domain: "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", - searchLinkToJournals: "/search/journals", - 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: "2020-05-06", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", - admins: ["rcd@openaire.eu"], - adminPortalURL: "https://beta.admin.connect.openaire.eu", - errorLink: '/error', - connectPortalUrl: 'https://beta.connect.openaire.eu' + domain:'https://beta.admin.connect.openaire.eu' + }; + +export let properties: EnvProperties = { + ...common, ...commonBeta, ...props +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d916388..aaa4c1f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,92 +1,15 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; + +let props: EnvProperties = { -export let properties: EnvProperties = { - environment:"production", - dashboard: 'connect', isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - 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/", - swhURL: "https://archive.softwareheritage.org/", - 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/login-service/openid_connect_login", - registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', - userInfoUrl: "https://services.openaire.eu/login-service/userInfo", - logoutUrl: "https://services.openaire.eu/login-service/openid_logout", - cookieDomain:".openaire.eu", - feedbackmail:"openaire.test@gmail.com", - feedbackmailForMissingEntities: "feedback@openaire.eu", - cacheUrl:"https://explore.openaire.eu/cache/get?url=", - deleteCacheUrl: 'https://explore.openaire.eu/cache/clear', - deleteBrowserCacheUrl: 'https://services.openaire.eu/uoa-admin-tools/cache', - 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: "", - domain: "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", - searchLinkToJournals: "/search/journals", - 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: "2020-12-17", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - admins: ["rcd@openaire.eu"], - adminPortalURL: "https://admin.connect.openaire.eu", - errorLink: '/error', - connectPortalUrl: 'https://connect.openaire.eu' + domain:'https://admin.connect.openaire.eu', + }; + +export let properties: EnvProperties = { + ...common, ...commonProd, ...props +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index fa9ff2e..4e9ff41 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,94 +4,19 @@ // The list of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonDev, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; + +let props: EnvProperties = { -export let properties: EnvProperties = { - environment: 'development', - dashboard: 'connect', isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - framesAPIURL: 'https://beta.openaire.eu/stats3/', - claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/', - statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', - statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", - useNewStatistisTool: true, - 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/', - swhURL: "https://archive.softwareheritage.org/", - 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', - registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", - cookieDomain: '.di.uoa.gr', - feedbackmail: 'openaire.test@gmail.com', - feedbackmailForMissingEntities: 'feedback@openaire.eu', - cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=', - // deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear', - // deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/cache', - adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/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: "", + connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200', domain:'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', - searchLinkToJournals: '/search/journals', - 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', - errorLink: '/error', - connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200' + }; + +export let properties: EnvProperties = { + ...common, ...commonDev, ...props +} +