From 85fab718b6c8258b7bf97f5173938d10ad79554f Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Fri, 15 Jan 2021 08:29:51 +0000 Subject: [PATCH] [Connect | Trunk] Package.josn: remove unused dependencies Properties: - properties using services of beta in production is removed and replaced with environment.prod.prod.ts - update stats tool property and login git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@60247 d315682c-612b-4755-9ff5-7f18f6832af3 --- angular.json | 4 +- package.json | 2 - src/environments/environment.prod.prod.ts | 131 ---------------------- src/environments/environment.prod.ts | 76 ++++++------- src/environments/environment.ts | 2 +- 5 files changed, 41 insertions(+), 174 deletions(-) delete mode 100644 src/environments/environment.prod.prod.ts diff --git a/angular.json b/angular.json index f8f84c1..e90ffb6 100644 --- a/angular.json +++ b/angular.json @@ -43,7 +43,7 @@ "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.prod.ts" + "with": "src/environments/environment.prod.ts" }, { "replace": "src/index.html", @@ -153,7 +153,7 @@ "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.prod.ts" + "with": "src/environments/environment.prod.ts" }, { "replace": "src/index.html", diff --git a/package.json b/package.json index a086cb8..6451e7c 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "@nguniversal/module-map-ngfactory-loader": "^6.0.0", "@types/express": "^4.16.1", "angular-datatables": "^4.4.1", - "citation-js": "^0.3.4", "clipboard": "^1.5.16", "core-js": "^2.4.1", "datatables.net": "^1.10.19", @@ -59,7 +58,6 @@ "prom-client": "^11.3.0", "ts-md5": "^1.2.0", "tslib": "^1.9.0", - "wikidata-sdk": "^5.2.9", "zone.js": "^0.8.26", "ng-recaptcha": "^3.0.5", "ng2-ckeditor": "1.1.9" diff --git a/src/environments/environment.prod.prod.ts b/src/environments/environment.prod.prod.ts deleted file mode 100644 index 4de5fbb..0000000 --- a/src/environments/environment.prod.prod.ts +++ /dev/null @@ -1,131 +0,0 @@ -import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; - -export let properties: EnvProperties = { - environment: "production", - adminToolsPortalType: "connect", - dashboard: "connect", - enablePiwikTrack: true, - useCache: false, - useLongCache: true, - showContent: true, - showAddThis: true, - metricsAPIURL: "https://services.openaire.eu/usagestats/", - 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/", - useNewStatistisTool: false, - 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/", - doiURL: "https://dx.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/", - 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/connect-user-management/openid_connect_login", - - userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", - registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', - logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - - 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", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", - searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", - 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", - - lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - 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: ["rcd-helpdesk@openaire.eu"], - lastIndexUpdate: "2019-07-24", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - adminPortalURL: "https://admin.connect.openaire.eu" -}; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 0f19487..c90de83 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -9,18 +9,18 @@ export let properties: EnvProperties = { useLongCache: true, showContent: true, showAddThis: 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/", - statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", + metricsAPIURL: "https://services.openaire.eu/usagestats/", + 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, impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/", - 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", + 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://beta.services.openaire.eu/search/v2/api/reports", + 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/", @@ -43,40 +43,41 @@ export let properties: EnvProperties = { 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/", - + 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/connect-login/openid_connect_login", - userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', logoutUrl: "https://services.openaire.eu/connect-login/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", - + + 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", - 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", - + 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", - + domain: "https://connect.openaire.eu", + afterLoginRedirectLink: "/myCommunities", - + searchLinkToResult: "/search/result?id=", searchLinkToPublication: "/search/publication?articleId=", searchLinkToProject: "/search/project?projectId=", @@ -100,7 +101,7 @@ export let properties: EnvProperties = { searchLinkToJournals: "/search/journals", searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", - + searchLinkToAdvancedPublications: "/search/advanced/publications", searchLinkToAdvancedProjects: "/search/advanced/projects", searchLinkToAdvancedDatasets: "/search/advanced/datasets", @@ -109,21 +110,20 @@ export let properties: EnvProperties = { searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", searchLinkToAdvancedOrganizations: "/search/advanced/organizations", searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - - lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", + + lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, - widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://beta.openaire.eu/linking", - + 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: ["rcd-helpdesk@openaire.eu"], - lastIndexUpdate: "2020-05-06", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", + lastIndexUpdate: "2019-07-24", + indexInfoAPI: "https://services.openaire.eu/openaire/info/", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", adminPortalURL: "https://admin.connect.openaire.eu" }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 69af813..c46afa8 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -18,7 +18,7 @@ export let properties: EnvProperties = { framesAPIURL: 'https://beta.openaire.eu/stats3/', statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: 'https://stats.madgik.di.uoa.gr/stats-api/', + statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", useNewStatistisTool: true, impactFactorsAPIURL: 'https://bip-api.imsi.athenarc.gr/paper/scores/batch/', claimsAPIURL: 'http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/',