From 9db0195119ace3785c541f23c0ab7a2901b0cd36 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 1 Nov 2023 16:36:39 +0200 Subject: [PATCH] [DONE] :update properties - use common properties from library --- src/environments/environment.beta.ts | 128 ++++----------------------- src/environments/environment.prod.ts | 127 +++----------------------- src/environments/environment.ts | 122 +++---------------------- 3 files changed, 41 insertions(+), 336 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 4d24f2c..3f7b05b 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,120 +1,22 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "beta", +let props: EnvProperties = { + + dashboard: 'connect', adminToolsPortalType: "connect", - dashboard: "connect", - enablePiwikTrack: true, + adminToolsCommunity: 'connect', + enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: true, showContent: true, - showAddThis: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", - 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/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL: "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - doiURL: "https://doi.org/", - pmcURL: "http://europepmc.org/articles/", - pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - handleURL: "http://hdl.handle.net/", - 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/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - sherpaURLSuffix: "/", - 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=", - piwikSiteId: "80", - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - cacheUrl: "https://demo.openaire.eu/cache/get?url=", - adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "connect", - datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/", - contextsAPI: "https://beta.services.openaire.eu/openaire/context", - communityAPI: "https://beta.services.openaire.eu/openaire/community/", - communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink:"", - domain:"https://beta.connect.openaire.eu", - afterLoginRedirectLink: "/myCommunities", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToCommunities: "/search/find/communities", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrps: "/search/find/other", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedOrps: "/search/advanced/other", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - errorLink: '/error', - lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://beta.openaire.eu/linking", - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - shareInZenodoPage: "/participate/deposit/zenodo", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ["feedback@openaire.eu"], - lastIndexUpdate: "2020-05-06", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://beta.admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links" + showAddThis: false, + domain: 'https://beta.connect.openaire.eu', + baseLink : "", + }; + +export let properties: EnvProperties = { + ...common, ...commonBeta, ...props +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index ed43186..6249155 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,121 +1,22 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "production", +let props: EnvProperties = { + + dashboard: 'connect', adminToolsPortalType: "connect", - dashboard: "connect", - enablePiwikTrack: true, + adminToolsCommunity: 'connect', + enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: true, showContent: true, - showAddThis: true, - framesAPIURL: "https://www.openaire.eu/stats3/", - statisticsAPIURL: "https://services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://www.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", - 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/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "https://services.openaire.eu/uoa-orcid-service/", - orcidTokenURL: "https://orcid.org/oauth/authorize?", - orcidClientId: "APP-IN0O56SBVVTB7NN4", - doiURL: "https://doi.org/", - pmcURL: "http://europepmc.org/articles/", - pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - handleURL: "http://hdl.handle.net/", - 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/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - sherpaURLSuffix: "/", - 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=", - piwikSiteId: "112", - 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: "feedback@openaire.eu", - cacheUrl: "https://explore.openaire.eu/cache/get?url=", - datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/", - adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "connect", - contextsAPI: "https://services.openaire.eu/openaire/context", - communityAPI: "https://services.openaire.eu/openaire/community/", - communitiesAPI: "https://services.openaire.eu/openaire/community/communities", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink:"", - domain: "https://connect.openaire.eu", - afterLoginRedirectLink: "/myCommunities", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToCommunities: "/search/find/communities", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrps: "/search/find/other", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedOrps: "/search/advanced/other", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - errorLink: '/error', - lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://www.openaire.eu/linking", - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - shareInZenodoPage: "/participate/deposit/zenodo", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ["feedback@openaire.eu"], - lastIndexUpdate: "2019-07-24", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: "https://admin.connect.openaire.eu", - myOrcidLinksPage: "/my-orcid-links", + showAddThis: false, + domain: 'https://connect.openaire.eu', + baseLink : "", hasMachineCache: true }; + +export let properties: EnvProperties = { + ...common, ...commonProd, ...props +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 34a2835..4a8a496 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,122 +4,24 @@ // The list of which env maps to which file can be found in `.angular.json`. import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: 'development', - adminToolsPortalType: "connect", +let props: EnvProperties = { dashboard: 'connect', + adminToolsPortalType: "connect", + adminToolsCommunity: 'connect', enablePiwikTrack: false, + piwikSiteId: '80', useCache: false, useLongCache: false, showContent: true, showAddThis: false, - framesAPIURL: 'https://beta.openaire.eu/stats3/', - statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', - statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - enermapsURL:"https://lab.idiap.ch/enermaps", - impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/', - 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/', - 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/v2.1/", - orcidURL: "https://orcid.org/", - orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/", - orcidTokenURL: "https://sandbox.orcid.org/oauth/authorize?", - orcidClientId: "APP-A5M3KTX6NCN67L91", - doiURL: 'https://doi.org/', - pmcURL: 'http://europepmc.org/articles/', - pmidURL: 'https://www.ncbi.nlm.nih.gov/pubmed/', - handleURL: 'http://hdl.handle.net/', - 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/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: 'http://sherpa.ac.uk/romeo/issn/', - sherpaURLSuffix: '/', - 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://dev-openaire.d4science.org/provision/mvc/vocabularies/', - piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=', - piwikSiteId: '80', - 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', - cacheUrl: 'http://dl170.madgik.di.uoa.gr:3000/get?url=', - adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/', - adminToolsCommunity: 'connect', - datasourcesAPI: 'https://beta.services.openaire.eu/openaire/ds/search/', - contextsAPI: 'https://dev-openaire.d4science.org/openaire/context', - communityAPI: 'https://dev-openaire.d4science.org/openaire/community/', - communitiesAPI: 'https://dev-openaire.d4science.org/openaire/community/communities', - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink: "", domain: 'https://beta.connect.openaire.eu', - afterLoginRedirectLink: '/myCommunities', - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: '/search/publication?articleId=', - searchLinkToProject: '/search/project?projectId=', - searchLinkToDataProvider: '/search/dataprovider?datasourceId=', - searchLinkToDataset: '/search/dataset?datasetId=', - searchLinkToSoftwareLanding: '/search/software?softwareId=', - searchLinkToOrganization: '/search/organization?organizationId=', - searchLinkToOrp: '/search/other?orpId=', - searchLinkToCommunities: '/search/find/communities', - searchLinkToPublications: '/search/find/publications', - searchLinkToDataProviders: '/search/find/dataproviders', - searchLinkToProjects: '/search/find/projects', - searchLinkToDatasets: '/search/find/datasets', - searchLinkToSoftware: '/search/find/software', - searchLinkToOrps: '/search/find/other', - searchLinkToOrganizations: '/search/find/organizations', - searchLinkToCompatibleDataProviders: '/search/content-providers', - searchLinkToEntityRegistriesDataProviders: '/search/entity-registries', - searchLinkToJournals: '/search/journals', - searchLinkToResults: '/search/find/research-outcomes', - searchLinkToAdvancedPublications: '/search/advanced/publications', - searchLinkToAdvancedProjects: '/search/advanced/projects', - searchLinkToAdvancedDatasets: '/search/advanced/datasets', - searchLinkToAdvancedSoftware: '/search/advanced/software', - searchLinkToAdvancedOrps: '/search/advanced/other', - searchLinkToAdvancedDataProviders: '/search/advanced/dataproviders', - searchLinkToAdvancedOrganizations: '/search/advanced/organizations', - searchLinkToAdvancedResults: '/search/advanced/research-outcomes', - errorLink: '/error', - lastIndexInformationLink: 'https://beta.openaire.eu/aggregation-and-content-provision-workflows', - showLastIndexInformationLink: true, - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", - widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=', - claimsInformationLink: 'https://beta.openaire.eu/linking', - depositLearnHowPage: '/participate/deposit/learn-how', - depositSearchPage: '/participate/deposit/search', - shareInZenodoPage: '/participate/deposit/zenodo', - reCaptchaSiteKey: '6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu', - admins: ['kostis30fylloy@gmail.com'], - lastIndexUpdate: '2019-11-01', - indexInfoAPI: 'https://dev-openaire.d4science.org/openaire/info/', - altMetricsAPIURL: 'https://api.altmetric.com/v1/doi/', - b2noteAPIURL: 'https://b2note.eudat.eu/', - adminPortalURL: 'https://beta.admin.connect.openaire.eu', - myOrcidLinksPage: "/my-orcid-links" + baseLink : "", + }; + + +export let properties: EnvProperties = { + ...common, ...commonDev, ...props +}