diff --git a/package.json b/package.json index 36a556c..e621943 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.16.14", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5699aed..2b99535 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5699aed59942a94e0d004023a09bc7994458cfe9 +Subproject commit 2b9953503aeadeca356e6942a1e60c43f8b04d5b diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index eb73b59..63893dd 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,118 +1,23 @@ 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: 'monitor', isDashboard: true, enablePiwikTrack: true, useCache: false, useLongCache: true, showContent: true, - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, monitorStatsFrameUrl:"https://beta.services.openaire.eu/stats-tool/", useOldStatisticsSchema: true, - 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", - 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/", - 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/", - 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=", - 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=", - - monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service", adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/", notificationsAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/notification/", adminToolsCommunity: "monitor", useHelpTexts:true, - 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: "/dashboard", - domain: "https://beta.monitor.openaire.eu", - 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=", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToCommunities: "/search/find/communities", - searchLinkToPublications: '/search/find/research-outcomes?type="publications"', - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: '/search/find/research-outcomes?type="datasets"', - searchLinkToSoftware: '/search/find/research-outcomes?type="software"', - searchLinkToOrps: '/search/find/research-outcomes?type="other"', - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToAdvancedResults: "/search/advanced/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", - 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: ["helpdesk@openaire.eu"], - lastIndexUpdate: "2019-08-07", - indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/" + domain: "https://beta.monitor.openaire.eu" }; + +export let properties: EnvProperties = { + ...common, ...commonBeta, ...props +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 5e2335e..33366fc 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,115 +1,23 @@ 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: 'monitor', isDashboard: true, enablePiwikTrack: true, useCache: false, useLongCache: true, showContent: true, - statisticsAPIURL: "https://services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://www.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - monitorStatsFrameUrl:"https://services.openaire.eu/stats-tool/", + monitorStatsFrameUrl: "https://services.openaire.eu/stats-tool/", useOldStatisticsSchema: false, - 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/", - 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/", - 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=", - 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=", - - monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service", adminToolsAPIURL: "https://services.openaire.eu/uoa-monitor-service/", notificationsAPIURL: "https://services.openaire.eu/uoa-monitor-service/notification/", adminToolsCommunity: "monitor", - useHelpTexts:true, - datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/", - 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, - + useHelpTexts: true, baseLink: "/dashboard", - domain: "https://monitor.openaire.eu", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToPublications: '/search/find/research-outcomes?type="publications"', - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: '/search/find/research-outcomes?type="datasets"', - searchLinkToSoftware: '/search/find/research-outcomes?type="software"', - searchLinkToOrps: '/search/find/research-outcomes?type="other"', - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToAdvancedResults: "/search/advanced/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", - 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: ["argirok@di.uoa.gr"], - lastIndexUpdate: "2019-07-24", - indexInfoAPI: "http://services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/" + domain: "https://monitor.openaire.eu" }; + +export let properties: EnvProperties = { + ...common, ...commonProd, ...props +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index aa6bb86..719f438 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,9 +4,9 @@ // 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} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "development", +let props: EnvProperties = { dashboard: 'monitor', adminToolsPortalType: "monitor", isDashboard: true, @@ -14,97 +14,18 @@ export let properties: EnvProperties = { useCache: false, useLongCache: false, showContent: true, - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, monitorStatsFrameUrl:"https://stats.madgik.di.uoa.gr/stats-api/", useOldStatisticsSchema: false, disableFrameLoad: true, - 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: "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/v2.1/", - orcidURL: "https://orcid.org/", - 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/", - 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=", - 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://scoobydoo.di.uoa.gr:3000/get?url=", - monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service", adminToolsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/", notificationsAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service/notification/", adminToolsCommunity: "monitor", useHelpTexts: true, - 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: "http://mpagasas.di.uoa.gr:4600", - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToPublications: '/search/find/research-outcomes?type="publications"', - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToResults: "/search/find/research-outcomes", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToDatasets: '/search/find/research-outcomes?type="datasets"', - searchLinkToSoftware: '/search/find/research-outcomes?type="software"', - searchLinkToOrps: '/search/find/research-outcomes?type="other"', - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - 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", "argirok@di.uoa.gr"], - lastIndexUpdate: "2019-05-16", - indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/" + reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu" }; + +export let properties: EnvProperties = { + ...common, ...commonDev, ...props +}