[Connect|Trunk]

Connect Helper: read community from domain for production

Add extra properties file for real production environment (environment.prop.prod.ts)

Add new piwik ids



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@59121 d315682c-612b-4755-9ff5-7f18f6832af3

package.json

@@ -24,7 +24,7 @@
     "webpack:server": "webpack --config webpack.server.config.js --progress --colors",
     "serve:prerender": "cd dist/browser && http-server",
     "serve:ssr": "node dist/server",
-    "after-build-clean":  "rm -rf src node_modules  .idea/ installOpenaireLib.sh deploy;"
+    "after-build-clean":  "rm -rf src node_modules  .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
   },
   "private": true,
   "dependencies": {

src/app/utils/piwikHelper.ts

@@ -19,7 +19,7 @@ export class PiwikHelper{
     "risis":219,
     "science-innovation-policy":253,
     "covid-19":267,
-    "desira":null,
+    "rural-digital-europe":null,
     "enermaps":null
   };
   public static siteIDsProduction={
@@ -42,8 +42,8 @@ export class PiwikHelper{
     "risis":null,
     "science-innovation-policy":null,
     "covid-19":null,
-    "desira":null,
+    "rural-digital-europe":319,
-    "enermaps":null
+    "enermaps":318
   };
   public static getSiteId(communityId:string, environment:string){
     // if(environment == 'production'){

src/environments/environment.beta.ts

@@ -7,7 +7,7 @@ export let properties: EnvProperties = {
   useCache: false,
   useLongCache: true,
   showContent: true,
-  showAddThis: false,
+  showAddThis: true,
   metricsAPIURL: "https://beta.services.openaire.eu/usagestats/",
   framesAPIURL: "https://beta.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",

src/environments/environment.prod.prod.ts

@@ -0,0 +1,130 @@
+import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
+
+export let properties: EnvProperties = {
+  environment: "production",
+  dashboard: "connect",
+  enablePiwikTrack: false,
+  useCache: true,
+  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=",
+  
+  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: "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=",
+  searchLinkToOrp: "/search/other?orpId=",
+  searchLinkToOrganization: "/search/organization?organizationId=",
+  
+  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: "http://services.openaire.eu/openaire/info/",
+  altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
+  b2noteAPIURL: "http://b2note-dev.bsc.es/api/",
+  adminPortalURL: "https://admin.connect.openaire.eu"
+};

src/environments/environment.prod.ts

@@ -3,23 +3,23 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert
 export let properties: EnvProperties = {
   environment: "production",
   dashboard: "connect",
-  enablePiwikTrack: false,
+  enablePiwikTrack: true,
   useCache: false,
   useLongCache: true,
   showContent: true,
-  showAddThis: false,
+  showAddThis: true,
-  metricsAPIURL: "https://services.openaire.eu/usagestats/",
+  metricsAPIURL: "https://beta.services.openaire.eu/usagestats/",
-  framesAPIURL: "https://www.openaire.eu/stats3/",
+  framesAPIURL: "https://beta.openaire.eu/stats3/",
-  statisticsAPIURL: "https://services.openaire.eu/stats-api/",
+  statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
-  statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
+  statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "https://services.openaire.eu/stats/",
+  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
-  useNewStatistisTool: false,
+  useNewStatistisTool: true,
   impactFactorsAPIURL: "https://bip-api.imsi.athenarc.gr/paper/scores/batch/",
-  claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
+  claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
-  searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
+  searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
-  searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources",
+  searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
   openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
-  csvAPIURL: "https://services.openaire.eu/search/v2/api/reports",
+  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/",
@@ -42,13 +42,13 @@ 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://explore.openaire.eu/utils-service",
+  utilsService: "https://demo.openaire.eu/utils-service",
 
-  vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
+  vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
 
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
   piwikSiteId: "112",
-  loginUrl: "https://services.openaire.eu/_UPDATE_/openid_connect_login",
+  loginUrl: "https://services.openaire.eu/connect-user-management/openid_connect_login",
 
   userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
   
@@ -58,17 +58,15 @@ export let properties: EnvProperties = {
 
   feedbackmail: "feedback@openaire.eu",
 
-  cacheUrl: "https://explore.openaire.eu/cache/get?url=",
+  cacheUrl: "https://demo.openaire.eu/cache/get?url=",
 
-  datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
+  adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
-  
-  adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
 
   adminToolsCommunity: "connect",
-  contextsAPI: "https://services.openaire.eu/openaire/context",
+  datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/search/",
-  
+  contextsAPI: "https://beta.services.openaire.eu/openaire/context",
-  communityAPI: "https://services.openaire.eu/openaire/community/",
+  communityAPI: "https://beta.services.openaire.eu/openaire/community/",
-  communitiesAPI: "https://services.openaire.eu/openaire/community/communities",
+  communitiesAPI: "https://beta.services.openaire.eu/openaire/community/communities",
 
   csvLimit: 2000,
   pagingLimit: 20,
@@ -84,8 +82,8 @@ export let properties: EnvProperties = {
   searchLinkToDataProvider: "/search/dataprovider?datasourceId=",
   searchLinkToDataset: "/search/dataset?datasetId=",
   searchLinkToSoftwareLanding: "/search/software?softwareId=",
-  searchLinkToOrp: "/search/other?orpId=",
   searchLinkToOrganization: "/search/organization?organizationId=",
+  searchLinkToOrp: "/search/other?orpId=",
 
   searchLinkToCommunities: "/search/find/communities",
   searchLinkToPublications: "/search/find/publications",
@@ -111,20 +109,21 @@ export let properties: EnvProperties = {
   searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
   searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
 
-  lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
+  lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
   showLastIndexInformationLink: true,
-  widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
+  widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
-  claimsInformationLink: "https://www.openaire.eu/linking",
+  claimsInformationLink: "https://beta.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",
+  lastIndexUpdate: "2020-05-06",
-  indexInfoAPI: "http://services.openaire.eu/openaire/info/",
+  indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/",
   altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
   b2noteAPIURL: "http://b2note-dev.bsc.es/api/",
-  adminPortalURL: "https://admin.connect.openaire.eu"
+  adminPortalURL: "https://beta.admin.connect.openaire.eu"
 };